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

Fix range violation errors in ConsumableQueue.

Browse source
This commit is contained in:
Sönke Ludwig 2017-01-13 20:30:56 +01:00
parent aa7b2946f3
commit 2341762992
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
source/eventcore/internal/consumablequeue.d
View file

@ -71,7 +71,7 @@ final class ConsumableQueue(T)
*/ */
ConsumedRange consume() ConsumedRange consume()
@safe { @safe {
auto first = m_first + m_consumedCount; auto first = (m_first + m_consumedCount) % m_storage.length;
auto count = m_pendingCount; auto count = m_pendingCount;
m_consumedCount += count; m_consumedCount += count;
m_pendingCount = 0; m_pendingCount = 0;
@ -103,14 +103,14 @@ final class ConsumableQueue(T)
m_queue = queue; m_queue = queue;
m_first = first; m_first = first;
m_count = count; m_count = count;
m_queue.m_storage[first].rc++; m_queue.m_storage[first & m_queue.m_capacityMask].rc++;
} }
} }
this(this) this(this)
{ {
if (m_count) if (m_count)
m_queue.m_storage[m_first].rc++; m_queue.m_storage[m_first & m_queue.m_capacityMask].rc++;
} }
~this() ~this()
@ -125,7 +125,7 @@ final class ConsumableQueue(T)
@property size_t length() const { return m_count; } @property size_t length() const { return m_count; }
@property ref inout(T) front() inout { return m_queue.m_storage[m_first].value; } @property ref inout(T) front() inout { return m_queue.m_storage[m_first & m_queue.m_capacityMask].value; }
void popFront() void popFront()
{ {
@ -149,14 +149,14 @@ final class ConsumableQueue(T)
{ {
if (shift_up) { if (shift_up) {
m_storage[(first+1) & m_capacityMask].rc++; m_storage[(first+1) & m_capacityMask].rc++;
if (!--m_storage[first].rc && first == m_first) { if (!--m_storage[first & m_capacityMask].rc && first == m_first) {
m_first++; m_first++;
m_consumedCount--; m_consumedCount--;
} }
} else { } else {
m_storage[first].rc--; m_storage[first & m_capacityMask].rc--;
if (first == m_first) if (first == m_first)
while (m_consumedCount > 0 && !m_storage[m_first].rc) { while (m_consumedCount > 0 && !m_storage[m_first & m_capacityMask].rc) {
m_first++; m_first++;
m_consumedCount--; m_consumedCount--;
} }
@ -222,3 +222,16 @@ unittest {
assert(q.consume.equal([17])); assert(q.consume.equal([17]));
assert(q.consume.empty); assert(q.consume.empty);
} }
unittest {
import std.range : iota;
import std.algorithm.comparison : equal;
auto q = new ConsumableQueue!int;
foreach (i; 0 .. 14)
q.put(i);
assert(q.consume().equal(iota(14)));
foreach (i; 0 .. 4)
q.put(i);
assert(q.consume().equal(iota(4)));
}