Skip to content

Commit d86e574

Browse files
pylaligandraggi
pylaligand
authored and
raggi
committed
The Magenta kernel is now called Zircon.
1 parent 01c65cb commit d86e574

File tree

7 files changed

+148
-145
lines changed

7 files changed

+148
-145
lines changed

‎src/ci/docker/dist-fuchsia/build-toolchain.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ source shared.sh
1616

1717
# Download sources
1818
SRCS=(
19-
"https://fuchsia.googlesource.com/magenta magenta d17073dc8de344ead3b65e8cc6a12280dec38c84"
19+
"https://fuchsia.googlesource.com/zircon zircon d17073dc8de344ead3b65e8cc6a12280dec38c84"
2020
"https://llvm.googlesource.com/llvm llvm 3f58a16d8eec385e2b3ebdfbb84ff9d3bf27e025"
2121
"https://llvm.googlesource.com/clang llvm/tools/clang 727ea63e6e82677f6e10e05e08bc7d6bdbae3111"
2222
"https://llvm.googlesource.com/lld llvm/tools/lld a31286c1366e5e89b8872803fded13805a1a084b"
@@ -51,7 +51,7 @@ cd llvm
5151
mkdir build
5252
cd build
5353
hide_output cmake -GNinja \
54-
-DFUCHSIA_SYSROOT=${PWD}/../../magenta/third_party/ulib/musl \
54+
-DFUCHSIA_SYSROOT=${PWD}/../../zircon/third_party/ulib/musl \
5555
-DLLVM_ENABLE_LTO=OFF \
5656
-DCLANG_BOOTSTRAP_PASSTHROUGH=LLVM_ENABLE_LTO \
5757
-C ../tools/clang/cmake/caches/Fuchsia.cmake \
@@ -62,21 +62,21 @@ cd ../..
6262

6363
# Build sysroot
6464
rm -rf llvm/runtimes/compiler-rt
65-
./magenta/scripts/download-toolchain
65+
./zircon/scripts/download-toolchain
6666

6767
build_sysroot() {
6868
local arch="$1"
6969

7070
case "${arch}" in
71-
x86_64) tgt="magenta-pc-x86-64" ;;
72-
aarch64) tgt="magenta-qemu-arm64" ;;
71+
x86_64) tgt="zircon-pc-x86-64" ;;
72+
aarch64) tgt="zircon-qemu-arm64" ;;
7373
esac
7474

75-
hide_output make -C magenta -j$(getconf _NPROCESSORS_ONLN) $tgt
75+
hide_output make -C zircon -j$(getconf _NPROCESSORS_ONLN) $tgt
7676
dst=/usr/local/${arch}-unknown-fuchsia
7777
mkdir -p $dst
78-
cp -r magenta/build-${tgt}/sysroot/include $dst/
79-
cp -r magenta/build-${tgt}/sysroot/lib $dst/
78+
cp -r zircon/build-${tgt}/sysroot/include $dst/
79+
cp -r zircon/build-${tgt}/sysroot/lib $dst/
8080

8181
cd llvm
8282
mkdir build-runtimes-${arch}
@@ -112,7 +112,7 @@ build_sysroot() {
112112
build_sysroot "x86_64"
113113
build_sysroot "aarch64"
114114

115-
rm -rf magenta llvm
115+
rm -rf zircon llvm
116116

117117
for arch in x86_64 aarch64; do
118118
for tool in clang clang++; do

‎src/libstd/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ fn main() {
6868
if cfg!(feature = "backtrace") {
6969
println!("cargo:rustc-link-lib=backtrace");
7070
}
71-
println!("cargo:rustc-link-lib=magenta");
72-
println!("cargo:rustc-link-lib=mxio");
71+
println!("cargo:rustc-link-lib=zircon");
72+
println!("cargo:rustc-link-lib=fdio");
7373
println!("cargo:rustc-link-lib=launchpad"); // for std::process
7474
}
7575
}

‎src/libstd/sys/unix/process/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ mod process_inner;
1919
#[path = "process_fuchsia.rs"]
2020
mod process_inner;
2121
#[cfg(target_os = "fuchsia")]
22-
mod magenta;
22+
mod zircon;

‎src/libstd/sys/unix/process/process_fuchsia.rs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use libc;
1313
use mem;
1414
use ptr;
1515

16-
use sys::process::magenta::{Handle, mx_handle_t};
16+
use sys::process::zircon::{Handle, zx_handle_t};
1717
use sys::process::process_common::*;
1818

