[zircon] Normal spelling of EVENTPAIR
Previously, we had EPAIR, EVPAIR, and EVENT_PAIR. Now we just use
EVENTPAIR, to match the "eventpair" noun in the syscalls.
Change-Id: Id5b3b33aca02921980022e3d69acae40aaab9eae
diff --git a/docs/syscalls/eventpair_create.md b/docs/syscalls/eventpair_create.md
index 99762e7..d7e3563 100644
--- a/docs/syscalls/eventpair_create.md
+++ b/docs/syscalls/eventpair_create.md
@@ -18,13 +18,13 @@
**eventpair_create**() creates an event pair, which is a pair of objects that
are mutually signalable.
-The signals *ZX_EPAIR_SIGNALED* and *ZX_USER_SIGNAL_n* (where *n* is 0 through 7)
+The signals *ZX_EVENTPAIR_SIGNALED* and *ZX_USER_SIGNAL_n* (where *n* is 0 through 7)
may be set or cleared using **object_signal**() (modifying the signals on the
object itself), or **object_signal_peer**() (modifying the signals on its
counterpart).
-When all the handles to one of the objects have been closed, the *ZX_EPAIR_PEER_CLOSED*
-signal will be asserted on the opposing object.
+When all the handles to one of the objects have been closed, the
+*ZX_EVENTPAIR_PEER_CLOSED* signal will be asserted on the opposing object.
The newly-created handles will have the *ZX_RIGHT_TRANSFER*,
*ZX_RIGHT_DUPLICATE*, *ZX_RIGHT_READ*, *ZX_RIGHT_WRITE*, *ZX_RIGHT_SIGNAL*,
diff --git a/docs/syscalls/job_set_policy.md b/docs/syscalls/job_set_policy.md
index 34a426e..d3f3d6b 100644
--- a/docs/syscalls/job_set_policy.md
+++ b/docs/syscalls/job_set_policy.md
@@ -57,7 +57,7 @@
a new channel.
+ **ZX_POL_NEW_EVENT** a process under this job is attempting to create
a new event.
-+ **ZX_POL_NEW_EVPAIR** a process under this job is attempting to create
++ **ZX_POL_NEW_EVENTPAIR** a process under this job is attempting to create
a new event pair.
+ **ZX_POL_NEW_PORT** a process under this job is attempting to create
a new port.
@@ -69,7 +69,7 @@
a new timer.
+ **ZX_POL_NEW_ANY** is a special *condition* that stands for all of
the above **ZX_NEW** condtions such as **ZX_POL_NEW_VMO**,
- **ZX_POL_NEW_CHANNEL**, **ZX_POL_NEW_EVENT**, **ZX_POL_NEW_EVPAIR**,
+ **ZX_POL_NEW_CHANNEL**, **ZX_POL_NEW_EVENT**, **ZX_POL_NEW_EVENTPAIR**,
**ZX_POL_NEW_PORT**, **ZX_POL_NEW_SOCKET**, **ZX_POL_NEW_FIFO**,
and any future ZX_NEW policy. This will include any new
kernel objects which do not require a parent object for creation.
diff --git a/docs/syscalls/object_signal.md b/docs/syscalls/object_signal.md
index af54080..e242eba 100644
--- a/docs/syscalls/object_signal.md
+++ b/docs/syscalls/object_signal.md
@@ -29,7 +29,7 @@
*Event* objects also allow control over the *ZX_EVENT_SIGNALED* bit.
-*Eventpair* objects also allow control over the *ZX_EPAIR_SIGNALED* bit.
+*Eventpair* objects also allow control over the *ZX_EVENTPAIR_SIGNALED* bit.
The *clear_mask* is first used to clear any bits indicated, and then the *set_mask*
is used to set any bits indicated.
diff --git a/kernel/object/diagnostics.cpp b/kernel/object/diagnostics.cpp
index 4202713..fa0063f 100644
--- a/kernel/object/diagnostics.cpp
+++ b/kernel/object/diagnostics.cpp
@@ -74,7 +74,7 @@
case ZX_OBJ_TYPE_LOG: return "log";
case ZX_OBJ_TYPE_SOCKET: return "socket";
case ZX_OBJ_TYPE_RESOURCE: return "resource";
- case ZX_OBJ_TYPE_EVENT_PAIR: return "event-pair";
+ case ZX_OBJ_TYPE_EVENTPAIR: return "event-pair";
case ZX_OBJ_TYPE_JOB: return "job";
case ZX_OBJ_TYPE_VMAR: return "vmar";
case ZX_OBJ_TYPE_FIFO: return "fifo";
@@ -127,7 +127,7 @@
types[ZX_OBJ_TYPE_VMO],
types[ZX_OBJ_TYPE_VMAR],
types[ZX_OBJ_TYPE_CHANNEL],
- types[ZX_OBJ_TYPE_EVENT] + types[ZX_OBJ_TYPE_EVENT_PAIR],
+ types[ZX_OBJ_TYPE_EVENT] + types[ZX_OBJ_TYPE_EVENTPAIR],
types[ZX_OBJ_TYPE_PORT],
types[ZX_OBJ_TYPE_SOCKET],
types[ZX_OBJ_TYPE_TIMER],
diff --git a/kernel/object/event_pair_dispatcher.cpp b/kernel/object/event_pair_dispatcher.cpp
index a5d417f..50452e9 100644
--- a/kernel/object/event_pair_dispatcher.cpp
+++ b/kernel/object/event_pair_dispatcher.cpp
@@ -33,7 +33,7 @@
disp0->Init(disp1);
disp1->Init(disp0);
- *rights = ZX_DEFAULT_EVENT_PAIR_RIGHTS;
+ *rights = ZX_DEFAULT_EVENTPAIR_RIGHTS;
*dispatcher0 = fbl::move(disp0);
*dispatcher1 = fbl::move(disp1);
@@ -50,7 +50,7 @@
DEBUG_ASSERT(peer_);
peer_->InvalidateCookieLocked(peer_->get_cookie_jar());
- peer_->UpdateStateLocked(0u, ZX_EPAIR_PEER_CLOSED);
+ peer_->UpdateStateLocked(0u, ZX_EVENTPAIR_PEER_CLOSED);
peer_.reset();
}
diff --git a/kernel/object/include/object/dispatcher.h b/kernel/object/include/object/dispatcher.h
index 69df35c..10ed0a3 100644
--- a/kernel/object/include/object/dispatcher.h
+++ b/kernel/object/include/object/dispatcher.h
@@ -54,7 +54,7 @@
DECLARE_DISPTAG(LogDispatcher, ZX_OBJ_TYPE_LOG)
DECLARE_DISPTAG(SocketDispatcher, ZX_OBJ_TYPE_SOCKET)
DECLARE_DISPTAG(ResourceDispatcher, ZX_OBJ_TYPE_RESOURCE)
-DECLARE_DISPTAG(EventPairDispatcher, ZX_OBJ_TYPE_EVENT_PAIR)
+DECLARE_DISPTAG(EventPairDispatcher, ZX_OBJ_TYPE_EVENTPAIR)
DECLARE_DISPTAG(JobDispatcher, ZX_OBJ_TYPE_JOB)
DECLARE_DISPTAG(VmAddressRegionDispatcher, ZX_OBJ_TYPE_VMAR)
DECLARE_DISPTAG(FifoDispatcher, ZX_OBJ_TYPE_FIFO)
diff --git a/kernel/object/include/object/event_pair_dispatcher.h b/kernel/object/include/object/event_pair_dispatcher.h
index 1a03355..1dfe6ae 100644
--- a/kernel/object/include/object/event_pair_dispatcher.h
+++ b/kernel/object/include/object/event_pair_dispatcher.h
@@ -20,7 +20,7 @@
zx_rights_t* rights);
~EventPairDispatcher() final;
- zx_obj_type_t get_type() const final { return ZX_OBJ_TYPE_EVENT_PAIR; }
+ zx_obj_type_t get_type() const final { return ZX_OBJ_TYPE_EVENTPAIR; }
bool has_state_tracker() const final { return true; }
CookieJar* get_cookie_jar() final { return &cookie_jar_; }
void on_zero_handles() final;
diff --git a/kernel/object/policy_manager.cpp b/kernel/object/policy_manager.cpp
index dd3bd6f..b6a63ad 100644
--- a/kernel/object/policy_manager.cpp
+++ b/kernel/object/policy_manager.cpp
@@ -146,7 +146,7 @@
case ZX_POL_NEW_VMO: return GetEffectiveAction(existing.new_vmo);
case ZX_POL_NEW_CHANNEL: return GetEffectiveAction(existing.new_channel);
case ZX_POL_NEW_EVENT: return GetEffectiveAction(existing.new_event);
- case ZX_POL_NEW_EVPAIR: return GetEffectiveAction(existing.new_evpair);
+ case ZX_POL_NEW_EVENTPAIR: return GetEffectiveAction(existing.new_evpair);
case ZX_POL_NEW_PORT: return GetEffectiveAction(existing.new_port);
case ZX_POL_NEW_SOCKET: return GetEffectiveAction(existing.new_socket);
case ZX_POL_NEW_FIFO: return GetEffectiveAction(existing.new_fifo);
@@ -204,7 +204,7 @@
case ZX_POL_NEW_EVENT:
POLMAN_SET_ENTRY(mode, existing.new_event, policy, result.new_event);
break;
- case ZX_POL_NEW_EVPAIR:
+ case ZX_POL_NEW_EVENTPAIR:
POLMAN_SET_ENTRY(mode, existing.new_evpair, policy, result.new_evpair);
break;
case ZX_POL_NEW_PORT:
diff --git a/kernel/syscalls/zircon.cpp b/kernel/syscalls/zircon.cpp
index dfcf6b4..250bbee 100644
--- a/kernel/syscalls/zircon.cpp
+++ b/kernel/syscalls/zircon.cpp
@@ -140,7 +140,7 @@
return ZX_ERR_NOT_SUPPORTED;
auto up = ProcessDispatcher::GetCurrent();
- zx_status_t res = up->QueryPolicy(ZX_POL_NEW_EVPAIR);
+ zx_status_t res = up->QueryPolicy(ZX_POL_NEW_EVENTPAIR);
if (res != ZX_OK)
return res;
diff --git a/system/fidl/tracelink/tracelink.fidl b/system/fidl/tracelink/tracelink.fidl
index a3b60cb..283fb8d 100644
--- a/system/fidl/tracelink/tracelink.fidl
+++ b/system/fidl/tracelink/tracelink.fidl
@@ -17,7 +17,7 @@
// and close both |buffer| and |fence| to indicate to the trace manager
// that tracing is finished.
//
- // When the trace provider observes |ZX_EPAIR_CLOSED| on |fence|, it must
+ // When the trace provider observes |ZX_EVENTPAIR_CLOSED| on |fence|, it must
// assume the trace manager has terminated abnormally (since |Stop| was
// not received as usual) and stop tracing automatically.
//
diff --git a/system/host/fidl/lib/names.cpp b/system/host/fidl/lib/names.cpp
index 4d490da..87d285a 100644
--- a/system/host/fidl/lib/names.cpp
+++ b/system/host/fidl/lib/names.cpp
@@ -232,7 +232,7 @@
case types::HandleSubtype::kResource:
return "ZX_OBJ_TYPE_RESOURCE";
case types::HandleSubtype::kEventpair:
- return "ZX_OBJ_TYPE_EVENT_PAIR";
+ return "ZX_OBJ_TYPE_EVENTPAIR";
case types::HandleSubtype::kJob:
return "ZX_OBJ_TYPE_JOB";
case types::HandleSubtype::kVmar:
diff --git a/system/public/zircon/rights.h b/system/public/zircon/rights.h
index 93a9923..cf74f93 100644
--- a/system/public/zircon/rights.h
+++ b/system/public/zircon/rights.h
@@ -15,10 +15,13 @@
#define ZX_DEFAULT_EVENT_RIGHTS \
(ZX_RIGHTS_BASIC | ZX_RIGHTS_IO | ZX_RIGHT_SIGNAL)
-#define ZX_DEFAULT_EVENT_PAIR_RIGHTS \
+#define ZX_DEFAULT_EVENTPAIR_RIGHTS \
(ZX_RIGHTS_BASIC | ZX_RIGHTS_IO |\
ZX_RIGHT_SIGNAL | ZX_RIGHT_SIGNAL_PEER)
+// DEPRECATED: Use ZX_DEFAULT_EVENTPAIR_RIGHTS instead.
+#define ZX_DEFAULT_EVENT_PAIR_RIGHTS ZX_DEFAULT_EVENTPAIR_RIGHTS
+
#define ZX_DEFAULT_FIFO_RIGHTS \
(ZX_RIGHTS_BASIC | ZX_RIGHTS_IO |\
ZX_RIGHT_SIGNAL | ZX_RIGHT_SIGNAL_PEER)
diff --git a/system/public/zircon/syscalls/policy.h b/system/public/zircon/syscalls/policy.h
index 52ba44b..c89758a 100644
--- a/system/public/zircon/syscalls/policy.h
+++ b/system/public/zircon/syscalls/policy.h
@@ -34,7 +34,7 @@
#define ZX_POL_NEW_VMO 4u
#define ZX_POL_NEW_CHANNEL 5u
#define ZX_POL_NEW_EVENT 6u
-#define ZX_POL_NEW_EVPAIR 7u
+#define ZX_POL_NEW_EVENTPAIR 7u
#define ZX_POL_NEW_PORT 8u
#define ZX_POL_NEW_SOCKET 9u
#define ZX_POL_NEW_FIFO 10u
diff --git a/system/public/zircon/types.h b/system/public/zircon/types.h
index 0777f96..507ea58 100644
--- a/system/public/zircon/types.h
+++ b/system/public/zircon/types.h
@@ -112,9 +112,14 @@
#define ZX_EVENT_SIGNAL_MASK (ZX_USER_SIGNAL_ALL | __ZX_OBJECT_SIGNALED)
// EventPair
-#define ZX_EPAIR_SIGNALED __ZX_OBJECT_SIGNALED
-#define ZX_EPAIR_PEER_CLOSED __ZX_OBJECT_PEER_CLOSED
-#define ZX_EPAIR_SIGNAL_MASK (ZX_USER_SIGNAL_ALL | __ZX_OBJECT_SIGNALED | __ZX_OBJECT_PEER_CLOSED)
+#define ZX_EVENTPAIR_SIGNALED __ZX_OBJECT_SIGNALED
+#define ZX_EVENTPAIR_PEER_CLOSED __ZX_OBJECT_PEER_CLOSED
+#define ZX_EVENTPAIR_SIGNAL_MASK (ZX_USER_SIGNAL_ALL | __ZX_OBJECT_SIGNALED | __ZX_OBJECT_PEER_CLOSED)
+
+// DEPRECATED: Use ZX_EVENTPAIR_* instead.
+#define ZX_EPAIR_SIGNALED ZX_EVENTPAIR_SIGNALED
+#define ZX_EPAIR_PEER_CLOSED ZX_EVENTPAIR_PEER_CLOSED
+#define ZX_EPAIR_SIGNAL_MASK ZX_EVENTPAIR_SIGNAL_MASK
// Channel
#define ZX_CHANNEL_READABLE __ZX_OBJECT_READABLE
@@ -356,7 +361,7 @@
#define ZX_OBJ_TYPE_LOG ((zx_obj_type_t)12u)
#define ZX_OBJ_TYPE_SOCKET ((zx_obj_type_t)14u)
#define ZX_OBJ_TYPE_RESOURCE ((zx_obj_type_t)15u)
-#define ZX_OBJ_TYPE_EVENT_PAIR ((zx_obj_type_t)16u)
+#define ZX_OBJ_TYPE_EVENTPAIR ((zx_obj_type_t)16u)
#define ZX_OBJ_TYPE_JOB ((zx_obj_type_t)17u)
#define ZX_OBJ_TYPE_VMAR ((zx_obj_type_t)18u)
#define ZX_OBJ_TYPE_FIFO ((zx_obj_type_t)19u)
@@ -370,6 +375,9 @@
#define ZX_OBJ_TYPE_SUSPEND_TOKEN ((zx_obj_type_t)27u)
#define ZX_OBJ_TYPE_LAST ((zx_obj_type_t)28u)
+// DEPRECATED: Use ZX_OBJ_TYPE_EVENTPAIR instead.
+#define ZX_OBJ_TYPE_EVENT_PAIR ZX_OBJ_TYPE_EVENTPAIR
+
typedef struct {
zx_handle_t handle;
zx_obj_type_t type;
diff --git a/system/uapp/psutils/memgraph.cpp b/system/uapp/psutils/memgraph.cpp
index f239d8f..27342e6 100644
--- a/system/uapp/psutils/memgraph.cpp
+++ b/system/uapp/psutils/memgraph.cpp
@@ -53,7 +53,7 @@
return "socket";
case ZX_OBJ_TYPE_RESOURCE:
return "resource";
- case ZX_OBJ_TYPE_EVENT_PAIR:
+ case ZX_OBJ_TYPE_EVENTPAIR:
return "event_pair";
case ZX_OBJ_TYPE_JOB:
return "job";
diff --git a/system/ulib/trace-provider/trace_provider.fidl.cpp b/system/ulib/trace-provider/trace_provider.fidl.cpp
index 7dbbfdb..0be04eb 100644
--- a/system/ulib/trace-provider/trace_provider.fidl.cpp
+++ b/system/ulib/trace-provider/trace_provider.fidl.cpp
@@ -14,7 +14,7 @@
static const fidl_type_t HandlevmononnullableTable = fidl_type_t(::fidl::FidlCodedHandle(ZX_OBJ_TYPE_VMO, ::fidl::kNonnullable));
-static const fidl_type_t HandleeventpairnonnullableTable = fidl_type_t(::fidl::FidlCodedHandle(ZX_OBJ_TYPE_EVENT_PAIR, ::fidl::kNonnullable));
+static const fidl_type_t HandleeventpairnonnullableTable = fidl_type_t(::fidl::FidlCodedHandle(ZX_OBJ_TYPE_EVENTPAIR, ::fidl::kNonnullable));
static const fidl_type_t String100nonnullableTable = fidl_type_t(::fidl::FidlCodedString(100, ::fidl::kNonnullable));
diff --git a/system/ulib/trace-reader/records.cpp b/system/ulib/trace-reader/records.cpp
index 979040d..aa9a1ae 100644
--- a/system/ulib/trace-reader/records.cpp
+++ b/system/ulib/trace-reader/records.cpp
@@ -68,7 +68,7 @@
return "socket";
case ZX_OBJ_TYPE_RESOURCE:
return "resource";
- case ZX_OBJ_TYPE_EVENT_PAIR:
+ case ZX_OBJ_TYPE_EVENTPAIR:
return "event-pair";
case ZX_OBJ_TYPE_JOB:
return "job";
diff --git a/system/ulib/zx/include/lib/zx/eventpair.h b/system/ulib/zx/include/lib/zx/eventpair.h
index 92fe3a1..0df0746 100644
--- a/system/ulib/zx/include/lib/zx/eventpair.h
+++ b/system/ulib/zx/include/lib/zx/eventpair.h
@@ -11,7 +11,7 @@
class eventpair : public object<eventpair> {
public:
- static constexpr zx_obj_type_t TYPE = ZX_OBJ_TYPE_EVENT_PAIR;
+ static constexpr zx_obj_type_t TYPE = ZX_OBJ_TYPE_EVENTPAIR;
constexpr eventpair() = default;
diff --git a/system/utest/core/event-pair/event-pair.c b/system/utest/core/event-pair/event-pair.c
index 22c449f..9e3731f 100644
--- a/system/utest/core/event-pair/event-pair.c
+++ b/system/utest/core/event-pair/event-pair.c
@@ -30,14 +30,14 @@
ZX_RIGHTS_BASIC | ZX_RIGHT_READ |
ZX_RIGHT_WRITE | ZX_RIGHT_SIGNAL | ZX_RIGHT_SIGNAL_PEER,
"wrong rights");
- EXPECT_EQ(info[0].type, (uint32_t)ZX_OBJ_TYPE_EVENT_PAIR, "wrong type");
+ EXPECT_EQ(info[0].type, (uint32_t)ZX_OBJ_TYPE_EVENTPAIR, "wrong type");
status = zx_object_get_info(h[1], ZX_INFO_HANDLE_BASIC, &info[1], sizeof(info[1]), NULL, NULL);
ASSERT_EQ(status, ZX_OK, "");
EXPECT_EQ(info[1].rights,
ZX_RIGHTS_BASIC | ZX_RIGHT_READ |
ZX_RIGHT_WRITE | ZX_RIGHT_SIGNAL | ZX_RIGHT_SIGNAL_PEER,
"wrong rights");
- EXPECT_EQ(info[1].type, (uint32_t)ZX_OBJ_TYPE_EVENT_PAIR, "wrong type");
+ EXPECT_EQ(info[1].type, (uint32_t)ZX_OBJ_TYPE_EVENTPAIR, "wrong type");
// Check that koids line up.
@@ -82,7 +82,7 @@
check_signals_state(h[0], 0u);
EXPECT_EQ(zx_handle_close(h[0]), ZX_OK, "failed to close event pair handle");
- check_signals_state(h[1], ZX_EPAIR_PEER_CLOSED);
+ check_signals_state(h[1], ZX_EVENTPAIR_PEER_CLOSED);
EXPECT_EQ(zx_handle_close(h[1]), ZX_OK, "failed to close event pair handle");
END_TEST;
}
@@ -114,7 +114,7 @@
// Signaled flags should remain satisfied but now should now also get peer closed (and
// unsignaled flags should be unsatisfiable).
check_signals_state(h[1],
- ZX_EPAIR_PEER_CLOSED | ZX_USER_SIGNAL_3 | ZX_USER_SIGNAL_4);
+ ZX_EVENTPAIR_PEER_CLOSED | ZX_USER_SIGNAL_3 | ZX_USER_SIGNAL_4);
EXPECT_EQ(zx_handle_close(h[1]), ZX_OK, "failed to close event pair handle");
diff --git a/system/utest/fidl/decoding_tests.cpp b/system/utest/fidl/decoding_tests.cpp
index 6ca3edf..6a7c2b6 100644
--- a/system/utest/fidl/decoding_tests.cpp
+++ b/system/utest/fidl/decoding_tests.cpp
@@ -342,22 +342,22 @@
for (i = 0; i < ArrayCount(handle_pairs) - 2; ++i) {
zx_signals_t observed_signals;
EXPECT_EQ(zx_object_wait_one(handle_pairs[i][1],
- ZX_EPAIR_PEER_CLOSED,
+ ZX_EVENTPAIR_PEER_CLOSED,
1, // deadline shouldn't matter, should return immediately.
&observed_signals),
ZX_OK);
- EXPECT_EQ(observed_signals & ZX_EPAIR_PEER_CLOSED, ZX_EPAIR_PEER_CLOSED);
+ EXPECT_EQ(observed_signals & ZX_EVENTPAIR_PEER_CLOSED, ZX_EVENTPAIR_PEER_CLOSED);
EXPECT_EQ(zx_handle_close(handle_pairs[i][1]), ZX_OK); // [i][0] was closed by fidl_encode.
}
// But the other ones should not be.
for (; i < ArrayCount(handle_pairs); ++i) {
zx_signals_t observed_signals;
EXPECT_EQ(zx_object_wait_one(handle_pairs[i][1],
- ZX_EPAIR_PEER_CLOSED,
+ ZX_EVENTPAIR_PEER_CLOSED,
zx_clock_get(ZX_CLOCK_MONOTONIC) + 1,
&observed_signals),
ZX_ERR_TIMED_OUT);
- EXPECT_EQ(observed_signals & ZX_EPAIR_PEER_CLOSED, 0);
+ EXPECT_EQ(observed_signals & ZX_EVENTPAIR_PEER_CLOSED, 0);
EXPECT_EQ(zx_handle_close(handle_pairs[i][0]), ZX_OK);
EXPECT_EQ(zx_handle_close(handle_pairs[i][1]), ZX_OK);
}
diff --git a/system/utest/fidl/encoding_tests.cpp b/system/utest/fidl/encoding_tests.cpp
index 5a23c24..e82b3cf 100644
--- a/system/utest/fidl/encoding_tests.cpp
+++ b/system/utest/fidl/encoding_tests.cpp
@@ -347,11 +347,11 @@
for (uint32_t i = 0; i < ArrayCount(handle_pairs); ++i) {
zx_signals_t observed_signals;
EXPECT_EQ(zx_object_wait_one(handle_pairs[i][1],
- ZX_EPAIR_PEER_CLOSED,
+ ZX_EVENTPAIR_PEER_CLOSED,
1, // deadline shouldn't matter, should return immediately.
&observed_signals),
ZX_OK);
- EXPECT_EQ(observed_signals & ZX_EPAIR_PEER_CLOSED, ZX_EPAIR_PEER_CLOSED);
+ EXPECT_EQ(observed_signals & ZX_EVENTPAIR_PEER_CLOSED, ZX_EVENTPAIR_PEER_CLOSED);
EXPECT_EQ(zx_handle_close(handle_pairs[i][1]), ZX_OK); // [i][0] was closed by fidl_encode.
}
diff --git a/system/utest/libzx/zx-test.cpp b/system/utest/libzx/zx-test.cpp
index c559136..e5f2368 100644
--- a/system/utest/libzx/zx-test.cpp
+++ b/system/utest/libzx/zx-test.cpp
@@ -180,8 +180,8 @@
ASSERT_EQ(channel[1].read_etc(0u, nullptr, 0u, nullptr, recv, 2, &h_count), ZX_OK);
ASSERT_EQ(h_count, 2u);
- ASSERT_EQ(recv[0].type, ZX_OBJ_TYPE_EVENT_PAIR, ZX_OK);
- ASSERT_EQ(recv[1].type, ZX_OBJ_TYPE_EVENT_PAIR, ZX_OK);
+ ASSERT_EQ(recv[0].type, ZX_OBJ_TYPE_EVENTPAIR, ZX_OK);
+ ASSERT_EQ(recv[1].type, ZX_OBJ_TYPE_EVENTPAIR, ZX_OK);
ASSERT_EQ(zx_handle_close(recv[0].handle), ZX_OK);
ASSERT_EQ(zx_handle_close(recv[1].handle), ZX_OK);
diff --git a/system/utest/thread-state/thread-state.cpp b/system/utest/thread-state/thread-state.cpp
index 993a36c..b9443f5 100644
--- a/system/utest/thread-state/thread-state.cpp
+++ b/system/utest/thread-state/thread-state.cpp
@@ -255,7 +255,7 @@
send_msg(channel, MSG_PROCEED);
zx_signals_t observed = 0u;
- auto status = zx_object_wait_one(msg->handles[0], ZX_EPAIR_PEER_CLOSED,
+ auto status = zx_object_wait_one(msg->handles[0], ZX_EVENTPAIR_PEER_CLOSED,
ZX_TIME_INFINITE, &observed);
tu_handle_close(msg->handles[0]);
if (status != ZX_OK) {
@@ -265,8 +265,8 @@
return;
}
- if (!(observed & ZX_EPAIR_PEER_CLOSED)) {
- unittest_printf("ERROR: ZX_EPAIR_PEER_CLOSED not observed\n");
+ if (!(observed & ZX_EVENTPAIR_PEER_CLOSED)) {
+ unittest_printf("ERROR: ZX_EVENTPAIR_PEER_CLOSED not observed\n");
send_msg(channel, MSG_FAIL);
return;
}
@@ -290,7 +290,7 @@
zx_wait_item_t items[num_handles];
for (uint32_t i = 0; i < num_handles; ++i) {
items[i].handle = msg->handles[i];
- items[i].waitfor = ZX_EPAIR_PEER_CLOSED;
+ items[i].waitfor = ZX_EVENTPAIR_PEER_CLOSED;
}
auto status = zx_object_wait_many(&items[0], num_handles, ZX_TIME_INFINITE);
for (uint32_t i = 0; i < num_handles; ++i) {
@@ -306,13 +306,13 @@
// At least one of the handles should have gotten PEER_CLOSED.
bool got_peer_closed = false;
for (uint32_t i = 0; i < num_handles; ++i) {
- if (items[i].pending & ZX_EPAIR_PEER_CLOSED) {
+ if (items[i].pending & ZX_EVENTPAIR_PEER_CLOSED) {
got_peer_closed = true;
break;
}
}
if (!got_peer_closed) {
- unittest_printf("ERROR: ZX_EPAIR_PEER_CLOSED not observed\n");
+ unittest_printf("ERROR: ZX_EVENTPAIR_PEER_CLOSED not observed\n");
send_msg(channel, MSG_FAIL);
return;
}
