Changes in kernel/generic/src/console/cmd.c [4ce914d4:cb3d641a] in mainline

File:

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

kernel/generic/src/console/cmd.c

@@ -46 +46 @@
 #include <print.h>
 #include <panic.h>
-#include <typedefs.h>
+#include <arch/types.h>
 #include <adt/list.h>
 #include <arch.h>
 #include <config.h>
 #include <func.h>
-#include <str.h>
+#include <string.h>
 #include <macros.h>
 #include <debug.h>
@@ -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,
@@ -837 +827 @@
         bool pointer = false;
         int rc;
-        
-        if (((char *) argv->buffer)[0] == '*') {
+
+        if (((char *)argv->buffer)[0] == '*') {
                 rc = symtab_addr_lookup((char *) argv->buffer + 1, &addr);
                 pointer = true;
-        } else if (((char *) argv->buffer)[0] >= '0' &&
-                   ((char *) argv->buffer)[0] <= '9') {
-                uint64_t value;
-                rc = str_uint64((char *) argv->buffer, NULL, 0, true, &value);
-                if (rc == EOK)
-                        addr = (uintptr_t) value;
-        } else
+        } else if (((char *) argv->buffer)[0] >= '0' && 
+                   ((char *)argv->buffer)[0] <= '9') {
+                rc = EOK;
+                addr = atoi((char *)argv->buffer);
+        } else {
                 rc = symtab_addr_lookup((char *) argv->buffer, &addr);
-        
+        }
+
         if (rc == ENOENT)
                 printf("Symbol %s not found.\n", argv->buffer);
-        else if (rc == EINVAL)
-                printf("Invalid address.\n");
         else if (rc == EOVERFLOW) {
                 symtab_print_search((char *) argv->buffer);
-                printf("Duplicate symbol (be more specific) or address overflow.\n");
+                printf("Duplicate symbol, be more specific.\n");
         } else if (rc == EOK) {
                 if (pointer)
@@ -862 +849 @@
                 printf("Writing %#" PRIx64 " -> %p\n", arg1, addr);
                 *(uint32_t *) addr = arg1;
-        } else
+        } else {
                 printf("No symbol information available.\n");
+        }
         
         return 1;
@@ -880 +868 @@
 }
 
-/** Command for dumping sysinfo
+
+/** Command for listings Thread information
  *
  * @param argv Ignores
@@ -886 +875 @@
  * @return Always 1
  */
-int cmd_sysinfo(cmd_arg_t * argv)
-{
-        sysinfo_dump(NULL);
-        return 1;
-}
-
+int cmd_threads(cmd_arg_t * argv)
+{
+        thread_print_list();
+        return 1;
+}
+
+/** Command for listings Task information
+ *
+ * @param argv Ignores
+ *
+ * @return Always 1
+ */
+int cmd_tasks(cmd_arg_t * argv)
+{
+        task_print_list();
+        return 1;
+}
 
 /** Command for listings Thread information
@@ -899 +899 @@
  * @return Always 1
  */
-int cmd_threads(cmd_arg_t * argv)
-{
-        thread_print_list();
-        return 1;
-}
-
-/** Command for listings Task information
- *
- * @param argv Ignores
- *
- * @return Always 1
- */
-int cmd_tasks(cmd_arg_t * argv)
-{
-        task_print_list();
-        return 1;
-}
-
-/** Command for listings Thread information
- *
- * @param argv Ignores
- *
- * @return Always 1
- */
 int cmd_sched(cmd_arg_t * argv)
 {
@@ -937 +913 @@
 int cmd_zones(cmd_arg_t * argv)
 {
-        zones_print_list();
+        zone_print_list();
         return 1;
 }
@@ -1051 +1027 @@
         ipl_t ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
-        uint64_t ucycles0, kcycles0;
-        task_get_accounting(TASK, &ucycles0, &kcycles0);
+        uint64_t t0 = task_get_accounting(TASK);
         spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
@@ -1058 +1033 @@
         /* Execute the test */
         test_quiet = false;
-        const char *ret = test->entry();
+        char *ret = test->entry();
         
         /* Update and read thread accounting */
-        uint64_t ucycles1, kcycles1; 
         ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
-        task_get_accounting(TASK, &ucycles1, &kcycles1);
+        uint64_t dt = task_get_accounting(TASK) - t0;
         spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
         
-        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);
+        uint64_t cycles;
+        char suffix;
+        order(dt, &cycles, &suffix);
+                
+        printf("Time: %" PRIu64 "%c cycles\n", cycles, suffix);
         
         if (ret == NULL) {
@@ -1089 +1061 @@
         uint32_t i;
         bool ret = true;
-        uint64_t ucycles, kcycles;
-        char usuffix, ksuffix;
+        uint64_t cycles;
+        char suffix;
         
         if (cnt < 1)
@@ -1108 +1080 @@
                 ipl_t ipl = interrupts_disable();
                 spinlock_lock(&TASK->lock);
-                uint64_t ucycles0, kcycles0;
-                task_get_accounting(TASK, &ucycles0, &kcycles0);
+                uint64_t t0 = task_get_accounting(TASK);
                 spinlock_unlock(&TASK->lock);
                 interrupts_restore(ipl);
@@ -1115 +1086 @@
                 /* Execute the test */
                 test_quiet = true;
-                const char *ret = test->entry();
+                char * ret = test->entry();
                 
                 /* Update and read thread accounting */
                 ipl = interrupts_disable();
                 spinlock_lock(&TASK->lock);
-                uint64_t ucycles1, kcycles1;
-                task_get_accounting(TASK, &ucycles1, &kcycles1);
+                uint64_t dt = task_get_accounting(TASK) - t0;
                 spinlock_unlock(&TASK->lock);
                 interrupts_restore(ipl);
-
+                
                 if (ret != NULL) {
                         printf("%s\n", ret);
@@ -1131 +1101 @@
                 }
                 
-                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);
+                data[i] = dt;
+                order(dt, &cycles, &suffix);
+                printf("OK (%" PRIu64 "%c cycles)\n", cycles, suffix);
         }
         
@@ -1147 +1115 @@
                 }
                 
-                order_suffix(sum / (uint64_t) cnt, &ucycles, &usuffix);
-                printf("Average\t\t%" PRIu64 "%c\n", ucycles, usuffix);
+                order(sum / (uint64_t) cnt, &cycles, &suffix);
+                printf("Average\t\t%" PRIu64 "%c\n", cycles, suffix);
         }