generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 02:18:04 +01:00
Code Issues Projects Releases Wiki Activity

- FIFOBuffer drain() problem #552

Browse Source 
- StreamSocket::receiveBytes(FIFOBuffer&) and sendBytes(FIFOBuffer&) are
  not thread safe #402
This commit is contained in:
Alex Fabijanic
2014-10-03 16:12:42 -05:00
parent 24ba3c0df0
commit a25877bfc2
3 changed files with 83 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Net/src/StreamSocket.cpp
View File

@@ -17,10 +17,13 @@
#include "Poco/Net/StreamSocket.h"
#include "Poco/Net/StreamSocketImpl.h"
#include "Poco/FIFOBuffer.h"
#include "Poco/Mutex.h"
#include "Poco/Exception.h"
using Poco::InvalidArgumentException;
using Poco::Mutex;
using Poco::ScopedLock;
namespace Poco {
@@ -116,7 +119,9 @@ int StreamSocket::sendBytes(const void* buffer, int length, int flags)
int StreamSocket::sendBytes(FIFOBuffer& fifoBuf)
{
int ret = impl()->sendBytes(&fifoBuf.buffer()[0], (int) fifoBuf.used());
ScopedLock<Mutex> l(fifoBuf.mutex());
int ret = impl()->sendBytes(fifoBuf.begin(), (int) fifoBuf.used());
if (ret > 0) fifoBuf.drain(ret);
return ret;
}
@@ -130,7 +135,9 @@ int StreamSocket::receiveBytes(void* buffer, int length, int flags)
int StreamSocket::receiveBytes(FIFOBuffer& fifoBuf)
{
int ret = impl()->receiveBytes(fifoBuf.next(), (int) fifoBuf.available());
ScopedLock<Mutex> l(fifoBuf.mutex());
int ret = impl()->receiveBytes(fifoBuf.next(), (int)fifoBuf.available());
if (ret > 0) fifoBuf.advance(ret);
return ret;
}