Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Unified Diff: runtime/bin/eventhandler_fuchsia.cc

Issue 2428373005: Remove dependency on Fuchsia's runtime library. (Closed)
Patch Set: Created 4 years, 2 months 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
« no previous file with comments | « runtime/bin/BUILD.gn ('k') | runtime/bin/run_vm_tests_fuchsia.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/eventhandler_fuchsia.cc
diff --git a/runtime/bin/eventhandler_fuchsia.cc b/runtime/bin/eventhandler_fuchsia.cc
index ff947eaeb3a28f592f02bee041264d0dafe5a592..2a611647f0bf13e0442d3ecf6c2d71b5674ef8e9 100644
--- a/runtime/bin/eventhandler_fuchsia.cc
+++ b/runtime/bin/eventhandler_fuchsia.cc
@@ -10,8 +10,8 @@
#include "bin/eventhandler.h"
#include "bin/eventhandler_fuchsia.h"
+#include <magenta/status.h>
#include <magenta/syscalls.h>
-#include <runtime/status.h>
#include "bin/thread.h"
#include "bin/utils.h"
@@ -22,7 +22,7 @@ namespace bin {
EventHandlerImplementation::EventHandlerImplementation() {
mx_status_t status = mx_msgpipe_create(interrupt_handles_, 0);
if (status != NO_ERROR) {
- FATAL1("mx_msgpipe_create failed: %s\n", mx_strstatus(status));
+ FATAL1("mx_msgpipe_create failed: %s\n", mx_status_get_string(status));
}
shutdown_ = false;
}
@@ -31,11 +31,11 @@ EventHandlerImplementation::EventHandlerImplementation() {
EventHandlerImplementation::~EventHandlerImplementation() {
mx_status_t status = mx_handle_close(interrupt_handles_[0]);
if (status != NO_ERROR) {
- FATAL1("mx_handle_close failed: %s\n", mx_strstatus(status));
+ FATAL1("mx_handle_close failed: %s\n", mx_status_get_string(status));
}
status = mx_handle_close(interrupt_handles_[1]);
if (status != NO_ERROR) {
- FATAL1("mx_handle_close failed: %s\n", mx_strstatus(status));
+ FATAL1("mx_handle_close failed: %s\n", mx_status_get_string(status));
}
}
@@ -51,7 +51,7 @@ void EventHandlerImplementation::WakeupHandler(intptr_t id,
mx_status_t status =
mx_msgpipe_write(interrupt_handles_[1], &msg, sizeof(msg), NULL, 0, 0);
if (status != NO_ERROR) {
- FATAL1("mx_msgpipe_write failed: %s\n", mx_strstatus(status));
+ FATAL1("mx_msgpipe_write failed: %s\n", mx_status_get_string(status));
}
}
@@ -78,7 +78,7 @@ void EventHandlerImplementation::HandleInterruptFd() {
// status == ERR_BAD_STATE when we try to read and there are no messages
// available, so it is an error if we get here and status != ERR_BAD_STATE.
if (status != ERR_BAD_STATE) {
- FATAL1("mx_msgpipe_read failed: %s\n", mx_strstatus(status));
+ FATAL1("mx_msgpipe_read failed: %s\n", mx_status_get_string(status));
}
}
@@ -130,7 +130,7 @@ void EventHandlerImplementation::Poll(uword args) {
timeout,
&signals_state);
if ((status != NO_ERROR) && (status != ERR_TIMED_OUT)) {
- FATAL1("mx_handle_wait_one failed: %s\n", mx_strstatus(status));
+ FATAL1("mx_handle_wait_one failed: %s\n", mx_status_get_string(status));
} else {
handler_impl->HandleTimeout();
if ((signals_state.satisfied & MX_SIGNAL_READABLE) != 0) {
« no previous file with comments | « runtime/bin/BUILD.gn ('k') | runtime/bin/run_vm_tests_fuchsia.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698