proc

cleonos/c/apps/bg_main.c

@@ -1,5 +1,31 @@
 #include "cmd_runtime.h"
 
+static int ush_bg_resume_pid(const char *pid_text) {
+    u64 pid = 0ULL;
+    u64 ret;
+
+    if (pid_text == (const char *)0 || ush_parse_u64_dec(pid_text, &pid) == 0 || pid == 0ULL) {
+        return 0;
+    }
+
+    ret = cleonos_sys_proc_kill(pid, CLEONOS_SIGCONT);
+
+    if (ret == (u64)-1) {
+        ush_writeln("bg: pid not found");
+        return 1;
+    }
+
+    if (ret == 0ULL) {
+        ush_writeln("bg: target cannot be resumed right now");
+        return 1;
+    }
+
+    ush_write("bg: resumed [");
+    ush_write_hex_u64(pid);
+    ush_writeln("]");
+    return 1;
+}
+
 static int ush_cmd_bg(const ush_state *sh, const char *arg) {
     char target[USH_PATH_MAX];
     char argv_line[USH_ARG_MAX];
@@ -23,6 +49,10 @@ static int ush_cmd_bg(const ush_state *sh, const char *arg) {
         ush_copy(argv_line, (u64)sizeof(argv_line), rest);
     }
 
+    if (argv_line[0] == '\0' && ush_bg_resume_pid(target) != 0) {
+        return 1;
+    }
+
     if (ush_resolve_exec_path(sh, target, path, (u64)sizeof(path)) == 0) {
         ush_writeln("bg: invalid target");
         return 0;

cleonos/c/apps/fg_main.c

@@ -52,7 +52,9 @@ static int ush_fg_pick_latest_job(u64 *out_pid) {
             continue;
         }
 
-        if (snap.state != CLEONOS_PROC_STATE_PENDING && snap.state != CLEONOS_PROC_STATE_RUNNING) {
+        if (snap.state != CLEONOS_PROC_STATE_PENDING &&
+            snap.state != CLEONOS_PROC_STATE_RUNNING &&
+            snap.state != CLEONOS_PROC_STATE_STOPPED) {
             continue;
         }
 
@@ -99,6 +101,7 @@ static int ush_fg_wait_pid(u64 pid) {
 
 static int ush_cmd_fg(const char *arg) {
     u64 pid = 0ULL;
+    cleonos_proc_snapshot snap;
 
     if (arg != (const char *)0 && arg[0] != '\0') {
         if (ush_parse_u64_dec(arg, &pid) == 0 || pid == 0ULL) {
@@ -112,6 +115,25 @@ static int ush_cmd_fg(const char *arg) {
         }
     }
 
+    if (cleonos_sys_proc_snapshot(pid, &snap, (u64)sizeof(snap)) == 0ULL) {
+        ush_writeln("fg: pid not found");
+        return 0;
+    }
+
+    if (snap.state == CLEONOS_PROC_STATE_STOPPED) {
+        u64 ret = cleonos_sys_proc_kill(pid, CLEONOS_SIGCONT);
+
+        if (ret == (u64)-1) {
+            ush_writeln("fg: pid not found");
+            return 0;
+        }
+
+        if (ret == 0ULL) {
+            ush_writeln("fg: failed to continue job");
+            return 0;
+        }
+    }
+
     ush_write("fg: waiting [");
     ush_write_hex_u64(pid);
     ush_writeln("]");

cleonos/c/apps/jobs_main.c

@@ -25,6 +25,9 @@ static const char *ush_jobs_state_name(u64 state) {
     if (state == CLEONOS_PROC_STATE_RUNNING) {
         return "RUNNING";
     }
+    if (state == CLEONOS_PROC_STATE_STOPPED) {
+        return "STOPPED";
+    }
     if (state == CLEONOS_PROC_STATE_EXITED) {
         return "EXITED ";
     }

cleonos/c/apps/kill_main.c

@@ -1,19 +1,105 @@
 #include "cmd_runtime.h"
 
+static void ush_kill_upper_copy(char *dst, u64 dst_size, const char *src) {
+    u64 i = 0ULL;
+
+    if (dst == (char *)0 || dst_size == 0ULL) {
+        return;
+    }
+
+    dst[0] = '\0';
+
+    if (src == (const char *)0) {
+        return;
+    }
+
+    while (src[i] != '\0' && i + 1ULL < dst_size) {
+        char ch = src[i];
+        if (ch >= 'a' && ch <= 'z') {
+            ch = (char)(ch - ('a' - 'A'));
+        }
+        dst[i] = ch;
+        i++;
+    }
+
+    dst[i] = '\0';
+}
+
+static int ush_kill_parse_signal_name(const char *text, u64 *out_signal) {
+    char name[32];
+    u64 start = 0ULL;
+
+    if (text == (const char *)0 || out_signal == (u64 *)0 || text[0] == '\0') {
+        return 0;
+    }
+
+    ush_kill_upper_copy(name, (u64)sizeof(name), text);
+
+    if (name[0] == '-') {
+        start = 1ULL;
+    }
+
+    if (name[start] == 'S' && name[start + 1ULL] == 'I' && name[start + 2ULL] == 'G') {
+        start += 3ULL;
+    }
+
+    if (name[start] == '\0') {
+        return 0;
+    }
+
+    if (ush_streq(&name[start], "TERM") != 0) {
+        *out_signal = CLEONOS_SIGTERM;
+        return 1;
+    }
+
+    if (ush_streq(&name[start], "KILL") != 0) {
+        *out_signal = CLEONOS_SIGKILL;
+        return 1;
+    }
+
+    if (ush_streq(&name[start], "STOP") != 0) {
+        *out_signal = CLEONOS_SIGSTOP;
+        return 1;
+    }
+
+    if (ush_streq(&name[start], "CONT") != 0) {
+        *out_signal = CLEONOS_SIGCONT;
+        return 1;
+    }
+
+    return 0;
+}
+
+static int ush_kill_parse_signal(const char *text, u64 *out_signal) {
+    u64 parsed = 0ULL;
+
+    if (text == (const char *)0 || out_signal == (u64 *)0 || text[0] == '\0') {
+        return 0;
+    }
+
+    if (ush_parse_u64_dec(text, &parsed) != 0 && parsed <= 255ULL) {
+        *out_signal = parsed;
+        return 1;
+    }
+
+    return ush_kill_parse_signal_name(text, out_signal);
+}
+
 static int ush_cmd_kill(const char *arg) {
     char pid_text[USH_PATH_MAX];
+    char signal_text[USH_PATH_MAX];
     const char *rest = "";
     u64 pid;
-    u64 signal = 15ULL;
+    u64 signal = CLEONOS_SIGTERM;
     u64 ret;
 
     if (arg == (const char *)0 || arg[0] == '\0') {
-        ush_writeln("kill: usage kill <pid> [signal]");
+        ush_writeln("kill: usage kill <pid> [TERM|KILL|STOP|CONT|signal]");
         return 0;
     }
 
     if (ush_split_first_and_rest(arg, pid_text, (u64)sizeof(pid_text), &rest) == 0) {
-        ush_writeln("kill: usage kill <pid> [signal]");
+        ush_writeln("kill: usage kill <pid> [TERM|KILL|STOP|CONT|signal]");
         return 0;
     }
 
@@ -23,7 +109,9 @@ static int ush_cmd_kill(const char *arg) {
     }
 
     if (rest != (const char *)0 && rest[0] != '\0') {
-        if (ush_parse_u64_dec(rest, &signal) == 0 || signal > 255ULL) {
+        ush_copy(signal_text, (u64)sizeof(signal_text), rest);
+        ush_trim_line(signal_text);
+        if (ush_kill_parse_signal(signal_text, &signal) == 0) {
             ush_writeln("kill: invalid signal");
             return 0;
         }

cleonos/c/apps/ps_main.c

@@ -25,6 +25,9 @@ static const char *ush_ps_state_name(u64 state) {
     if (state == CLEONOS_PROC_STATE_RUNNING) {
         return "RUN ";
     }
+    if (state == CLEONOS_PROC_STATE_STOPPED) {
+        return "STOP";
+    }
     if (state == CLEONOS_PROC_STATE_EXITED) {
         return "EXIT";
     }

cleonos/c/apps/top_main.c

@@ -7,6 +7,9 @@ static const char *ush_top_state_name(u64 state) {
     if (state == CLEONOS_PROC_STATE_RUNNING) {
         return "RUN ";
     }
+    if (state == CLEONOS_PROC_STATE_STOPPED) {
+        return "STOP";
+    }
     if (state == CLEONOS_PROC_STATE_EXITED) {
         return "EXIT";
     }
@@ -114,7 +117,9 @@ static void ush_top_render_frame(u64 frame_index, u64 delay_ticks) {
             continue;
         }
 
-        if (snap.state != CLEONOS_PROC_STATE_PENDING && snap.state != CLEONOS_PROC_STATE_RUNNING) {
+        if (snap.state != CLEONOS_PROC_STATE_PENDING &&
+            snap.state != CLEONOS_PROC_STATE_RUNNING &&
+            snap.state != CLEONOS_PROC_STATE_STOPPED) {
             continue;
         }