Changes in kernel/generic/src/console/cmd.c [3266412:2f33fbc] in mainline

File:

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

kernel/generic/src/console/cmd.c

@@ -45 +45 @@
 #include <console/kconsole.h>
 #include <print.h>
-#include <log.h>
 #include <panic.h>
 #include <typedefs.h>
@@ -70 +69 @@
 #include <sysinfo/sysinfo.h>
 #include <symtab.h>
-#include <synch/workqueue.h>
-#include <synch/rcu.h>
 #include <errno.h>
 
@@ -206 +203 @@
         .func = cmd_test,
         .argc = 1,
-        .argv = test_argv,
-        .hints_enum = tests_hints_enum
+        .argv = test_argv
 };
 
@@ -247 +243 @@
         .func = cmd_desc,
         .argc = 1,
-        .argv = &desc_argv,
-        .hints_enum = cmdtab_enum
+        .argv = &desc_argv
 };
 
@@ -264 +259 @@
         .func = cmd_symaddr,
         .argc = 1,
-        .argv = &symaddr_argv,
-        .hints_enum = symtab_hints_enum,
+        .argv = &symaddr_argv
 };
 
@@ -306 +300 @@
         .func = cmd_call0,
         .argc = 1,
-        .argv = &call0_argv,
-        .hints_enum = symtab_hints_enum
+        .argv = &call0_argv
 };
 
@@ -322 +315 @@
         .func = cmd_mcall0,
         .argc = 1,
-        .argv = &mcall0_argv,
-        .hints_enum = symtab_hints_enum
+        .argv = &mcall0_argv
 };
 
@@ -345 +337 @@
         .func = cmd_call1,
         .argc = 2,
-        .argv = call1_argv,
-        .hints_enum = symtab_hints_enum
+        .argv = call1_argv
 };
 
@@ -373 +364 @@
         .func = cmd_call2,
         .argc = 3,
-        .argv = call2_argv,
-        .hints_enum = symtab_hints_enum
+        .argv = call2_argv
 };
 
@@ -407 +397 @@
         .func = cmd_call3,
         .argc = 4,
-        .argv = call3_argv,
-        .hints_enum = symtab_hints_enum
+        .argv = call3_argv
 };
 
@@ -534 +523 @@
         .argc = 1,
         .argv = &zone_argv
-};
-
-/* Data and methods for the 'workq' command */
-static int cmd_workq(cmd_arg_t *argv);
-static cmd_info_t workq_info = {
-        .name = "workq",
-        .description = "Show global workq information.",
-        .func = cmd_workq,
-        .argc = 0
-};
-
-/* Data and methods for the 'workq' command */
-static int cmd_rcu(cmd_arg_t *argv);
-static cmd_info_t rcu_info = {
-        .name = "rcu",
-        .description = "Show RCU run-time statistics.",
-        .func = cmd_rcu,
-        .argc = 0
 };
 
@@ -617 +588 @@
         &physmem_info,
         &reboot_info,
-        &rcu_info,
         &sched_info,
         &set4_info,
@@ -628 +598 @@
         &uptime_info,
         &version_info,
-        &workq_info,
         &zones_info,
         &zone_info,
@@ -670 +639 @@
         for (i = 0; basic_commands[i]; i++) {
                 if (!cmd_register(basic_commands[i])) {
-                        log(LF_OTHER, LVL_ERROR,
-                            "Cannot register command %s",
+                        printf("Cannot register command %s\n",
                             basic_commands[i]->name);
                 }
@@ -688 +656 @@
         
         size_t len = 0;
-        list_foreach(cmd_list, link, cmd_info_t, hlp) {
+        list_foreach(cmd_list, cur) {
+                cmd_info_t *hlp;
+                hlp = list_get_instance(cur, cmd_info_t, link);
+                
                 spinlock_lock(&hlp->lock);
                 if (str_length(hlp->name) > len)
@@ -697 +668 @@
         unsigned int _len = (unsigned int) len;
         if ((_len != len) || (((int) _len) < 0)) {
-                log(LF_OTHER, LVL_ERROR, "Command length overflow");
+                printf("Command length overflow\n");
                 return 1;
         }
         
-        list_foreach(cmd_list, link, cmd_info_t, hlp) {
+        list_foreach(cmd_list, cur) {
+                cmd_info_t *hlp;
+                hlp = list_get_instance(cur, cmd_info_t, link);
+                
                 spinlock_lock(&hlp->lock);
                 printf("%-*s %s\n", _len, hlp->name, hlp->description);
@@ -938 +912 @@
         spinlock_lock(&cmd_lock);
         
-        list_foreach(cmd_list, link, cmd_info_t, hlp) {
+        list_foreach(cmd_list, cur) {
+                cmd_info_t *hlp;
+                
+                hlp = list_get_instance(cur, cmd_info_t, link);
                 spinlock_lock(&hlp->lock);
                 
@@ -1179 +1156 @@
 int cmd_set4(cmd_arg_t *argv)
 {
-        uintptr_t addr = 0; // Prevent -Werror=maybe-uninitialized
+        uintptr_t addr;
         uint32_t arg1 = argv[1].intval;
         bool pointer = false;
@@ -1303 +1280 @@
 }
 
-/** Prints information about the global work queue.
- *
- * @param argv Ignores
- *
- * @return Always 1
- */
-int cmd_workq(cmd_arg_t *argv)
-{
-        workq_global_print_info();
-        return 1;
-}
-
-/** Prints RCU statistics.
- *
- * @param argv Ignores
- *
- * @return Always 1
- */
-int cmd_rcu(cmd_arg_t *argv)
-{
-        rcu_print_stat();
-        return 1;
-}
-
 /** Command for listing memory zones
  *
@@ -1411 +1364 @@
         printf("The kernel will now relinquish the console.\n");
         release_console();
+        
+        event_notify_0(EVENT_KCONSOLE, false);
         indev_pop_character(stdin);