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

Fix the broken backtrace info on panic

Browse Source
This commit is contained in:
Tate, Hongliang Tian 2019-10-06 04:29:14 +00:00
parent ae46caa63a
commit 70fd9dc210
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,8 @@ use std::ffi::{CStr, CString, OsString};
use std::path::Path; use std::path::Path;
use util::mem_util::from_untrusted::*; use util::mem_util::from_untrusted::*;
const ENCLAVE_PATH: &'static str = ".occlum/build/lib/libocclum.signed.so";
#[no_mangle] #[no_mangle]
pub extern "C" fn libos_boot(path_buf: *const c_char, argv: *const *const c_char) -> i32 { pub extern "C" fn libos_boot(path_buf: *const c_char, argv: *const *const c_char) -> i32 {
util::log::init(); util::log::init();
@ -18,7 +20,7 @@ pub extern "C" fn libos_boot(path_buf: *const c_char, argv: *const *const c_char
// register exception handlers (support cpuid & rdtsc for now) // register exception handlers (support cpuid & rdtsc for now)
register_exception_handlers(); register_exception_handlers();
let _ = backtrace::enable_backtrace("libocclum.signed.so", PrintFormat::Short); let _ = backtrace::enable_backtrace(ENCLAVE_PATH, PrintFormat::Short);
panic::catch_unwind(|| { panic::catch_unwind(|| {
backtrace::__rust_begin_short_backtrace(|| match do_boot(&path, &args) { backtrace::__rust_begin_short_backtrace(|| match do_boot(&path, &args) {
Ok(()) => 0, Ok(()) => 0,
@ -30,7 +32,7 @@ pub extern "C" fn libos_boot(path_buf: *const c_char, argv: *const *const c_char
#[no_mangle] #[no_mangle]
pub extern "C" fn libos_run(host_tid: i32) -> i32 { pub extern "C" fn libos_run(host_tid: i32) -> i32 {
let _ = backtrace::enable_backtrace("libocclum.signed.so", PrintFormat::Short); let _ = backtrace::enable_backtrace(ENCLAVE_PATH, PrintFormat::Short);
panic::catch_unwind(|| { panic::catch_unwind(|| {
backtrace::__rust_begin_short_backtrace(|| match do_run(host_tid as pid_t) { backtrace::__rust_begin_short_backtrace(|| match do_run(host_tid as pid_t) {
Ok(exit_status) => exit_status, Ok(exit_status) => exit_status,