Sort procecces in processes command by worker id

phpstreamserver · Sep 29, 2024 · 60333d2 · 60333d2
1 parent 3b05850
commit 60333d2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/src/Internal/SystemPlugin/Command/ProcessesCommand.php b/src/Internal/SystemPlugin/Command/ProcessesCommand.php
@@ -33,6 +33,9 @@ public function execute(Options $options): int
         \assert($status instanceof ServerStatus);
 
         if ($status->getProcessesCount() > 0) {
+            $processes = $status->getProcesses();
+            \usort($processes, static fn (RunningProcess $a, RunningProcess $b) => $a->workerId <=> $b->workerId);
+
             echo (new Table(indent: 1))
                 ->setHeaderRow([
                     'Pid',
@@ -44,7 +47,7 @@ public function execute(Options $options): int
                     'Bytes (RX / TX)',
                     'Status',
                 ])
-                ->addRows(\array_map(array: $status->getProcesses(), callback: static function (RunningProcess $w) {
+                ->addRows(\array_map(array: $processes, callback: static function (RunningProcess $w) {
                     return [
                         $w->pid,
                         $w->user === 'root' ? $w->user : "<color;fg=gray>{$w->user}</>",

diff --git a/src/Internal/SystemPlugin/ServerStatus/RunningProcess.php b/src/Internal/SystemPlugin/ServerStatus/RunningProcess.php
@@ -10,6 +10,7 @@ final class RunningProcess
      * @param array<int, Connection> $connections
      */
     public function __construct(
+        public int $workerId,
         public int $pid,
         public string $user,
         public string $name,

diff --git a/src/Internal/SystemPlugin/ServerStatus/ServerStatus.php b/src/Internal/SystemPlugin/ServerStatus/ServerStatus.php
@@ -65,6 +65,7 @@ public function subscribeToWorkerMessages(MessageHandler $handler): void
     {
         $handler->subscribe(ProcessSpawnedEvent::class, weakClosure(function (ProcessSpawnedEvent $message): void {
             $this->processes[$message->pid] = new RunningProcess(
+                workerId: $message->workerId,
                 pid: $message->pid,
                 user: $message->user,
                 name: $message->name,

diff --git a/src/Message/ProcessSpawnedEvent.php b/src/Message/ProcessSpawnedEvent.php
@@ -13,6 +13,7 @@
 final readonly class ProcessSpawnedEvent implements Message
 {
     public function __construct(
+        public int $workerId,
         public int $pid,
         public string $user,
         public string $name,

diff --git a/src/WorkerProcess.php b/src/WorkerProcess.php
@@ -84,6 +84,7 @@ private function initWorker(): void
         EventLoop::onSignal(SIGUSR1, fn() => $this->reload());
 
         $this->messageBus->dispatch(new ProcessSpawnedEvent(
+            workerId: $this->id,
             pid: $this->pid,
             user: $this->getUser(),
             name: $this->name,