1919
////////////////////////////////////////////////////////////////////////////////
@@ -51,10 +51,10 @@ impl Command {
5151
}
5252

5353
unsafe fn do_exec(&mut self, stdio: ChildPipes)
54-
-> io::Result<mx_handle_t> {
55-
use sys::process::magenta::*;
54+
-> io::Result<zx_handle_t> {
55+
use sys::process::zircon::*;
5656

57-
let job_handle = mx_job_default();
57+
let job_handle = zx_job_default();
5858
let envp = match *self.get_envp() {
5959
Some(ref envp) => envp.as_ptr(),
6060
None => ptr::null(),
@@ -67,39 +67,39 @@ impl Command {
6767
}
6868

6969
// Duplicate the job handle
70-
let mut job_copy: mx_handle_t = MX_HANDLE_INVALID;
71-
mx_cvt(mx_handle_duplicate(job_handle, MX_RIGHT_SAME_RIGHTS, &mut job_copy))?;
70+
let mut job_copy: zx_handle_t = zx_HANDLE_INVALID;
71+
zx_cvt(zx_handle_duplicate(job_handle, zx_RIGHT_SAME_RIGHTS, &mut job_copy))?;
7272
// Create a launchpad
7373
let mut launchpad: *mut launchpad_t = ptr::null_mut();
74-
mx_cvt(launchpad_create(job_copy, self.get_argv()[0], &mut launchpad))?;
74+
zx_cvt(launchpad_create(job_copy, self.get_argv()[0], &mut launchpad))?;
7575
let launchpad_destructor = LaunchpadDestructor(launchpad);
7676

7777
// Set the process argv
78-
mx_cvt(launchpad_set_args(launchpad, self.get_argv().len() as i32 - 1,
78+
zx_cvt(launchpad_set_args(launchpad, self.get_argv().len() as i32 - 1,
7979
self.get_argv().as_ptr()))?;
8080
// Setup the environment vars
81-
mx_cvt(launchpad_set_environ(launchpad, envp))?;
82-
mx_cvt(launchpad_add_vdso_vmo(launchpad))?;
81+
zx_cvt(launchpad_set_environ(launchpad, envp))?;
82+
zx_cvt(launchpad_add_vdso_vmo(launchpad))?;
8383
// Load the executable
84-
mx_cvt(launchpad_elf_load(launchpad, launchpad_vmo_from_file(self.get_argv()[0])))?;
85-
mx_cvt(launchpad_load_vdso(launchpad, MX_HANDLE_INVALID))?;
86-
mx_cvt(launchpad_clone(launchpad, LP_CLONE_MXIO_ROOT | LP_CLONE_MXIO_CWD))?;
84+
zx_cvt(launchpad_elf_load(launchpad, launchpad_vmo_from_file(self.get_argv()[0])))?;
85+
zx_cvt(launchpad_load_vdso(launchpad, zx_HANDLE_INVALID))?;
86+
zx_cvt(launchpad_clone(launchpad, LP_CLONE_FDIO_ROOT | LP_CLONE_FDIO_CWD))?;
8787

8888
// Clone stdin, stdout, and stderr
8989
if let Some(fd) = stdio.stdin.fd() {
90-
mx_cvt(launchpad_transfer_fd(launchpad, fd, 0))?;
90+
zx_cvt(launchpad_transfer_fd(launchpad, fd, 0))?;
9191
} else {
92-
mx_cvt(launchpad_clone_fd(launchpad, 0, 0))?;
92+
zx_cvt(launchpad_clone_fd(launchpad, 0, 0))?;
9393
}
9494
if let Some(fd) = stdio.stdout.fd() {
95-
mx_cvt(launchpad_transfer_fd(launchpad, fd, 1))?;
95+
zx_cvt(launchpad_transfer_fd(launchpad, fd, 1))?;
9696
} else {
97-
mx_cvt(launchpad_clone_fd(launchpad, 1, 1))?;
97+
zx_cvt(launchpad_clone_fd(launchpad, 1, 1))?;
9898
}
9999
if let Some(fd) = stdio.stderr.fd() {
100-
mx_cvt(launchpad_transfer_fd(launchpad, fd, 2))?;
100+
zx_cvt(launchpad_transfer_fd(launchpad, fd, 2))?;
101101
} else {
102-
mx_cvt(launchpad_clone_fd(launchpad, 2, 2))?;
102+
zx_cvt(launchpad_clone_fd(launchpad, 2, 2))?;
103103
}
104104

105105
// We don't want FileDesc::drop to be called on any stdio. It would close their fds. The
@@ -113,9 +113,9 @@ impl Command {
113113
// `launchpad_go` destroys the launchpad, so we must not
114114
mem::forget(launchpad_destructor);
115115

116-
let mut process_handle: mx_handle_t = 0;
116+
let mut process_handle: zx_handle_t = 0;
117117
let mut err_msg: *const libc::c_char = ptr::null();
118-
mx_cvt(launchpad_go(launchpad, &mut process_handle, &mut err_msg))?;
118+
zx_cvt(launchpad_go(launchpad, &mut process_handle, &mut err_msg))?;
119119
// FIXME: See if we want to do something with that err_msg
120120

121121
Ok(process_handle)
@@ -136,27 +136,27 @@ impl Process {
136136
}
137137

138138
pub fn kill(&mut self) -> io::Result<()> {
139-
use sys::process::magenta::*;
139+
use sys::process::zircon::*;
140140

141-
unsafe { mx_cvt(mx_task_kill(self.handle.raw()))?; }
141+
unsafe { zx_cvt(zx_task_kill(self.handle.raw()))?; }
142142

143143
Ok(())
144144
}
145145

146146
pub fn wait(&mut self) -> io::Result<ExitStatus> {
147147
use default::Default;
148-
use sys::process::magenta::*;
148+
use sys::process::zircon::*;
149149

150-
let mut proc_info: mx_info_process_t = Default::default();
151-
let mut actual: mx_size_t = 0;
152-
let mut avail: mx_size_t = 0;
150+
let mut proc_info: zx_info_process_t = Default::default();
151+
let mut actual: zx_size_t = 0;
152+
let mut avail: zx_size_t = 0;
153153

154154
unsafe {
155-
mx_cvt(mx_object_wait_one(self.handle.raw(), MX_TASK_TERMINATED,
156-
MX_TIME_INFINITE, ptr::null_mut()))?;
157-
mx_cvt(mx_object_get_info(self.handle.raw(), MX_INFO_PROCESS,
155+
zx_cvt(zx_object_wait_one(self.handle.raw(), zx_TASK_TERMINATED,
156+
zx_TIME_INFINITE, ptr::null_mut()))?;
157+
zx_cvt(zx_object_get_info(self.handle.raw(), zx_INFO_PROCESS,
158158
&mut proc_info as *mut _ as *mut libc::c_void,
159-
mem::size_of::<mx_info_process_t>(), &mut actual,
159+
mem::size_of::<zx_info_process_t>(), &mut actual,
160160
&mut avail))?;
161161
}
162162
if actual != 1 {
@@ -168,14 +168,14 @@ impl Process {
168168

169169
pub fn try_wait(&mut self) -> io::Result<Option<ExitStatus>> {
170170
use default::Default;
171-
use sys::process::magenta::*;
171+
use sys::process::zircon::*;
172172

173-
let mut proc_info: mx_info_process_t = Default::default();
174-
let mut actual: mx_size_t = 0;
175-
let mut avail: mx_size_t = 0;
173+
let mut proc_info: zx_info_process_t = Default::default();
174+
let mut actual: zx_size_t = 0;
175+
let mut avail: zx_size_t = 0;
176176

177177
unsafe {
178-
let status = mx_object_wait_one(self.handle.raw(), MX_TASK_TERMINATED,
178+
let status = zx_object_wait_one(self.handle.raw(), zx_TASK_TERMINATED,
179179
0, ptr::null_mut());
180180
match status {
181181
0 => { }, // Success
@@ -184,9 +184,9 @@ impl Process {
184184
},
185185
_ => { panic!("Failed to wait on process handle: {}", status); },
186186
}
187-
mx_cvt(mx_object_get_info(self.handle.raw(), MX_INFO_PROCESS,
187+
zx_cvt(zx_object_get_info(self.handle.raw(), zx_INFO_PROCESS,
188188
&mut proc_info as *mut _ as *mut libc::c_void,
189-
mem::size_of::<mx_info_process_t>(), &mut actual,
189+
mem::size_of::<zx_info_process_t>(), &mut actual,
190190
&mut avail))?;
191191
}
192192
if actual != 1 {

0 commit comments

Comments
 (0)