| Index: mojo/edk/system/remote_message_pipe_unittest.cc
|
| diff --git a/mojo/edk/system/remote_message_pipe_unittest.cc b/mojo/edk/system/remote_message_pipe_unittest.cc
|
| index 326ab1f53065fe1abc3c16ff96a147a6947e7cc5..5c4d662100864b7e17e9dfa6f736cbb5c0f51f3d 100644
|
| --- a/mojo/edk/system/remote_message_pipe_unittest.cc
|
| +++ b/mojo/edk/system/remote_message_pipe_unittest.cc
|
| @@ -196,8 +196,8 @@ TEST_F(RemoteMessagePipeTest, Basic) {
|
| // it later, it might already be readable.)
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 123, nullptr));
|
| + mp1->AddAwakable(1, &waiter, 123, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| // Write to MP 0, port 0.
|
| EXPECT_EQ(
|
| @@ -210,7 +210,7 @@ TEST_F(RemoteMessagePipeTest, Basic) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(123u, context);
|
| hss = HandleSignalsState();
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -229,8 +229,8 @@ TEST_F(RemoteMessagePipeTest, Basic) {
|
|
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp0->AddAwakable(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 456, nullptr));
|
| + mp0->AddAwakable(0, &waiter, 456, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| EXPECT_EQ(
|
| MOJO_RESULT_OK,
|
| @@ -241,7 +241,7 @@ TEST_F(RemoteMessagePipeTest, Basic) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(456u, context);
|
| hss = HandleSignalsState();
|
| - mp0->RemoveAwakable(0, &waiter, &hss);
|
| + mp0->RemoveAwakable(0, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -264,14 +264,14 @@ TEST_F(RemoteMessagePipeTest, Basic) {
|
| // immediately.)
|
| waiter.Init();
|
| hss = HandleSignalsState();
|
| - MojoResult result = mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE,
|
| - false, 789, &hss);
|
| + MojoResult result = mp1->AddAwakable(1, &waiter, 789, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, &hss);
|
| if (result == MOJO_RESULT_OK) {
|
| EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(789u, context);
|
| hss = HandleSignalsState();
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| }
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfiable_signals);
|
| @@ -301,14 +301,14 @@ TEST_F(RemoteMessagePipeTest, PeerClosed) {
|
| // Try to wait for MP 1, port 1 to be signaled with peer closed.
|
| waiter.Init();
|
| hss = HandleSignalsState();
|
| - MojoResult result = mp1->AddAwakable(
|
| - 1, &waiter, MOJO_HANDLE_SIGNAL_PEER_CLOSED, false, 101, &hss);
|
| + MojoResult result = mp1->AddAwakable(1, &waiter, 101, false,
|
| + MOJO_HANDLE_SIGNAL_PEER_CLOSED, &hss);
|
| if (result == MOJO_RESULT_OK) {
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(101u, context);
|
| hss = HandleSignalsState();
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| }
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfiable_signals);
|
| @@ -357,8 +357,8 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
|
|
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 123, nullptr));
|
| + mp1->AddAwakable(1, &waiter, 123, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| mp0->WriteMessage(0, UserPointer<const void>(endpoint_info.get()),
|
| @@ -369,7 +369,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(123u, context);
|
| hss = HandleSignalsState();
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -398,8 +398,8 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
|
|
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp3->AddAwakable(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 789, nullptr));
|
| + mp3->AddAwakable(0, &waiter, 789, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| EXPECT_EQ(
|
| MOJO_RESULT_OK,
|
| @@ -410,7 +410,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(789u, context);
|
| hss = HandleSignalsState();
|
| - mp3->RemoveAwakable(0, &waiter, &hss);
|
| + mp3->RemoveAwakable(0, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -447,8 +447,8 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
|
|
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 123, nullptr));
|
| + mp1->AddAwakable(1, &waiter, 123, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| EXPECT_EQ(
|
| MOJO_RESULT_OK,
|
| @@ -459,7 +459,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(123u, context);
|
| hss = HandleSignalsState();
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -530,8 +530,8 @@ TEST_F(RemoteMessagePipeTest, CloseBeforeAttachAndRun) {
|
| // it later, it might already be readable.)
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 123, nullptr));
|
| + mp1->AddAwakable(1, &waiter, 123, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| BootstrapChannelEndpointNoWait(1, std::move(ep1));
|
|
|
| @@ -544,7 +544,7 @@ TEST_F(RemoteMessagePipeTest, CloseBeforeAttachAndRun) {
|
| // not appear as writable (there's a race, and it may not have noticed that
|
| // the other side was closed yet -- e.g., inserting a sleep here would make it
|
| // much more likely to notice that it's no longer writable).
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_TRUE((hss.satisfied_signals & MOJO_HANDLE_SIGNAL_READABLE));
|
| EXPECT_TRUE((hss.satisfiable_signals & MOJO_HANDLE_SIGNAL_READABLE));
|
|
|
| @@ -593,8 +593,8 @@ TEST_F(RemoteMessagePipeTest, CloseBeforeConnect) {
|
| // it later, it might already be readable.)
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 123, nullptr));
|
| + mp1->AddAwakable(1, &waiter, 123, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| BootstrapChannelEndpointNoWait(1, std::move(ep1));
|
|
|
| @@ -607,7 +607,7 @@ TEST_F(RemoteMessagePipeTest, CloseBeforeConnect) {
|
| // not appear as writable (there's a race, and it may not have noticed that
|
| // the other side was closed yet -- e.g., inserting a sleep here would make it
|
| // much more likely to notice that it's no longer writable).
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_TRUE((hss.satisfied_signals & MOJO_HANDLE_SIGNAL_READABLE));
|
| EXPECT_TRUE((hss.satisfiable_signals & MOJO_HANDLE_SIGNAL_READABLE));
|
|
|
| @@ -647,8 +647,8 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) {
|
| // it later, it might already be readable.)
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 123, nullptr));
|
| + mp1->AddAwakable(1, &waiter, 123, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| // Write to MP 0, port 0.
|
| {
|
| @@ -674,7 +674,7 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(123u, context);
|
| hss = HandleSignalsState();
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -707,8 +707,8 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) {
|
| // Add the waiter now, before it becomes readable to avoid a race.
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - dispatcher->AddAwakable(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 456,
|
| - nullptr));
|
| + dispatcher->AddAwakable(&waiter, 456, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| // Write to "local_mp", port 1.
|
| EXPECT_EQ(
|
| @@ -724,7 +724,7 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(456u, context);
|
| hss = HandleSignalsState();
|
| - dispatcher->RemoveAwakable(&waiter, &hss);
|
| + dispatcher->RemoveAwakable(false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -744,8 +744,8 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) {
|
| // Prepare to wait on "local_mp", port 1.
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - local_mp->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE,
|
| - false, 789, nullptr));
|
| + local_mp->AddAwakable(1, &waiter, 789, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| // Write to the dispatcher.
|
| EXPECT_EQ(MOJO_RESULT_OK, dispatcher->WriteMessage(
|
| @@ -757,7 +757,7 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(789u, context);
|
| hss = HandleSignalsState();
|
| - local_mp->RemoveAwakable(1, &waiter, &hss);
|
| + local_mp->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -840,8 +840,8 @@ TEST_F(RemoteMessagePipeTest, HandlePassingHalfClosed) {
|
| // it later, it might already be readable.)
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 123, nullptr));
|
| + mp1->AddAwakable(1, &waiter, 123, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| // Write to MP 0, port 0.
|
| {
|
| @@ -867,7 +867,7 @@ TEST_F(RemoteMessagePipeTest, HandlePassingHalfClosed) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(123u, context);
|
| hss = HandleSignalsState();
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -975,8 +975,8 @@ TEST_F(RemoteMessagePipeTest, SharedBufferPassing) {
|
| // it later, it might already be readable.)
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 123, nullptr));
|
| + mp1->AddAwakable(1, &waiter, 123, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| // Write to MP 0, port 0.
|
| {
|
| @@ -1002,7 +1002,7 @@ TEST_F(RemoteMessagePipeTest, SharedBufferPassing) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(123u, context);
|
| hss = HandleSignalsState();
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -1091,8 +1091,8 @@ TEST_F(RemoteMessagePipeTest, PlatformHandlePassing) {
|
| // it later, it might already be readable.)
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 123, nullptr));
|
| + mp1->AddAwakable(1, &waiter, 123, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| // Write to MP 0, port 0.
|
| {
|
| @@ -1118,7 +1118,7 @@ TEST_F(RemoteMessagePipeTest, PlatformHandlePassing) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(123u, context);
|
| hss = HandleSignalsState();
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -1232,8 +1232,8 @@ TEST_F(RemoteMessagePipeTest, PassMessagePipeHandleAcrossAndBack) {
|
| // it later, it might already be readable.)
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 123, nullptr));
|
| + mp1->AddAwakable(1, &waiter, 123, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| // Write to MP 0, port 0.
|
| {
|
| @@ -1259,7 +1259,7 @@ TEST_F(RemoteMessagePipeTest, PassMessagePipeHandleAcrossAndBack) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(123u, context);
|
| hss = HandleSignalsState();
|
| - mp1->RemoveAwakable(1, &waiter, &hss);
|
| + mp1->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -1295,8 +1295,8 @@ TEST_F(RemoteMessagePipeTest, PassMessagePipeHandleAcrossAndBack) {
|
| // it later, it might already be readable.)
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - mp0->AddAwakable(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
|
| - 456, nullptr));
|
| + mp0->AddAwakable(0, &waiter, 456, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| // Write to MP 1, port 1.
|
| {
|
| @@ -1322,7 +1322,7 @@ TEST_F(RemoteMessagePipeTest, PassMessagePipeHandleAcrossAndBack) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(456u, context);
|
| hss = HandleSignalsState();
|
| - mp0->RemoveAwakable(0, &waiter, &hss);
|
| + mp0->RemoveAwakable(0, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -1354,8 +1354,8 @@ TEST_F(RemoteMessagePipeTest, PassMessagePipeHandleAcrossAndBack) {
|
| // Add the waiter now, before it becomes readable to avoid a race.
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - dispatcher->AddAwakable(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 789,
|
| - nullptr));
|
| + dispatcher->AddAwakable(&waiter, 789, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| // Write to "local_mp", port 1.
|
| EXPECT_EQ(
|
| @@ -1368,7 +1368,7 @@ TEST_F(RemoteMessagePipeTest, PassMessagePipeHandleAcrossAndBack) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(789u, context);
|
| hss = HandleSignalsState();
|
| - dispatcher->RemoveAwakable(&waiter, &hss);
|
| + dispatcher->RemoveAwakable(false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
| @@ -1388,8 +1388,8 @@ TEST_F(RemoteMessagePipeTest, PassMessagePipeHandleAcrossAndBack) {
|
| // Prepare to wait on "local_mp", port 1.
|
| waiter.Init();
|
| ASSERT_EQ(MOJO_RESULT_OK,
|
| - local_mp->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE,
|
| - false, 789, nullptr));
|
| + local_mp->AddAwakable(1, &waiter, 789, false,
|
| + MOJO_HANDLE_SIGNAL_READABLE, nullptr));
|
|
|
| // Write to the dispatcher.
|
| EXPECT_EQ(MOJO_RESULT_OK, dispatcher->WriteMessage(
|
| @@ -1401,7 +1401,7 @@ TEST_F(RemoteMessagePipeTest, PassMessagePipeHandleAcrossAndBack) {
|
| waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
|
| EXPECT_EQ(789u, context);
|
| hss = HandleSignalsState();
|
| - local_mp->RemoveAwakable(1, &waiter, &hss);
|
| + local_mp->RemoveAwakable(1, false, &waiter, 0, &hss);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
|
| hss.satisfied_signals);
|
| EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
|
|
|