Changeset 3492583

Timestamp:

03/27/2026 11:17:42 AM (22 hours ago)

Author:

bastho

Message:

Add CPU utilization

Location:

ressources/trunk

Files:

• ressources.css (modified) (1 diff)
• ressources.php (modified) (2 diffs)

ressources/trunk/ressources.css

@@ -27 +27 @@
 }
 
+#ressources_cpu .cpu-ships{
+    display: inline-flex;
+    flex-wrap: wrap;
+    gap: 2px;
+}
+#ressources_cpu .cpu-ship{
+    background: linear-gradient(90deg, var(--wp-admin-theme-color), var(--wp-admin-theme-color-darker-10) 100%);
+    width: 10px;
+    height: 10px;
+    cursor: progress;
+}
+
 #ressources_memory .inside,
 #ressources_disk .inside,

ressources/trunk/ressources.php

@@ -175 +175 @@
                 <th><?php esc_attr_e('TIME', 'ressources') ?></th>
                 <th><?php esc_attr_e('CPU Load average', 'ressources') ?></th>
+                <th><?php esc_attr_e('Utilization', 'ressources') ?></th>
             </tr>
             </thead>
-            <tbody class="ressources-widget-content" data-id="cpu" data-refresh="20">
+            <tbody class="ressources-widget-content" data-id="cpu" data-refresh="5">
             </tbody>
         </table>
@@ -284 +285 @@
         // PHPCS:ignore WordPress.PHP.DiscouragedPHPFunctions.system_calls_exec
         exec('cat /proc/loadavg', $cpuloadavg);
+        // PHPCS:ignore WordPress.PHP.DiscouragedPHPFunctions.system_calls_exec
+        exec('grep "^model name" /proc/cpuinfo', $model);
+        $count = count($model);
+        // get load of each CPU core
+        $cpus_load = array();
+        for($i=0; $i<$count; $i++){
+            // PHPCS:ignore WordPress.PHP.DiscouragedPHPFunctions.system_calls_exec
+            exec('cat /proc/stat | grep "^cpu'.$i.'"', $cpus_load[$i]);
+        }
         if($cpuloadavg){
             $load = explode(' ',$cpuloadavg[0]);
             ?>
             <tr>
-            <td>1 MIN</td>
-            <td><?php echo esc_html( $load[0] ) ?></td>
-            </tr>
-            <tr>
-            <td>5 MIN</td>
-            <td><?php echo esc_html( $load[1] ) ?></td>
-            </tr>
-            <tr>
-            <td>15 MIN</td>
-            <td><?php echo esc_html( $load[2] ) ?></td>
+                <td>1 MIN</td>
+                <td><?php echo esc_html( $load[0] ) ?></td>
+                <td>
+                    <div class="cpu-ships">
+                        <?php foreach($cpus_load as $cpu => $cpu_load): ?>
+                            <?php
+                                $data = explode(' ',$cpu_load[0]);
+                                $total = array_sum(array_slice($data, 1));
+                                $idle = $data[4];
+                                $usage = 100 - round($idle / $total * 100);
+                            // translators: %1$d is the CPU index, %2$d is the CPU usage percentage ?>
+                        <div class="cpu-ship" style="opacity:<?php echo esc_attr( $usage/100 ) ?>;" title="<?php echo esc_attr( sprintf('CPU %1$d: %2$d%% load', $cpu+1, $usage) ) ?>">
+                        </div>
+                    <?php endforeach; ?>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td>5 MIN</td>
+                <td><?php echo esc_html( $load[1] ) ?></td>
+            </tr>
+            <tr>
+                <td>15 MIN</td>
+                <td><?php echo esc_html( $load[2] ) ?></td>
             </tr>
             <?php
         }
     }
+
     function getMySQLVersion() {
         // PHPCS:ignore WordPress.PHP.DiscouragedPHPFunctions.system_calls_shell_exec