Give each eventbase a wheeltimer

[folly.git] / folly / io / async / test / HHWheelTimerTest.cpp

diff --git a/folly/io/async/test/HHWheelTimerTest.cpp b/folly/io/async/test/HHWheelTimerTest.cpp
index 90b260be9e31834a627d67c323c6d017848b2184..85ce3e838ab6767dd99dcfe6bd271954e0e9868c 100644 (file)
--- a/folly/io/async/test/HHWheelTimerTest.cpp
+++ b/folly/io/async/test/HHWheelTimerTest.cpp
@@ -110,7 +110,7 @@ TEST_F(HHWheelTimerTest, FireOnce) {
  * Test scheduling a timeout from another timeout callback.
  */
 TEST_F(HHWheelTimerTest, TestSchedulingWithinCallback) {
  * Test scheduling a timeout from another timeout callback.
  */
 TEST_F(HHWheelTimerTest, TestSchedulingWithinCallback) {

-  StackWheelTimer t(&eventBase, milliseconds(10));
+  HHWheelTimer& t = eventBase.timer();

 
   TestTimeout t1;
   // Delayed to simulate the steady_clock counter lagging
 
   TestTimeout t1;
   // Delayed to simulate the steady_clock counter lagging


@@ -135,7 +135,7 @@ TEST_F(HHWheelTimerTest, TestSchedulingWithinCallback) {
  */
 
 TEST_F(HHWheelTimerTest, CancelTimeout) {
  */
 
 TEST_F(HHWheelTimerTest, CancelTimeout) {

-  StackWheelTimer t(&eventBase, milliseconds(1));
+  HHWheelTimer& t = eventBase.timer();

 
   // Create several timeouts that will all fire in 5ms.
   TestTimeout t5_1(&t, milliseconds(5));
 
   // Create several timeouts that will all fire in 5ms.
   TestTimeout t5_1(&t, milliseconds(5));


@@ -350,7 +350,7 @@ TEST_F(HHWheelTimerTest, AtMostEveryN) {
  */
 
 TEST_F(HHWheelTimerTest, SlowLoop) {
  */
 
 TEST_F(HHWheelTimerTest, SlowLoop) {

-  StackWheelTimer t(&eventBase, milliseconds(1));
+  HHWheelTimer& t = eventBase.timer();

 
   TestTimeout t1;
   TestTimeout t2;
 
   TestTimeout t1;
   TestTimeout t2;


@@ -429,7 +429,7 @@ TEST_F(HHWheelTimerTest, DefaultTimeout) {
 }
 
 TEST_F(HHWheelTimerTest, lambda) {
 }
 
 TEST_F(HHWheelTimerTest, lambda) {

-  StackWheelTimer t(&eventBase, milliseconds(1));
+  HHWheelTimer& t = eventBase.timer();

   size_t count = 0;
   t.scheduleTimeoutFn([&]{ count++; }, milliseconds(1));
   eventBase.loop();
   size_t count = 0;
   t.scheduleTimeoutFn([&]{ count++; }, milliseconds(1));
   eventBase.loop();


@@ -439,14 +439,14 @@ TEST_F(HHWheelTimerTest, lambda) {
 // shouldn't crash because we swallow and log the error (you'll have to look
 // at the console to confirm logging)
 TEST_F(HHWheelTimerTest, lambdaThrows) {
 // shouldn't crash because we swallow and log the error (you'll have to look
 // at the console to confirm logging)
 TEST_F(HHWheelTimerTest, lambdaThrows) {

-  StackWheelTimer t(&eventBase, milliseconds(1));
+  HHWheelTimer& t = eventBase.timer();

   t.scheduleTimeoutFn([&]{ throw std::runtime_error("expected"); },
                       milliseconds(1));
   eventBase.loop();
 }
 
 TEST_F(HHWheelTimerTest, cancelAll) {
   t.scheduleTimeoutFn([&]{ throw std::runtime_error("expected"); },
                       milliseconds(1));
   eventBase.loop();
 }
 
 TEST_F(HHWheelTimerTest, cancelAll) {

-  StackWheelTimer t(&eventBase);
+  HHWheelTimer& t = eventBase.timer();

   TestTimeout tt;
   t.scheduleTimeout(&tt, std::chrono::minutes(1));
   EXPECT_EQ(1, t.cancelAll());
   TestTimeout tt;
   t.scheduleTimeout(&tt, std::chrono::minutes(1));
   EXPECT_EQ(1, t.cancelAll());