Merge branch 'main' into feature/top-ni-pr

Author: Krysztal112233

.github/workflows/ci.yml

@@ -52,8 +52,8 @@ jobs:
       - name: build and test all programs separately
         shell: bash
         run: |
-          ## TODO: add hugetop and skill
-          programs="free pgrep pidof pidwait pkill pmap ps pwdx slabtop snice sysctl tload top vmstat w watch"
+          ## TODO: add hugetop
+          programs="free pgrep pidof pidwait pkill pmap ps pwdx skill slabtop snice sysctl tload top vmstat w watch"
           for program in $programs; do
             echo "Building and testing $program"
             cargo test -p "uu_$program" || exit 1

Cargo.lock

@@ -40,6 +40,7 @@ feat_common_core = [
     "pmap",
     "ps",
     "pwdx",
+    "skill",
     "slabtop",
     "snice",
     "sysctl",
@@ -98,6 +99,7 @@ pkill = { optional = true, version = "0.0.1", package = "uu_pkill", path = "src/
 pmap = { optional = true, version = "0.0.1", package = "uu_pmap", path = "src/uu/pmap" }
 ps = { optional = true, version = "0.0.1", package = "uu_ps", path = "src/uu/ps" }
 pwdx = { optional = true, version = "0.0.1", package = "uu_pwdx", path = "src/uu/pwdx" }
+skill = { optional = true, version = "0.0.1", package = "uu_skill", path = "src/uu/skill" }
 slabtop = { optional = true, version = "0.0.1", package = "uu_slabtop", path = "src/uu/slabtop" }
 snice = { optional = true, version = "0.0.1", package = "uu_snice", path = "src/uu/snice" }
 sysctl = { optional = true, version = "0.0.1", package = "uu_sysctl", path = "src/uu/sysctl" }

Cargo.toml

@@ -20,6 +20,7 @@ Ongoing:
 * `pmap`: Displays the memory map of a process.
 * `ps`: Displays information about active processes.
 * `pwdx`: Shows the current working directory of a process.
+* `skill`: Sends a signal to processes based on criteria like user, terminal, etc.
 * `slabtop`: Displays detailed kernel slab cache information in real time.
 * `snice`: Changes the scheduling priority of a running process.
 * `sysctl`: Read or write kernel parameters at run-time.
@@ -31,7 +32,6 @@ Ongoing:
 
 TODO:
 * `hugetop`: Report hugepage usage of processes and the system as a whole.
-* `skill`: Sends a signal to processes based on criteria like user, terminal, etc.
 
 Elsewhere:
 

README.md

@@ -4,7 +4,7 @@
 // file that was distributed with this source code.
 
 // Pid utils
-use clap::{arg, crate_version, Command};
+use clap::{arg, crate_version, value_parser, Command};
 #[cfg(unix)]
 use nix::{
     sys::signal::{self, Signal},
@@ -48,19 +48,21 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     } else {
         let sig = (settings.signal as i32)
             .try_into()
-            .map_err(|e| std::io::Error::from_raw_os_error(e as i32))?;
+            .map_err(|e| Error::from_raw_os_error(e as i32))?;
         Some(sig)
     };
 
     // Collect pids
     let pids = process_matcher::find_matching_pids(&settings)?;
 
     // Send signal
-    // TODO: Implement -q
     #[cfg(unix)]
-    let echo = matches.get_flag("echo");
-    #[cfg(unix)]
-    kill(&pids, sig, echo);
+    {
+        let echo = matches.get_flag("echo");
+        let queue = matches.get_one::<u32>("queue").cloned();
+
+        kill(&pids, sig, queue, echo);
+    }
 
     if matches.get_flag("count") {
         println!("{}", pids.len());
@@ -71,25 +73,50 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 
 #[cfg(unix)]
 fn handle_obsolete(args: &mut [String]) {
-    // Sanity check
-    if args.len() > 2 {
-        // Old signal can only be in the first argument position
-        let slice = args[1].as_str();
-        if let Some(signal) = slice.strip_prefix('-') {
+    for arg in &mut args[1..] {
+        if let Some(signal) = arg.strip_prefix('-') {
             // Check if it is a valid signal
             let opt_signal = signal_by_name_or_value(signal);
             if opt_signal.is_some() {
                 // Replace with long option that clap can parse
-                args[1] = format!("--signal={signal}");
+                *arg = format!("--signal={signal}");
             }
         }
     }
 }
 
+// Not contains in libc
+#[cfg(target_os = "linux")]
+extern "C" {
+    fn sigqueue(
+        pid: uucore::libc::pid_t,
+        sig: uucore::libc::c_int,
+        val: uucore::libc::sigval,
+    ) -> uucore::libc::c_int;
+}
+
 #[cfg(unix)]
-fn kill(pids: &Vec<ProcessInformation>, sig: Option<Signal>, echo: bool) {
+#[allow(unused_variables)]
+fn kill(pids: &Vec<ProcessInformation>, sig: Option<Signal>, queue: Option<u32>, echo: bool) {
     for pid in pids {
-        if let Err(e) = signal::kill(Pid::from_raw(pid.pid as i32), sig) {
+        #[cfg(target_os = "linux")]
+        let result = if let Some(queue) = queue {
+            let v = unsafe {
+                sigqueue(
+                    pid.pid as i32,
+                    sig.map_or(0, |s| s as uucore::libc::c_int),
+                    uucore::libc::sigval {
+                        sival_ptr: queue as usize as *mut uucore::libc::c_void,
+                    },
+                )
+            };
+            nix::errno::Errno::result(v).map(drop)
+        } else {
+            signal::kill(Pid::from_raw(pid.pid as i32), sig)
+        };
+        #[cfg(not(target_os = "linux"))]
+        let result = signal::kill(Pid::from_raw(pid.pid as i32), sig);
+        if let Err(e) = result {
             show!(Error::from_raw_os_error(e as i32)
                 .map_err_context(|| format!("killing pid {} failed", pid.pid)));
         } else if echo {
@@ -111,7 +138,8 @@ pub fn uu_app() -> Command {
         .args_override_self(true)
         .args([
             // arg!(-<sig>                    "signal to send (either number or name)"),
-            // arg!(-q --queue <value>        "integer value to be sent with the signal"),
+            arg!(-q --queue <value>        "integer value to be sent with the signal")
+                .value_parser(value_parser!(u32)),
             arg!(-e --echo                 "display what is killed"),
         ])
         .args(process_matcher::clap_args(

src/uu/pkill/src/pkill.rs

@@ -378,27 +378,27 @@ mod test {
         limit_address_range_and_assert(&address, 0x0, low - 1, false);
         limit_address_range_and_assert(&address, low - 1, low - 1, false);
 
-        limit_address_range_and_assert(&address, 0x0, low + 0, true);
-        limit_address_range_and_assert(&address, low - 1, low + 0, true);
-        limit_address_range_and_assert(&address, low + 0, low + 0, true);
+        limit_address_range_and_assert(&address, 0x0, low, true);
+        limit_address_range_and_assert(&address, low - 1, low, true);
+        limit_address_range_and_assert(&address, low, low, true);
 
         limit_address_range_and_assert(&address, low - 1, high - 1, true);
-        limit_address_range_and_assert(&address, low - 1, high + 0, true);
+        limit_address_range_and_assert(&address, low - 1, high, true);
         limit_address_range_and_assert(&address, low - 1, high + 1, true);
-        limit_address_range_and_assert(&address, low + 0, high - 1, true);
-        limit_address_range_and_assert(&address, low + 0, high + 0, true);
-        limit_address_range_and_assert(&address, low + 0, high + 1, true);
+        limit_address_range_and_assert(&address, low, high - 1, true);
+        limit_address_range_and_assert(&address, low, high, true);
+        limit_address_range_and_assert(&address, low, high + 1, true);
         limit_address_range_and_assert(&address, low + 1, high - 1, true);
-        limit_address_range_and_assert(&address, low + 1, high + 0, true);
+        limit_address_range_and_assert(&address, low + 1, high, true);
         limit_address_range_and_assert(&address, low + 1, high + 1, true);
 
         limit_address_range_and_assert(&address, high - 1, high - 1, true);
-        limit_address_range_and_assert(&address, high - 1, high + 0, true);
+        limit_address_range_and_assert(&address, high - 1, high, true);
         limit_address_range_and_assert(&address, high - 1, u64::MAX, true);
 
-        limit_address_range_and_assert(&address, high + 0, high + 0, false);
-        limit_address_range_and_assert(&address, high + 0, high + 1, false);
-        limit_address_range_and_assert(&address, high + 0, u64::MAX, false);
+        limit_address_range_and_assert(&address, high, high, false);
+        limit_address_range_and_assert(&address, high, high + 1, false);
+        limit_address_range_and_assert(&address, high, u64::MAX, false);
         limit_address_range_and_assert(&address, 0xffffffffffff, u64::MAX, false);
         limit_address_range_and_assert(&address, u64::MAX, u64::MAX, false);
 
@@ -411,24 +411,24 @@ mod test {
         limit_address_range_and_assert(&address, low - 1, 0x0, false);
         limit_address_range_and_assert(&address, low - 1, low - 1, false);
 
-        limit_address_range_and_assert(&address, low + 0, 0x0, false);
-        limit_address_range_and_assert(&address, low + 0, low - 1, false);
+        limit_address_range_and_assert(&address, low, 0x0, false);
+        limit_address_range_and_assert(&address, low, low - 1, false);
 
         limit_address_range_and_assert(&address, high - 1, low - 1, false);
-        limit_address_range_and_assert(&address, high + 0, low - 1, false);
+        limit_address_range_and_assert(&address, high, low - 1, false);
         limit_address_range_and_assert(&address, high + 1, low - 1, false);
-        limit_address_range_and_assert(&address, high - 1, low + 0, true); // true
-        limit_address_range_and_assert(&address, high + 0, low + 0, false);
-        limit_address_range_and_assert(&address, high + 1, low + 0, false);
-        limit_address_range_and_assert(&address, high - 1, low + 1, true); // true
-        limit_address_range_and_assert(&address, high + 0, low + 1, false);
+        limit_address_range_and_assert(&address, high - 1, low, true);
+        limit_address_range_and_assert(&address, high, low, false);
+        limit_address_range_and_assert(&address, high + 1, low, false);
+        limit_address_range_and_assert(&address, high - 1, low + 1, true);
+        limit_address_range_and_assert(&address, high, low + 1, false);
         limit_address_range_and_assert(&address, high + 1, low + 1, false);
 
-        limit_address_range_and_assert(&address, high + 0, high - 1, false);
+        limit_address_range_and_assert(&address, high, high - 1, false);
         limit_address_range_and_assert(&address, u64::MAX, high - 1, false);
 
-        limit_address_range_and_assert(&address, high + 1, high + 0, false);
-        limit_address_range_and_assert(&address, u64::MAX, high + 0, false);
+        limit_address_range_and_assert(&address, high + 1, high, false);
+        limit_address_range_and_assert(&address, u64::MAX, high, false);
         limit_address_range_and_assert(&address, u64::MAX, 0xffffffffffff, false);
     }
 

src/uu/pmap/src/maps_format_parser.rs

@@ -0,0 +1,26 @@
+[package]
+name = "uu_skill"
+description = "skill - (uutils) send a signal or report process status"
+repository = "https://github.com/uutils/procps/tree/main/src/uu/skill"
+authors.workspace = true
+categories.workspace = true
+edition.workspace = true
+homepage.workspace = true
+keywords.workspace = true
+license.workspace = true
+version.workspace = true
+
+[dependencies]
+uucore = { workspace = true, features = ["signals"] }
+clap = { workspace = true }
+nix = { workspace = true }
+
+uu_snice = { path = "../snice" }
+
+
+[lib]
+path = "src/skill.rs"
+
+[[bin]]
+name = "skill"
+path = "src/main.rs"

src/uu/skill/Cargo.toml

@@ -0,0 +1,7 @@
+# skill
+
+```
+skill [signal] [options] <expression>
+```
+
+Report processes matching an expression and send a signal to them.

src/uu/skill/skill.md

@@ -0,0 +1 @@
+uucore::bin!(uu_skill);