Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(902)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2084593005: Rationalize AddAwakable...() and RemoveAwakable...() methods. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: doh 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
« no previous file with comments | « mojo/edk/system/message_pipe_unittest.cc ('k') | mojo/edk/system/remote_message_pipe_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/remote_data_pipe_impl_unittest.cc
diff --git a/mojo/edk/system/remote_data_pipe_impl_unittest.cc b/mojo/edk/system/remote_data_pipe_impl_unittest.cc
index 624de09ca1064cd90ba6aef8948de3eac1d9121c..7bae3d29ff76a10140610e6ab3cbeb01194fd993 100644
--- a/mojo/edk/system/remote_data_pipe_impl_unittest.cc
+++ b/mojo/edk/system/remote_data_pipe_impl_unittest.cc
@@ -141,8 +141,8 @@ TEST_F(RemoteDataPipeImplTest, Sanity) {
// first, to avoid any handling the case where it's already readable.)
waiter.Init();
ASSERT_EQ(MOJO_RESULT_OK,
- message_pipe(1)->AddAwakable(
- 0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false, 123, nullptr));
+ message_pipe(1)->AddAwakable(0, &waiter, 123, false,
+ MOJO_HANDLE_SIGNAL_READABLE, nullptr));
EXPECT_EQ(MOJO_RESULT_OK,
message_pipe(0)->WriteMessage(0, UserPointer<const void>(kHello),
sizeof(kHello), nullptr,
@@ -151,7 +151,7 @@ TEST_F(RemoteDataPipeImplTest, Sanity) {
waiter.Wait(test::ActionTimeout(), &context, nullptr));
EXPECT_EQ(123u, context);
hss = HandleSignalsState();
- message_pipe(1)->RemoveAwakable(0, &waiter, &hss);
+ message_pipe(1)->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 |
@@ -195,8 +195,8 @@ TEST_F(RemoteDataPipeImplTest, SendConsumerWithClosedProducer) {
// readable.)
waiter.Init();
ASSERT_EQ(MOJO_RESULT_OK,
- message_pipe(1)->AddAwakable(
- 0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false, 123, nullptr));
+ message_pipe(1)->AddAwakable(0, &waiter, 123, false,
+ MOJO_HANDLE_SIGNAL_READABLE, nullptr));
{
HandleTransport transport(test::HandleTryStartTransport(consumer_handle));
EXPECT_TRUE(transport.is_valid());
@@ -217,7 +217,7 @@ TEST_F(RemoteDataPipeImplTest, SendConsumerWithClosedProducer) {
waiter.Wait(test::ActionTimeout(), &context, nullptr));
EXPECT_EQ(123u, context);
hss = HandleSignalsState();
- message_pipe(1)->RemoveAwakable(0, &waiter, &hss);
+ message_pipe(1)->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 |
@@ -245,14 +245,14 @@ TEST_F(RemoteDataPipeImplTest, SendConsumerWithClosedProducer) {
waiter.Init();
hss = HandleSignalsState();
- MojoResult result =
- consumer->AddAwakable(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 456, &hss);
+ MojoResult result = consumer->AddAwakable(&waiter, 456, false,
+ MOJO_HANDLE_SIGNAL_READABLE, &hss);
if (result == MOJO_RESULT_OK) {
context = 0;
EXPECT_EQ(MOJO_RESULT_OK,
waiter.Wait(test::ActionTimeout(), &context, nullptr));
EXPECT_EQ(456u, context);
- consumer->RemoveAwakable(&waiter, &hss);
+ consumer->RemoveAwakable(false, &waiter, 0, &hss);
} else {
ASSERT_EQ(MOJO_RESULT_ALREADY_EXISTS, result);
}
@@ -275,14 +275,14 @@ TEST_F(RemoteDataPipeImplTest, SendConsumerWithClosedProducer) {
waiter.Init();
hss = HandleSignalsState();
- result =
- consumer->AddAwakable(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 789, &hss);
+ result = consumer->AddAwakable(&waiter, 789, false,
+ MOJO_HANDLE_SIGNAL_READABLE, &hss);
if (result == MOJO_RESULT_OK) {
context = 0;
EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
waiter.Wait(test::ActionTimeout(), &context, nullptr));
EXPECT_EQ(789u, context);
- consumer->RemoveAwakable(&waiter, &hss);
+ consumer->RemoveAwakable(false, &waiter, 0, &hss);
} else {
ASSERT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
}
@@ -320,8 +320,8 @@ TEST_F(RemoteDataPipeImplTest, SendConsumerDuringTwoPhaseWrite) {
// readable.)
waiter.Init();
ASSERT_EQ(MOJO_RESULT_OK,
- message_pipe(1)->AddAwakable(
- 0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false, 123, nullptr));
+ message_pipe(1)->AddAwakable(0, &waiter, 123, false,
+ MOJO_HANDLE_SIGNAL_READABLE, nullptr));
{
HandleTransport transport(test::HandleTryStartTransport(consumer_handle));
EXPECT_TRUE(transport.is_valid());
@@ -342,7 +342,7 @@ TEST_F(RemoteDataPipeImplTest, SendConsumerDuringTwoPhaseWrite) {
waiter.Wait(test::ActionTimeout(), &context, nullptr));
EXPECT_EQ(123u, context);
hss = HandleSignalsState();
- message_pipe(1)->RemoveAwakable(0, &waiter, &hss);
+ message_pipe(1)->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 |
@@ -378,14 +378,14 @@ TEST_F(RemoteDataPipeImplTest, SendConsumerDuringTwoPhaseWrite) {
// Wait for the consumer to be readable.
waiter.Init();
hss = HandleSignalsState();
- MojoResult result =
- consumer->AddAwakable(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 456, &hss);
+ MojoResult result = consumer->AddAwakable(&waiter, 456, false,
+ MOJO_HANDLE_SIGNAL_READABLE, &hss);
if (result == MOJO_RESULT_OK) {
context = 0;
EXPECT_EQ(MOJO_RESULT_OK,
waiter.Wait(test::ActionTimeout(), &context, nullptr));
EXPECT_EQ(456u, context);
- consumer->RemoveAwakable(&waiter, &hss);
+ consumer->RemoveAwakable(false, &waiter, 0, &hss);
} else {
ASSERT_EQ(MOJO_RESULT_ALREADY_EXISTS, result);
}
@@ -449,8 +449,8 @@ TEST_F(RemoteDataPipeImplTest, SendConsumerDuringSecondTwoPhaseWrite) {
// readable.)
waiter.Init();
ASSERT_EQ(MOJO_RESULT_OK,
- message_pipe(1)->AddAwakable(
- 0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false, 123, nullptr));
+ message_pipe(1)->AddAwakable(0, &waiter, 123, false,
+ MOJO_HANDLE_SIGNAL_READABLE, nullptr));
{
HandleTransport transport(test::HandleTryStartTransport(consumer_handle));
EXPECT_TRUE(transport.is_valid());
@@ -471,7 +471,7 @@ TEST_F(RemoteDataPipeImplTest, SendConsumerDuringSecondTwoPhaseWrite) {
waiter.Wait(test::ActionTimeout(), &context, nullptr));
EXPECT_EQ(123u, context);
hss = HandleSignalsState();
- message_pipe(1)->RemoveAwakable(0, &waiter, &hss);
+ message_pipe(1)->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 |
@@ -507,14 +507,14 @@ TEST_F(RemoteDataPipeImplTest, SendConsumerDuringSecondTwoPhaseWrite) {
// Wait for the consumer to know that the producer is closed.
waiter.Init();
hss = HandleSignalsState();
- MojoResult result =
- consumer->AddAwakable(&waiter, MOJO_HANDLE_SIGNAL_PEER_CLOSED, 456, &hss);
+ MojoResult result = consumer->AddAwakable(
+ &waiter, 456, false, MOJO_HANDLE_SIGNAL_PEER_CLOSED, &hss);
if (result == MOJO_RESULT_OK) {
context = 0;
EXPECT_EQ(MOJO_RESULT_OK,
waiter.Wait(test::ActionTimeout(), &context, nullptr));
EXPECT_EQ(456u, context);
- consumer->RemoveAwakable(&waiter, &hss);
+ consumer->RemoveAwakable(false, &waiter, 0, &hss);
} else {
ASSERT_EQ(MOJO_RESULT_ALREADY_EXISTS, result);
}
« no previous file with comments | « mojo/edk/system/message_pipe_unittest.cc ('k') | mojo/edk/system/remote_message_pipe_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698