You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2014/10/11 11:41:39 UTC
git commit: THRIFT-2782: D: Timing-insensitive unit tests for
thrift.internal.resource_pool. Client: D Patch: David Nadlinger
Repository: thrift
Updated Branches:
refs/heads/master 2adfb0a8d -> 7a03611fa
THRIFT-2782: D: Timing-insensitive unit tests for thrift.internal.resource_pool.
Client: D
Patch: David Nadlinger
This closes #245
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/7a03611f
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/7a03611f
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/7a03611f
Branch: refs/heads/master
Commit: 7a03611fae753ad053db7f364ac1e0c258e070a4
Parents: 2adfb0a
Author: Jens Geyer <je...@apache.org>
Authored: Sat Oct 11 11:19:35 2014 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Sat Oct 11 11:19:35 2014 +0200
----------------------------------------------------------------------
lib/d/src/thrift/internal/resource_pool.d | 60 +++++++++++++++-----------
1 file changed, 35 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/7a03611f/lib/d/src/thrift/internal/resource_pool.d
----------------------------------------------------------------------
diff --git a/lib/d/src/thrift/internal/resource_pool.d b/lib/d/src/thrift/internal/resource_pool.d
index f910cbb..c0820a3 100644
--- a/lib/d/src/thrift/internal/resource_pool.d
+++ b/lib/d/src/thrift/internal/resource_pool.d
@@ -65,7 +65,7 @@ final class TResourcePool(Resource) {
/**
* Returns an »enriched« input range to iterate over the pool members.
*/
- struct Range {
+ static struct Range {
/**
* Whether the range is empty.
*
@@ -98,9 +98,7 @@ final class TResourcePool(Resource) {
auto fi = r in parent_.faultInfos_;
if (fi && fi.resetTime != fi.resetTime.init) {
- // The argument to < needs to be an lvalue…
- auto currentTick = TickDuration.currSystemTick;
- if (fi.resetTime < currentTick) {
+ if (fi.resetTime < parent_.getCurrentTick_()) {
// The timeout expired, remove the resource from the list and go
// ahead trying it.
parent_.faultInfos_.remove(r);
@@ -154,7 +152,7 @@ final class TResourcePool(Resource) {
*/
bool willBecomeNonempty(out Resource next, out Duration waitTime) {
// If no resources are in the pool, the range will never become non-empty.
- if (resources_.empty) return true;
+ if (resources_.empty) return false;
// If cycle mode is not enabled, a range never becomes non-empty after
// being empty once, because all the elements have already been
@@ -167,7 +165,7 @@ final class TResourcePool(Resource) {
).front;
next = nextPair[0];
- waitTime = to!Duration(nextPair[1].resetTime - TickDuration.currSystemTick);
+ waitTime = to!Duration(nextPair[1].resetTime - parent_.getCurrentTick_());
return true;
}
@@ -232,8 +230,7 @@ final class TResourcePool(Resource) {
if (fi.count >= faultDisableCount) {
// If the resource has hit the fault count limit, disable it for
// specified duration.
- fi.resetTime = TickDuration.currSystemTick +
- TickDuration.from!"hnsecs"(faultDisableDuration.total!"hnsecs");
+ fi.resetTime = getCurrentTick_() + cast(TickDuration)faultDisableDuration;
}
}
@@ -270,6 +267,15 @@ final class TResourcePool(Resource) {
private:
Resource[] resources_;
FaultInfo[Resource] faultInfos_;
+
+ /// Function to get the current timestamp from some monotonic system clock.
+ ///
+ /// This is overridable to be able to write timing-insensitive unit tests.
+ /// The extra indirection should not matter much performance-wise compared to
+ /// the actual system call, and by its very nature thisshould not be on a hot
+ /// path anyway.
+ typeof(&TickDuration.currSystemTick) getCurrentTick_ =
+ &TickDuration.currSystemTick;
}
private {
@@ -279,12 +285,17 @@ private {
}
}
-import std.datetime;
-import thrift.base;
+unittest {
+ auto pool = new TResourcePool!Object([]);
+ enforce(pool[].empty);
+ Object dummyRes;
+ Duration dummyDur;
+ enforce(!pool[].willBecomeNonempty(dummyRes, dummyDur));
+}
unittest {
-/*
- import core.thread;
+ import std.datetime;
+ import thrift.base;
auto a = new Object;
auto b = new Object;
@@ -292,7 +303,10 @@ unittest {
auto objs = [a, b, c];
auto pool = new TResourcePool!Object(objs);
pool.permute = false;
- pool.faultDisableDuration = dur!"msecs"(5);
+
+ static Duration fakeClock;
+ pool.getCurrentTick_ = () => cast(TickDuration)fakeClock;
+
Object dummyRes = void;
Duration dummyDur = void;
@@ -329,7 +343,7 @@ unittest {
enforce(r.empty);
enforce(!r.willBecomeNonempty(dummyRes, dummyDur));
- Thread.sleep(dur!"msecs"(5));
+ fakeClock += 2.seconds;
// Not in cycle mode, has to be still empty after the timeouts expired.
enforce(r.empty);
enforce(!r.willBecomeNonempty(dummyRes, dummyDur));
@@ -341,9 +355,7 @@ unittest {
pool.faultDisableCount = 1;
pool.recordFault(a);
- Thread.sleep(dur!"usecs"(1));
pool.recordFault(b);
- Thread.sleep(dur!"usecs"(1));
pool.recordFault(c);
auto r = pool[];
@@ -384,7 +396,7 @@ unittest {
r.popFront();
enforce(r.front == b);
- Thread.sleep(dur!"msecs"(5));
+ fakeClock += 2.seconds;
r.popFront();
enforce(r.front == c);
@@ -401,21 +413,19 @@ unittest {
pool.faultDisableCount = 1;
pool.recordFault(a);
- Thread.sleep(dur!"usecs"(1));
+ fakeClock += 1.msecs;
pool.recordFault(b);
- Thread.sleep(dur!"usecs"(1));
+ fakeClock += 1.msecs;
pool.recordFault(c);
auto r = pool[];
enforce(r.empty);
- Object nextRes;
- Duration nextWait;
- enforce(r.willBecomeNonempty(nextRes, nextWait));
- enforce(nextRes == a);
- enforce(nextWait > dur!"hnsecs"(0));
+ // Make sure willBecomeNonempty gets the order right.
+ enforce(r.willBecomeNonempty(dummyRes, dummyDur));
+ enforce(dummyRes == a);
+ enforce(dummyDur > Duration.zero);
foreach (o; objs) pool.recordSuccess(o);
}
-*/
}