Changeset 79edc36 in mainline for kernel/generic/src/ps/load.c

Timestamp:

2010-04-01T15:21:03Z (15 years ago)

Author:

Stanislav Kozina <stanislav.kozina@…>

Branches:

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

Children:

62550dce

Parents:

83a957a

Message:

System load echo fix, now it looks realistic
top echoes first values (uptime)
Several ps and uptime fixes

File:

• kernel/generic/src/ps/load.c (modified) (3 diffs)

kernel/generic/src/ps/load.c

@@ -47 +47 @@
 static size_t get_running_count(void);
 
-size_t avenrun[3];
+unsigned long avenrun[3];
 
 #define FSHIFT   11             /* nr of bits of precision */
@@ -56 +56 @@
 #define EXP_15 2037             /* 1/exp(5sec/15min) */
 
-#define CALC_LOAD(load,exp,n) \
-        load *= exp; \
-        load += n*(FIXED_1-exp); \
-        load >>= FSHIFT;
+void get_avenrun(unsigned long *loads, int shift)
+{
+        loads[0] = avenrun[0] << shift;
+        loads[1] = avenrun[1] << shift;
+        loads[2] = avenrun[2] << shift;
+}
 
-static inline unsigned long calc_load(size_t load, size_t exp, size_t active)
+static inline unsigned long calc_load(unsigned long load, size_t exp, size_t active)
 {
         load *= exp;
@@ -120 +122 @@
 }
 
-int sys_ps_get_load(size_t *user_load)
+int sys_ps_get_load(unsigned long *user_load)
 {
-        copy_to_uspace(user_load, avenrun, sizeof(avenrun));
+        unsigned long loads[3];
+        get_avenrun(loads, 5);
+        copy_to_uspace(user_load, loads, sizeof(loads));
         return 0;
 }