oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

event/BufferedSocket: move output buffer to FullyBufferedSocket

Browse Source 
BufferedSocket has just an input buffer, and FullyBufferedSocket adds
the output buffer.
This commit is contained in:
Max Kellermann
2013-01-30 10:36:47 +01:00
parent 4ad7456428
commit a291415326
8 changed files with 210 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/event/BufferedSocket.cxx
View File

@@ -32,26 +32,6 @@ BufferedSocket::~BufferedSocket()
fifo_buffer_free(input);
}
BufferedSocket::ssize_t
BufferedSocket::DirectWrite(const void *data, size_t length)
{
const auto nbytes = SocketMonitor::Write((const char *)data, length);
if (gcc_unlikely(nbytes < 0)) {
const auto code = GetSocketError();
if (IsSocketErrorAgain(code))
return 0;
Cancel();
if (IsSocketErrorClosed(code))
OnSocketClosed();
else
OnSocketError(NewSocketError(code));
}
return nbytes;
}
BufferedSocket::ssize_t
BufferedSocket::DirectRead(void *data, size_t length)
{
@@ -75,30 +55,6 @@ BufferedSocket::DirectRead(void *data, size_t length)
return -1;
}
bool
BufferedSocket::WriteFromBuffer()
{
assert(IsDefined());
size_t length;
const void *data = output.Read(&length);
if (data == nullptr) {
CancelWrite();
return true;
}
auto nbytes = DirectWrite(data, length);
if (gcc_unlikely(nbytes <= 0))
return nbytes == 0;
output.Consume(nbytes);
if (output.IsEmpty())
CancelWrite();
return true;
}
bool
BufferedSocket::ReadToBuffer()
{
@@ -118,38 +74,6 @@ BufferedSocket::ReadToBuffer()
return nbytes >= 0;
}
bool
BufferedSocket::Write(const void *data, size_t length)
{
assert(IsDefined());
#if 0
/* TODO: disabled because this would add overhead on some callers (the ones that often), but it may be useful */
if (output.IsEmpty()) {
/* try to write it directly first */
const auto nbytes = DirectWrite(data, length);
if (gcc_likely(nbytes > 0)) {
data = (const uint8_t *)data + nbytes;
length -= nbytes;
if (length == 0)
return true;
} else if (nbytes < 0)
return false;
}
#endif
if (!output.Append(data, length)) {
// TODO
OnSocketError(g_error_new_literal(g_quark_from_static_string("buffered_socket"),
0, "Output buffer is full"));
return false;
}
ScheduleWrite();
return true;
}
bool
BufferedSocket::ResumeInput()
{
@@ -220,20 +144,6 @@ BufferedSocket::OnSocketReady(unsigned flags)
if (input == nullptr || !fifo_buffer_is_full(input))
ScheduleRead();
/* just in case the OnSocketInput() method has added
data to the output buffer: try to send it now
instead of waiting for the next event loop
iteration */
if (!output.IsEmpty())
flags |= WRITE;
}
if (flags & WRITE) {
assert(!output.IsEmpty());
if (!WriteFromBuffer())
return false;
}
return true;