Changeset 944f2cab in mainline

Timestamp:

2010-03-31T09:30:04Z (14 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e257ae3

Parents:

3a10e34

Message:

ps -l echoes system load

Files:

• kernel/generic/include/ps/load.h (modified) (1 diff)
• kernel/generic/include/syscall/syscall.h (modified) (1 diff)
• kernel/generic/src/ps/load.c (modified) (2 diffs)
• kernel/generic/src/syscall/syscall.c (modified) (2 diffs)
• uspace/app/ps/ps.c (modified) (4 diffs)
• uspace/lib/c/Makefile (modified) (1 diff)
• uspace/lib/c/generic/load.c (added)
• uspace/lib/c/include/load.h (added)

kernel/generic/include/ps/load.h

@@ -37 +37 @@
 
 extern void kload_thread(void *);
+extern int sys_ps_get_load(size_t *user_load);
 
 #endif

kernel/generic/include/syscall/syscall.h

@@ -91 +91 @@
         SYS_PS_GET_TASK_INFO,
         SYS_PS_GET_THREADS,
+        SYS_PS_GET_LOAD,
 
         SYS_IPC_CONNECT_KBOX,

kernel/generic/src/ps/load.c

@@ -40 +40 @@
 #include <ps/load.h>
 #include <arch.h>
+#include <proc/scheduler.h>
+#include <config.h>
+#include <arch/types.h>
+#include <time/clock.h>
+#include <syscall/copy.h>
+
+static size_t get_running_count(void);
+
+size_t avenrun[3];
+
+#define FSHIFT   11             /* nr of bits of precision */
+#define FIXED_1  (1<<FSHIFT)    /* 1.0 as fixed-point */
+#define LOAD_FREQ 5             /* 5 sec intervals */
+#define EXP_1  1884             /* 1/exp(5sec/1min) as fixed-point */
+#define EXP_5  2014             /* 1/exp(5sec/5min) */
+#define EXP_15 2037             /* 1/exp(5sec/15min) */
+
+#define CALC_LOAD(load,exp,n) \
+        load *= exp; \
+        load += n*(FIXED_1-exp); \
+        load >>= FSHIFT;
+
+static inline unsigned long calc_load(size_t load, size_t exp, size_t active)
+{
+        load *= exp;
+        load += active * (FIXED_1 - exp);
+        return load >> FSHIFT;
+}
+
+static inline void calc_load_global(void)
+{
+        size_t active;
+
+        active = get_running_count();
+        active = active > 0 ? active * FIXED_1 : 0;
+        avenrun[0] = calc_load(avenrun[0], EXP_1, active);
+        avenrun[1] = calc_load(avenrun[1], EXP_5, active);
+        avenrun[2] = calc_load(avenrun[2], EXP_15, active);
+}
+
+static size_t get_running_count(void)
+{
+        size_t i;
+        size_t result = 0;
+        ipl_t ipl;
+
+        /* run queues should not change during reading */
+        ipl = interrupts_disable();
+
+        for (i = 0; i < config.cpu_active; ++i) {
+                cpu_t *cpu = &cpus[i];
+                int j;
+                for (j = 0; j < RQ_COUNT; ++j) {
+                        result += cpu->rq[j].n;
+                }
+        } 
+
+        interrupts_restore(ipl);
+        return result;
+}
 
 /** Load thread main function.
@@ -51 +111 @@
         /* Noone will thread_join us */
         thread_detach(THREAD);
+        avenrun[0] = 0;
+        avenrun[1] = 0;
+        avenrun[2] = 0;
 
         while (true) {
-                printf("load thread alive\n");
-                thread_sleep(5);
+                calc_load_global();
+                printf("Computed loads: 0x%x 0x%x 0x%x\n", avenrun[0], avenrun[1], avenrun[2]);
+                thread_sleep(LOAD_FREQ);
         }
+}
+
+int sys_ps_get_load(size_t *user_load)
+{
+        copy_to_uspace(user_load, avenrun, sizeof(avenrun));
+        return 0;
 }
 

kernel/generic/src/syscall/syscall.c

@@ -55 +55 @@
 #include <udebug/udebug.h>
 #include <ps/ps.h>
+#include <ps/load.h>
 
 /** Dispatch system call */
@@ -171 +172 @@
         (syshandler_t) sys_ps_get_task_info,
         (syshandler_t) sys_ps_get_threads,
+        (syshandler_t) sys_ps_get_load,
         
         (syshandler_t) sys_ipc_connect_kbox

uspace/app/ps/ps.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <malloc.h>
+#include <load.h>
 
 #include "func.h"
@@ -120 +121 @@
 }
 
+static void echo_load(void)
+{
+        size_t load[3];
+        load[0] = 0;
+        load[1] = 0;
+        load[2] = 0;
+        get_load(load);
+        printf("Current load: %d.%03d %d.%03d %d.%03d\n", load[0] >> 11, (load[0] & 0x7ff) / 2, load[1] >> 11, (load[1] & 0x7ff) / 2, load[2] >> 11, (load[2] & 0x7ff) / 2);
+}
+
 static void usage()
 {
-        printf("Usage: ps [-t pid]\n");
+        printf("Usage: ps [-t pid -l]\n");
 }
 
@@ -140 +151 @@
                         task_id_t taskid = strtol(*argv, NULL, 10);
                         list_threads(taskid);
+                } if (str_cmp(*argv, "-l") == 0) {
+                        --argc; ++argv;
+                        if (argc != 0) {
+                                printf("Bad argument count!\n");
+                                usage();
+                                exit(1);
+                        }
+                        echo_load();
                 } else {
                         printf("Unknown argument %s!\n", *argv);
@@ -145 +164 @@
                         exit(1);
                 }
-
         } else {
                 list_tasks();

uspace/lib/c/Makefile

@@ -91 +91 @@
         generic/vfs/canonify.c \
         generic/stacktrace.c \
-        generic/ps.c
+        generic/ps.c \
+        generic/load.c
 
 SOURCES = \