generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 11:06:50 +01:00
Code Issues Projects Releases Wiki Activity

fixed FIFOBuffer writable notifications and tests

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2012-04-29 01:51:30 +00:00
parent fae6d780b7
commit 156a43150d
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Foundation/include/Poco/FIFOBuffer.h
View File

@@ -246,7 +246,8 @@ private:
Readable.notify(this, t); Readable.notify(this, t);
else if (usedBefore > 0 && 0 == _used) else if (usedBefore > 0 && 0 == _used)
Readable.notify(this, f); Readable.notify(this, f);
else if (usedBefore == _buffer.size() && _used < _buffer.size())
if (usedBefore == _buffer.size() && _used < _buffer.size())
Writeable.notify(this, t); Writeable.notify(this, t);
else if (usedBefore < _buffer.size() && _used == _buffer.size()) else if (usedBefore < _buffer.size() && _used == _buffer.size())
Writeable.notify(this, f); Writeable.notify(this, f);

26
Foundation/testsuite/src/CoreTest.cpp
View File

@@ -245,7 +245,7 @@ void CoreTest::testFIFOBufferChar()
std::vector<T> v; std::vector<T> v;
f.Readable += delegate(this, &CoreTest::onReadable); f.Readable += delegate(this, &CoreTest::onReadable);
f.Writeable += delegate(this, &CoreTest::onReadable); f.Writeable += delegate(this, &CoreTest::onWriteable);
for (T c = '0'; c < '0' + 10; ++c) for (T c = '0'; c < '0' + 10; ++c)
v.push_back(c); v.push_back(c);
@@ -325,9 +325,13 @@ void CoreTest::testFIFOBufferChar()
assert(1 == _notToReadable); assert(1 == _notToReadable);
assert(0 == _readableToNot); assert(0 == _readableToNot);
assert(0 == _notToWriteable);
assert(0 == _writeableToNot);
f.read(b, 6); f.read(b, 6);
assert(1 == _notToReadable); assert(1 == _notToReadable);
assert(1 == _readableToNot); assert(1 == _readableToNot);
assert(0 == _notToWriteable);
assert(0 == _writeableToNot);
assert (5 == b.size()); assert (5 == b.size());
assert (20 == f.size()); assert (20 == f.size());
@@ -338,9 +342,13 @@ void CoreTest::testFIFOBufferChar()
assert(1 == _notToReadable); assert(1 == _notToReadable);
assert(1 == _readableToNot); assert(1 == _readableToNot);
assert(0 == _notToWriteable);
assert(0 == _writeableToNot);
assert (5 == f.write(b)); assert (5 == f.write(b));
assert(2 == _notToReadable); assert(2 == _notToReadable);
assert(1 == _readableToNot); assert(1 == _readableToNot);
assert(0 == _notToWriteable);
assert(0 == _writeableToNot);
assert (20 == f.size()); assert (20 == f.size());
assert (5 == f.used()); assert (5 == f.used());
@@ -363,9 +371,13 @@ void CoreTest::testFIFOBufferChar()
assert(2 == _notToReadable); assert(2 == _notToReadable);
assert(1 == _readableToNot); assert(1 == _readableToNot);
assert(0 == _notToWriteable);
assert(0 == _writeableToNot);
f.resize(3, false); f.resize(3, false);
assert(2 == _notToReadable); assert(2 == _notToReadable);
assert(2 == _readableToNot); assert(2 == _readableToNot);
assert(0 == _notToWriteable);
assert(0 == _writeableToNot);
assert (3 == f.size()); assert (3 == f.size());
assert (0 == f.used()); assert (0 == f.used());
assert (f.isEmpty()); assert (f.isEmpty());
@@ -374,12 +386,24 @@ void CoreTest::testFIFOBufferChar()
b[0] = 'x'; b[0] = 'x';
b[1] = 'y'; b[1] = 'y';
b[2] = 'z'; b[2] = 'z';
f.resize(3);
assert(2 == _notToReadable); assert(2 == _notToReadable);
assert(2 == _readableToNot); assert(2 == _readableToNot);
assert(0 == _notToWriteable);
assert(0 == _writeableToNot);
f.write(b); f.write(b);
assert(3 == _notToReadable); assert(3 == _notToReadable);
assert(2 == _readableToNot); assert(2 == _readableToNot);
assert(0 == _notToWriteable);
assert(1 == _writeableToNot);
f.read(b);
assert(3 == _notToReadable);
assert(3 == _readableToNot);
assert(1 == _notToWriteable);
assert(1 == _writeableToNot);
assert (f.isEmpty());
f.Readable -= delegate(this, &CoreTest::onReadable); f.Readable -= delegate(this, &CoreTest::onReadable);
f.Writeable -= delegate(this, &CoreTest::onReadable); f.Writeable -= delegate(this, &CoreTest::onReadable);