general/occlum
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Occlum memory leak issue

Browse Source 
The enable_backtrace function should only be used in the init function.
This commit is contained in:
zongmin.gu 2020-12-02 10:52:09 +08:00 committed by Tate, Hongliang Tian
parent b5e3558f5f
commit f699ff3efd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libos/src/entry.rs
View File

@ -80,6 +80,9 @@ pub extern "C" fn occlum_ecall_init(log_level: *const c_char, instance_dir: *con
// Init boot up time stamp here. // Init boot up time stamp here.
time::up_time::init(); time::up_time::init();
// Enable global backtrace
unsafe { backtrace::enable_backtrace(&ENCLAVE_PATH, PrintFormat::Short) };
}); });
0 0
@ -105,7 +108,6 @@ pub extern "C" fn occlum_ecall_new_process(
} }
}; };
let _ = unsafe { backtrace::enable_backtrace(&ENCLAVE_PATH, PrintFormat::Short) };
panic::catch_unwind(|| { panic::catch_unwind(|| {
backtrace::__rust_begin_short_backtrace(|| { backtrace::__rust_begin_short_backtrace(|| {
match do_new_process(&path, &args, env, &host_stdio_fds) { match do_new_process(&path, &args, env, &host_stdio_fds) {
@ -126,7 +128,6 @@ pub extern "C" fn occlum_ecall_exec_thread(libos_pid: i32, host_tid: i32) -> i32
return ecall_errno!(EAGAIN); return ecall_errno!(EAGAIN);
} }
let _ = unsafe { backtrace::enable_backtrace(&ENCLAVE_PATH, PrintFormat::Short) };
panic::catch_unwind(|| { panic::catch_unwind(|| {
backtrace::__rust_begin_short_backtrace(|| { backtrace::__rust_begin_short_backtrace(|| {
match do_exec_thread(libos_pid as pid_t, host_tid as pid_t) { match do_exec_thread(libos_pid as pid_t, host_tid as pid_t) {
@ -147,7 +148,6 @@ pub extern "C" fn occlum_ecall_kill(pid: i32, sig: i32) -> i32 {
return ecall_errno!(EAGAIN); return ecall_errno!(EAGAIN);
} }
let _ = unsafe { backtrace::enable_backtrace(&ENCLAVE_PATH, PrintFormat::Short) };
panic::catch_unwind(|| { panic::catch_unwind(|| {
backtrace::__rust_begin_short_backtrace(|| match do_kill(pid, sig) { backtrace::__rust_begin_short_backtrace(|| match do_kill(pid, sig) {
Ok(()) => 0, Ok(()) => 0,
@ -166,7 +166,6 @@ pub extern "C" fn occlum_ecall_broadcast_interrupts() -> i32 {
return ecall_errno!(EAGAIN); return ecall_errno!(EAGAIN);
} }
let _ = unsafe { backtrace::enable_backtrace(&ENCLAVE_PATH, PrintFormat::Short) };
panic::catch_unwind(|| { panic::catch_unwind(|| {
backtrace::__rust_begin_short_backtrace(|| match interrupt::broadcast_interrupts() { backtrace::__rust_begin_short_backtrace(|| match interrupt::broadcast_interrupts() {
Ok(count) => count as i32, Ok(count) => count as i32,