mojo/edk/system/simple_dispatcher_unittest.cc - Issue 2075353002: Plumb the handle signals state out of Waiter::Wait().

Unified Diff: mojo/edk/system/simple_dispatcher_unittest.cc

Issue 2075353002: Plumb the handle signals state out of Waiter::Wait(). (Closed) Base URL: https://github.com/domokit/mojo.git@work795_wait_set_4.3-x-work794_wait_set_4.2

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: mojo/edk/system/simple_dispatcher_unittest.cc

diff --git a/mojo/edk/system/simple_dispatcher_unittest.cc b/mojo/edk/system/simple_dispatcher_unittest.cc

index 9efcf4096f5e4213a16247cefa33bbec2ad925c7..c03dfa5772276051ff23e57d13664600c1641bff 100644

--- a/mojo/edk/system/simple_dispatcher_unittest.cc

+++ b/mojo/edk/system/simple_dispatcher_unittest.cc

@@ -60,7 +60,8 @@ TEST(SimpleDispatcherTest, Basic) {

d->AddAwakable(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 1, nullptr));

d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_WRITABLE);

stopwatch.Start();

- EXPECT_EQ(MOJO_RESULT_OK, w.Wait(MOJO_DEADLINE_INDEFINITE, &context));

+ EXPECT_EQ(MOJO_RESULT_OK,

+ w.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));

EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout());

EXPECT_EQ(1u, context);

hss = HandleSignalsState();

@@ -76,7 +77,7 @@ TEST(SimpleDispatcherTest, Basic) {

d->AddAwakable(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 2, nullptr));

d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_WRITABLE);

stopwatch.Start();

- EXPECT_EQ(MOJO_RESULT_OK, w.Wait(0, &context));

+ EXPECT_EQ(MOJO_RESULT_OK, w.Wait(0, &context, nullptr));

EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout());

EXPECT_EQ(2u, context);

hss = HandleSignalsState();

@@ -92,7 +93,8 @@ TEST(SimpleDispatcherTest, Basic) {

d->AddAwakable(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 3, nullptr));

d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_WRITABLE);

stopwatch.Start();

- EXPECT_EQ(MOJO_RESULT_OK, w.Wait(2 * test::EpsilonTimeout(), &context));

+ EXPECT_EQ(MOJO_RESULT_OK,

+ w.Wait(2 * test::EpsilonTimeout(), &context, nullptr));

EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout());

EXPECT_EQ(3u, context);

hss = HandleSignalsState();

@@ -107,7 +109,7 @@ TEST(SimpleDispatcherTest, Basic) {

ASSERT_EQ(MOJO_RESULT_OK,

d->AddAwakable(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 4, nullptr));

stopwatch.Start();

- EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, w.Wait(0, nullptr));

+ EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, w.Wait(0, nullptr, nullptr));

EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout());

hss = HandleSignalsState();

d->RemoveAwakable(&w, &hss);

@@ -123,7 +125,7 @@ TEST(SimpleDispatcherTest, Basic) {

d->AddAwakable(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 5, nullptr));

stopwatch.Start();

EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED,

- w.Wait(2 * test::EpsilonTimeout(), nullptr));

+ w.Wait(2 * test::EpsilonTimeout(), nullptr, nullptr));

MojoDeadline elapsed = stopwatch.Elapsed();

EXPECT_GT(elapsed, (2 - 1) * test::EpsilonTimeout());

EXPECT_LT(elapsed, (2 + 1) * test::EpsilonTimeout());

@@ -164,7 +166,7 @@ TEST(SimpleDispatcherTest, BasicUnsatisfiable) {

d->SetSatisfiableSignals(MOJO_HANDLE_SIGNAL_READABLE);

stopwatch.Start();

EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,

- w.Wait(MOJO_DEADLINE_INDEFINITE, &context));

+ w.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));

EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout());

EXPECT_EQ(2u, context);

hss = HandleSignalsState();

@@ -180,7 +182,7 @@ TEST(SimpleDispatcherTest, BasicUnsatisfiable) {

d->AddAwakable(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 3, nullptr));

d->SetSatisfiableSignals(MOJO_HANDLE_SIGNAL_READABLE);

stopwatch.Start();

- EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, w.Wait(0, &context));

+ EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, w.Wait(0, &context, nullptr));

EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout());

EXPECT_EQ(3u, context);

hss = HandleSignalsState();

@@ -198,7 +200,7 @@ TEST(SimpleDispatcherTest, BasicUnsatisfiable) {

d->SetSatisfiableSignals(MOJO_HANDLE_SIGNAL_READABLE);

stopwatch.Start();

EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,

- w.Wait(2 * test::EpsilonTimeout(), &context));

+ w.Wait(2 * test::EpsilonTimeout(), &context, nullptr));

EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout());

EXPECT_EQ(4u, context);

hss = HandleSignalsState();

@@ -235,7 +237,8 @@ TEST(SimpleDispatcherTest, BasicClosed) {

d->AddAwakable(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 2, nullptr));

EXPECT_EQ(MOJO_RESULT_OK, d->Close());

stopwatch.Start();

- EXPECT_EQ(MOJO_RESULT_CANCELLED, w.Wait(MOJO_DEADLINE_INDEFINITE, &context));

+ EXPECT_EQ(MOJO_RESULT_CANCELLED,

+ w.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));

EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout());

EXPECT_EQ(2u, context);

// Don't need to remove waiters from closed dispatchers.

@@ -247,7 +250,7 @@ TEST(SimpleDispatcherTest, BasicClosed) {

d->AddAwakable(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 3, nullptr));

EXPECT_EQ(MOJO_RESULT_OK, d->Close());

stopwatch.Start();

- EXPECT_EQ(MOJO_RESULT_CANCELLED, w.Wait(0, &context));

+ EXPECT_EQ(MOJO_RESULT_CANCELLED, w.Wait(0, &context, nullptr));

EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout());

EXPECT_EQ(3u, context);

// Don't need to remove waiters from closed dispatchers.

@@ -261,7 +264,7 @@ TEST(SimpleDispatcherTest, BasicClosed) {

EXPECT_EQ(MOJO_RESULT_OK, d->Close());

stopwatch.Start();

EXPECT_EQ(MOJO_RESULT_CANCELLED,

- w.Wait(2 * test::EpsilonTimeout(), &context));

+ w.Wait(2 * test::EpsilonTimeout(), &context, nullptr));

EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout());

EXPECT_EQ(4u, context);

// Don't need to remove waiters from closed dispatchers.

« no previous file with comments | « mojo/edk/system/remote_message_pipe_unittest.cc ('k') | mojo/edk/system/waiter.h » ('j') | mojo/edk/system/waiter.cc » ('J')