fio_cli stops at -- + fix IO worker restart signaling

facil-io · Jan 31, 2025 · 8f7a48a · 8f7a48a
1 parent 83fec68
commit 8f7a48a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/fio-stl.h b/fio-stl.h
@@ -13118,6 +13118,8 @@ SFUNC void fio_cli_start FIO_NOOP(int argc,
         (key.len == 6 && key.buf[1] == '-' &&
          (fio_buf2u32u(key.buf + 2) | 0x20202020UL) == help_value32))
       fio___cli_print_help();
+    if (key.len == 2 && key.buf[1] == '-') /* "--" detected, skip the rest */
+      break;
     /* look for longest argument match for argument (find, i.e. -arg=val) */
     for (;;) {
       fio___cli_aliases_s o = {.name = fio_cli_str_tmp(key)};
@@ -37313,7 +37315,7 @@ SFUNC void fio___io_restart(void *workers_, void *ignr_) {
   FIO___LOCK_LOCK(FIO___IO.lock);
   FIO_LIST_EACH(fio___io_pid_s, node, &FIO___IO.pids, w) {
     w->stop = 1;
-    fio_thread_kill(w->pid, SIGUSR1);
+    fio_thread_kill(w->pid, FIO___IO.restart_signal);
   }
   FIO___LOCK_UNLOCK(FIO___IO.lock);
   /* switch to single mode? */

diff --git a/fio-stl/005 cli.h b/fio-stl/005 cli.h
@@ -814,6 +814,8 @@ SFUNC void fio_cli_start FIO_NOOP(int argc,
         (key.len == 6 && key.buf[1] == '-' &&
          (fio_buf2u32u(key.buf + 2) | 0x20202020UL) == help_value32))
       fio___cli_print_help();
+    if (key.len == 2 && key.buf[1] == '-') /* "--" detected, skip the rest */
+      break;
     /* look for longest argument match for argument (find, i.e. -arg=val) */
     for (;;) {
       fio___cli_aliases_s o = {.name = fio_cli_str_tmp(key)};

diff --git a/fio-stl/402 io reactor.h b/fio-stl/402 io reactor.h
@@ -433,7 +433,7 @@ SFUNC void fio___io_restart(void *workers_, void *ignr_) {
   FIO___LOCK_LOCK(FIO___IO.lock);
   FIO_LIST_EACH(fio___io_pid_s, node, &FIO___IO.pids, w) {
     w->stop = 1;
-    fio_thread_kill(w->pid, SIGUSR1);
+    fio_thread_kill(w->pid, FIO___IO.restart_signal);
   }
   FIO___LOCK_UNLOCK(FIO___IO.lock);
   /* switch to single mode? */