Changes in kernel/generic/src/console/cmd.c [b3631bc:1ba37fa] in mainline

File:

• kernel/generic/src/console/cmd.c (modified) (11 diffs)

kernel/generic/src/console/cmd.c

@@ -66 +66 @@
 #include <ipc/irq.h>
 #include <ipc/event.h>
-#include <sysinfo/sysinfo.h>
 #include <symtab.h>
 #include <errno.h>
@@ -388 +387 @@
 };
 
-static int cmd_sysinfo(cmd_arg_t *argv);
-static cmd_info_t sysinfo_info = {
-        .name = "sysinfo",
-        .description = "Dump sysinfo.",
-        .func = cmd_sysinfo,
-        .argc = 0
-};
-
 /* Data and methods for 'zones' command */
 static int cmd_zones(cmd_arg_t *argv);
@@ -484 +475 @@
         &set4_info,
         &slabs_info,
-        &sysinfo_info,
         &symaddr_info,
         &sched_info,
@@ -878 +868 @@
 }
 
-/** Command for dumping sysinfo
- *
- * @param argv Ignores
- *
- * @return Always 1
- */
-int cmd_sysinfo(cmd_arg_t * argv)
-{
-        sysinfo_dump(NULL, 0);
-        return 1;
-}
-
 
 /** Command for listings Thread information
@@ -1049 +1027 @@
         ipl_t ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
-        uint64_t t0 = task_get_accounting(TASK);
+        uint64_t ucycles0, kcycles0;
+        task_get_accounting(TASK, &ucycles0, &kcycles0);
         spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
@@ -1058 +1037 @@
         
         /* Update and read thread accounting */
+        uint64_t ucycles1, kcycles1; 
         ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
-        uint64_t dt = task_get_accounting(TASK) - t0;
+        task_get_accounting(TASK, &ucycles1, &kcycles1);
         spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
         
-        uint64_t cycles;
-        char suffix;
-        order(dt, &cycles, &suffix);
-                
-        printf("Time: %" PRIu64 "%c cycles\n", cycles, suffix);
+        uint64_t ucycles, kcycles;
+        char usuffix, ksuffix;
+        order(ucycles1 - ucycles0, &ucycles, &usuffix);
+        order(kcycles1 - kcycles0, &kcycles, &ksuffix);
+                
+        printf("Time: %" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles\n",
+                        ucycles, usuffix, kcycles, ksuffix);
         
         if (ret == NULL) {
@@ -1083 +1065 @@
         uint32_t i;
         bool ret = true;
-        uint64_t cycles;
-        char suffix;
+        uint64_t ucycles, kcycles;
+        char usuffix, ksuffix;
         
         if (cnt < 1)
@@ -1102 +1084 @@
                 ipl_t ipl = interrupts_disable();
                 spinlock_lock(&TASK->lock);
-                uint64_t t0 = task_get_accounting(TASK);
+                uint64_t ucycles0, kcycles0;
+                task_get_accounting(TASK, &ucycles0, &kcycles0);
                 spinlock_unlock(&TASK->lock);
                 interrupts_restore(ipl);
@@ -1113 +1096 @@
                 ipl = interrupts_disable();
                 spinlock_lock(&TASK->lock);
-                uint64_t dt = task_get_accounting(TASK) - t0;
+                uint64_t ucycles1, kcycles1;
+                task_get_accounting(TASK, &ucycles1, &kcycles1);
                 spinlock_unlock(&TASK->lock);
                 interrupts_restore(ipl);
-                
+
                 if (ret != NULL) {
                         printf("%s\n", ret);
@@ -1123 +1107 @@
                 }
                 
-                data[i] = dt;
-                order(dt, &cycles, &suffix);
-                printf("OK (%" PRIu64 "%c cycles)\n", cycles, suffix);
+                data[i] = ucycles1 - ucycles0 + kcycles1 - kcycles0;
+                order(ucycles1 - ucycles0, &ucycles, &usuffix);
+                order(kcycles1 - kcycles0, &kcycles, &ksuffix);
+                printf("OK (%" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles)\n",
+                                ucycles, usuffix, kcycles, ksuffix);
         }
         
@@ -1137 +1123 @@
                 }
                 
-                order(sum / (uint64_t) cnt, &cycles, &suffix);
-                printf("Average\t\t%" PRIu64 "%c\n", cycles, suffix);
+                order(sum / (uint64_t) cnt, &ucycles, &usuffix);
+                printf("Average\t\t%" PRIu64 "%c\n", ucycles, usuffix);
         }