WebSVN – HelenOS – Diff – //branches/dynload/kernel/generic/src/console/cmd.c

 /** @addtogroup genericconsole
  * @{
  */
 /**
- * @file    cmd.c
+ * @file  cmd.c
- * @brief   Kernel console command wrappers.
+ * @brief Kernel console command wrappers.
+ *
  * This file is meant to contain all wrapper functions for
  * all kconsole commands. The point is in separating
  * kconsole specific wrappers from kconsole-unaware functions
  * from other subsystems.
 #include <proc/scheduler.h>
 #include <proc/thread.h>
 #include <proc/task.h>
 #include <ipc/ipc.h>
 #include <ipc/irq.h>
-#include <event/event.h>
+#include <ipc/event.h>
 #include <symtab.h>
 #include <errno.h>
 #ifdef CONFIG_TEST
 #include <test.h>
 int cmd_help(cmd_arg_t *argv)
+{
     spinlock_lock(&cmd_lock);
     link_t *cur;
-    size_t len = 0;
+    count_t len = 0;
     for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
         cmd_info_t *hlp;
         hlp = list_get_instance(cur, cmd_info_t, link);
         spinlock_lock(&hlp->lock);
-        if (strlen(hlp->name) > len)
+        if (str_length(hlp->name) > len)
-            len = strlen(hlp->name);
+            len = str_length(hlp->name);
         spinlock_unlock(&hlp->lock);
+    }
     for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
         cmd_info_t *hlp;
  * @return 0 on failure, 1 on success.
  */
 int cmd_desc(cmd_arg_t *argv)
+{
     link_t *cur;
     spinlock_lock(&cmd_lock);
     for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
         cmd_info_t *hlp;
         hlp = list_get_instance(cur, cmd_info_t, link);
         spinlock_lock(&hlp->lock);
-        if (strncmp(hlp->name, (const char *) argv->buffer, strlen(hlp->name)) == 0) {
+        if (str_lcmp(hlp->name, (const char *) argv->buffer, str_length(hlp->name)) == 0) {
             printf("%s - %s\n", hlp->name, hlp->description);
             if (hlp->help)
                 hlp->help();
             spinlock_unlock(&hlp->lock);
             break;
+        }
         spinlock_unlock(&hlp->lock);
+    }
     spinlock_unlock(&cmd_lock);
     return 1;
+}
 /** Search symbol table */
 int cmd_symaddr(cmd_arg_t *argv)
+{
     printf("The kernel will now relinquish the console.\n");
     release_console();
     event_notify_0(EVENT_KCONSOLE);
+    indev_pop_character(stdin);
     return 1;
+}
 #ifdef CONFIG_TEST
+ *
  * return Always 1.
  */
 int cmd_tests(cmd_arg_t *argv)
+{
-    size_t len = 0;
+    count_t len = 0;
     test_t *test;
     for (test = tests; test->name != NULL; test++) {
-        if (strlen(test->name) > len)
+        if (str_length(test->name) > len)
-            len = strlen(test->name);
+            len = str_length(test->name);
+    }
     for (test = tests; test->name != NULL; test++)
         printf("%-*s %s%s\n", len, test->name, test->desc, (test->safe ? "" : " (unsafe)"));
     uint64_t t0 = task_get_accounting(TASK);
     spinlock_unlock(&TASK->lock);
     interrupts_restore(ipl);
     /* Execute the test */
+    test_quiet = false;
-    char * ret = test->entry(false);
+    char *ret = test->entry();
     /* Update and read thread accounting */
     ipl = interrupts_disable();
     spinlock_lock(&TASK->lock);
     uint64_t dt = task_get_accounting(TASK) - t0;
         uint64_t t0 = task_get_accounting(TASK);
         spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
         /* Execute the test */
+        test_quiet = true;
-        char * ret = test->entry(true);
+        char * ret = test->entry();
         /* Update and read thread accounting */
         ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
         uint64_t dt = task_get_accounting(TASK) - t0;
  */
 int cmd_test(cmd_arg_t *argv)
+{
     test_t *test;
-    if (strcmp((char *) argv->buffer, "*") == 0) {
+    if (str_cmp((char *) argv->buffer, "*") == 0) {
         for (test = tests; test->name != NULL; test++) {
             if (test->safe) {
                 printf("\n");
                 if (!run_test(test))
                     break;
+        }
     } else {
         bool fnd = false;
         for (test = tests; test->name != NULL; test++) {
-            if (strcmp(test->name, (char *) argv->buffer) == 0) {
+            if (str_cmp(test->name, (char *) argv->buffer) == 0) {
                 fnd = true;
                 run_test(test);
                 break;
+            }
+        }
 int cmd_bench(cmd_arg_t *argv)
+{
     test_t *test;
     uint32_t cnt = argv[1].intval;
-    bool fnd = false;
+    if (str_cmp((char *) argv->buffer, "*") == 0) {
-    for (test = tests; test->name != NULL; test++) {
+        for (test = tests; test->name != NULL; test++) {
-        if (strcmp(test->name, (char *) argv->buffer) == 0) {
-            fnd = true;
-            if (test->safe)
+            if (test->safe) {
-                run_bench(test, cnt);
+                if (!run_bench(test, cnt))
-            else
+                    break;
-                printf("Unsafe test\n");
+            }
-            break;
+        }
-    }
+    } else {
+        bool fnd = false;
+        for (test = tests; test->name != NULL; test++) {
+            if (str_cmp(test->name, (char *) argv->buffer) == 0) {
+                fnd = true;
+                if (test->safe)
+                    run_bench(test, cnt);
+                else
+                    printf("Unsafe test\n");
+                break;
+            }
+        }
-    if (!fnd)
+        if (!fnd)
-        printf("Unknown test\n");
+            printf("Unknown test\n");
+    }
     return 1;
+}
 #endif

Subversion Repositories HelenOS

(root)//branches/dynload/kernel/generic/src/console/cmd.c – Rev 4347 → 4348