rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed bug in stream buffer that could cause data to be 

inserted out of order.  Also removed unnecessary limit
on writes to the TCP socket.
This commit is contained in:
crs 2002-05-02 11:43:52 +00:00
parent 76269a48c1
commit 5132161e30
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
io/CStreamBuffer.cpp
View File

@ -56,13 +56,13 @@ void CStreamBuffer::pop(UInt32 n)
scan = m_chunks.erase(scan); scan = m_chunks.erase(scan);
assert(scan != m_chunks.end()); assert(scan != m_chunks.end());
} }
assert(n > 0);
// remove left over bytes from the head chunk // remove left over bytes from the head chunk
scan->erase(scan->begin(), scan->begin() + n); if (n > 0) {
scan->erase(scan->begin(), scan->begin() + n);
}
} }
#include "CLog.h"
void CStreamBuffer::write( void CStreamBuffer::write(
const void* vdata, UInt32 n) const void* vdata, UInt32 n)
{ {
@ -72,28 +72,19 @@ void CStreamBuffer::write(
if (n == 0) { if (n == 0) {
return; return;
} }
log((CLOG_DEBUG "### %p buffering %d bytes onto %d bytes", this, n, m_size));
m_size += n; m_size += n;
// cast data to bytes // cast data to bytes
const UInt8* data = reinterpret_cast<const UInt8*>(vdata); const UInt8* data = reinterpret_cast<const UInt8*>(vdata);
if (n > 1000)
log((CLOG_DEBUG "### %p src: %u %u %u %u %u %u %u %u", this,
data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]));
// point to last chunk if it has space, otherwise append an empty chunk // point to last chunk if it has space, otherwise append an empty chunk
ChunkList::iterator scan = m_chunks.end(); ChunkList::iterator scan = m_chunks.end();
if (scan != m_chunks.begin()) { if (scan != m_chunks.begin()) {
log((CLOG_DEBUG "### %p at least one chunk", this));
--scan; --scan;
if (scan->size() >= kChunkSize) if (scan->size() >= kChunkSize)
{
log((CLOG_DEBUG "### %p last chunk full", this));
++scan; ++scan;
}
} }
if (scan == m_chunks.end()) { if (scan == m_chunks.end()) {
log((CLOG_DEBUG "### %p append chunk", this));
scan = m_chunks.insert(scan, Chunk()); scan = m_chunks.insert(scan, Chunk());
} }
@ -106,7 +97,6 @@ log((CLOG_DEBUG "### %p append chunk", this));
count = n; count = n;
// transfer data // transfer data
log((CLOG_DEBUG "### %p append %d bytes onto last chunk", this, count));
scan->insert(scan->end(), data, data + count); scan->insert(scan->end(), data, data + count);
n -= count; n -= count;
data += count; data += count;
@ -115,7 +105,6 @@ log((CLOG_DEBUG "### %p append %d bytes onto last chunk", this, count));
if (n > 0) { if (n > 0) {
++scan; ++scan;
scan = m_chunks.insert(scan, Chunk()); scan = m_chunks.insert(scan, Chunk());
log((CLOG_DEBUG "### %p append chunk2", this));
} }
} }
} }
@ -124,4 +113,3 @@ UInt32 CStreamBuffer::getSize() const
{ {
return m_size; return m_size;
} }

4
net/CTCPSocket.cpp
View File

@ -211,10 +211,6 @@ void CTCPSocket::ioService()
// get amount of data to write // get amount of data to write
UInt32 n = m_output->getSize(); UInt32 n = m_output->getSize();
if (n > 4096) {
// limit write size
n = 4096;
}
// write data // write data
const void* buffer = m_output->peek(n); const void* buffer = m_output->peek(n);