diff options
38 files changed, 347 insertions, 316 deletions
diff --git a/mojo/bindings/js/core.cc b/mojo/bindings/js/core.cc index 104a49b..d6bd2ea 100644 --- a/mojo/bindings/js/core.cc +++ b/mojo/bindings/js/core.cc @@ -242,10 +242,9 @@ v8::Local<v8::Value> Core::GetModule(v8::Isolate* isolate) { .SetValue("DEADLINE_INDEFINITE", MOJO_DEADLINE_INDEFINITE) - .SetValue("WAIT_FLAG_NONE", MOJO_WAIT_FLAG_NONE) - .SetValue("WAIT_FLAG_READABLE", MOJO_WAIT_FLAG_READABLE) - .SetValue("WAIT_FLAG_READABLE", MOJO_WAIT_FLAG_READABLE) - .SetValue("WAIT_FLAG_EVERYTHING", MOJO_WAIT_FLAG_EVERYTHING) + .SetValue("HANDLE_SIGNAL_NONE", MOJO_HANDLE_SIGNAL_NONE) + .SetValue("HANDLE_SIGNAL_READABLE", MOJO_HANDLE_SIGNAL_READABLE) + .SetValue("HANDLE_SIGNAL_READABLE", MOJO_HANDLE_SIGNAL_READABLE) .SetValue("WRITE_MESSAGE_FLAG_NONE", MOJO_WRITE_MESSAGE_FLAG_NONE) diff --git a/mojo/common/data_pipe_utils.cc b/mojo/common/data_pipe_utils.cc index 4ae1085..cf9dc78 100644 --- a/mojo/common/data_pipe_utils.cc +++ b/mojo/common/data_pipe_utils.cc @@ -34,7 +34,7 @@ bool BlockingCopyToFile(ScopedDataPipeConsumerHandle source, return false; } else if (result == MOJO_RESULT_SHOULD_WAIT) { result = Wait(source.get(), - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE); if (result != MOJO_RESULT_OK) { // If the producer handle was closed, then treat as EOF. diff --git a/mojo/common/handle_watcher.cc b/mojo/common/handle_watcher.cc index a01c220a..84e8b64 100644 --- a/mojo/common/handle_watcher.cc +++ b/mojo/common/handle_watcher.cc @@ -46,7 +46,7 @@ base::TimeTicks MojoDeadlineToTimeTicks(MojoDeadline deadline) { struct WatchData { WatchData() : id(0), - handle_signals(MOJO_WAIT_FLAG_NONE), + handle_signals(MOJO_HANDLE_SIGNAL_NONE), message_loop(NULL) {} WatcherID id; @@ -299,7 +299,7 @@ void HandleWatcher::Start(const Handle& handle, MojoDeadline deadline, const base::Callback<void(MojoResult)>& callback) { DCHECK(handle.is_valid()); - DCHECK_NE(MOJO_WAIT_FLAG_NONE, handle_signals); + DCHECK_NE(MOJO_HANDLE_SIGNAL_NONE, handle_signals); state_.reset(new State(this, handle, handle_signals, deadline, callback)); } diff --git a/mojo/common/handle_watcher_unittest.cc b/mojo/common/handle_watcher_unittest.cc index 39667814..02cc610 100644 --- a/mojo/common/handle_watcher_unittest.cc +++ b/mojo/common/handle_watcher_unittest.cc @@ -78,8 +78,8 @@ class CallbackHelper { void StartWithCallback(HandleWatcher* watcher, const MessagePipeHandle& handle, const base::Callback<void(MojoResult)>& callback) { - watcher->Start(handle, MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE, - callback); + watcher->Start(handle, MOJO_HANDLE_SIGNAL_READABLE, + MOJO_DEADLINE_INDEFINITE, callback); } private: @@ -279,7 +279,7 @@ TEST_F(HandleWatcherTest, Deadline) { // Add another watcher wth a timeout of 500 microseconds. HandleWatcher watcher2; - watcher2.Start(test_pipe2.handle0.get(), MOJO_WAIT_FLAG_READABLE, 500, + watcher2.Start(test_pipe2.handle0.get(), MOJO_HANDLE_SIGNAL_READABLE, 500, callback_helper2.GetCallback()); RunUntilIdle(); EXPECT_FALSE(callback_helper1.got_callback()); @@ -325,7 +325,7 @@ TEST(HandleWatcherCleanEnvironmentTest, AbortedOnMessageLoopDestruction) { base::MessageLoop loop; watcher.Start(pipe.handle0.get(), - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, base::Bind(&ObserveCallback, &was_signaled, &result)); diff --git a/mojo/common/message_pump_mojo.cc b/mojo/common/message_pump_mojo.cc index 751d5c0..37d636b 100644 --- a/mojo/common/message_pump_mojo.cc +++ b/mojo/common/message_pump_mojo.cc @@ -215,7 +215,7 @@ MessagePumpMojo::WaitState MessagePumpMojo::GetWaitState( const RunState& run_state) const { WaitState wait_state; wait_state.handles.push_back(run_state.read_handle.get()); - wait_state.wait_signals.push_back(MOJO_WAIT_FLAG_READABLE); + wait_state.wait_signals.push_back(MOJO_HANDLE_SIGNAL_READABLE); for (HandleToHandler::const_iterator i = handlers_.begin(); i != handlers_.end(); ++i) { diff --git a/mojo/common/message_pump_mojo.h b/mojo/common/message_pump_mojo.h index 49d3e9e..7513118 100644 --- a/mojo/common/message_pump_mojo.h +++ b/mojo/common/message_pump_mojo.h @@ -51,7 +51,7 @@ class MOJO_COMMON_EXPORT MessagePumpMojo : public base::MessagePump { // Contains the data needed to track a request to AddHandler(). struct Handler { - Handler() : handler(NULL), wait_signals(MOJO_WAIT_FLAG_NONE), id(0) {} + Handler() : handler(NULL), wait_signals(MOJO_HANDLE_SIGNAL_NONE), id(0) {} MessagePumpMojoHandler* handler; MojoHandleSignals wait_signals; diff --git a/mojo/embedder/embedder_unittest.cc b/mojo/embedder/embedder_unittest.cc index 5c4e56a..32bac63 100644 --- a/mojo/embedder/embedder_unittest.cc +++ b/mojo/embedder/embedder_unittest.cc @@ -133,7 +133,7 @@ TEST_F(EmbedderTest, ChannelsBasic) { // Now wait for the other side to become readable. EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(client_mp, MOJO_WAIT_FLAG_READABLE, + MojoWait(client_mp, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE)); char buffer[1000] = {}; @@ -200,7 +200,7 @@ TEST_F(EmbedderTest, ChannelsHandlePassing) { // Wait for |client_mp| to become readable. EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(client_mp, MOJO_WAIT_FLAG_READABLE, + MojoWait(client_mp, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE)); // Read a message from |client_mp|. @@ -219,7 +219,8 @@ TEST_F(EmbedderTest, ChannelsHandlePassing) { // Wait for |h1| to become readable. EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(h1, MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE)); + MojoWait(h1, MOJO_HANDLE_SIGNAL_READABLE, + MOJO_DEADLINE_INDEFINITE)); // Read a message from |h1|. memset(buffer, 0, sizeof(buffer)); @@ -235,7 +236,8 @@ TEST_F(EmbedderTest, ChannelsHandlePassing) { // Wait for |h1| to become readable (again). EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(h1, MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE)); + MojoWait(h1, MOJO_HANDLE_SIGNAL_READABLE, + MOJO_DEADLINE_INDEFINITE)); // Read the second message from |h1|. memset(buffer, 0, sizeof(buffer)); @@ -255,7 +257,8 @@ TEST_F(EmbedderTest, ChannelsHandlePassing) { // Wait for |h0| to become readable. EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(h0, MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE)); + MojoWait(h0, MOJO_HANDLE_SIGNAL_READABLE, + MOJO_DEADLINE_INDEFINITE)); // Read a message from |h0|. memset(buffer, 0, sizeof(buffer)); @@ -320,7 +323,7 @@ TEST_F(EmbedderTest, MultiprocessChannels) { // 2. Read a message from |server_mp|. EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(server_mp, MOJO_WAIT_FLAG_READABLE, + MojoWait(server_mp, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE)); char buffer[1000] = {}; uint32_t num_bytes = static_cast<uint32_t>(sizeof(buffer)); @@ -355,7 +358,8 @@ TEST_F(EmbedderTest, MultiprocessChannels) { // 9. Read a message from |mp0|, which should have |mp2| attached. EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(mp0, MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE)); + MojoWait(mp0, MOJO_HANDLE_SIGNAL_READABLE, + MOJO_DEADLINE_INDEFINITE)); memset(buffer, 0, sizeof(buffer)); num_bytes = static_cast<uint32_t>(sizeof(buffer)); MojoHandle mp2 = MOJO_HANDLE_INVALID; @@ -371,7 +375,8 @@ TEST_F(EmbedderTest, MultiprocessChannels) { // 7. Read a message from |mp2|. EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(mp2, MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE)); + MojoWait(mp2, MOJO_HANDLE_SIGNAL_READABLE, + MOJO_DEADLINE_INDEFINITE)); memset(buffer, 0, sizeof(buffer)); num_bytes = static_cast<uint32_t>(sizeof(buffer)); EXPECT_EQ(MOJO_RESULT_OK, @@ -388,7 +393,8 @@ TEST_F(EmbedderTest, MultiprocessChannels) { // TODO(vtl): crbug.com/351768 #if 0 EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - MojoWait(mp2, MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE)); + MojoWait(mp2, MOJO_HANDLE_SIGNAL_READABLE, + MOJO_DEADLINE_INDEFINITE)); #endif EXPECT_EQ(MOJO_RESULT_OK, MojoClose(mp2)); } @@ -416,7 +422,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessChannelsClient) { // 1. Read the first message from |client_mp|. EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(client_mp, MOJO_WAIT_FLAG_READABLE, + MojoWait(client_mp, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE)); char buffer[1000] = {}; uint32_t num_bytes = static_cast<uint32_t>(sizeof(buffer)); @@ -436,7 +442,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessChannelsClient) { // 4. Read a message from |client_mp|, which should have |mp1| attached. EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(client_mp, MOJO_WAIT_FLAG_READABLE, + MojoWait(client_mp, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE)); // TODO(vtl): If the scope were to end here (and |client_mp| closed), we'd // die (again due to |Channel::HandleLocalError()|). @@ -483,7 +489,8 @@ MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessChannelsClient) { // 3. Read a message from |mp1|. EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(mp1, MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE)); + MojoWait(mp1, MOJO_HANDLE_SIGNAL_READABLE, + MOJO_DEADLINE_INDEFINITE)); memset(buffer, 0, sizeof(buffer)); num_bytes = static_cast<uint32_t>(sizeof(buffer)); EXPECT_EQ(MOJO_RESULT_OK, @@ -495,7 +502,8 @@ MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessChannelsClient) { // 11. Wait on |mp1| (which should eventually fail) and then close it. EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - MojoWait(mp1, MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE)); + MojoWait(mp1, MOJO_HANDLE_SIGNAL_READABLE, + MOJO_DEADLINE_INDEFINITE)); EXPECT_EQ(MOJO_RESULT_OK, MojoClose(mp1)); } diff --git a/mojo/examples/html_viewer/html_viewer.cc b/mojo/examples/html_viewer/html_viewer.cc index a1a44d2..8e93f47 100644 --- a/mojo/examples/html_viewer/html_viewer.cc +++ b/mojo/examples/html_viewer/html_viewer.cc @@ -38,7 +38,7 @@ class LaunchableConnection : public InterfaceImpl<launcher::Launchable> { MOJO_READ_DATA_FLAG_NONE); if (result == MOJO_RESULT_SHOULD_WAIT) { Wait(response_body_stream.get(), - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE); } else if (result == MOJO_RESULT_OK) { fwrite(buf, num_bytes, 1, stdout); diff --git a/mojo/examples/image_viewer/image_viewer.cc b/mojo/examples/image_viewer/image_viewer.cc index 51afd8f..0bd264f 100644 --- a/mojo/examples/image_viewer/image_viewer.cc +++ b/mojo/examples/image_viewer/image_viewer.cc @@ -43,7 +43,7 @@ class LaunchableConnection : public InterfaceImpl<launcher::Launchable> { MOJO_READ_DATA_FLAG_NONE); if (result == MOJO_RESULT_SHOULD_WAIT) { Wait(response_body_stream.get(), - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE); } else if (result == MOJO_RESULT_OK) { buf += num_bytes; diff --git a/mojo/examples/wget/wget.cc b/mojo/examples/wget/wget.cc index d72b186..8a0ad5e 100644 --- a/mojo/examples/wget/wget.cc +++ b/mojo/examples/wget/wget.cc @@ -89,7 +89,7 @@ class WGetApp : public Application, public URLLoaderClient { MOJO_READ_DATA_FLAG_NONE); if (result == MOJO_RESULT_SHOULD_WAIT) { Wait(response_body_stream_.get(), - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE); } else if (result == MOJO_RESULT_OK) { fwrite(buf, num_bytes, 1, stdout); diff --git a/mojo/public/c/system/tests/core_perftest.cc b/mojo/public/c/system/tests/core_perftest.cc index e828858..c81f51a 100644 --- a/mojo/public/c/system/tests/core_perftest.cc +++ b/mojo/public/c/system/tests/core_perftest.cc @@ -86,7 +86,7 @@ class MessagePipeReaderThread : public mojo::Thread { } if (result == MOJO_RESULT_SHOULD_WAIT) { - result = MojoWait(handle_, MOJO_WAIT_FLAG_READABLE, + result = MojoWait(handle_, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE); if (result == MOJO_RESULT_OK) { // Go to the top of the loop to read again. diff --git a/mojo/public/c/system/tests/core_unittest.cc b/mojo/public/c/system/tests/core_unittest.cc index ec366a0..9c29aea 100644 --- a/mojo/public/c/system/tests/core_unittest.cc +++ b/mojo/public/c/system/tests/core_unittest.cc @@ -34,9 +34,9 @@ TEST(CoreTest, InvalidHandle) { // Wait: EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, - MojoWait(MOJO_HANDLE_INVALID, MOJO_WAIT_FLAG_EVERYTHING, 1000000)); + MojoWait(MOJO_HANDLE_INVALID, ~MOJO_HANDLE_SIGNAL_NONE, 1000000)); h0 = MOJO_HANDLE_INVALID; - sig = MOJO_WAIT_FLAG_EVERYTHING; + sig = ~MOJO_HANDLE_SIGNAL_NONE; EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, MojoWaitMany(&h0, &sig, 1, MOJO_DEADLINE_INDEFINITE)); @@ -89,10 +89,10 @@ TEST(CoreTest, BasicMessagePipe) { // Shouldn't be readable. EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, - MojoWait(h0, MOJO_WAIT_FLAG_READABLE, 0)); + MojoWait(h0, MOJO_HANDLE_SIGNAL_READABLE, 0)); // Should be writable. - EXPECT_EQ(MOJO_RESULT_OK, MojoWait(h0, MOJO_WAIT_FLAG_WRITABLE, 0)); + EXPECT_EQ(MOJO_RESULT_OK, MojoWait(h0, MOJO_HANDLE_SIGNAL_WRITABLE, 0)); // Try to read. buffer_size = static_cast<uint32_t>(sizeof(buffer)); @@ -108,7 +108,7 @@ TEST(CoreTest, BasicMessagePipe) { MOJO_WRITE_MESSAGE_FLAG_NONE)); // |h0| should be readable. - sig = MOJO_WAIT_FLAG_READABLE; + sig = MOJO_HANDLE_SIGNAL_READABLE; EXPECT_EQ(MOJO_RESULT_OK, MojoWaitMany(&h0, &sig, 1, MOJO_DEADLINE_INDEFINITE)); @@ -122,14 +122,15 @@ TEST(CoreTest, BasicMessagePipe) { // |h0| should no longer be readable. EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, - MojoWait(h0, MOJO_WAIT_FLAG_READABLE, 10)); + MojoWait(h0, MOJO_HANDLE_SIGNAL_READABLE, 10)); // Close |h0|. EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h0)); // |h1| should no longer be readable or writable. EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - MojoWait(h1, MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE, + MojoWait(h1, + MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE, 1000)); EXPECT_EQ(MOJO_RESULT_OK, MojoClose(h1)); @@ -151,10 +152,10 @@ TEST(CoreTest, BasicDataPipe) { // The consumer |hc| shouldn't be readable. EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, - MojoWait(hc, MOJO_WAIT_FLAG_READABLE, 0)); + MojoWait(hc, MOJO_HANDLE_SIGNAL_READABLE, 0)); // The producer |hp| should be writable. - EXPECT_EQ(MOJO_RESULT_OK, MojoWait(hp, MOJO_WAIT_FLAG_WRITABLE, 0)); + EXPECT_EQ(MOJO_RESULT_OK, MojoWait(hp, MOJO_HANDLE_SIGNAL_WRITABLE, 0)); // Try to read from |hc|. buffer_size = static_cast<uint32_t>(sizeof(buffer)); @@ -176,7 +177,7 @@ TEST(CoreTest, BasicDataPipe) { MOJO_WRITE_MESSAGE_FLAG_NONE)); // |hc| should be(come) readable. - sig = MOJO_WAIT_FLAG_READABLE; + sig = MOJO_HANDLE_SIGNAL_READABLE; EXPECT_EQ(MOJO_RESULT_OK, MojoWaitMany(&hc, &sig, 1, MOJO_DEADLINE_INDEFINITE)); @@ -201,7 +202,7 @@ TEST(CoreTest, BasicDataPipe) { EXPECT_EQ(MOJO_RESULT_OK, MojoClose(hp)); // |hc| should still be readable. - EXPECT_EQ(MOJO_RESULT_OK, MojoWait(hc, MOJO_WAIT_FLAG_READABLE, 0)); + EXPECT_EQ(MOJO_RESULT_OK, MojoWait(hc, MOJO_HANDLE_SIGNAL_READABLE, 0)); // Do a two-phase read from |hc|. read_pointer = NULL; @@ -215,7 +216,7 @@ TEST(CoreTest, BasicDataPipe) { // |hc| should no longer be readable. EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - MojoWait(hc, MOJO_WAIT_FLAG_READABLE, 1000)); + MojoWait(hc, MOJO_HANDLE_SIGNAL_READABLE, 1000)); EXPECT_EQ(MOJO_RESULT_OK, MojoClose(hc)); diff --git a/mojo/public/c/system/tests/core_unittest_pure_c.c b/mojo/public/c/system/tests/core_unittest_pure_c.c index cbe2cbe..6464d8e 100644 --- a/mojo/public/c/system/tests/core_unittest_pure_c.c +++ b/mojo/public/c/system/tests/core_unittest_pure_c.c @@ -54,13 +54,13 @@ const char* MinimalCTest(void) { EXPECT_NE(MOJO_RESULT_OK, MojoClose(handle0)); EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, - MojoWait(handle0, MOJO_WAIT_FLAG_EVERYTHING, + MojoWait(handle0, ~MOJO_HANDLE_SIGNAL_NONE, MOJO_DEADLINE_INDEFINITE)); handle1 = MOJO_HANDLE_INVALID; EXPECT_EQ(MOJO_RESULT_OK, MojoCreateMessagePipe(NULL, &handle0, &handle1)); - signals = MOJO_WAIT_FLAG_READABLE; + signals = MOJO_HANDLE_SIGNAL_READABLE; EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, MojoWaitMany(&handle0, &signals, 1, 1)); @@ -69,7 +69,7 @@ const char* MinimalCTest(void) { 0u, MOJO_WRITE_DATA_FLAG_NONE)); EXPECT_EQ(MOJO_RESULT_OK, - MojoWait(handle1, MOJO_WAIT_FLAG_READABLE, + MojoWait(handle1, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE)); num_bytes = (uint32_t) sizeof(buffer); diff --git a/mojo/public/c/system/types.h b/mojo/public/c/system/types.h index 0e97db9..26c6877 100644 --- a/mojo/public/c/system/types.h +++ b/mojo/public/c/system/types.h @@ -145,25 +145,21 @@ const MojoDeadline MOJO_DEADLINE_INDEFINITE = static_cast<MojoDeadline>(-1); // |MojoHandleSignals|: Used to specify signals that can be waited on for a // handle (and which can be triggered), e.g., the ability to read or write to // the handle. -// |MOJO_WAIT_FLAG_NONE| - No flags. |MojoWait()|, etc. will return +// |MOJO_HANDLE_SIGNAL_NONE| - No flags. |MojoWait()|, etc. will return // |MOJO_RESULT_FAILED_PRECONDITION| if you attempt to wait on this. -// |MOJO_WAIT_FLAG_READABLE| - Can read (e.g., a message) from the handle. -// |MOJO_WAIT_FLAG_WRITABLE| - Can write (e.g., a message) to the handle. -// |MOJO_WAIT_FLAG_EVERYTHING| - All flags. +// |MOJO_HANDLE_SIGNAL_READABLE| - Can read (e.g., a message) from the handle. +// |MOJO_HANDLE_SIGNAL_WRITABLE| - Can write (e.g., a message) to the handle. typedef uint32_t MojoHandleSignals; -// TODO(vtl): Rename these to MOJO_HANDLE_SIGNAL_.... #ifdef __cplusplus -const MojoHandleSignals MOJO_WAIT_FLAG_NONE = 0; -const MojoHandleSignals MOJO_WAIT_FLAG_READABLE = 1 << 0; -const MojoHandleSignals MOJO_WAIT_FLAG_WRITABLE = 1 << 1; -const MojoHandleSignals MOJO_WAIT_FLAG_EVERYTHING = ~0; +const MojoHandleSignals MOJO_HANDLE_SIGNAL_NONE = 0; +const MojoHandleSignals MOJO_HANDLE_SIGNAL_READABLE = 1 << 0; +const MojoHandleSignals MOJO_HANDLE_SIGNAL_WRITABLE = 1 << 1; #else -#define MOJO_WAIT_FLAG_NONE ((MojoHandleSignals) 0) -#define MOJO_WAIT_FLAG_READABLE ((MojoHandleSignals) 1 << 0) -#define MOJO_WAIT_FLAG_WRITABLE ((MojoHandleSignals) 1 << 1) -#define MOJO_WAIT_FLAG_EVERYTHING (~((MojoHandleSignals) 0)) +#define MOJO_HANDLE_SIGNAL_NONE ((MojoHandleSignals) 0) +#define MOJO_HANDLE_SIGNAL_READABLE ((MojoHandleSignals) 1 << 0) +#define MOJO_HANDLE_SIGNAL_WRITABLE ((MojoHandleSignals) 1 << 1) #endif // TODO(vtl): Add out parameters with this to MojoWait/MojoWaitMany. diff --git a/mojo/public/cpp/bindings/lib/connector.cc b/mojo/public/cpp/bindings/lib/connector.cc index 8054830..aa2c4d1 100644 --- a/mojo/public/cpp/bindings/lib/connector.cc +++ b/mojo/public/cpp/bindings/lib/connector.cc @@ -114,7 +114,7 @@ void Connector::OnHandleReady(MojoResult result) { void Connector::WaitToReadMore() { async_wait_id_ = waiter_->AsyncWait(message_pipe_.get().value(), - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, &Connector::CallOnHandleReady, this); diff --git a/mojo/public/cpp/bindings/lib/sync_dispatcher.cc b/mojo/public/cpp/bindings/lib/sync_dispatcher.cc index acb537e..2cde97f 100644 --- a/mojo/public/cpp/bindings/lib/sync_dispatcher.cc +++ b/mojo/public/cpp/bindings/lib/sync_dispatcher.cc @@ -18,7 +18,7 @@ bool WaitForMessageAndDispatch(MessagePipeHandle handle, if (rv == MOJO_RESULT_OK) return result; if (rv == MOJO_RESULT_SHOULD_WAIT) - rv = Wait(handle, MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE); + rv = Wait(handle, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE); if (rv != MOJO_RESULT_OK) return false; } diff --git a/mojo/public/cpp/environment/tests/async_waiter_unittest.cc b/mojo/public/cpp/environment/tests/async_waiter_unittest.cc index a71f769..0abeb95 100644 --- a/mojo/public/cpp/environment/tests/async_waiter_unittest.cc +++ b/mojo/public/cpp/environment/tests/async_waiter_unittest.cc @@ -72,7 +72,7 @@ TEST_F(AsyncWaiterTest, CallbackNotified) { EXPECT_TRUE(test::WriteTextMessage(test_pipe.handle1.get(), std::string())); CallAsyncWait(test_pipe.handle0.get(), - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, &callback); RunLoop::current()->Run(); EXPECT_EQ(1, callback.result_count()); @@ -88,8 +88,12 @@ TEST_F(AsyncWaiterTest, TwoCallbacksNotified) { EXPECT_TRUE(test::WriteTextMessage(test_pipe1.handle1.get(), std::string())); EXPECT_TRUE(test::WriteTextMessage(test_pipe2.handle1.get(), std::string())); - CallAsyncWait(test_pipe1.handle0.get(), MOJO_WAIT_FLAG_READABLE, &callback1); - CallAsyncWait(test_pipe2.handle0.get(), MOJO_WAIT_FLAG_READABLE, &callback2); + CallAsyncWait(test_pipe1.handle0.get(), + MOJO_HANDLE_SIGNAL_READABLE, + &callback1); + CallAsyncWait(test_pipe2.handle0.get(), + MOJO_HANDLE_SIGNAL_READABLE, + &callback2); RunLoop::current()->Run(); EXPECT_EQ(1, callback1.result_count()); @@ -106,7 +110,7 @@ TEST_F(AsyncWaiterTest, CancelCallback) { CallCancelWait( CallAsyncWait(test_pipe.handle0.get(), - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, &callback)); RunLoop::current()->Run(); EXPECT_EQ(0, callback.result_count()); diff --git a/mojo/public/cpp/system/tests/core_unittest.cc b/mojo/public/cpp/system/tests/core_unittest.cc index a78789a..baa11b8 100644 --- a/mojo/public/cpp/system/tests/core_unittest.cc +++ b/mojo/public/cpp/system/tests/core_unittest.cc @@ -99,12 +99,12 @@ TEST(CoreCppTest, Basic) { EXPECT_EQ(kInvalidHandleValue, h.get().value()); EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, - Wait(h.get(), MOJO_WAIT_FLAG_EVERYTHING, 1000000)); + Wait(h.get(), ~MOJO_HANDLE_SIGNAL_NONE, 1000000)); std::vector<Handle> wh; wh.push_back(h.get()); std::vector<MojoHandleSignals> sigs; - sigs.push_back(MOJO_WAIT_FLAG_EVERYTHING); + sigs.push_back(~MOJO_HANDLE_SIGNAL_NONE); EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, WaitMany(wh, sigs, MOJO_DEADLINE_INDEFINITE)); } @@ -163,13 +163,13 @@ TEST(CoreCppTest, Basic) { MojoHandle hv1 = h1.get().value(); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, - Wait(h0.get(), MOJO_WAIT_FLAG_READABLE, 0)); + Wait(h0.get(), MOJO_HANDLE_SIGNAL_READABLE, 0)); std::vector<Handle> wh; wh.push_back(h0.get()); wh.push_back(h1.get()); std::vector<MojoHandleSignals> sigs; - sigs.push_back(MOJO_WAIT_FLAG_READABLE); - sigs.push_back(MOJO_WAIT_FLAG_WRITABLE); + sigs.push_back(MOJO_HANDLE_SIGNAL_READABLE); + sigs.push_back(MOJO_HANDLE_SIGNAL_WRITABLE); EXPECT_EQ(1, WaitMany(wh, sigs, 1000)); // Test closing |h1| explicitly. @@ -178,11 +178,11 @@ TEST(CoreCppTest, Basic) { // Make sure |h1| is closed. EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, - MojoWait(hv1, MOJO_WAIT_FLAG_EVERYTHING, + MojoWait(hv1, ~MOJO_HANDLE_SIGNAL_NONE, MOJO_DEADLINE_INDEFINITE)); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - Wait(h0.get(), MOJO_WAIT_FLAG_READABLE, + Wait(h0.get(), MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE)); } // |hv0| should have been closed when |h0| went out of scope, so this close @@ -203,7 +203,7 @@ TEST(CoreCppTest, Basic) { NULL, 0, MOJO_WRITE_MESSAGE_FLAG_NONE)); EXPECT_EQ(MOJO_RESULT_OK, - Wait(h1.get(), MOJO_WAIT_FLAG_READABLE, + Wait(h1.get(), MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE)); char buffer[10] = { 0 }; uint32_t buffer_size = static_cast<uint32_t>(sizeof(buffer)); @@ -245,7 +245,7 @@ TEST(CoreCppTest, Basic) { // Read "hello" and the sent handle. EXPECT_EQ(MOJO_RESULT_OK, - Wait(h0.get(), MOJO_WAIT_FLAG_READABLE, + Wait(h0.get(), MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE)); memset(buffer, 0, sizeof(buffer)); buffer_size = static_cast<uint32_t>(sizeof(buffer)); @@ -267,7 +267,7 @@ TEST(CoreCppTest, Basic) { // Save |handles[0]| to check that it gets properly closed. hv0 = handles[0]; EXPECT_EQ(MOJO_RESULT_OK, - Wait(mp.handle1.get(), MOJO_WAIT_FLAG_READABLE, + Wait(mp.handle1.get(), MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE)); memset(buffer, 0, sizeof(buffer)); buffer_size = static_cast<uint32_t>(sizeof(buffer)); diff --git a/mojo/public/cpp/test_support/lib/test_utils.cc b/mojo/public/cpp/test_support/lib/test_utils.cc index 576c70a..b47ea20 100644 --- a/mojo/public/cpp/test_support/lib/test_utils.cc +++ b/mojo/public/cpp/test_support/lib/test_utils.cc @@ -38,7 +38,7 @@ bool ReadTextMessage(const MessagePipeHandle& handle, std::string* text) { assert(false); // Looping endlessly!? return false; } - rv = Wait(handle, MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE); + rv = Wait(handle, MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE); if (rv != MOJO_RESULT_OK) return false; did_wait = true; diff --git a/mojo/public/cpp/utility/run_loop.h b/mojo/public/cpp/utility/run_loop.h index 4febc97..74f870a 100644 --- a/mojo/public/cpp/utility/run_loop.h +++ b/mojo/public/cpp/utility/run_loop.h @@ -57,7 +57,7 @@ class RunLoop { struct HandlerData { HandlerData() : handler(NULL), - handle_signals(MOJO_WAIT_FLAG_NONE), + handle_signals(MOJO_HANDLE_SIGNAL_NONE), deadline(0), id(0) {} diff --git a/mojo/public/cpp/utility/tests/run_loop_unittest.cc b/mojo/public/cpp/utility/tests/run_loop_unittest.cc index ff4b2d1..ba17fe8 100644 --- a/mojo/public/cpp/utility/tests/run_loop_unittest.cc +++ b/mojo/public/cpp/utility/tests/run_loop_unittest.cc @@ -101,7 +101,7 @@ TEST_F(RunLoopTest, HandleReady) { RunLoop run_loop; handler.set_run_loop(&run_loop); run_loop.AddHandler(&handler, test_pipe.handle0.get(), - MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE); + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE); run_loop.Run(); EXPECT_EQ(1, handler.ready_count()); EXPECT_EQ(0, handler.error_count()); @@ -137,7 +137,7 @@ TEST_F(RunLoopTest, QuitFromReady) { RunLoop run_loop; handler.set_run_loop(&run_loop); run_loop.AddHandler(&handler, test_pipe.handle0.get(), - MOJO_WAIT_FLAG_READABLE, MOJO_DEADLINE_INDEFINITE); + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE); run_loop.Run(); EXPECT_EQ(1, handler.ready_count()); EXPECT_EQ(0, handler.error_count()); @@ -172,7 +172,7 @@ TEST_F(RunLoopTest, QuitWhenDeadlineExpired) { RunLoop run_loop; handler.set_run_loop(&run_loop); run_loop.AddHandler(&handler, test_pipe.handle0.get(), - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, static_cast<MojoDeadline>(10000)); run_loop.Run(); EXPECT_EQ(0, handler.ready_count()); diff --git a/mojo/public/js/bindings/connector.js b/mojo/public/js/bindings/connector.js index 5774598..51022b0 100644 --- a/mojo/public/js/bindings/connector.js +++ b/mojo/public/js/bindings/connector.js @@ -77,7 +77,7 @@ define("mojo/public/js/bindings/connector", [ Connector.prototype.waitToReadMore_ = function() { this.readWaitCookie_ = support.asyncWait(this.handle_, - core.WAIT_FLAG_READABLE, + core.HANDLE_SIGNAL_READABLE, this.readMore_.bind(this)); }; diff --git a/mojo/public/js/bindings/core.js b/mojo/public/js/bindings/core.js index 5377533..138553e 100644 --- a/mojo/public/js/bindings/core.js +++ b/mojo/public/js/bindings/core.js @@ -52,10 +52,10 @@ var DEADLINE_INDEFINITE; * the handle. * See core.h for more information. */ -var WAIT_FLAG_NONE; -var WAIT_FLAG_READABLE; -var WAIT_FLAG_WRITABLE; -var WAIT_FLAG_EVERYTHING; +var HANDLE_SIGNAL_NONE; +var HANDLE_SIGNAL_READABLE; +var HANDLE_SIGNAL_WRITABLE; +var HANDLE_SIGNAL_EVERYTHING; /* * MojoWriteMessageFlags: Used to specify different modes to |writeMessage()|. diff --git a/mojo/spy/spy.cc b/mojo/spy/spy.cc index acce078..3fcc49c 100644 --- a/mojo/spy/spy.cc +++ b/mojo/spy/spy.cc @@ -50,8 +50,8 @@ class MessageProcessor : pipes.push_back(client.get()); pipes.push_back(interceptor.get()); std::vector<MojoHandleSignals> handle_signals; - handle_signals.push_back(MOJO_WAIT_FLAG_READABLE); - handle_signals.push_back(MOJO_WAIT_FLAG_READABLE); + handle_signals.push_back(MOJO_HANDLE_SIGNAL_READABLE); + handle_signals.push_back(MOJO_HANDLE_SIGNAL_READABLE); scoped_ptr<char[]> mbuf(new char[kMessageBufSize]); scoped_ptr<MojoHandle[]> hbuf(new MojoHandle[kHandleBufSize]); @@ -90,7 +90,7 @@ class MessageProcessor : mojo::MessagePipeHandle write_handle = (r == 0) ? pipes[1] : pipes[0]; if (!CheckResult(Wait(write_handle, - MOJO_WAIT_FLAG_WRITABLE, + MOJO_HANDLE_SIGNAL_WRITABLE, MOJO_DEADLINE_INDEFINITE))) break; diff --git a/mojo/system/channel_unittest.cc b/mojo/system/channel_unittest.cc index e8c8260..1c40d02 100644 --- a/mojo/system/channel_unittest.cc +++ b/mojo/system/channel_unittest.cc @@ -264,7 +264,7 @@ TEST_F(ChannelTest, ShutdownAfterAttach) { Waiter waiter; waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp->AddWaiter(0, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); + mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); // Don't wait for the shutdown to run ... io_thread()->PostTask(FROM_HERE, @@ -315,7 +315,7 @@ TEST_F(ChannelTest, WaitAfterAttachRunAndShutdown) { Waiter waiter; waiter.Init(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - mp->AddWaiter(0, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); + mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); mp->Close(0); diff --git a/mojo/system/core_unittest.cc b/mojo/system/core_unittest.cc index ee58d87..af3d0c1 100644 --- a/mojo/system/core_unittest.cc +++ b/mojo/system/core_unittest.cc @@ -94,16 +94,16 @@ TEST_F(CoreTest, Basic) { EXPECT_EQ(0u, info.GetAddWaiterCallCount()); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - core()->Wait(h, MOJO_WAIT_FLAG_EVERYTHING, + core()->Wait(h, ~MOJO_HANDLE_SIGNAL_NONE, MOJO_DEADLINE_INDEFINITE)); EXPECT_EQ(1u, info.GetAddWaiterCallCount()); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - core()->Wait(h, MOJO_WAIT_FLAG_EVERYTHING, 0)); + core()->Wait(h, ~MOJO_HANDLE_SIGNAL_NONE, 0)); EXPECT_EQ(2u, info.GetAddWaiterCallCount()); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - core()->Wait(h, MOJO_WAIT_FLAG_EVERYTHING, 10 * 1000)); + core()->Wait(h, ~MOJO_HANDLE_SIGNAL_NONE, 10 * 1000)); EXPECT_EQ(3u, info.GetAddWaiterCallCount()); - MojoHandleSignals handle_signals = MOJO_WAIT_FLAG_EVERYTHING; + MojoHandleSignals handle_signals = ~MOJO_HANDLE_SIGNAL_NONE; EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, core()->WaitMany(&h, &handle_signals, 1, MOJO_DEADLINE_INDEFINITE)); EXPECT_EQ(4u, info.GetAddWaiterCallCount()); @@ -139,18 +139,18 @@ TEST_F(CoreTest, InvalidArguments) { // |Wait()|: { EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, - core()->Wait(MOJO_HANDLE_INVALID, MOJO_WAIT_FLAG_EVERYTHING, + core()->Wait(MOJO_HANDLE_INVALID, ~MOJO_HANDLE_SIGNAL_NONE, MOJO_DEADLINE_INDEFINITE)); EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, - core()->Wait(10, MOJO_WAIT_FLAG_EVERYTHING, + core()->Wait(10, ~MOJO_HANDLE_SIGNAL_NONE, MOJO_DEADLINE_INDEFINITE)); } // |WaitMany()|: { MojoHandle handles[2] = {MOJO_HANDLE_INVALID, MOJO_HANDLE_INVALID}; - MojoHandleSignals signals[2] = {MOJO_WAIT_FLAG_EVERYTHING, - MOJO_WAIT_FLAG_EVERYTHING}; + MojoHandleSignals signals[2] = {~MOJO_HANDLE_SIGNAL_NONE, + ~MOJO_HANDLE_SIGNAL_NONE}; EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, core()->WaitMany(handles, signals, 0, MOJO_DEADLINE_INDEFINITE)); EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, @@ -204,7 +204,7 @@ TEST_F(CoreTest, InvalidArguments) { MockHandleInfo info; MojoHandle h = CreateMockHandle(&info); - MojoHandle handles[2] = { MOJO_HANDLE_INVALID, MOJO_HANDLE_INVALID }; + MojoHandle handles[2] = {MOJO_HANDLE_INVALID, MOJO_HANDLE_INVALID}; // Null |handles| with nonzero |num_handles|. EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, @@ -332,13 +332,13 @@ TEST_F(CoreTest, MessagePipe) { EXPECT_NE(h[0], h[1]); // Neither should be readable. - MojoHandleSignals signals[2] = {MOJO_WAIT_FLAG_READABLE, - MOJO_WAIT_FLAG_READABLE}; + MojoHandleSignals signals[2] = {MOJO_HANDLE_SIGNAL_READABLE, + MOJO_HANDLE_SIGNAL_READABLE}; EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, core()->WaitMany(h, signals, 2, 0)); // Try to read anyway. - char buffer[1] = { 'a' }; + char buffer[1] = {'a'}; uint32_t buffer_size = 1; EXPECT_EQ(MOJO_RESULT_SHOULD_WAIT, core()->ReadMessage(h[0], buffer, &buffer_size, NULL, NULL, @@ -349,13 +349,13 @@ TEST_F(CoreTest, MessagePipe) { // Both should be writable. EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(h[0], MOJO_WAIT_FLAG_WRITABLE, 1000000000)); + core()->Wait(h[0], MOJO_HANDLE_SIGNAL_WRITABLE, 1000000000)); EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(h[1], MOJO_WAIT_FLAG_WRITABLE, 1000000000)); + core()->Wait(h[1], MOJO_HANDLE_SIGNAL_WRITABLE, 1000000000)); // Also check that |h[1]| is writable using |WaitMany()|. - signals[0] = MOJO_WAIT_FLAG_READABLE; - signals[1] = MOJO_WAIT_FLAG_WRITABLE; + signals[0] = MOJO_HANDLE_SIGNAL_READABLE; + signals[1] = MOJO_HANDLE_SIGNAL_WRITABLE; EXPECT_EQ(1, core()->WaitMany(h, signals, 2, MOJO_DEADLINE_INDEFINITE)); // Write to |h[1]|. @@ -365,8 +365,8 @@ TEST_F(CoreTest, MessagePipe) { MOJO_WRITE_MESSAGE_FLAG_NONE)); // Check that |h[0]| is now readable. - signals[0] = MOJO_WAIT_FLAG_READABLE; - signals[1] = MOJO_WAIT_FLAG_READABLE; + signals[0] = MOJO_HANDLE_SIGNAL_READABLE; + signals[1] = MOJO_HANDLE_SIGNAL_READABLE; EXPECT_EQ(0, core()->WaitMany(h, signals, 2, MOJO_DEADLINE_INDEFINITE)); // Read from |h[0]|. @@ -387,7 +387,7 @@ TEST_F(CoreTest, MessagePipe) { // |h[0]| should no longer be readable. EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, - core()->Wait(h[0], MOJO_WAIT_FLAG_READABLE, 0)); + core()->Wait(h[0], MOJO_HANDLE_SIGNAL_READABLE, 0)); // Write to |h[0]|. buffer[0] = 'd'; @@ -400,11 +400,11 @@ TEST_F(CoreTest, MessagePipe) { // Check that |h[1]| is no longer writable (and will never be). EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - core()->Wait(h[1], MOJO_WAIT_FLAG_WRITABLE, 1000000000)); + core()->Wait(h[1], MOJO_HANDLE_SIGNAL_WRITABLE, 1000000000)); // Check that |h[1]| is still readable (for the moment). EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(h[1], MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(h[1], MOJO_HANDLE_SIGNAL_READABLE, 1000000000)); // Discard a message from |h[1]|. EXPECT_EQ(MOJO_RESULT_RESOURCE_EXHAUSTED, @@ -413,7 +413,7 @@ TEST_F(CoreTest, MessagePipe) { // |h[1]| is no longer readable (and will never be). EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - core()->Wait(h[1], MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(h[1], MOJO_HANDLE_SIGNAL_READABLE, 1000000000)); // Try writing to |h[1]|. buffer[0] = 'e'; @@ -448,7 +448,8 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing1) { NULL, 0, MOJO_WRITE_MESSAGE_FLAG_NONE)); EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(h_passing[1], MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(h_passing[1], MOJO_HANDLE_SIGNAL_READABLE, + 1000000000)); num_bytes = kBufferSize; num_handles = arraysize(handles); EXPECT_EQ(MOJO_RESULT_OK, @@ -484,7 +485,7 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing1) { NULL, 0, MOJO_WRITE_MESSAGE_FLAG_NONE)); EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(h_passed[1], MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(h_passed[1], MOJO_HANDLE_SIGNAL_READABLE, 1000000000)); num_bytes = kBufferSize; num_handles = arraysize(handles); EXPECT_EQ(MOJO_RESULT_OK, @@ -503,7 +504,8 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing1) { &h_passed[1], 1, MOJO_WRITE_MESSAGE_FLAG_NONE)); EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(h_passing[1], MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(h_passing[1], MOJO_HANDLE_SIGNAL_READABLE, + 1000000000)); num_bytes = kBufferSize; num_handles = arraysize(handles); EXPECT_EQ(MOJO_RESULT_OK, @@ -534,7 +536,7 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing1) { NULL, 0, MOJO_WRITE_MESSAGE_FLAG_NONE)); EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(h_received, MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(h_received, MOJO_HANDLE_SIGNAL_READABLE, 1000000000)); num_bytes = kBufferSize; num_handles = arraysize(handles); EXPECT_EQ(MOJO_RESULT_OK, @@ -563,18 +565,18 @@ TEST_F(CoreTest, DataPipe) { // Producer should be never-readable, but already writable. EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - core()->Wait(ph, MOJO_WAIT_FLAG_READABLE, 0)); + core()->Wait(ph, MOJO_HANDLE_SIGNAL_READABLE, 0)); EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(ph, MOJO_WAIT_FLAG_WRITABLE, 0)); + core()->Wait(ph, MOJO_HANDLE_SIGNAL_WRITABLE, 0)); // Consumer should be never-writable, and not yet readable. EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - core()->Wait(ch, MOJO_WAIT_FLAG_WRITABLE, 0)); + core()->Wait(ch, MOJO_HANDLE_SIGNAL_WRITABLE, 0)); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, - core()->Wait(ch, MOJO_WAIT_FLAG_READABLE, 0)); + core()->Wait(ch, MOJO_HANDLE_SIGNAL_READABLE, 0)); // Write. - char elements[2] = { 'A', 'B' }; + char elements[2] = {'A', 'B'}; uint32_t num_bytes = 2u; EXPECT_EQ(MOJO_RESULT_OK, core()->WriteData(ph, elements, &num_bytes, @@ -583,7 +585,7 @@ TEST_F(CoreTest, DataPipe) { // Consumer should now be readable. EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(ch, MOJO_WAIT_FLAG_READABLE, 0)); + core()->Wait(ch, MOJO_HANDLE_SIGNAL_READABLE, 0)); // Read one character. elements[0] = -1; @@ -659,7 +661,7 @@ TEST_F(CoreTest, DataPipe) { // Consumer should now be no longer readable. EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, - core()->Wait(ch, MOJO_WAIT_FLAG_READABLE, 0)); + core()->Wait(ch, MOJO_HANDLE_SIGNAL_READABLE, 0)); // TODO(vtl): More. @@ -668,7 +670,7 @@ TEST_F(CoreTest, DataPipe) { // The consumer should now be never-readable. EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - core()->Wait(ch, MOJO_WAIT_FLAG_READABLE, 0)); + core()->Wait(ch, MOJO_HANDLE_SIGNAL_READABLE, 0)); EXPECT_EQ(MOJO_RESULT_OK, core()->Close(ch)); } @@ -700,7 +702,8 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing2) { &ch, 1, MOJO_WRITE_MESSAGE_FLAG_NONE)); EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(h_passing[1], MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(h_passing[1], MOJO_HANDLE_SIGNAL_READABLE, + 1000000000)); num_bytes = kBufferSize; num_handles = arraysize(handles); EXPECT_EQ(MOJO_RESULT_OK, @@ -730,7 +733,7 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing2) { core()->WriteData(ph, kWorld, &num_bytes, MOJO_WRITE_DATA_FLAG_ALL_OR_NONE)); EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(ch_received, MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(ch_received, MOJO_HANDLE_SIGNAL_READABLE, 1000000000)); num_bytes = kBufferSize; EXPECT_EQ(MOJO_RESULT_OK, core()->ReadData(ch_received, buffer, &num_bytes, @@ -745,7 +748,8 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing2) { &ph, 1, MOJO_WRITE_MESSAGE_FLAG_NONE)); EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(h_passing[1], MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(h_passing[1], MOJO_HANDLE_SIGNAL_READABLE, + 1000000000)); num_bytes = kBufferSize; num_handles = arraysize(handles); EXPECT_EQ(MOJO_RESULT_OK, @@ -775,7 +779,7 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing2) { core()->WriteData(ph_received, kHello, &num_bytes, MOJO_WRITE_DATA_FLAG_ALL_OR_NONE)); EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(ch_received, MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(ch_received, MOJO_HANDLE_SIGNAL_READABLE, 1000000000)); num_bytes = kBufferSize; EXPECT_EQ(MOJO_RESULT_OK, core()->ReadData(ch_received, buffer, &num_bytes, @@ -809,7 +813,8 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing2) { MOJO_WRITE_MESSAGE_FLAG_NONE)); ch = MOJO_HANDLE_INVALID; EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(h_passing[1], MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(h_passing[1], MOJO_HANDLE_SIGNAL_READABLE, + 1000000000)); num_bytes = kBufferSize; num_handles = arraysize(handles); EXPECT_EQ(MOJO_RESULT_OK, @@ -829,7 +834,7 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing2) { // Wait for |ch| to be readable. EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(ch, MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(ch, MOJO_HANDLE_SIGNAL_READABLE, 1000000000)); // Make sure that |ch| can't be sent if it's in a two-phase read. const void* read_ptr = NULL; @@ -851,7 +856,8 @@ TEST_F(CoreTest, MessagePipeBasicLocalHandlePassing2) { MOJO_WRITE_MESSAGE_FLAG_NONE)); ph = MOJO_HANDLE_INVALID; EXPECT_EQ(MOJO_RESULT_OK, - core()->Wait(h_passing[1], MOJO_WAIT_FLAG_READABLE, 1000000000)); + core()->Wait(h_passing[1], MOJO_HANDLE_SIGNAL_READABLE, + 1000000000)); num_bytes = kBufferSize; num_handles = arraysize(handles); EXPECT_EQ(MOJO_RESULT_OK, diff --git a/mojo/system/data_pipe.cc b/mojo/system/data_pipe.cc index 80cd44c..ed0536a 100644 --- a/mojo/system/data_pipe.cc +++ b/mojo/system/data_pipe.cc @@ -168,7 +168,7 @@ MojoResult DataPipe::ProducerEndWriteData(uint32_t num_bytes_written) { // If we're now writable, we *became* writable (since we weren't writable // during the two-phase write), so awake producer waiters. WaitFlagsState new_producer_state = ProducerGetWaitFlagsStateNoLock(); - if (new_producer_state.satisfies(MOJO_WAIT_FLAG_WRITABLE)) + if (new_producer_state.satisfies(MOJO_HANDLE_SIGNAL_WRITABLE)) AwakeProducerWaitersForStateChangeNoLock(new_producer_state); WaitFlagsState new_consumer_state = ConsumerGetWaitFlagsStateNoLock(); if (!new_consumer_state.equals(old_consumer_state)) @@ -320,7 +320,7 @@ MojoResult DataPipe::ConsumerEndReadData(uint32_t num_bytes_read) { // If we're now readable, we *became* readable (since we weren't readable // during the two-phase read), so awake consumer waiters. WaitFlagsState new_consumer_state = ConsumerGetWaitFlagsStateNoLock(); - if (new_consumer_state.satisfies(MOJO_WAIT_FLAG_READABLE)) + if (new_consumer_state.satisfies(MOJO_HANDLE_SIGNAL_READABLE)) AwakeConsumerWaitersForStateChangeNoLock(new_consumer_state); WaitFlagsState new_producer_state = ProducerGetWaitFlagsStateNoLock(); if (!new_producer_state.equals(old_producer_state)) diff --git a/mojo/system/dispatcher_unittest.cc b/mojo/system/dispatcher_unittest.cc index 0434964..9178082 100644 --- a/mojo/system/dispatcher_unittest.cc +++ b/mojo/system/dispatcher_unittest.cc @@ -64,7 +64,7 @@ TEST(DispatcherTest, Basic) { Waiter w; w.Init(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - d->AddWaiter(&w, MOJO_WAIT_FLAG_EVERYTHING, 0)); + d->AddWaiter(&w, ~MOJO_HANDLE_SIGNAL_NONE, 0)); // Okay to remove even if it wasn't added (or was already removed). d->RemoveWaiter(&w); d->RemoveWaiter(&w); @@ -89,7 +89,7 @@ TEST(DispatcherTest, Basic) { EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, d->EndReadData(0)); EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, - d->AddWaiter(&w, MOJO_WAIT_FLAG_EVERYTHING, 0)); + d->AddWaiter(&w, ~MOJO_HANDLE_SIGNAL_NONE, 0)); d->RemoveWaiter(&w); } @@ -192,7 +192,7 @@ class ThreadSafetyStressThread : public base::SimpleThread { } case ADD_WAITER: { MojoResult r = dispatcher_->AddWaiter(&waiter_, - MOJO_WAIT_FLAG_EVERYTHING, 0); + ~MOJO_HANDLE_SIGNAL_NONE, 0); EXPECT_TRUE(r == MOJO_RESULT_FAILED_PRECONDITION || r == MOJO_RESULT_INVALID_ARGUMENT); break; diff --git a/mojo/system/local_data_pipe.cc b/mojo/system/local_data_pipe.cc index 05eacf5..c3241bb 100644 --- a/mojo/system/local_data_pipe.cc +++ b/mojo/system/local_data_pipe.cc @@ -156,8 +156,8 @@ WaitFlagsState LocalDataPipe::ProducerGetWaitFlagsStateNoLock() const { if (consumer_open_no_lock()) { if ((may_discard() || current_num_bytes_ < capacity_num_bytes()) && !producer_in_two_phase_write_no_lock()) - rv.satisfied_signals |= MOJO_WAIT_FLAG_WRITABLE; - rv.satisfiable_signals |= MOJO_WAIT_FLAG_WRITABLE; + rv.satisfied_signals |= MOJO_HANDLE_SIGNAL_WRITABLE; + rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_WRITABLE; } return rv; } @@ -277,10 +277,10 @@ WaitFlagsState LocalDataPipe::ConsumerGetWaitFlagsStateNoLock() const { WaitFlagsState rv; if (current_num_bytes_ > 0) { if (!consumer_in_two_phase_read_no_lock()) - rv.satisfied_signals |= MOJO_WAIT_FLAG_READABLE; - rv.satisfiable_signals |= MOJO_WAIT_FLAG_READABLE; + rv.satisfied_signals |= MOJO_HANDLE_SIGNAL_READABLE; + rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_READABLE; } else if (producer_open_no_lock()) { - rv.satisfiable_signals |= MOJO_WAIT_FLAG_READABLE; + rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_READABLE; } return rv; } diff --git a/mojo/system/local_data_pipe_unittest.cc b/mojo/system/local_data_pipe_unittest.cc index 391f001..6d747bd 100644 --- a/mojo/system/local_data_pipe_unittest.cc +++ b/mojo/system/local_data_pipe_unittest.cc @@ -206,12 +206,12 @@ TEST(LocalDataPipeTest, BasicProducerWaiting) { // Never readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 12)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 12)); // Already writable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 34)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 34)); // Write two elements. int32_t elements[2] = { 123, 456 }; @@ -222,7 +222,7 @@ TEST(LocalDataPipeTest, BasicProducerWaiting) { // Adding a waiter should now succeed. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 56)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 56)); // And it shouldn't be writable yet. EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL)); dp->ProducerRemoveWaiter(&waiter); @@ -230,7 +230,7 @@ TEST(LocalDataPipeTest, BasicProducerWaiting) { // Do it again. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 78)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 78)); // Read one element. elements[0] = -1; @@ -262,7 +262,7 @@ TEST(LocalDataPipeTest, BasicProducerWaiting) { // Add a waiter. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 90)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 90)); // Read one element, using a two-phase read. const void* read_buffer = NULL; @@ -293,7 +293,7 @@ TEST(LocalDataPipeTest, BasicProducerWaiting) { // Add a waiter. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 12)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 12)); // Close the consumer. dp->ConsumerClose(); @@ -325,12 +325,12 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) { // Never writable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 12)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 12)); // Not yet readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 34)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 34)); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL)); dp->ConsumerRemoveWaiter(&waiter); @@ -343,7 +343,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) { // Should already be readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 56)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 56)); // Discard one element. num_bytes = static_cast<uint32_t>(1u * sizeof(elements[0])); @@ -353,7 +353,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) { // Should still be readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 78)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 78)); // Read one element. elements[0] = -1; @@ -367,7 +367,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) { // Adding a waiter should now succeed. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 90)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 90)); // Write one element. elements[0] = 789; @@ -387,7 +387,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) { // Should still be readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 12)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 12)); // Read one element. elements[0] = -1; @@ -401,7 +401,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) { // Should be never-readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 34)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 34)); dp->ConsumerClose(); } @@ -432,7 +432,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) { // Should already be readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 12)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 12)); // Read one element. // Request two in all-or-none mode, but only read one. @@ -451,7 +451,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) { // Should still be readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 34)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 34)); // Read one element. // Request three, but not in all-or-none mode. @@ -470,7 +470,7 @@ TEST(LocalDataPipeTest, BasicConsumerWaiting) { // Adding a waiter should now succeed. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 56)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 56)); // Close the producer. dp->ProducerClose(); @@ -502,7 +502,7 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) { // It should be writable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 0)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 0)); uint32_t num_bytes = static_cast<uint32_t>(1u * sizeof(int32_t)); void* write_ptr = NULL; @@ -514,14 +514,14 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) { // At this point, it shouldn't be writable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 1)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 1)); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL)); dp->ProducerRemoveWaiter(&waiter); // It shouldn't be readable yet either. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 2)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 2)); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL)); dp->ConsumerRemoveWaiter(&waiter); @@ -533,12 +533,12 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) { // It should be writable again. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 3)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 3)); // And readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 4)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 4)); // Start another two-phase write and check that it's readable even in the // middle of it. @@ -552,7 +552,7 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) { // It should be readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 5)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 5)); // End the two-phase write without writing anything. EXPECT_EQ(MOJO_RESULT_OK, dp->ProducerEndWriteData(0u)); @@ -568,12 +568,12 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) { // At this point, it should still be writable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 6)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 6)); // But not readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 7)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 7)); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL)); dp->ConsumerRemoveWaiter(&waiter); @@ -583,7 +583,7 @@ TEST(LocalDataPipeTest, BasicTwoPhaseWaiting) { // It should be readable again. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 8)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 8)); dp->ProducerClose(); dp->ConsumerClose(); @@ -607,12 +607,12 @@ TEST(LocalDataPipeTest, BasicMayDiscardWaiting) { // Writable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 0)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 0)); // Not readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 1)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 1)); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL)); dp->ConsumerRemoveWaiter(&waiter); @@ -625,12 +625,12 @@ TEST(LocalDataPipeTest, BasicMayDiscardWaiting) { // Still writable (even though it's full). waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 2)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 2)); // Now readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 3)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 3)); // Overwrite that element. num_bytes = static_cast<uint32_t>(sizeof(int32_t)); @@ -642,12 +642,12 @@ TEST(LocalDataPipeTest, BasicMayDiscardWaiting) { // Still writable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 4)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 4)); // And still readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 5)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 5)); // Read that element. num_bytes = static_cast<uint32_t>(sizeof(int32_t)); @@ -660,12 +660,12 @@ TEST(LocalDataPipeTest, BasicMayDiscardWaiting) { // Still writable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - dp->ProducerAddWaiter(&waiter, MOJO_WAIT_FLAG_WRITABLE, 6)); + dp->ProducerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 6)); // No longer readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dp->ConsumerAddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 7)); + dp->ConsumerAddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 7)); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL)); dp->ConsumerRemoveWaiter(&waiter); diff --git a/mojo/system/local_message_pipe_endpoint.cc b/mojo/system/local_message_pipe_endpoint.cc index d919854..a07f65e 100644 --- a/mojo/system/local_message_pipe_endpoint.cc +++ b/mojo/system/local_message_pipe_endpoint.cc @@ -150,12 +150,13 @@ void LocalMessagePipeEndpoint::RemoveWaiter(Waiter* waiter) { WaitFlagsState LocalMessagePipeEndpoint::GetWaitFlagsState() { WaitFlagsState rv; if (!message_queue_.IsEmpty()) { - rv.satisfied_signals |= MOJO_WAIT_FLAG_READABLE; - rv.satisfiable_signals |= MOJO_WAIT_FLAG_READABLE; + rv.satisfied_signals |= MOJO_HANDLE_SIGNAL_READABLE; + rv.satisfiable_signals |= MOJO_HANDLE_SIGNAL_READABLE; } if (is_peer_open_) { - rv.satisfied_signals |= MOJO_WAIT_FLAG_WRITABLE; - rv.satisfiable_signals |= MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE; + rv.satisfied_signals |= MOJO_HANDLE_SIGNAL_WRITABLE; + rv.satisfiable_signals |= + MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE; } return rv; } diff --git a/mojo/system/message_pipe_dispatcher_unittest.cc b/mojo/system/message_pipe_dispatcher_unittest.cc index 127e34e..291a2c1 100644 --- a/mojo/system/message_pipe_dispatcher_unittest.cc +++ b/mojo/system/message_pipe_dispatcher_unittest.cc @@ -53,14 +53,14 @@ TEST(MessagePipeDispatcherTest, Basic) { // Try adding a writable waiter when already writable. w.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - d0->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 0)); + d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 0)); // Shouldn't need to remove the waiter (it was not added). // Add a readable waiter to |d0|, then make it readable (by writing to // |d1|), then wait. w.Init(); EXPECT_EQ(MOJO_RESULT_OK, - d0->AddWaiter(&w, MOJO_WAIT_FLAG_READABLE, 1)); + d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 1)); buffer[0] = 123456789; EXPECT_EQ(MOJO_RESULT_OK, d1->WriteMessage(buffer, kBufferSize, @@ -75,7 +75,7 @@ TEST(MessagePipeDispatcherTest, Basic) { // Try adding a readable waiter when already readable (from above). w.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - d0->AddWaiter(&w, MOJO_WAIT_FLAG_READABLE, 2)); + d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 2)); // Shouldn't need to remove the waiter (it was not added). // Make |d0| no longer readable (by reading from it). @@ -91,7 +91,7 @@ TEST(MessagePipeDispatcherTest, Basic) { // Wait for zero time for readability on |d0| (will time out). w.Init(); EXPECT_EQ(MOJO_RESULT_OK, - d0->AddWaiter(&w, MOJO_WAIT_FLAG_READABLE, 3)); + d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 3)); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, w.Wait(0, NULL)); EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout()); @@ -100,7 +100,7 @@ TEST(MessagePipeDispatcherTest, Basic) { // Wait for non-zero, finite time for readability on |d0| (will time out). w.Init(); EXPECT_EQ(MOJO_RESULT_OK, - d0->AddWaiter(&w, MOJO_WAIT_FLAG_READABLE, 3)); + d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 3)); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, w.Wait(2 * test::EpsilonTimeout().InMicroseconds(), NULL)); @@ -185,7 +185,7 @@ TEST(MessagePipeDispatcherTest, BasicClosed) { // Try waiting for readable on |d0|; should fail (already satisfied). w.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - d0->AddWaiter(&w, MOJO_WAIT_FLAG_READABLE, 0)); + d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 0)); // Try reading from |d1|; should fail (nothing to read). buffer[0] = 0; @@ -201,7 +201,7 @@ TEST(MessagePipeDispatcherTest, BasicClosed) { // Try waiting for readable on |d0|; should fail (already satisfied). w.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - d0->AddWaiter(&w, MOJO_WAIT_FLAG_READABLE, 1)); + d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 1)); // Read from |d0|. buffer[0] = 0; @@ -216,7 +216,7 @@ TEST(MessagePipeDispatcherTest, BasicClosed) { // Try waiting for readable on |d0|; should fail (already satisfied). w.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - d0->AddWaiter(&w, MOJO_WAIT_FLAG_READABLE, 2)); + d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 2)); // Read again from |d0|. buffer[0] = 0; @@ -231,12 +231,12 @@ TEST(MessagePipeDispatcherTest, BasicClosed) { // Try waiting for readable on |d0|; should fail (unsatisfiable). w.Init(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - d0->AddWaiter(&w, MOJO_WAIT_FLAG_READABLE, 3)); + d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 3)); // Try waiting for writable on |d0|; should fail (unsatisfiable). w.Init(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - d0->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 4)); + d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 4)); // Try reading from |d0|; should fail (nothing to read and other end // closed). @@ -283,7 +283,7 @@ TEST(MessagePipeDispatcherTest, BasicThreaded) { // Wait for readable on |d1|, which will become readable after some time. { test::WaiterThread thread(d1, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, 1, &did_wait, &result, &context); @@ -307,7 +307,7 @@ TEST(MessagePipeDispatcherTest, BasicThreaded) { // Now |d1| is already readable. Try waiting for it again. { test::WaiterThread thread(d1, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, 2, &did_wait, &result, &context); @@ -332,7 +332,7 @@ TEST(MessagePipeDispatcherTest, BasicThreaded) { // cancel that wait. { test::WaiterThread thread(d1, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, 3, &did_wait, &result, &context); @@ -366,7 +366,7 @@ TEST(MessagePipeDispatcherTest, BasicThreaded) { // cancel that wait. { test::WaiterThread thread(d1, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, 4, &did_wait, &result, &context); @@ -470,7 +470,7 @@ class ReaderThread : public base::SimpleThread { for (;;) { // Wait for it to be readable. w.Init(); - result = read_dispatcher_->AddWaiter(&w, MOJO_WAIT_FLAG_READABLE, 0); + result = read_dispatcher_->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 0); EXPECT_TRUE(result == MOJO_RESULT_OK || result == MOJO_RESULT_ALREADY_EXISTS) << "result: " << result; if (result == MOJO_RESULT_OK) { diff --git a/mojo/system/message_pipe_unittest.cc b/mojo/system/message_pipe_unittest.cc index 73c310f..5405fd5 100644 --- a/mojo/system/message_pipe_unittest.cc +++ b/mojo/system/message_pipe_unittest.cc @@ -366,18 +366,19 @@ TEST(MessagePipeTest, BasicWaiting) { // Always writable (until the other port is closed). waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - mp->AddWaiter(0, &waiter, MOJO_WAIT_FLAG_WRITABLE, 0)); + mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 0)); waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, mp->AddWaiter(0, &waiter, - MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE, + MOJO_HANDLE_SIGNAL_READABLE | + MOJO_HANDLE_SIGNAL_WRITABLE, 0)); // Not yet readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp->AddWaiter(0, &waiter, MOJO_WAIT_FLAG_READABLE, 1)); + mp->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 1)); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, waiter.Wait(0, NULL)); mp->RemoveWaiter(0, &waiter); @@ -392,17 +393,18 @@ TEST(MessagePipeTest, BasicWaiting) { // Port 1 should already be readable now. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - mp->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 2)); + mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 2)); waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, mp->AddWaiter(1, &waiter, - MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE, + MOJO_HANDLE_SIGNAL_READABLE | + MOJO_HANDLE_SIGNAL_WRITABLE, 0)); // ... and still writable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - mp->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_WRITABLE, 3)); + mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 3)); // Close port 0. mp->Close(0); @@ -410,12 +412,12 @@ TEST(MessagePipeTest, BasicWaiting) { // Now port 1 should not be writable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - mp->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_WRITABLE, 4)); + mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_WRITABLE, 4)); // But it should still be readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - mp->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 5)); + mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 5)); // Read from port 1. buffer[0] = 0; @@ -430,7 +432,7 @@ TEST(MessagePipeTest, BasicWaiting) { // Now port 1 should no longer be readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - mp->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 6)); + mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 6)); mp->Close(1); } @@ -449,7 +451,8 @@ TEST(MessagePipeTest, ThreadedWaiting) { thread.waiter()->Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp->AddWaiter(1, thread.waiter(), MOJO_WAIT_FLAG_READABLE, 1)); + mp->AddWaiter(1, thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, + 1)); thread.Start(); buffer[0] = 123456789; @@ -476,7 +479,8 @@ TEST(MessagePipeTest, ThreadedWaiting) { thread.waiter()->Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp->AddWaiter(1, thread.waiter(), MOJO_WAIT_FLAG_READABLE, 2)); + mp->AddWaiter(1, thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, + 2)); thread.Start(); // Close port 1 first -- this should result in the waiter being cancelled. @@ -498,7 +502,8 @@ TEST(MessagePipeTest, ThreadedWaiting) { thread.waiter()->Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp->AddWaiter(1, thread.waiter(), MOJO_WAIT_FLAG_READABLE, 3)); + mp->AddWaiter(1, thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, + 3)); thread.Start(); // Close port 0 first -- this should wake the waiter up, since port 1 will diff --git a/mojo/system/multiprocess_message_pipe_unittest.cc b/mojo/system/multiprocess_message_pipe_unittest.cc index a27a40c..5552778 100644 --- a/mojo/system/multiprocess_message_pipe_unittest.cc +++ b/mojo/system/multiprocess_message_pipe_unittest.cc @@ -159,7 +159,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(EchoEcho) { int rv = 0; for (;; rv = (rv + 1) % 100) { // Wait for our end of the message pipe to be readable. - MojoResult result = WaitIfNecessary(mp, MOJO_WAIT_FLAG_READABLE); + MojoResult result = WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE); if (result != MOJO_RESULT_OK) { // It was closed, probably. CHECK_EQ(result, MOJO_RESULT_FAILED_PRECONDITION); @@ -210,7 +210,7 @@ TEST_F(MultiprocessMessagePipeTest, Basic) { NULL, MOJO_WRITE_MESSAGE_FLAG_NONE)); - EXPECT_EQ(MOJO_RESULT_OK, WaitIfNecessary(mp, MOJO_WAIT_FLAG_READABLE)); + EXPECT_EQ(MOJO_RESULT_OK, WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE)); std::string read_buffer(1000, '\0'); uint32_t read_buffer_size = static_cast<uint32_t>(read_buffer.size()); @@ -259,7 +259,7 @@ TEST_F(MultiprocessMessagePipeTest, QueueMessages) { MOJO_WRITE_MESSAGE_FLAG_NONE)); for (size_t i = 0; i < kNumMessages; i++) { - EXPECT_EQ(MOJO_RESULT_OK, WaitIfNecessary(mp, MOJO_WAIT_FLAG_READABLE)); + EXPECT_EQ(MOJO_RESULT_OK, WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE)); std::string read_buffer(kNumMessages * 2, '\0'); uint32_t read_buffer_size = static_cast<uint32_t>(read_buffer.size()); @@ -276,7 +276,7 @@ TEST_F(MultiprocessMessagePipeTest, QueueMessages) { // Wait for it to become readable, which should fail (since we sent // "quitquitquit"). EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - WaitIfNecessary(mp, MOJO_WAIT_FLAG_READABLE)); + WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE)); mp->Close(0); @@ -295,7 +295,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(CheckSharedBuffer) { channel_thread.Start(client_platform_handle.Pass(), mp); // Wait for the first message from our parent. - CHECK_EQ(WaitIfNecessary(mp, MOJO_WAIT_FLAG_READABLE), MOJO_RESULT_OK); + CHECK_EQ(WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE), MOJO_RESULT_OK); // It should have a shared buffer. std::string read_buffer(100, '\0'); @@ -341,7 +341,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(CheckSharedBuffer) { MOJO_RESULT_OK); // Now wait for our parent to send us a message. - CHECK_EQ(WaitIfNecessary(mp, MOJO_WAIT_FLAG_READABLE), MOJO_RESULT_OK); + CHECK_EQ(WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE), MOJO_RESULT_OK); read_buffer = std::string(100, '\0'); num_bytes = static_cast<uint32_t>(read_buffer.size()); @@ -413,7 +413,7 @@ TEST_F(MultiprocessMessagePipeTest, MAYBE_SharedBufferPassing) { dispatcher = NULL; // Wait for a message from the child. - EXPECT_EQ(MOJO_RESULT_OK, WaitIfNecessary(mp, MOJO_WAIT_FLAG_READABLE)); + EXPECT_EQ(MOJO_RESULT_OK, WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE)); std::string read_buffer(100, '\0'); uint32_t num_bytes = static_cast<uint32_t>(read_buffer.size()); @@ -445,7 +445,7 @@ TEST_F(MultiprocessMessagePipeTest, MAYBE_SharedBufferPassing) { // Wait for |mp| to become readable, which should fail. EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - WaitIfNecessary(mp, MOJO_WAIT_FLAG_READABLE)); + WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE)); mp->Close(0); @@ -462,7 +462,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_MAIN(CheckPlatformHandleFile) { scoped_ptr<MessagePipeEndpoint>(new ProxyMessagePipeEndpoint()))); channel_thread.Start(client_platform_handle.Pass(), mp); - CHECK_EQ(WaitIfNecessary(mp, MOJO_WAIT_FLAG_READABLE), MOJO_RESULT_OK); + CHECK_EQ(WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE), MOJO_RESULT_OK); std::string read_buffer(100, '\0'); uint32_t num_bytes = static_cast<uint32_t>(read_buffer.size()); @@ -543,7 +543,7 @@ TEST_F(MultiprocessMessagePipeTest, MAYBE_PlatformHandlePassing) { // Wait for it to become readable, which should fail. EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - WaitIfNecessary(mp, MOJO_WAIT_FLAG_READABLE)); + WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE)); mp->Close(0); diff --git a/mojo/system/remote_message_pipe_unittest.cc b/mojo/system/remote_message_pipe_unittest.cc index f6db49f..e1f5557 100644 --- a/mojo/system/remote_message_pipe_unittest.cc +++ b/mojo/system/remote_message_pipe_unittest.cc @@ -197,7 +197,7 @@ TEST_F(RemoteMessagePipeTest, Basic) { // it later, it might already be readable.) waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); + mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); // Write to MP 0, port 0. EXPECT_EQ(MOJO_RESULT_OK, @@ -224,7 +224,7 @@ TEST_F(RemoteMessagePipeTest, Basic) { waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp0->AddWaiter(0, &waiter, MOJO_WAIT_FLAG_READABLE, 456)); + mp0->AddWaiter(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 456)); EXPECT_EQ(MOJO_RESULT_OK, mp1->WriteMessage(1, @@ -252,7 +252,8 @@ TEST_F(RemoteMessagePipeTest, Basic) { // when it realizes that MP 0, port 0 has been closed. (It may also fail // immediately.) waiter.Init(); - MojoResult result = mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 789); + MojoResult result = + mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 789); if (result == MOJO_RESULT_OK) { EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context)); @@ -298,7 +299,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) { waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp3->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 789)); + mp3->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 789)); EXPECT_EQ(MOJO_RESULT_OK, mp2->WriteMessage(0, @@ -344,7 +345,7 @@ TEST_F(RemoteMessagePipeTest, Multiplex) { waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); + mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); EXPECT_EQ(MOJO_RESULT_OK, mp0->WriteMessage(0, @@ -427,7 +428,7 @@ TEST_F(RemoteMessagePipeTest, CloseBeforeConnect) { // it later, it might already be readable.) waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); + mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); BootstrapMessagePipeNoWait(1, mp1); @@ -472,7 +473,7 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) { // it later, it might already be readable.) waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); + mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); // Write to MP 0, port 0. { @@ -528,7 +529,7 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) { // Wait for the dispatcher to become readable. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - dispatcher->AddWaiter(&waiter, MOJO_WAIT_FLAG_READABLE, 456)); + dispatcher->AddWaiter(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 456)); EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context)); EXPECT_EQ(456u, context); dispatcher->RemoveWaiter(&waiter); @@ -545,7 +546,7 @@ TEST_F(RemoteMessagePipeTest, HandlePassing) { // Prepare to wait on "local_mp", port 1. waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - local_mp->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 789)); + local_mp->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 789)); // Write to the dispatcher. EXPECT_EQ(MOJO_RESULT_OK, @@ -620,7 +621,7 @@ TEST_F(RemoteMessagePipeTest, MAYBE_SharedBufferPassing) { // it later, it might already be readable.) waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); + mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); // Write to MP 0, port 0. { @@ -731,7 +732,7 @@ TEST_F(RemoteMessagePipeTest, MAYBE_PlatformHandlePassing) { // it later, it might already be readable.) waiter.Init(); EXPECT_EQ(MOJO_RESULT_OK, - mp1->AddWaiter(1, &waiter, MOJO_WAIT_FLAG_READABLE, 123)); + mp1->AddWaiter(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 123)); // Write to MP 0, port 0. { diff --git a/mojo/system/simple_dispatcher_unittest.cc b/mojo/system/simple_dispatcher_unittest.cc index 2910608..913e138 100644 --- a/mojo/system/simple_dispatcher_unittest.cc +++ b/mojo/system/simple_dispatcher_unittest.cc @@ -28,8 +28,8 @@ namespace { class MockSimpleDispatcher : public SimpleDispatcher { public: MockSimpleDispatcher() - : state_(MOJO_WAIT_FLAG_NONE, - MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE) {} + : state_(MOJO_HANDLE_SIGNAL_NONE, + MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE) {} void SetSatisfiedSignals(MojoHandleSignals new_satisfied_signals) { base::AutoLock locker(lock()); @@ -96,16 +96,16 @@ TEST(SimpleDispatcherTest, Basic) { // Try adding a readable waiter when already readable. w.Init(); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, - d->AddWaiter(&w, MOJO_WAIT_FLAG_READABLE, 0)); + d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 0)); // Shouldn't need to remove the waiter (it was not added). // Wait (forever) for writable when already writable. w.Init(); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); - EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 1)); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_WRITABLE); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); + EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 1)); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_WRITABLE); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_OK, w.Wait(MOJO_DEADLINE_INDEFINITE, &context)); EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout()); @@ -114,9 +114,9 @@ TEST(SimpleDispatcherTest, Basic) { // Wait for zero time for writable when already writable. w.Init(); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); - EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 2)); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_WRITABLE); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); + EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 2)); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_WRITABLE); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_OK, w.Wait(0, &context)); EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout()); @@ -125,9 +125,9 @@ TEST(SimpleDispatcherTest, Basic) { // Wait for non-zero, finite time for writable when already writable. w.Init(); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); - EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 3)); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_WRITABLE); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); + EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 3)); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_WRITABLE); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_OK, w.Wait(2 * test::EpsilonTimeout().InMicroseconds(), &context)); @@ -137,8 +137,8 @@ TEST(SimpleDispatcherTest, Basic) { // Wait for zero time for writable when not writable (will time out). w.Init(); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); - EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 4)); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); + EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 4)); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, w.Wait(0, NULL)); EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout()); @@ -147,8 +147,8 @@ TEST(SimpleDispatcherTest, Basic) { // Wait for non-zero, finite time for writable when not writable (will time // out). w.Init(); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); - EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 5)); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); + EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 5)); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, w.Wait(2 * test::EpsilonTimeout().InMicroseconds(), NULL)); @@ -169,17 +169,18 @@ TEST(SimpleDispatcherTest, BasicUnsatisfiable) { // Try adding a writable waiter when it can never be writable. w.Init(); - d->SetSatisfiableSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiableSignals(MOJO_HANDLE_SIGNAL_READABLE); d->SetSatisfiedSignals(0); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, - d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 1)); + d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 1)); // Shouldn't need to remove the waiter (it was not added). // Wait (forever) for writable and then it becomes never writable. w.Init(); - d->SetSatisfiableSignals(MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE); - EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 2)); - d->SetSatisfiableSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiableSignals( + MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE); + EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 2)); + d->SetSatisfiableSignals(MOJO_HANDLE_SIGNAL_READABLE); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, w.Wait(MOJO_DEADLINE_INDEFINITE, &context)); @@ -189,9 +190,10 @@ TEST(SimpleDispatcherTest, BasicUnsatisfiable) { // Wait for zero time for writable and then it becomes never writable. w.Init(); - d->SetSatisfiableSignals(MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE); - EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 3)); - d->SetSatisfiableSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiableSignals( + MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE); + EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 3)); + d->SetSatisfiableSignals(MOJO_HANDLE_SIGNAL_READABLE); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, w.Wait(0, &context)); EXPECT_LT(stopwatch.Elapsed(), test::EpsilonTimeout()); @@ -201,9 +203,10 @@ TEST(SimpleDispatcherTest, BasicUnsatisfiable) { // Wait for non-zero, finite time for writable and then it becomes never // writable. w.Init(); - d->SetSatisfiableSignals(MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE); - EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 4)); - d->SetSatisfiableSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiableSignals( + MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE); + EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 4)); + d->SetSatisfiableSignals(MOJO_HANDLE_SIGNAL_READABLE); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, w.Wait(2 * test::EpsilonTimeout().InMicroseconds(), &context)); @@ -226,13 +229,13 @@ TEST(SimpleDispatcherTest, BasicClosed) { w.Init(); EXPECT_EQ(MOJO_RESULT_OK, d->Close()); EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, - d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 1)); + d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 1)); // Shouldn't need to remove the waiter (it was not added). // Wait (forever) for writable and then the dispatcher is closed. d = new MockSimpleDispatcher(); w.Init(); - EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 2)); + EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 2)); EXPECT_EQ(MOJO_RESULT_OK, d->Close()); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_CANCELLED, w.Wait(MOJO_DEADLINE_INDEFINITE, &context)); @@ -243,7 +246,7 @@ TEST(SimpleDispatcherTest, BasicClosed) { // Wait for zero time for writable and then the dispatcher is closed. d = new MockSimpleDispatcher(); w.Init(); - EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 3)); + EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 3)); EXPECT_EQ(MOJO_RESULT_OK, d->Close()); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_CANCELLED, w.Wait(0, &context)); @@ -255,7 +258,7 @@ TEST(SimpleDispatcherTest, BasicClosed) { // closed. d = new MockSimpleDispatcher(); w.Init(); - EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_WAIT_FLAG_WRITABLE, 4)); + EXPECT_EQ(MOJO_RESULT_OK, d->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 4)); EXPECT_EQ(MOJO_RESULT_OK, d->Close()); stopwatch.Start(); EXPECT_EQ(MOJO_RESULT_CANCELLED, @@ -275,9 +278,9 @@ TEST(SimpleDispatcherTest, BasicThreaded) { { scoped_refptr<MockSimpleDispatcher> d(new MockSimpleDispatcher()); { - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); test::WaiterThread thread(d, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, 1, &did_wait, &result, &context); @@ -295,14 +298,14 @@ TEST(SimpleDispatcherTest, BasicThreaded) { { scoped_refptr<MockSimpleDispatcher> d(new MockSimpleDispatcher()); test::WaiterThread thread(d, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, 2, &did_wait, &result, &context); stopwatch.Start(); thread.Start(); base::PlatformThread::Sleep(2 * test::EpsilonTimeout()); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); EXPECT_EQ(MOJO_RESULT_OK, d->Close()); } // Joins the thread. base::TimeDelta elapsed = stopwatch.Elapsed(); @@ -316,14 +319,14 @@ TEST(SimpleDispatcherTest, BasicThreaded) { { scoped_refptr<MockSimpleDispatcher> d(new MockSimpleDispatcher()); test::WaiterThread thread(d, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, 3, &did_wait, &result, &context); stopwatch.Start(); thread.Start(); base::PlatformThread::Sleep(2 * test::EpsilonTimeout()); - d->SetSatisfiableSignals(MOJO_WAIT_FLAG_NONE); + d->SetSatisfiableSignals(MOJO_HANDLE_SIGNAL_NONE); EXPECT_EQ(MOJO_RESULT_OK, d->Close()); } // Joins the thread. elapsed = stopwatch.Elapsed(); @@ -337,7 +340,7 @@ TEST(SimpleDispatcherTest, BasicThreaded) { { scoped_refptr<MockSimpleDispatcher> d(new MockSimpleDispatcher()); test::WaiterThread thread(d, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, 4, &did_wait, &result, &context); @@ -358,7 +361,7 @@ TEST(SimpleDispatcherTest, BasicThreaded) { scoped_refptr<MockSimpleDispatcher> d(new MockSimpleDispatcher()); { test::WaiterThread thread(d, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, 2 * test::EpsilonTimeout().InMicroseconds(), 5, &did_wait, &result, &context); @@ -366,7 +369,7 @@ TEST(SimpleDispatcherTest, BasicThreaded) { thread.Start(); base::PlatformThread::Sleep(1 * test::EpsilonTimeout()); // Not what we're waiting for. - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_WRITABLE); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_WRITABLE); } // Joins the thread (after its wait times out). // If we closed earlier, then probably we'd get a |MOJO_RESULT_CANCELLED|. EXPECT_EQ(MOJO_RESULT_OK, d->Close()); @@ -391,7 +394,7 @@ TEST(SimpleDispatcherTest, MultipleWaiters) { ScopedVector<test::WaiterThread> threads; for (uint32_t i = 0; i < kNumWaiters; i++) { threads.push_back(new test::WaiterThread(d, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, i, &did_wait[i], @@ -400,7 +403,7 @@ TEST(SimpleDispatcherTest, MultipleWaiters) { threads.back()->Start(); } base::PlatformThread::Sleep(2 * test::EpsilonTimeout()); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); EXPECT_EQ(MOJO_RESULT_OK, d->Close()); } // Joins the threads. for (uint32_t i = 0; i < kNumWaiters; i++) { @@ -416,7 +419,7 @@ TEST(SimpleDispatcherTest, MultipleWaiters) { ScopedVector<test::WaiterThread> threads; for (uint32_t i = 0; i < kNumWaiters / 2; i++) { threads.push_back(new test::WaiterThread(d, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, i, &did_wait[i], @@ -426,7 +429,7 @@ TEST(SimpleDispatcherTest, MultipleWaiters) { } for (uint32_t i = kNumWaiters / 2; i < kNumWaiters; i++) { threads.push_back(new test::WaiterThread(d, - MOJO_WAIT_FLAG_WRITABLE, + MOJO_HANDLE_SIGNAL_WRITABLE, MOJO_DEADLINE_INDEFINITE, i, &did_wait[i], @@ -435,7 +438,7 @@ TEST(SimpleDispatcherTest, MultipleWaiters) { threads.back()->Start(); } base::PlatformThread::Sleep(2 * test::EpsilonTimeout()); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); // This will wake up the ones waiting to write. EXPECT_EQ(MOJO_RESULT_OK, d->Close()); } // Joins the threads. @@ -457,7 +460,7 @@ TEST(SimpleDispatcherTest, MultipleWaiters) { ScopedVector<test::WaiterThread> threads; for (uint32_t i = 0; i < kNumWaiters / 2; i++) { threads.push_back(new test::WaiterThread(d, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, i, &did_wait[i], @@ -467,7 +470,7 @@ TEST(SimpleDispatcherTest, MultipleWaiters) { } for (uint32_t i = kNumWaiters / 2; i < kNumWaiters; i++) { threads.push_back(new test::WaiterThread(d, - MOJO_WAIT_FLAG_WRITABLE, + MOJO_HANDLE_SIGNAL_WRITABLE, MOJO_DEADLINE_INDEFINITE, i, &did_wait[i], @@ -476,9 +479,9 @@ TEST(SimpleDispatcherTest, MultipleWaiters) { threads.back()->Start(); } base::PlatformThread::Sleep(1 * test::EpsilonTimeout()); - d->SetSatisfiableSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiableSignals(MOJO_HANDLE_SIGNAL_READABLE); base::PlatformThread::Sleep(1 * test::EpsilonTimeout()); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); EXPECT_EQ(MOJO_RESULT_OK, d->Close()); } // Joins the threads. for (uint32_t i = 0; i < kNumWaiters / 2; i++) { @@ -500,7 +503,7 @@ TEST(SimpleDispatcherTest, MultipleWaiters) { for (uint32_t i = 0; i < kNumWaiters / 2; i++) { threads.push_back( new test::WaiterThread(d, - MOJO_WAIT_FLAG_READABLE, + MOJO_HANDLE_SIGNAL_READABLE, 3 * test::EpsilonTimeout().InMicroseconds(), i, &did_wait[i], &result[i], &context[i])); @@ -509,14 +512,14 @@ TEST(SimpleDispatcherTest, MultipleWaiters) { for (uint32_t i = kNumWaiters / 2; i < kNumWaiters; i++) { threads.push_back( new test::WaiterThread(d, - MOJO_WAIT_FLAG_WRITABLE, + MOJO_HANDLE_SIGNAL_WRITABLE, 1 * test::EpsilonTimeout().InMicroseconds(), i, &did_wait[i], &result[i], &context[i])); threads.back()->Start(); } base::PlatformThread::Sleep(2 * test::EpsilonTimeout()); - d->SetSatisfiedSignals(MOJO_WAIT_FLAG_READABLE); + d->SetSatisfiedSignals(MOJO_HANDLE_SIGNAL_READABLE); // All those waiting for writable should have timed out. EXPECT_EQ(MOJO_RESULT_OK, d->Close()); } // Joins the threads. diff --git a/mojo/system/wait_flags_state.h b/mojo/system/wait_flags_state.h index 5647b68..d5c1097 100644 --- a/mojo/system/wait_flags_state.h +++ b/mojo/system/wait_flags_state.h @@ -16,8 +16,8 @@ namespace system { // (for convenience). This should add no overhead. struct MOJO_SYSTEM_IMPL_EXPORT WaitFlagsState : public MojoWaitFlagsState { WaitFlagsState() { - satisfied_signals = MOJO_WAIT_FLAG_NONE; - satisfiable_signals = MOJO_WAIT_FLAG_NONE; + satisfied_signals = MOJO_HANDLE_SIGNAL_NONE; + satisfiable_signals = MOJO_HANDLE_SIGNAL_NONE; } WaitFlagsState(MojoHandleSignals satisfied, MojoHandleSignals satisfiable) { satisfied_signals = satisfied; diff --git a/mojo/system/waiter_list_unittest.cc b/mojo/system/waiter_list_unittest.cc index 8b9714b..8142357 100644 --- a/mojo/system/waiter_list_unittest.cc +++ b/mojo/system/waiter_list_unittest.cc @@ -29,7 +29,7 @@ TEST(WaiterListTest, BasicCancel) { { WaiterList waiter_list; test::SimpleWaiterThread thread(&result, &context); - waiter_list.AddWaiter(thread.waiter(), MOJO_WAIT_FLAG_READABLE, 1); + waiter_list.AddWaiter(thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 1); thread.Start(); waiter_list.CancelAllWaiters(); waiter_list.RemoveWaiter(thread.waiter()); // Double-remove okay. @@ -41,7 +41,7 @@ TEST(WaiterListTest, BasicCancel) { { WaiterList waiter_list; test::SimpleWaiterThread thread(&result, &context); - waiter_list.AddWaiter(thread.waiter(), MOJO_WAIT_FLAG_WRITABLE, 2); + waiter_list.AddWaiter(thread.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 2); waiter_list.CancelAllWaiters(); thread.Start(); } // Join |thread|. @@ -52,7 +52,7 @@ TEST(WaiterListTest, BasicCancel) { { WaiterList waiter_list; test::SimpleWaiterThread thread(&result, &context); - waiter_list.AddWaiter(thread.waiter(), MOJO_WAIT_FLAG_READABLE, 3); + waiter_list.AddWaiter(thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 3); thread.Start(); base::PlatformThread::Sleep(2 * test::EpsilonTimeout()); waiter_list.CancelAllWaiters(); @@ -69,11 +69,12 @@ TEST(WaiterListTest, BasicAwakeSatisfied) { { WaiterList waiter_list; test::SimpleWaiterThread thread(&result, &context); - waiter_list.AddWaiter(thread.waiter(), MOJO_WAIT_FLAG_READABLE, 1); + waiter_list.AddWaiter(thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 1); thread.Start(); waiter_list.AwakeWaitersForStateChange( - WaitFlagsState(MOJO_WAIT_FLAG_READABLE, - MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE)); + WaitFlagsState(MOJO_HANDLE_SIGNAL_READABLE, + MOJO_HANDLE_SIGNAL_READABLE | + MOJO_HANDLE_SIGNAL_WRITABLE)); waiter_list.RemoveWaiter(thread.waiter()); } // Join |thread|. EXPECT_EQ(MOJO_RESULT_OK, result); @@ -83,10 +84,11 @@ TEST(WaiterListTest, BasicAwakeSatisfied) { { WaiterList waiter_list; test::SimpleWaiterThread thread(&result, &context); - waiter_list.AddWaiter(thread.waiter(), MOJO_WAIT_FLAG_WRITABLE, 2); + waiter_list.AddWaiter(thread.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 2); waiter_list.AwakeWaitersForStateChange( - WaitFlagsState(MOJO_WAIT_FLAG_WRITABLE, - MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE)); + WaitFlagsState(MOJO_HANDLE_SIGNAL_WRITABLE, + MOJO_HANDLE_SIGNAL_READABLE | + MOJO_HANDLE_SIGNAL_WRITABLE)); waiter_list.RemoveWaiter(thread.waiter()); waiter_list.RemoveWaiter(thread.waiter()); // Double-remove okay. thread.Start(); @@ -98,12 +100,13 @@ TEST(WaiterListTest, BasicAwakeSatisfied) { { WaiterList waiter_list; test::SimpleWaiterThread thread(&result, &context); - waiter_list.AddWaiter(thread.waiter(), MOJO_WAIT_FLAG_READABLE, 3); + waiter_list.AddWaiter(thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 3); thread.Start(); base::PlatformThread::Sleep(2 * test::EpsilonTimeout()); waiter_list.AwakeWaitersForStateChange( - WaitFlagsState(MOJO_WAIT_FLAG_READABLE, - MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE)); + WaitFlagsState(MOJO_HANDLE_SIGNAL_READABLE, + MOJO_HANDLE_SIGNAL_READABLE | + MOJO_HANDLE_SIGNAL_WRITABLE)); waiter_list.RemoveWaiter(thread.waiter()); } // Join |thread|. EXPECT_EQ(MOJO_RESULT_OK, result); @@ -118,10 +121,10 @@ TEST(WaiterListTest, BasicAwakeUnsatisfiable) { { WaiterList waiter_list; test::SimpleWaiterThread thread(&result, &context); - waiter_list.AddWaiter(thread.waiter(), MOJO_WAIT_FLAG_READABLE, 1); + waiter_list.AddWaiter(thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 1); thread.Start(); waiter_list.AwakeWaitersForStateChange( - WaitFlagsState(MOJO_WAIT_FLAG_NONE, MOJO_WAIT_FLAG_WRITABLE)); + WaitFlagsState(MOJO_HANDLE_SIGNAL_NONE, MOJO_HANDLE_SIGNAL_WRITABLE)); waiter_list.RemoveWaiter(thread.waiter()); } // Join |thread|. EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result); @@ -131,9 +134,10 @@ TEST(WaiterListTest, BasicAwakeUnsatisfiable) { { WaiterList waiter_list; test::SimpleWaiterThread thread(&result, &context); - waiter_list.AddWaiter(thread.waiter(), MOJO_WAIT_FLAG_WRITABLE, 2); + waiter_list.AddWaiter(thread.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 2); waiter_list.AwakeWaitersForStateChange( - WaitFlagsState(MOJO_WAIT_FLAG_READABLE, MOJO_WAIT_FLAG_READABLE)); + WaitFlagsState(MOJO_HANDLE_SIGNAL_READABLE, + MOJO_HANDLE_SIGNAL_READABLE)); waiter_list.RemoveWaiter(thread.waiter()); thread.Start(); } // Join |thread|. @@ -144,11 +148,11 @@ TEST(WaiterListTest, BasicAwakeUnsatisfiable) { { WaiterList waiter_list; test::SimpleWaiterThread thread(&result, &context); - waiter_list.AddWaiter(thread.waiter(), MOJO_WAIT_FLAG_READABLE, 3); + waiter_list.AddWaiter(thread.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 3); thread.Start(); base::PlatformThread::Sleep(2 * test::EpsilonTimeout()); waiter_list.AwakeWaitersForStateChange( - WaitFlagsState(MOJO_WAIT_FLAG_NONE, MOJO_WAIT_FLAG_WRITABLE)); + WaitFlagsState(MOJO_HANDLE_SIGNAL_NONE, MOJO_HANDLE_SIGNAL_WRITABLE)); waiter_list.RemoveWaiter(thread.waiter()); waiter_list.RemoveWaiter(thread.waiter()); // Double-remove okay. } // Join |thread|. @@ -170,10 +174,10 @@ TEST(WaiterListTest, MultipleWaiters) { { WaiterList waiter_list; test::SimpleWaiterThread thread1(&result1, &context1); - waiter_list.AddWaiter(thread1.waiter(), MOJO_WAIT_FLAG_READABLE, 1); + waiter_list.AddWaiter(thread1.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 1); thread1.Start(); test::SimpleWaiterThread thread2(&result2, &context2); - waiter_list.AddWaiter(thread2.waiter(), MOJO_WAIT_FLAG_WRITABLE, 2); + waiter_list.AddWaiter(thread2.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 2); thread2.Start(); base::PlatformThread::Sleep(2 * test::EpsilonTimeout()); waiter_list.CancelAllWaiters(); @@ -187,15 +191,16 @@ TEST(WaiterListTest, MultipleWaiters) { { WaiterList waiter_list; test::SimpleWaiterThread thread1(&result1, &context1); - waiter_list.AddWaiter(thread1.waiter(), MOJO_WAIT_FLAG_READABLE, 3); + waiter_list.AddWaiter(thread1.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 3); thread1.Start(); test::SimpleWaiterThread thread2(&result2, &context2); - waiter_list.AddWaiter(thread2.waiter(), MOJO_WAIT_FLAG_WRITABLE, 4); + waiter_list.AddWaiter(thread2.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 4); thread2.Start(); base::PlatformThread::Sleep(2 * test::EpsilonTimeout()); waiter_list.AwakeWaitersForStateChange( - WaitFlagsState(MOJO_WAIT_FLAG_READABLE, - MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE)); + WaitFlagsState(MOJO_HANDLE_SIGNAL_READABLE, + MOJO_HANDLE_SIGNAL_READABLE | + MOJO_HANDLE_SIGNAL_WRITABLE)); waiter_list.RemoveWaiter(thread1.waiter()); waiter_list.CancelAllWaiters(); } // Join threads. @@ -208,14 +213,14 @@ TEST(WaiterListTest, MultipleWaiters) { { WaiterList waiter_list; test::SimpleWaiterThread thread1(&result1, &context1); - waiter_list.AddWaiter(thread1.waiter(), MOJO_WAIT_FLAG_READABLE, 5); + waiter_list.AddWaiter(thread1.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 5); thread1.Start(); test::SimpleWaiterThread thread2(&result2, &context2); - waiter_list.AddWaiter(thread2.waiter(), MOJO_WAIT_FLAG_WRITABLE, 6); + waiter_list.AddWaiter(thread2.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 6); thread2.Start(); base::PlatformThread::Sleep(2 * test::EpsilonTimeout()); waiter_list.AwakeWaitersForStateChange( - WaitFlagsState(MOJO_WAIT_FLAG_NONE, MOJO_WAIT_FLAG_READABLE)); + WaitFlagsState(MOJO_HANDLE_SIGNAL_NONE, MOJO_HANDLE_SIGNAL_READABLE)); waiter_list.RemoveWaiter(thread2.waiter()); waiter_list.CancelAllWaiters(); } // Join threads. @@ -228,43 +233,45 @@ TEST(WaiterListTest, MultipleWaiters) { { WaiterList waiter_list; test::SimpleWaiterThread thread1(&result1, &context1); - waiter_list.AddWaiter(thread1.waiter(), MOJO_WAIT_FLAG_READABLE, 7); + waiter_list.AddWaiter(thread1.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 7); thread1.Start(); base::PlatformThread::Sleep(1 * test::EpsilonTimeout()); // Should do nothing. waiter_list.AwakeWaitersForStateChange( - WaitFlagsState(MOJO_WAIT_FLAG_NONE, - MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE)); + WaitFlagsState(MOJO_HANDLE_SIGNAL_NONE, + MOJO_HANDLE_SIGNAL_READABLE | + MOJO_HANDLE_SIGNAL_WRITABLE)); test::SimpleWaiterThread thread2(&result2, &context2); - waiter_list.AddWaiter(thread2.waiter(), MOJO_WAIT_FLAG_WRITABLE, 8); + waiter_list.AddWaiter(thread2.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 8); thread2.Start(); base::PlatformThread::Sleep(1 * test::EpsilonTimeout()); // Awake #1. waiter_list.AwakeWaitersForStateChange( - WaitFlagsState(MOJO_WAIT_FLAG_READABLE, - MOJO_WAIT_FLAG_READABLE | MOJO_WAIT_FLAG_WRITABLE)); + WaitFlagsState(MOJO_HANDLE_SIGNAL_READABLE, + MOJO_HANDLE_SIGNAL_READABLE | + MOJO_HANDLE_SIGNAL_WRITABLE)); waiter_list.RemoveWaiter(thread1.waiter()); base::PlatformThread::Sleep(1 * test::EpsilonTimeout()); test::SimpleWaiterThread thread3(&result3, &context3); - waiter_list.AddWaiter(thread3.waiter(), MOJO_WAIT_FLAG_WRITABLE, 9); + waiter_list.AddWaiter(thread3.waiter(), MOJO_HANDLE_SIGNAL_WRITABLE, 9); thread3.Start(); test::SimpleWaiterThread thread4(&result4, &context4); - waiter_list.AddWaiter(thread4.waiter(), MOJO_WAIT_FLAG_READABLE, 10); + waiter_list.AddWaiter(thread4.waiter(), MOJO_HANDLE_SIGNAL_READABLE, 10); thread4.Start(); base::PlatformThread::Sleep(1 * test::EpsilonTimeout()); // Awake #2 and #3 for unsatisfiability. waiter_list.AwakeWaitersForStateChange( - WaitFlagsState(MOJO_WAIT_FLAG_NONE, MOJO_WAIT_FLAG_READABLE)); + WaitFlagsState(MOJO_HANDLE_SIGNAL_NONE, MOJO_HANDLE_SIGNAL_READABLE)); waiter_list.RemoveWaiter(thread2.waiter()); waiter_list.RemoveWaiter(thread3.waiter()); |