Rename Magenta to Zircon
Change-Id: Iaefb70cb0ad438179fc0ba4be2306310691f99e6
diff --git a/benchmarks/BUILD.gn b/benchmarks/BUILD.gn
index 7b61a32..c3dadf2 100644
--- a/benchmarks/BUILD.gn
+++ b/benchmarks/BUILD.gn
@@ -42,7 +42,7 @@
if (current_os == "fuchsia") {
libs = [
"launchpad",
- "magenta",
+ "zircon",
]
}
public_configs = [ ":util_config" ]
diff --git a/benchmarks/spec_fixture.cc b/benchmarks/spec_fixture.cc
index 43d5e3b..2cd56b2 100644
--- a/benchmarks/spec_fixture.cc
+++ b/benchmarks/spec_fixture.cc
@@ -20,10 +20,10 @@
#ifdef __Fuchsia__
#include <launchpad/launchpad.h>
#include <launchpad/vmo.h>
-#include <magenta/syscalls.h>
-#include <magenta/process.h>
-#include <magenta/processargs.h>
-#include <magenta/syscalls/object.h>
+#include <zircon/syscalls.h>
+#include <zircon/process.h>
+#include <zircon/processargs.h>
+#include <zircon/syscalls/object.h>
#endif
extern std::string executableDir;
@@ -154,22 +154,22 @@
}
#ifdef __Fuchsia__
-static mx_status_t launch(const char* filename,
+static zx_status_t launch(const char* filename,
int argc,
char** argv,
int input,
- mx_handle_t* process) {
+ zx_handle_t* process) {
launchpad_t* lp = NULL;
- mx_handle_t job_to_child = MX_HANDLE_INVALID;
- mx_handle_t job = mx_get_startup_handle(PA_HND(PA_JOB_DEFAULT, 0));
- if (job != MX_HANDLE_INVALID) {
- mx_handle_duplicate(job, MX_RIGHT_SAME_RIGHTS, &job_to_child);
+ zx_handle_t job_to_child = ZX_HANDLE_INVALID;
+ zx_handle_t job = zx_get_startup_handle(PA_HND(PA_JOB_DEFAULT, 0));
+ if (job != ZX_HANDLE_INVALID) {
+ zx_handle_duplicate(job, ZX_RIGHT_SAME_RIGHTS, &job_to_child);
}
launchpad_create(job_to_child, filename, &lp);
launchpad_load_from_file(lp, filename);
launchpad_set_args(lp, argc, argv);
launchpad_set_environ(lp, (const char**)environ);
- launchpad_clone(lp, LP_CLONE_MXIO_NAMESPACE | LP_CLONE_MXIO_CWD);
+ launchpad_clone(lp, LP_CLONE_FDIO_NAMESPACE | LP_CLONE_FDIO_CWD);
launchpad_clone_fd(lp, STDIN_FILENO, STDIN_FILENO);
launchpad_clone_fd(lp, STDOUT_FILENO, STDOUT_FILENO);
launchpad_clone_fd(lp, STDERR_FILENO, STDERR_FILENO);
@@ -177,8 +177,8 @@
launchpad_transfer_fd(lp, input, STDIN_FILENO);
}
const char* errmsg;
- mx_status_t status = launchpad_go(lp, process, &errmsg);
- if (status == MX_OK) {
+ zx_status_t status = launchpad_go(lp, process, &errmsg);
+ if (status == ZX_OK) {
LOG(ERROR) << "Failed to launch: " << filename << ", error: " << errmsg
<< ": " << status;
}
@@ -188,7 +188,7 @@
int SpecFixture::LaunchProcess(char** args,
int args_length,
const char* input_filename) {
- mx_handle_t handle;
+ zx_handle_t handle;
int input = -1;
if (input_filename != NULL) {
if ((input = open(input_filename, O_RDONLY)) < 0) {
@@ -202,23 +202,23 @@
close(input);
}
});
- mx_status_t status = launch(args[0], args_length, args, input, &handle);
- if (status != MX_OK) {
+ zx_status_t status = launch(args[0], args_length, args, input, &handle);
+ if (status != ZX_OK) {
return status;
}
status =
- mx_object_wait_one(handle, MX_PROCESS_TERMINATED, MX_TIME_INFINITE, NULL);
+ zx_object_wait_one(handle, ZX_PROCESS_TERMINATED, ZX_TIME_INFINITE, NULL);
- if (status != MX_OK) {
+ if (status != ZX_OK) {
LOG(ERROR) << "Failed to wait for process exiting " << args[0] << ":"
<< status;
return status;
}
- mx_info_process_t proc_info;
- ssize_t info_status = mx_object_get_info(handle, MX_INFO_PROCESS, &proc_info,
+ zx_info_process_t proc_info;
+ ssize_t info_status = zx_object_get_info(handle, ZX_INFO_PROCESS, &proc_info,
sizeof(proc_info), NULL, NULL);
- mx_handle_close(handle);
+ zx_handle_close(handle);
if (info_status < 0) {
LOG(ERROR) << "Failed to get process return code " << args[0] << ":"