Changes in kernel/generic/src/sysinfo/stats.c [1ab8539:9d58539] in mainline

File:

• kernel/generic/src/sysinfo/stats.c (modified) (4 diffs)

kernel/generic/src/sysinfo/stats.c

@@ -80 +80 @@
 static mutex_t load_lock;
 
+/** Get system uptime
+ *
+ * @param item Sysinfo item (unused).
+ * @param data Unused.
+ *
+ * @return System uptime (in secords).
+ *
+ */
+static sysarg_t get_stats_uptime(struct sysinfo_item *item, void *data)
+{
+        /* This doesn't have to be very accurate */
+        return uptime->seconds1;
+}
+
 /** Get statistics of all CPUs
  *
@@ -161 +175 @@
         
         /* Walk the B+ tree and count pages */
-        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t,
-            node) {
+        list_foreach(as->as_area_btree.leaf_list, cur) {
+                btree_node_t *node =
+                    list_get_instance(cur, btree_node_t, leaf_link);
+                
                 unsigned int i;
                 for (i = 0; i < node->keys; i++) {
@@ -202 +218 @@
         
         /* Walk the B+ tree and count pages */
-        list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) {
+        list_foreach(as->as_area_btree.leaf_list, cur) {
+                btree_node_t *node =
+                    list_get_instance(cur, btree_node_t, leaf_link);
+                
                 unsigned int i;
                 for (i = 0; i < node->keys; i++) {
@@ -804 +823 @@
         mutex_initialize(&load_lock, MUTEX_PASSIVE);
         
+        sysinfo_set_item_gen_val("system.uptime", NULL, get_stats_uptime, NULL);
         sysinfo_set_item_gen_data("system.cpus", NULL, get_stats_cpus, NULL);
         sysinfo_set_item_gen_data("system.physmem", NULL, get_stats_physmem, NULL);