premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fix Windows "file::preadv" emulation EOF handling

This commit is contained in:
Andrei Kurushin 2018-07-12 22:36:59 +03:00 committed by Arvid Norberg
parent 490d8eb328
commit 7a34b27499
2 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/file.cpp
View File

@ -198,28 +198,42 @@ namespace
} }
int ret = 0; int ret = 0;
int num_waits = num_bufs;
for (int i = 0; i < num_bufs; ++i) for (int i = 0; i < num_bufs; ++i)
{ {
DWORD num_read; DWORD num_read;
if (ReadFile(fd, bufs[i].iov_base, bufs[i].iov_len, &num_read, &ol[i]) == FALSE if (ReadFile(fd, bufs[i].iov_base, bufs[i].iov_len, &num_read, &ol[i]) == FALSE)
&& GetLastError() != ERROR_IO_PENDING
#ifdef ERROR_CANT_WAIT
&& GetLastError() != ERROR_CANT_WAIT
#endif
)
{ {
ret = -1; DWORD const last_error = GetLastError();
goto done; if (last_error == ERROR_HANDLE_EOF)
{
num_waits = i;
break;
}
else if (last_error != ERROR_IO_PENDING
#ifdef ERROR_CANT_WAIT
&& last_error != ERROR_CANT_WAIT
#endif
)
{
ret = -1;
goto done;
}
} }
} }
if (wait_for_multiple_objects(num_bufs, h) == WAIT_FAILED) if (num_waits == 0)
{
goto done;
}
if (wait_for_multiple_objects(num_waits, h) == WAIT_FAILED)
{ {
ret = -1; ret = -1;
goto done; goto done;
} }
for (int i = 0; i < num_bufs; ++i) for (int i = 0; i < num_waits; ++i)
{ {
if (WaitForSingleObject(ol[i].hEvent, INFINITE) == WAIT_FAILED) if (WaitForSingleObject(ol[i].hEvent, INFINITE) == WAIT_FAILED)
{ {
@ -229,11 +243,15 @@ namespace
DWORD num_read; DWORD num_read;
if (GetOverlappedResult(fd, &ol[i], &num_read, FALSE) == FALSE) if (GetOverlappedResult(fd, &ol[i], &num_read, FALSE) == FALSE)
{ {
DWORD const last_error = GetLastError();
if (last_error != ERROR_HANDLE_EOF)
{
#ifdef ERROR_CANT_WAIT #ifdef ERROR_CANT_WAIT
TORRENT_ASSERT(GetLastError() != ERROR_CANT_WAIT); TORRENT_ASSERT(last_error != ERROR_CANT_WAIT);
#endif #endif
ret = -1; ret = -1;
break; break;
}
} }
ret += num_read; ret += num_read;
} }

19
test/test_file.cpp
View File

@ -302,6 +302,25 @@ TORRENT_TEST(file)
TEST_EQUAL(ec, error_code()); TEST_EQUAL(ec, error_code());
TEST_CHECK(strcmp(test_buf, "test") == 0); TEST_CHECK(strcmp(test_buf, "test") == 0);
f.close(); f.close();
TEST_CHECK(f.open("test_file", file::read_only, ec));
if (ec)
fprintf(stdout, "open failed: [%s] %s\n", ec.category().name(), ec.message().c_str());
TEST_EQUAL(ec, error_code());
file::iovec_t two_buffers[2];
std::memset(test_buf, 0, sizeof(test_buf));
char test_buf2[5] = {0};
two_buffers[0].iov_base = test_buf;
two_buffers[0].iov_len = 4;
two_buffers[1].iov_base = test_buf2;
two_buffers[1].iov_len = 4;
TEST_EQUAL(f.readv(0, two_buffers, 2, ec), 4);
if (ec)
fprintf(stdout, "readv failed: [%s] %s\n", ec.category().name(), ec.message().c_str());
TEST_EQUAL(ec, error_code());
TEST_CHECK(strcmp(test_buf, "test") == 0);
f.close();
} }
TORRENT_TEST(hard_link) TORRENT_TEST(hard_link)