feat(clone): add SIGHAND

Author: Mivik

Cargo.lock

@@ -116,19 +116,13 @@ pub fn sys_rt_sigaction(
     }
 
     let curr = current();
-    curr.task_ext()
-        .process_data()
-        .signal
-        .with_action_mut::<LinuxResult<_>>(signo, |action| {
-            if let Some(oldact) = oldact.nullable(UserPtr::get)? {
-                action.to_ctype(unsafe { &mut *oldact });
-            }
-            if let Some(act) = act.nullable(UserConstPtr::get)? {
-                *action = unsafe { (*act).try_into()? };
-            }
-            Ok(())
-        })?;
-
+    let mut actions = curr.task_ext().process_data().signal.actions.lock();
+    if let Some(oldact) = oldact.nullable(UserPtr::get)? {
+        actions[signo].to_ctype(unsafe { &mut *oldact });
+    }
+    if let Some(act) = act.nullable(UserConstPtr::get)? {
+        actions[signo] = unsafe { (*act).try_into()? };
+    }
     Ok(0)
 }
 

api/src/imp/signal.rs

@@ -83,6 +83,8 @@ bitflags! {
     }
 }
 
+// TODO: CLEAR_SIGHAND in clone3
+
 #[apply(syscall_instrument)]
 pub fn sys_clone(
     flags: u32,
@@ -151,17 +153,16 @@ pub fn sys_clone(
 
         curr.task_ext().thread.process()
     } else {
-        // create a new process
-        let builder = if flags.contains(CloneFlags::PARENT) {
+        let parent = if flags.contains(CloneFlags::PARENT) {
             curr.task_ext()
                 .thread
                 .process()
                 .parent()
                 .ok_or(LinuxError::EINVAL)?
-                .fork(tid)
         } else {
-            curr.task_ext().thread.process().fork(tid)
+            curr.task_ext().thread.process().clone()
         };
+        let builder = parent.fork(tid);
 
         let aspace = if flags.contains(CloneFlags::VM) {
             curr.task_ext().process_data().aspace.clone()
@@ -175,9 +176,17 @@ pub fn sys_clone(
             .ctx_mut()
             .set_page_table_root(aspace.lock().page_table_root());
 
+        let signal_actions = if flags.contains(CloneFlags::SIGHAND) {
+            parent
+                .data::<ProcessData>()
+                .map_or_else(Arc::default, |it| it.signal.actions.clone())
+        } else {
+            Arc::default()
+        };
         let process_data = ProcessData::new(
             curr.task_ext().process_data().exe_path.read().clone(),
             aspace,
+            signal_actions,
             exit_signal,
         );
 

api/src/imp/task/clone.rs

@@ -20,7 +20,7 @@ use axns::{AxNamespace, AxNamespaceIf};
 use axprocess::{Pid, Process, ProcessGroup, Session, Thread};
 use axsignal::{
     Signo,
-    api::{ProcessSignalManager, ThreadSignalManager},
+    api::{ProcessSignalManager, SignalActions, ThreadSignalManager},
 };
 use axsync::{Mutex, RawMutex};
 use axtask::{TaskExtRef, TaskInner, WaitQueue, current};
@@ -196,7 +196,12 @@ pub struct ProcessData {
 }
 
 impl ProcessData {
-    pub fn new(exe_path: String, aspace: Arc<Mutex<AddrSpace>>, exit_signal: Option<Signo>) -> Self {
+    pub fn new(
+        exe_path: String,
+        aspace: Arc<Mutex<AddrSpace>>,
+        signal_actions: Arc<Mutex<SignalActions>>,
+        exit_signal: Option<Signo>,
+    ) -> Self {
         Self {
             exe_path: RwLock::new(exe_path),
             aspace,
@@ -207,7 +212,10 @@ impl ProcessData {
             child_exit_wq: WaitQueue::new(),
             exit_signal,
 
-            signal: Arc::new(ProcessSignalManager::new(axconfig::plat::SIGNAL_TRAMPOLINE)),
+            signal: Arc::new(ProcessSignalManager::new(
+                signal_actions,
+                axconfig::plat::SIGNAL_TRAMPOLINE,
+            )),
         }
     }
 

core/src/task.rs

@@ -31,8 +31,12 @@ pub fn run_user_app(args: &[String], envs: &[String]) -> Option<i32> {
     let mut task = new_user_task(name, uctx, None);
     task.ctx_mut().set_page_table_root(uspace.page_table_root());
 
-    let process_data =
-        ProcessData::new(exe_path, Arc::new(Mutex::new(uspace)), Some(Signo::SIGCHLD));
+    let process_data = ProcessData::new(
+        exe_path,
+        Arc::new(Mutex::new(uspace)),
+        Arc::default(),
+        Some(Signo::SIGCHLD),
+    );
 
     FD_TABLE
         .deref_from(&process_data.ns)