bug fix: some signal testcases may fail

Cargo.toml

@@ -15,6 +15,3 @@ exclude = ["zircon-user", "rboot"]
 
 [profile.release]
 lto = true
-
-[patch.'https://github.com/DeathWish5/PreemptiveScheduler']
-executor = { path = "../../ASYNC/PreemptiveScheduler" }

kernel-hal/src/bare/arch/x86_64/trap.rs

@@ -30,7 +30,7 @@ pub(super) fn super_timer() {
 
 #[no_mangle]
 pub extern "C" fn trap_handler(tf: &mut TrapFrame) {
-    trace!(
+    debug!(
         "Interrupt: {:#x} @ CPU{}",
         tf.trap_num,
         super::cpu::cpu_id()

kernel-hal/src/bare/timer.rs

@@ -8,7 +8,7 @@ use lock::Mutex;
 use naive_timer::Timer;
 
 #[allow(dead_code)]
-pub(super) const TICKS_PER_SEC: u64 = 10;
+pub(super) const TICKS_PER_SEC: u64 = 100;
 
 lazy_static! {
     static ref NAIVE_TIMER: Mutex<Timer> = Mutex::new(Timer::default());

loader/src/linux.rs

@@ -79,9 +79,10 @@ async fn run_user(thread: CurrentThread) {
         // trace!("ctx = {:#x?}", ctx);
         ctx.enter_uspace();
         debug!(
-            "back from user: tid = {} pc = {:x}",
+            "back from user: tid = {} pc = {:x} trap reason = {:?}",
             thread.id(),
-            ctx.get_field(UserContextField::InstrPointer)
+            ctx.get_field(UserContextField::InstrPointer),
+            ctx.trap_reason(),
         );
         // trace!("ctx = {:#x?}", ctx);
         // handle trap/interrupt/syscall
@@ -136,7 +137,6 @@ async fn handle_signal(
         } else {
             (*ctx).setup_uspace(action.handler, sp, &[signal as usize, 0, 0]);
         }
-        (*ctx).enter_uspace();
     }
     ctx
 }

zCore/src/utils.rs

@@ -61,8 +61,7 @@ pub fn boot_options() -> BootOptions {
                 cmdline: cmdline.clone(),
                 log_level: options.get("LOG").unwrap_or(&"").to_string(),
                 #[cfg(feature = "linux")]
-                // root_proc: options.get("ROOTPROC").unwrap_or(&"/bin/busybox?sh").to_string(),
-                root_proc: options.get("ROOTPROC").unwrap_or(&"/libc-test/src/regression/pthread_cancel-sem_wait-static.exe").to_string(),
+                root_proc: options.get("ROOTPROC").unwrap_or(&"/bin/busybox?sh").to_string(),
             }
         }
     }