| Index: mojo/edk/system/awakable_list_unittest.cc
|
| diff --git a/mojo/edk/system/awakable_list_unittest.cc b/mojo/edk/system/awakable_list_unittest.cc
|
| index c2a1fb1cdcf30f99663e9c5d6056a01524ebbfd8..d698b9bf30a686a2a6f7c6fb091d91583d3b09ae 100644
|
| --- a/mojo/edk/system/awakable_list_unittest.cc
|
| +++ b/mojo/edk/system/awakable_list_unittest.cc
|
| @@ -9,13 +9,15 @@
|
|
|
| #include "mojo/edk/system/awakable_list.h"
|
|
|
| +#include "mojo/edk/platform/thread_utils.h"
|
| #include "mojo/edk/system/handle_signals_state.h"
|
| -#include "mojo/edk/system/test/sleep.h"
|
| #include "mojo/edk/system/test/timeouts.h"
|
| #include "mojo/edk/system/waiter.h"
|
| #include "mojo/edk/system/waiter_test_utils.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| +using mojo::platform::ThreadSleep;
|
| +
|
| namespace mojo {
|
| namespace system {
|
| namespace {
|
| @@ -54,7 +56,7 @@ TEST(AwakableListTest, BasicCancel) {
|
| test::SimpleWaiterThread thread(&result, &context);
|
| awakable_list.Add(thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 3);
|
| thread.Start();
|
| - test::Sleep(2 * test::EpsilonTimeout());
|
| + ThreadSleep(2 * test::EpsilonTimeout());
|
| awakable_list.CancelAll();
|
| } // Join |thread|.
|
| EXPECT_EQ(MOJO_RESULT_CANCELLED, result);
|
| @@ -101,7 +103,7 @@ TEST(AwakableListTest, BasicAwakeSatisfied) {
|
| test::SimpleWaiterThread thread(&result, &context);
|
| awakable_list.Add(thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 3);
|
| thread.Start();
|
| - test::Sleep(2 * test::EpsilonTimeout());
|
| + ThreadSleep(2 * test::EpsilonTimeout());
|
| awakable_list.AwakeForStateChange(HandleSignalsState(
|
| MOJO_HANDLE_SIGNAL_READABLE,
|
| MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE));
|
| @@ -147,7 +149,7 @@ TEST(AwakableListTest, BasicAwakeUnsatisfiable) {
|
| test::SimpleWaiterThread thread(&result, &context);
|
| awakable_list.Add(thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 3);
|
| thread.Start();
|
| - test::Sleep(2 * test::EpsilonTimeout());
|
| + ThreadSleep(2 * test::EpsilonTimeout());
|
| awakable_list.AwakeForStateChange(HandleSignalsState(
|
| MOJO_HANDLE_SIGNAL_NONE, MOJO_HANDLE_SIGNAL_WRITABLE));
|
| awakable_list.Remove(thread.waiter());
|
| @@ -177,7 +179,7 @@ TEST(AwakableListTest, MultipleAwakables) {
|
| test::SimpleWaiterThread thread2(&result2, &context2);
|
| awakable_list.Add(thread2.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 2);
|
| thread2.Start();
|
| - test::Sleep(2 * test::EpsilonTimeout());
|
| + ThreadSleep(2 * test::EpsilonTimeout());
|
| awakable_list.CancelAll();
|
| } // Join threads.
|
| EXPECT_EQ(MOJO_RESULT_CANCELLED, result1);
|
| @@ -194,7 +196,7 @@ TEST(AwakableListTest, MultipleAwakables) {
|
| test::SimpleWaiterThread thread2(&result2, &context2);
|
| awakable_list.Add(thread2.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 4);
|
| thread2.Start();
|
| - test::Sleep(2 * test::EpsilonTimeout());
|
| + ThreadSleep(2 * test::EpsilonTimeout());
|
| awakable_list.AwakeForStateChange(HandleSignalsState(
|
| MOJO_HANDLE_SIGNAL_READABLE,
|
| MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE));
|
| @@ -215,7 +217,7 @@ TEST(AwakableListTest, MultipleAwakables) {
|
| test::SimpleWaiterThread thread2(&result2, &context2);
|
| awakable_list.Add(thread2.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 6);
|
| thread2.Start();
|
| - test::Sleep(2 * test::EpsilonTimeout());
|
| + ThreadSleep(2 * test::EpsilonTimeout());
|
| awakable_list.AwakeForStateChange(HandleSignalsState(
|
| MOJO_HANDLE_SIGNAL_NONE, MOJO_HANDLE_SIGNAL_READABLE));
|
| awakable_list.Remove(thread2.waiter());
|
| @@ -233,7 +235,7 @@ TEST(AwakableListTest, MultipleAwakables) {
|
| awakable_list.Add(thread1.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 7);
|
| thread1.Start();
|
|
|
| - test::Sleep(1 * test::EpsilonTimeout());
|
| + ThreadSleep(1 * test::EpsilonTimeout());
|
|
|
| // Should do nothing.
|
| awakable_list.AwakeForStateChange(HandleSignalsState(
|
| @@ -244,7 +246,7 @@ TEST(AwakableListTest, MultipleAwakables) {
|
| awakable_list.Add(thread2.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 8);
|
| thread2.Start();
|
|
|
| - test::Sleep(1 * test::EpsilonTimeout());
|
| + ThreadSleep(1 * test::EpsilonTimeout());
|
|
|
| // Awake #1.
|
| awakable_list.AwakeForStateChange(HandleSignalsState(
|
| @@ -252,7 +254,7 @@ TEST(AwakableListTest, MultipleAwakables) {
|
| MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE));
|
| awakable_list.Remove(thread1.waiter());
|
|
|
| - test::Sleep(1 * test::EpsilonTimeout());
|
| + ThreadSleep(1 * test::EpsilonTimeout());
|
|
|
| test::SimpleWaiterThread thread3(&result3, &context3);
|
| awakable_list.Add(thread3.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 9);
|
| @@ -262,7 +264,7 @@ TEST(AwakableListTest, MultipleAwakables) {
|
| awakable_list.Add(thread4.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 10);
|
| thread4.Start();
|
|
|
| - test::Sleep(1 * test::EpsilonTimeout());
|
| + ThreadSleep(1 * test::EpsilonTimeout());
|
|
|
| // Awake #2 and #3 for unsatisfiability.
|
| awakable_list.AwakeForStateChange(HandleSignalsState(
|
|
|