From b411066eee24af03fc2d4672bae18c43bc5aa564 Mon Sep 17 00:00:00 2001
From: Marty Faltesek <mfaltesek@google.com>
Date: Tue, 23 Apr 2019 22:29:22 +0000
Subject: [PATCH] [zx] Transition zx::channel::read and zx::channel::read_etc
(part 3)
Transition is complete. This change removes the temporary methods
rea2 and rea2_etc. Also transitions a missed and a new caller.
Test: CQ
Bug: ZX-2812
Change-Id: I70f87de74df2b863fbcf35df08643f098c6d516b
---
.../devmgr/devcoordinator/coordinator-test.cpp | 2 +-
zircon/system/ulib/zx/include/lib/zx/channel.h | 16 ----------------
.../core/handle-transfer/handle-transfer.cpp | 6 +++---
3 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/zircon/system/core/devmgr/devcoordinator/coordinator-test.cpp b/zircon/system/core/devmgr/devcoordinator/coordinator-test.cpp
index d9ec7b8407c..f10e1144472 100644
--- a/zircon/system/core/devmgr/devcoordinator/coordinator-test.cpp
+++ b/zircon/system/core/devmgr/devcoordinator/coordinator-test.cpp
@@ -269,7 +269,7 @@ void CheckSuspendReceived(const zx::channel& remote, uint32_t expected_flags,
zx_handle_t handles[ZX_CHANNEL_MAX_MSG_HANDLES];
uint32_t actual_bytes;
uint32_t actual_handles;
- zx_status_t status = remote.rea2(0, bytes, handles, sizeof(bytes), fbl::count_of(handles),
+ zx_status_t status = remote.read(0, bytes, handles, sizeof(bytes), fbl::count_of(handles),
&actual_bytes, &actual_handles);
ASSERT_OK(status);
ASSERT_LT(0, actual_bytes);
diff --git a/zircon/system/ulib/zx/include/lib/zx/channel.h b/zircon/system/ulib/zx/include/lib/zx/channel.h
index 3fc0779c7d5..b71aa83eb66 100644
--- a/zircon/system/ulib/zx/include/lib/zx/channel.h
+++ b/zircon/system/ulib/zx/include/lib/zx/channel.h
@@ -38,14 +38,6 @@ public:
num_handles, actual_bytes, actual_handles);
}
- // ZX-2812 Do not use rea2, use read instead. This will be removed shortly.
- zx_status_t rea2(uint32_t flags, void* bytes, zx_handle_t* handles,
- uint32_t num_bytes, uint32_t num_handles,
- uint32_t* actual_bytes, uint32_t* actual_handles) const {
- return zx_channel_read(get(), flags, bytes, handles, num_bytes,
- num_handles, actual_bytes, actual_handles);
- }
-
zx_status_t read_etc(uint32_t flags, void* bytes, zx_handle_info_t* handles,
uint32_t num_bytes, uint32_t num_handles,
uint32_t* actual_bytes, uint32_t* actual_handles) const {
@@ -53,14 +45,6 @@ public:
num_handles, actual_bytes, actual_handles);
}
- // ZX-2812 Do not use rea2_etc, use read_etc instead. This will be removed shortly.
- zx_status_t rea2_etc(uint32_t flags, void* bytes, zx_handle_info_t* handles,
- uint32_t num_bytes, uint32_t num_handles,
- uint32_t* actual_bytes, uint32_t* actual_handles) const {
- return zx_channel_read_etc(get(), flags, bytes, handles, num_bytes,
- num_handles, actual_bytes, actual_handles);
- }
-
zx_status_t write(uint32_t flags, const void* bytes, uint32_t num_bytes,
const zx_handle_t* handles, uint32_t num_handles) const {
return zx_channel_write(get(), flags, bytes, num_bytes, handles,
diff --git a/zircon/system/utest/core/handle-transfer/handle-transfer.cpp b/zircon/system/utest/core/handle-transfer/handle-transfer.cpp
index f194b5a175a..91b3cbf0ecb 100644
--- a/zircon/system/utest/core/handle-transfer/handle-transfer.cpp
+++ b/zircon/system/utest/core/handle-transfer/handle-transfer.cpp
@@ -36,7 +36,7 @@ TEST(HandleTransferTest, OverChannelThenRead) {
a_remote_raw = ZX_HANDLE_INVALID;
uint32_t num_bytes = 0u;
uint32_t num_handles = 1u;
- ASSERT_OK(b_remote.rea2(0u, nullptr, &a_remote_raw,
+ ASSERT_OK(b_remote.read(0u, nullptr, &a_remote_raw,
num_bytes, num_handles, &num_bytes, &num_handles));
ASSERT_EQ(num_handles, 1);
a_remote.reset(a_remote_raw);
@@ -48,7 +48,7 @@ TEST(HandleTransferTest, OverChannelThenRead) {
char incoming_byte;
num_bytes = 1u;
num_handles = 0u;
- ASSERT_OK(a_remote.rea2(0u, &incoming_byte, nullptr, num_bytes,
+ ASSERT_OK(a_remote.read(0u, &incoming_byte, nullptr, num_bytes,
num_handles, nullptr, &num_handles));
ASSERT_EQ(num_handles, 0);
ASSERT_EQ(kMessage[i], incoming_byte);
@@ -84,7 +84,7 @@ int DoWork(void* arg) {
// Read from b_0 into handle_a_0_incoming, thus canceling any waits on a_0.
uint32_t num_handles = 1;
- test->fail_incoming_a_0_from_b_0 = test->b_client.rea2(0,
+ test->fail_incoming_a_0_from_b_0 = test->b_client.read(0,
nullptr, &a_client_raw, 0, num_handles, nullptr, &num_handles);
test->num_handles = num_handles;
--
GitLab