refactor(signal): remove SigDetails::CHLD

ChenRuiwei · Jul 26, 2024 · 43d4b8a · 43d4b8a
1 parent 2c6afab
commit 43d4b8a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 26 deletions.
diff --git a/kernel/src/task/signal.rs b/kernel/src/task/signal.rs
@@ -129,12 +129,7 @@ impl Task {
                 SigInfo {
                     sig: Sig::SIGCHLD,
                     code,
-                    details: SigDetails::CHLD {
-                        pid: self.pid(),
-                        status: signum.raw() as i32 & 0x7F,
-                        utime: self.time_stat().user_time(),
-                        stime: self.time_stat().sys_time(),
-                    },
+                    details: SigDetails::None,
                 },
                 false,
             );

diff --git a/kernel/src/task/task.rs b/kernel/src/task/task.rs
@@ -594,12 +594,7 @@ impl Task {
                         SigInfo {
                             sig: Sig::SIGCHLD,
                             code: SigInfo::CLD_EXITED,
-                            details: SigDetails::CHLD {
-                                pid: c.pid(),
-                                status: c.exit_code(),
-                                utime: c.time_stat().user_time(),
-                                stime: c.time_stat().sys_time(),
-                            },
+                            details: SigDetails::None,
                         },
                         false,
                     )
@@ -617,12 +612,7 @@ impl Task {
                 SigInfo {
                     sig: Sig::SIGCHLD,
                     code: SigInfo::CLD_EXITED,
-                    details: SigDetails::CHLD {
-                        pid: self.pid(),
-                        status: self.exit_code(),
-                        utime: self.time_stat().user_time(),
-                        stime: self.time_stat().sys_time(),
-                    },
+                    details: SigDetails::None,
                 },
                 false,
             );

diff --git a/modules/signal/src/siginfo.rs b/modules/signal/src/siginfo.rs
@@ -18,14 +18,6 @@ pub enum SigDetails {
         /// sender's pid
         pid: usize,
     },
-    CHLD {
-        /// which child
-        pid: usize,
-        /// exit code
-        status: i32,
-        utime: Duration,
-        stime: Duration,
-    },
 }
 
 #[allow(unused)]