mojo/edk/system/message_pipe_dispatcher_unittest.cc - Issue 741503003: Adding MOJO_HANDLE_SIGNAL_PEER_CLOSED to be notified when a peer is closed.

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

Issue 741503003: Adding MOJO_HANDLE_SIGNAL_PEER_CLOSED to be notified when a peer is closed. (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

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

Jump to:

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

Download patch

Index: mojo/edk/system/message_pipe_dispatcher_unittest.cc

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

index 8076a99410d3ac68456e4d260026be2f17f337e2..3139b5f1c79ceab8998b12e452abb0203559ad05 100644

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

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

@@ -29,6 +29,10 @@ namespace mojo {

namespace system {

namespace {

+const MojoHandleSignals kAllSignals = MOJO_HANDLE_SIGNAL_READABLE |

+ MOJO_HANDLE_SIGNAL_WRITABLE |

+ MOJO_HANDLE_SIGNAL_CLOSED;

TEST(MessagePipeDispatcherTest, Basic) {

test::Stopwatch stopwatch;

int32_t buffer[1];

@@ -57,8 +61,7 @@ TEST(MessagePipeDispatcherTest, Basic) {

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 0, &hss));

EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, hss.satisfied_signals);

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

- hss.satisfiable_signals);

+ EXPECT_EQ(kAllSignals, hss.satisfiable_signals);

// Shouldn't need to remove the waiter (it was not added).

// Add a readable waiter to |d0|, then make it readable (by writing to

@@ -78,8 +81,7 @@ TEST(MessagePipeDispatcherTest, Basic) {

d0->RemoveWaiter(&w, &hss);

EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

hss.satisfied_signals);

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

- hss.satisfiable_signals);

+ EXPECT_EQ(kAllSignals, hss.satisfiable_signals);

// Try adding a readable waiter when already readable (from above).

w.Init();

@@ -88,8 +90,7 @@ TEST(MessagePipeDispatcherTest, Basic) {

d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 2, &hss));

EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

hss.satisfied_signals);

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

- hss.satisfiable_signals);

+ EXPECT_EQ(kAllSignals, hss.satisfiable_signals);

// Shouldn't need to remove the waiter (it was not added).

// Make |d0| no longer readable (by reading from it).

@@ -112,8 +113,7 @@ TEST(MessagePipeDispatcherTest, Basic) {

hss = HandleSignalsState();

d0->RemoveWaiter(&w, &hss);

EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, hss.satisfied_signals);

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

- hss.satisfiable_signals);

+ EXPECT_EQ(kAllSignals, hss.satisfiable_signals);

// Wait for non-zero, finite time for readability on |d0| (will time out).

w.Init();

@@ -128,8 +128,7 @@ TEST(MessagePipeDispatcherTest, Basic) {

hss = HandleSignalsState();

d0->RemoveWaiter(&w, &hss);

EXPECT_EQ(MOJO_HANDLE_SIGNAL_WRITABLE, hss.satisfied_signals);

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

- hss.satisfiable_signals);

+ EXPECT_EQ(kAllSignals, hss.satisfiable_signals);

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

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

@@ -238,8 +237,7 @@ TEST(MessagePipeDispatcherTest, BasicClosed) {

d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 0, &hss));

EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

hss.satisfied_signals);

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

- hss.satisfiable_signals);

+ EXPECT_EQ(kAllSignals, hss.satisfiable_signals);

// Try reading from |d1|; should fail (nothing to read).

buffer[0] = 0;

@@ -257,8 +255,10 @@ TEST(MessagePipeDispatcherTest, BasicClosed) {

hss = HandleSignalsState();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 1, &hss));

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE, hss.satisfied_signals);

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE, hss.satisfiable_signals);

+ EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_CLOSED,

+ hss.satisfied_signals);

+ EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_CLOSED,

+ hss.satisfiable_signals);

// Read from |d0|.

buffer[0] = 0;

@@ -275,8 +275,10 @@ TEST(MessagePipeDispatcherTest, BasicClosed) {

hss = HandleSignalsState();

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS,

d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 2, &hss));

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE, hss.satisfied_signals);

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE, hss.satisfiable_signals);

+ EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_CLOSED,

+ hss.satisfied_signals);

+ EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_CLOSED,

+ hss.satisfiable_signals);

// Read again from |d0|.

buffer[0] = 0;

@@ -293,16 +295,16 @@ TEST(MessagePipeDispatcherTest, BasicClosed) {

hss = HandleSignalsState();

EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,

d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_READABLE, 3, &hss));

- EXPECT_EQ(0u, hss.satisfied_signals);

- EXPECT_EQ(0u, hss.satisfiable_signals);

+ EXPECT_EQ(MOJO_HANDLE_SIGNAL_CLOSED, hss.satisfied_signals);

+ EXPECT_EQ(MOJO_HANDLE_SIGNAL_CLOSED, hss.satisfiable_signals);

// Try waiting for writable on |d0|; should fail (unsatisfiable).

w.Init();

hss = HandleSignalsState();

EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,

d0->AddWaiter(&w, MOJO_HANDLE_SIGNAL_WRITABLE, 4, &hss));

- EXPECT_EQ(0u, hss.satisfied_signals);

- EXPECT_EQ(0u, hss.satisfiable_signals);

+ EXPECT_EQ(MOJO_HANDLE_SIGNAL_CLOSED, hss.satisfied_signals);

+ EXPECT_EQ(MOJO_HANDLE_SIGNAL_CLOSED, hss.satisfiable_signals);

// Try reading from |d0|; should fail (nothing to read and other end

// closed).

@@ -374,8 +376,7 @@ TEST(MessagePipeDispatcherTest, MAYBE_BasicThreaded) {

EXPECT_EQ(1u, context);

EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

hss.satisfied_signals);

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

- hss.satisfiable_signals);

+ EXPECT_EQ(kAllSignals, hss.satisfiable_signals);

// Now |d1| is already readable. Try waiting for it again.

{

@@ -390,8 +391,7 @@ TEST(MessagePipeDispatcherTest, MAYBE_BasicThreaded) {

EXPECT_EQ(MOJO_RESULT_ALREADY_EXISTS, result);

EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

hss.satisfied_signals);

- EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,

- hss.satisfiable_signals);

+ EXPECT_EQ(kAllSignals, hss.satisfiable_signals);

// Consume what we wrote to |d0|.

buffer[0] = 0;

@@ -420,8 +420,8 @@ TEST(MessagePipeDispatcherTest, MAYBE_BasicThreaded) {

EXPECT_TRUE(did_wait);

EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);

EXPECT_EQ(3u, context);

- EXPECT_EQ(0u, hss.satisfied_signals);

- EXPECT_EQ(0u, hss.satisfiable_signals);

+ EXPECT_EQ(MOJO_HANDLE_SIGNAL_CLOSED, hss.satisfied_signals);

+ EXPECT_EQ(MOJO_HANDLE_SIGNAL_CLOSED, hss.satisfiable_signals);

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

}

« no previous file with comments | « mojo/edk/system/local_message_pipe_endpoint.cc ('k') | mojo/edk/system/message_pipe_unittest.cc » ('j') | mojo/public/c/system/types.h » ('J')