debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #227 from vibe-d/eventcore_fileio_cancel_workaround

Browse source 
Work around critical issue in eventcore's cancelRead/cancelWrite.
This commit is contained in:
Leonid Kramer 2020-09-18 22:58:34 +02:00 committed by GitHub
parent bc7521ed1f f5c6099656
commit 5f0bac04f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/vibe/core/file.d
View file

@ -607,9 +607,11 @@ struct FileStream {
size_t read(ubyte[] dst, IOMode mode) size_t read(ubyte[] dst, IOMode mode)
{ {
auto res = asyncAwait!(FileIOCallback, // NOTE: cancelRead is currently not behaving as specified and cannot
cb => eventDriver.files.read(m_fd, ctx.ptr, dst, mode, cb), // be relied upon. For this reason, we MUST use the uninterruptible
cb => eventDriver.files.cancelRead(m_fd) // version of asyncAwait here!
auto res = asyncAwaitUninterruptible!(FileIOCallback,
cb => eventDriver.files.read(m_fd, ctx.ptr, dst, mode, cb)
); );
ctx.ptr += res[2]; ctx.ptr += res[2];
enforce(res[1] == IOStatus.ok, "Failed to read data from disk."); enforce(res[1] == IOStatus.ok, "Failed to read data from disk.");
@ -624,9 +626,11 @@ struct FileStream {
size_t write(in ubyte[] bytes, IOMode mode) size_t write(in ubyte[] bytes, IOMode mode)
{ {
auto res = asyncAwait!(FileIOCallback, // NOTE: cancelWrite is currently not behaving as specified and cannot
cb => eventDriver.files.write(m_fd, ctx.ptr, bytes, mode, cb), // be relied upon. For this reason, we MUST use the uninterruptible
cb => eventDriver.files.cancelWrite(m_fd) // version of asyncAwait here!
auto res = asyncAwaitUninterruptible!(FileIOCallback,
cb => eventDriver.files.write(m_fd, ctx.ptr, bytes, mode, cb)
); );
ctx.ptr += res[2]; ctx.ptr += res[2];
if (ctx.ptr > ctx.size) ctx.size = ctx.ptr; if (ctx.ptr > ctx.size) ctx.size = ctx.ptr;