Changeset b1c57a8 in mainline for kernel/generic/src/console

Timestamp:

2014-10-09T15:03:55Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (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 from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

Location:

kernel/generic/src/console

Files:

• chardev.c (modified) (1 diff)
• cmd.c (modified) (5 diffs)
• console.c (modified) (1 diff)
• kconsole.c (modified) (1 diff)

kernel/generic/src/console/chardev.c

@@ -39 +39 @@
 #include <print.h>
 #include <func.h>
-#include <arch.h>
+#include <cpu.h>
 
 /** Initialize input character device.

kernel/generic/src/console/cmd.c

@@ -70 +70 @@
 #include <sysinfo/sysinfo.h>
 #include <symtab.h>
+#include <synch/workqueue.h>
+#include <synch/rcu.h>
 #include <errno.h>
 
@@ -526 +528 @@
 };
 
+/* 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
+};
+
 /* Data and methods for 'ipc' command */
 static int cmd_ipc(cmd_arg_t *argv);
@@ -589 +609 @@
         &physmem_info,
         &reboot_info,
+        &rcu_info,
         &sched_info,
         &set4_info,
@@ -599 +620 @@
         &uptime_info,
         &version_info,
+        &workq_info,
         &zones_info,
         &zone_info,
@@ -1270 +1292 @@
 {
         sched_print_list();
+        return 1;
+}
+
+/** 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;
 }

kernel/generic/src/console/console.c

@@ -53 +53 @@
 #include <str.h>
 #include <abi/kio.h>
+#include <mm/frame.h> /* SIZE2FRAMES */
+#include <mm/slab.h>  /* malloc */
 
 #define KIO_PAGES    8

kernel/generic/src/console/kconsole.c

@@ -59 +59 @@
 #include <putchar.h>
 #include <str.h>
+#include <mm/slab.h>
 
 /** Simple kernel console.