From 57d256377c7ec99ada943cd2c8e5855557ea2405 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Fri, 25 May 2018 19:43:15 +0000 Subject: [PATCH] [fuchsia] Update for port API change zx_port_wait and zx_port_queue no longer take an unused count parameter. Change-Id: I62f03871282d076638c51527603473252821d316 Reviewed-on: https://dart-review.googlesource.com/56705 Reviewed-by: Ryan Macnak Commit-Queue: Adam Barth --- runtime/bin/eventhandler_fuchsia.cc | 4 ++-- runtime/bin/process_fuchsia.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/bin/eventhandler_fuchsia.cc b/runtime/bin/eventhandler_fuchsia.cc index 4d0804bec9e..16eee9d77ad 100644 --- a/runtime/bin/eventhandler_fuchsia.cc +++ b/runtime/bin/eventhandler_fuchsia.cc @@ -340,7 +340,7 @@ void EventHandlerImplementation::WakeupHandler(intptr_t id, msg->id = id; msg->dart_port = dart_port; msg->data = data; - zx_status_t status = zx_port_queue(port_handle_, &pkt, 1); + zx_status_t status = zx_port_queue(port_handle_, &pkt); if (status != ZX_OK) { // This is a FATAL because the VM won't work at all if we can't send any // messages to the EventHandler thread. @@ -511,7 +511,7 @@ void EventHandlerImplementation::Poll(uword args) { millis == kInfinityTimeout ? ZX_TIME_INFINITE : zx_deadline_after(ZX_MSEC(millis)), - &pkt, 1); + &pkt); if (status == ZX_ERR_TIMED_OUT) { handler_impl->HandleTimeout(); } else if (status != ZX_OK) { diff --git a/runtime/bin/process_fuchsia.cc b/runtime/bin/process_fuchsia.cc index 43f01cad6f6..d8ff3d0b720 100644 --- a/runtime/bin/process_fuchsia.cc +++ b/runtime/bin/process_fuchsia.cc @@ -205,7 +205,7 @@ class ExitCodeHandler { static void SendShutdownMessage() { zx_port_packet_t pkt; pkt.key = kShutdownPacketKey; - zx_status_t status = zx_port_queue(port_, &pkt, 1); + zx_status_t status = zx_port_queue(port_, &pkt); if (status != ZX_OK) { Log::PrintErr("ExitCodeHandler: zx_port_queue failed: %s\n", zx_status_get_string(status)); @@ -219,7 +219,7 @@ class ExitCodeHandler { zx_port_packet_t pkt; while (true) { - zx_status_t status = zx_port_wait(port_, ZX_TIME_INFINITE, &pkt, 1); + zx_status_t status = zx_port_wait(port_, ZX_TIME_INFINITE, &pkt); if (status != ZX_OK) { FATAL1("ExitCodeHandler: zx_port_wait failed: %s\n", zx_status_get_string(status)); @@ -397,7 +397,7 @@ bool Process::Wait(intptr_t pid, } while ((out_tmp != NULL) || (err_tmp != NULL) || (exit_tmp != NULL)) { zx_port_packet_t pkt; - status = zx_port_wait(port, ZX_TIME_INFINITE, &pkt, 1); + status = zx_port_wait(port, ZX_TIME_INFINITE, &pkt); if (status != ZX_OK) { Log::PrintErr("Process::Wait: zx_port_wait failed: %s\n", zx_status_get_string(status));