Changeset 5869ce0 in mainline for kernel/generic/src

Timestamp:

2012-03-01T23:22:32Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0030eef

Parents:

3d23553

Message:

extend sysinfo generated subtree interface

Location:

kernel/generic/src/sysinfo

Files:

• stats.c (modified) (7 diffs)
• sysinfo.c (modified) (3 diffs)

kernel/generic/src/sysinfo/stats.c

@@ -451 +451 @@
  * @param name    Task ID (string-encoded number).
  * @param dry_run Do not get the data, just calculate the size.
+ * @param data    Unused.
  *
  * @return Sysinfo return holder. The type of the returned
@@ -460 +461 @@
  *
  */
-static sysinfo_return_t get_stats_task(const char *name, bool dry_run)
+static sysinfo_return_t get_stats_task(const char *name, bool dry_run,
+    void *data)
 {
         /* Initially no return value */
@@ -520 +522 @@
  * @param name    Thread ID (string-encoded number).
  * @param dry_run Do not get the data, just calculate the size.
+ * @param data    Unused.
  *
  * @return Sysinfo return holder. The type of the returned
@@ -529 +532 @@
  *
  */
-static sysinfo_return_t get_stats_thread(const char *name, bool dry_run)
+static sysinfo_return_t get_stats_thread(const char *name, bool dry_run,
+    void *data)
 {
         /* Initially no return value */
@@ -634 +638 @@
  * @param name    Exception number (string-encoded number).
  * @param dry_run Do not get the data, just calculate the size.
+ * @param data    Unused.
  *
  * @return Sysinfo return holder. The type of the returned
@@ -643 +648 @@
  *
  */
-static sysinfo_return_t get_stats_exception(const char *name, bool dry_run)
+static sysinfo_return_t get_stats_exception(const char *name, bool dry_run,
+    void *data)
 {
         /* Initially no return value */
@@ -817 +823 @@
         sysinfo_set_item_fn_data("system.threads", NULL, get_stats_threads);
         sysinfo_set_item_fn_data("system.exceptions", NULL, get_stats_exceptions);
-        sysinfo_set_subtree_fn("system.tasks", NULL, get_stats_task);
-        sysinfo_set_subtree_fn("system.threads", NULL, get_stats_thread);
-        sysinfo_set_subtree_fn("system.exceptions", NULL, get_stats_exception);
+        sysinfo_set_subtree_fn("system.tasks", NULL, get_stats_task, NULL);
+        sysinfo_set_subtree_fn("system.threads", NULL, get_stats_thread, NULL);
+        sysinfo_set_subtree_fn("system.exceptions", NULL, get_stats_exception, NULL);
 }
 

kernel/generic/src/sysinfo/sysinfo.c

@@ -151 +151 @@
                         case SYSINFO_SUBTREE_FUNCTION:
                                 /* Get generated data */
-                                **ret = cur->subtree.get_data(name + i + 1, dry_run);
+                                **ret = cur->subtree.generator.fn(name + i + 1, dry_run,
+                                    cur->subtree.generator.data);
                                 return NULL;
                         default:
@@ -431 +432 @@
  *             a new root item (NULL for global sysinfo root).
  * @param fn   Subtree generator function.
+ * @param data Private data to be passed to the generator.
  *
  */
 void sysinfo_set_subtree_fn(const char *name, sysinfo_item_t **root,
-    sysinfo_fn_subtree_t fn)
+    sysinfo_fn_subtree_t fn, void *data)
 {
         /* Protect sysinfo tree consistency */
@@ -448 +450 @@
         if ((item != NULL) && (item->subtree_type != SYSINFO_SUBTREE_TABLE)) {
                 item->subtree_type = SYSINFO_SUBTREE_FUNCTION;
-                item->subtree.get_data = fn;
+                item->subtree.generator.fn = fn;
+                item->subtree.generator.data = data;
         }