Fixed Throttle bug causing any increase in the number of operations to block all message throughput. Fix prevents copying from negative indices of _ops. This caused a NaN entry which always resulted in an effective age of 0 regardless of getTimer(), causing a permanent state of throttling
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5475 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -77,9 +77,12 @@ public class Throttle
|
|||||||
public function reinit (operations :int, period :int) :void
|
public function reinit (operations :int, period :int) :void
|
||||||
{
|
{
|
||||||
var ops :Array = ArrayUtil.create(operations, 0);
|
var ops :Array = ArrayUtil.create(operations, 0);
|
||||||
// copy up to 'operations' of our most recent operations into our new array
|
// copy as much as we can of our most recent operations into our new array
|
||||||
for (var ii :int = 0; ii < operations; ii++) {
|
var copyCount :int = Math.min(operations, _ops.length);
|
||||||
ops[operations-ii-1] = _ops[(_oldestOp + _ops.length - ii - 1) % _ops.length];
|
var srcOffset :int = _oldestOp + _ops.length*2 - 1; // need *2 to prevent copying _ops[-1]
|
||||||
|
var destOffset :int = operations-1;
|
||||||
|
for (var ii :int = 0; ii < copyCount; ii++) {
|
||||||
|
ops[destOffset-ii] = _ops[(srcOffset-ii) % _ops.length];
|
||||||
}
|
}
|
||||||
_oldestOp = Math.max(0, operations-_ops.length);
|
_oldestOp = Math.max(0, operations-_ops.length);
|
||||||
_ops = ops;
|
_ops = ops;
|
||||||
@@ -160,6 +163,19 @@ public class Throttle
|
|||||||
return _ops.length + " ops per " + _period + "ms (oldest " + oldest + ")";
|
return _ops.length + " ops per " + _period + "ms (oldest " + oldest + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* For debugging, includes the age of all operations.
|
||||||
|
*/
|
||||||
|
public function opsToString () :String
|
||||||
|
{
|
||||||
|
var now :int = getTimer();
|
||||||
|
var ages :Array = []
|
||||||
|
for (var ii :int = 0; ii < _ops.length; ++ii) {
|
||||||
|
ages.push(now - _ops[(_oldestOp + ii) % _ops.length]);
|
||||||
|
}
|
||||||
|
return "[" + StringUtil.toString(ages) + "] [Oldest idx = " + _oldestOp + "]";
|
||||||
|
}
|
||||||
|
|
||||||
protected var _ops :Array;
|
protected var _ops :Array;
|
||||||
protected var _oldestOp :int;
|
protected var _oldestOp :int;
|
||||||
protected var _period :int;
|
protected var _period :int;
|
||||||
|
|||||||
Reference in New Issue
Block a user