Changeset f4f866c in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/generic/src/console/cmd.c (modified) (12 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>
@@ -387 +388 @@
 };
 
+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);
@@ -475 +484 @@
         &set4_info,
         &slabs_info,
+        &sysinfo_info,
         &symaddr_info,
         &sched_info,
@@ -868 +878 @@
 }
 
+/** Command for dumping sysinfo
+ *
+ * @param argv Ignores
+ *
+ * @return Always 1
+ */
+int cmd_sysinfo(cmd_arg_t * argv)
+{
+        sysinfo_dump(NULL);
+        return 1;
+}
+
 
 /** Command for listings Thread information
@@ -913 +935 @@
 int cmd_zones(cmd_arg_t * argv)
 {
-        zone_print_list();
+        zones_print_list();
         return 1;
 }
@@ -1027 +1049 @@
         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);
@@ -1036 +1059 @@
         
         /* 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_suffix(ucycles1 - ucycles0, &ucycles, &usuffix);
+        order_suffix(kcycles1 - kcycles0, &kcycles, &ksuffix);
+                
+        printf("Time: %" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles\n",
+                        ucycles, usuffix, kcycles, ksuffix);
         
         if (ret == NULL) {
@@ -1061 +1087 @@
         uint32_t i;
         bool ret = true;
-        uint64_t cycles;
-        char suffix;
+        uint64_t ucycles, kcycles;
+        char usuffix, ksuffix;
         
         if (cnt < 1)
@@ -1080 +1106 @@
                 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);
@@ -1091 +1118 @@
                 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);
@@ -1101 +1129 @@
                 }
                 
-                data[i] = dt;
-                order(dt, &cycles, &suffix);
-                printf("OK (%" PRIu64 "%c cycles)\n", cycles, suffix);
+                data[i] = ucycles1 - ucycles0 + kcycles1 - kcycles0;
+                order_suffix(ucycles1 - ucycles0, &ucycles, &usuffix);
+                order_suffix(kcycles1 - kcycles0, &kcycles, &ksuffix);
+                printf("OK (%" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles)\n",
+                                ucycles, usuffix, kcycles, ksuffix);
         }
         
@@ -1115 +1145 @@
                 }
                 
-                order(sum / (uint64_t) cnt, &cycles, &suffix);
-                printf("Average\t\t%" PRIu64 "%c\n", cycles, suffix);
+                order_suffix(sum / (uint64_t) cnt, &ucycles, &usuffix);
+                printf("Average\t\t%" PRIu64 "%c\n", ucycles, usuffix);
         }