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

Add IOMode parameters to stream read/write methods.

Browse source
This commit is contained in:
Sönke Ludwig 2017-01-19 00:36:32 +01:00
parent e80d7244bc
commit 2acc60934f
No known key found for this signature in database
GPG key ID: D95E8DB493EE314C
4 changed files with 95 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

25
source/vibe/core/net.d
View file

@ -512,28 +512,37 @@ mixin(tracer);
});
}
void read(ubyte[] dst)
size_t read(scope ubyte[] dst, IOMode mode)
{
mixin(tracer);
import std.algorithm.comparison : min;
if (!dst.length) return;
if (!dst.length) return 0;
size_t nbytes = 0;
m_context.readTimeout.loopWithTimeout!((remaining) {
enforce(waitForData(), "Reached end of stream while reading data.");
if (m_context.readBuffer.length == 0) {
if (mode == IOMode.immediate || mode == IOMode.once && nbytes > 0)
return true;
enforce(waitForData(remaining), "Reached end of stream while reading data.");
}
assert(m_context.readBuffer.length > 0);
auto l = min(dst.length, m_context.readBuffer.length);
m_context.readBuffer.read(dst[0 .. l]);
dst = dst[l .. $];
nbytes += l;
return dst.length == 0;
});
return nbytes;
}
void write(in ubyte[] bytes)
void read(scope ubyte[] dst) { auto r = read(dst, IOMode.all); assert(r == dst.length); }
size_t write(in ubyte[] bytes, IOMode mode)
{
mixin(tracer);
if (bytes.length == 0) return;
if (bytes.length == 0) return 0;
auto res = asyncAwait!(IOCallback,
cb => eventDriver.sockets.write(m_socket, bytes, IOMode.all, cb),
cb => eventDriver.sockets.write(m_socket, bytes, mode, cb),
cb => eventDriver.sockets.cancelWrite(m_socket));
switch (res[1]) {
@ -541,10 +550,12 @@ mixin(tracer);
throw new Exception("Error writing data to socket.");
case IOStatus.ok: break;
case IOStatus.disconnected: break;
}
return res[2];
}
void write(in ubyte[] bytes) { auto r = write(bytes, IOMode.all); assert(r == bytes.length); }
void write(in char[] bytes) { write(cast(const(ubyte)[])bytes); }
void write(InputStream stream) { write(stream, 0); }