This is an automated email from the ASF dual-hosted git repository.
kasjer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new 1751b4256 os/shell: Add load averages to uptime command
1751b4256 is described below
commit 1751b4256d8fe24bab51af86825487bf0e1a64a5
Author: Jerzy Kasenberg <[email protected]>
AuthorDate: Mon May 11 23:17:40 2026 +0200
os/shell: Add load averages to uptime command
Print load average for last 1,5,15 minutes
and also total load
Load is counted as how many ticks were NOT
spent in idle task.
compat> uptime
up 0:42:35.257, load average: 0.14 0.03 0.02 0.07
Signed-off-by: Jerzy Kasenberg <[email protected]>
---
sys/shell/pkg.yml | 3 +++
sys/shell/src/shell_os.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++-
sys/shell/syscfg.yml | 6 +++++
3 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/sys/shell/pkg.yml b/sys/shell/pkg.yml
index 9d8e7757d..c2684ede7 100644
--- a/sys/shell/pkg.yml
+++ b/sys/shell/pkg.yml
@@ -47,3 +47,6 @@ pkg.link_tables:
pkg.init:
shell_init: 'MYNEWT_VAL(SHELL_SYSINIT_STAGE)'
+
+pkg.init.SHELL_UPTIME_LOAD:
+ shell_load_monitor_init: 200
diff --git a/sys/shell/src/shell_os.c b/sys/shell/src/shell_os.c
index ab32180b9..a6e811fe3 100644
--- a/sys/shell/src/shell_os.c
+++ b/sys/shell/src/shell_os.c
@@ -84,6 +84,44 @@ shell_os_tasks_display_cmd(const struct shell_cmd *cmd, int
argc, char **argv,
return 0;
}
+extern struct os_task g_idle_task;
+
+#define TICKS_PER_MIN (60 * OS_TICKS_PER_SEC)
+
+static uint32_t idle_task_ticks[16];
+static uint32_t last_snap_shot_minute;
+
+static struct os_callout load_monitor;
+
+static uint32_t
+load_in_last_minutes(int minutes)
+{
+ uint32_t ix1 = last_snap_shot_minute & 15;
+ uint32_t ix2 = (ix1 - minutes) & 15;
+ uint32_t idle_ticks = idle_task_ticks[ix1] - idle_task_ticks[ix2];
+
+ return 100 - idle_ticks * 100 / (minutes * TICKS_PER_MIN);
+}
+
+static void
+load_monitor_cb(struct os_event *e)
+{
+ uint32_t ix;
+
+ last_snap_shot_minute = os_time_get() / TICKS_PER_MIN;
+ ix = last_snap_shot_minute & 15;
+ idle_task_ticks[ix] = g_idle_task.t_run_time;
+
+ os_callout_reset(&load_monitor, TICKS_PER_MIN);
+}
+
+void
+shell_load_monitor_init(void)
+{
+ os_callout_init(&load_monitor, os_eventq_dflt_get(), load_monitor_cb,
NULL);
+ os_callout_reset(&load_monitor, TICKS_PER_MIN);
+}
+
static int
uptime_cmd(const struct shell_cmd *cmd, int argc, char **argv, struct streamer
*streamer)
{
@@ -112,8 +150,34 @@ uptime_cmd(const struct shell_cmd *cmd, int argc, char
**argv, struct streamer *
} else if (days > 1) {
sprintf(days_str, "%d days ", days);
}
- streamer_printf(streamer, "up %s%d:%02d:%02d.%03d\n", days_str, hours,
+ streamer_printf(streamer, "up %s%d:%02d:%02d.%03d", days_str, hours,
minutes, seconds, (int)(uptime.tv_usec / 1000));
+ if (MYNEWT_VAL(SHELL_UPTIME_LOAD)) {
+ int cpu_load[4];
+ os_time_t now = os_time_get();
+
+ cpu_load[3] = 100 - (int)(g_idle_task.t_run_time * 100ULL / now);
+ if (last_snap_shot_minute >= 1) {
+ cpu_load[0] = load_in_last_minutes(1);
+ } else {
+ cpu_load[0] = cpu_load[3];
+ }
+ if (last_snap_shot_minute >= 5) {
+ cpu_load[1] = load_in_last_minutes(5);
+ } else {
+ cpu_load[1] = cpu_load[3];
+ }
+ if (last_snap_shot_minute >= 15) {
+ cpu_load[2] = load_in_last_minutes(15);
+ } else {
+ cpu_load[2] = cpu_load[3];
+ }
+ streamer_write(streamer, ", load average:", sizeof(", load
average:"));
+ for (int i = 0; i < 4; ++i) {
+ streamer_printf(streamer, " %d.%02d", cpu_load[i] / 100,
cpu_load[i] % 100);
+ }
+ }
+ streamer_write(streamer, "\n", 1);
return 0;
}
diff --git a/sys/shell/syscfg.yml b/sys/shell/syscfg.yml
index 757ef7454..c7b02b5e2 100644
--- a/sys/shell/syscfg.yml
+++ b/sys/shell/syscfg.yml
@@ -93,6 +93,12 @@ syscfg.defs:
printf call during processing of the `shell exec` newtmgr command.
value: 128
+ SHELL_UPTIME_LOAD:
+ description: >
+ Add statistic of CPU usage to 'uptime' command. Shows load in last
+ 1, 5, 15 minutes plus total usage from boot time.
+ value: 0
+
## duplicated from boot/boot_serial
BOOT_SERIAL_NVREG_MAGIC:
description: >
