This commit is contained in:
Viktor Klang 2011-03-16 12:37:48 +01:00
parent 2d80ff4e04
commit fadd30e96b
2 changed files with 45 additions and 45 deletions

View file

@ -65,17 +65,9 @@ trait DefaultActorPool extends ActorPool { this: Actor =>
self reply_? Stats(_delegates length) self reply_? Stats(_delegates length)
case max: MaximumNumberOfRestartsWithinTimeRangeReached => case max: MaximumNumberOfRestartsWithinTimeRangeReached =>
_delegates = _delegates filterNot { _.uuid == max.victim.uuid } _delegates = _delegates filterNot { _.uuid == max.victim.uuid }
case msg => case msg =>
_capacity() _capacity()
_select() foreach { delegate => _select() foreach { _ forward msg }
self.senderFuture match {
case None =>
delegate ! msg
case Some(future) =>
delegate.!!!(msg, TimeUnit.NANOSECONDS.toMillis(future.timeoutInNanos)).onComplete( future.completeWith(_) )
}
}
} }
private def _capacity() = { private def _capacity() = {

View file

@ -186,7 +186,6 @@ class RoutingSpec extends junit.framework.TestCase with Suite with MustMatchers
// make sure the pool is of the fixed, expected capacity // make sure the pool is of the fixed, expected capacity
// //
@Test def testFixedCapacityActorPool = { @Test def testFixedCapacityActorPool = {
val latch = new CountDownLatch(2) val latch = new CountDownLatch(2)
val counter = new AtomicInteger(0) val counter = new AtomicInteger(0)
class TestPool extends Actor with DefaultActorPool class TestPool extends Actor with DefaultActorPool
@ -198,6 +197,7 @@ class RoutingSpec extends junit.framework.TestCase with Suite with MustMatchers
case _ => case _ =>
counter.incrementAndGet counter.incrementAndGet
latch.countDown latch.countDown
self reply_? "success"
} }
}) })
@ -208,11 +208,19 @@ class RoutingSpec extends junit.framework.TestCase with Suite with MustMatchers
def receive = _route def receive = _route
} }
val successes = new CountDownLatch(2)
implicit val successCounterActor = Some(actorOf(new Actor {
def receive = {
case "success" => successes.countDown
}
}).start)
val pool = actorOf(new TestPool).start val pool = actorOf(new TestPool).start
pool ! "a" pool ! "a"
pool ! "b" pool ! "b"
val done = latch.await(1,TimeUnit.SECONDS)
done must be (true) latch.await(1,TimeUnit.SECONDS) must be (true)
successes.await(1,TimeUnit.SECONDS) must be (true)
counter.get must be (2) counter.get must be (2)
(pool !! ActorPool.Stat).asInstanceOf[Option[ActorPool.Stats]].get.size must be (2) (pool !! ActorPool.Stat).asInstanceOf[Option[ActorPool.Stats]].get.size must be (2)