Changeset efb8d15 in mainline

Timestamp:

2012-03-02T15:32:13Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

196c253

Parents:

71232af

Message:

dump sysinfo in a more compact way

Files:

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

kernel/generic/src/sysinfo/sysinfo.c

@@ -464 +464 @@
 /** Sysinfo dump indentation helper routine
  *
- * @param depth Number of indentation characters to print.
- *
- */
-NO_TRACE static void sysinfo_indent(unsigned int depth)
-{
-        unsigned int i;
-        for (i = 0; i < depth; i++)
-                printf("  ");
+ * @param depth Number of spaces to print.
+ *
+ */
+NO_TRACE static void sysinfo_indent(size_t spaces)
+{
+        for (size_t i = 0; i < spaces; i++)
+                printf(" ");
 }
 
@@ -478 +477 @@
  * Should be called with sysinfo_lock held.
  *
- * @param root  Root item of the current (sub)tree.
- * @param depth Current depth in the sysinfo tree.
- *
- */
-NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, unsigned int depth)
-{
-        sysinfo_item_t *cur = root;
-        
+ * @param root   Root item of the current (sub)tree.
+ * @param spaces Current indentation level.
+ *
+ */
+NO_TRACE static void sysinfo_dump_internal(sysinfo_item_t *root, size_t spaces)
+{
         /* Walk all siblings */
-        while (cur != NULL) {
-                sysinfo_indent(depth);
+        for (sysinfo_item_t *cur = root; cur; cur = cur->next) {
+                size_t length;
+                
+                if (spaces == 0) {
+                        printf("%s", cur->name);
+                        length = str_length(cur->name);
+                } else {
+                        sysinfo_indent(spaces);
+                        printf(".%s", cur->name);
+                        length = str_length(cur->name) + 1;
+                }
                 
                 sysarg_t val;
@@ -496 +502 @@
                 switch (cur->val_type) {
                 case SYSINFO_VAL_UNDEFINED:
-                        printf("+ %s\n", cur->name);
+                        printf(" [undefined]\n");
                         break;
                 case SYSINFO_VAL_VAL:
-                        printf("+ %s -> %" PRIun" (%#" PRIxn ")\n", cur->name,
-                            cur->val.val, cur->val.val);
+                        printf(" -> %" PRIun" (%#" PRIxn ")\n", cur->val.val,
+                            cur->val.val);
                         break;
                 case SYSINFO_VAL_DATA:
-                        printf("+ %s (%zu bytes)\n", cur->name,
-                            cur->val.data.size);
+                        printf(" (%zu bytes)\n", cur->val.data.size);
                         break;
                 case SYSINFO_VAL_FUNCTION_VAL:
                         val = cur->val.fn_val(cur);
-                        printf("+ %s -> %" PRIun" (%#" PRIxn ") [generated]\n",
-                            cur->name, val, val);
+                        printf(" -> %" PRIun" (%#" PRIxn ") [generated]\n", val,
+                            val);
                         break;
                 case SYSINFO_VAL_FUNCTION_DATA:
                         /* N.B.: No data was actually returned (only a dry run) */
                         (void) cur->val.fn_data(cur, &size, true);
-                        printf("+ %s (%zu bytes) [generated]\n", cur->name,
-                            size);
+                        printf(" (%zu bytes) [generated]\n", size);
                         break;
                 default:
@@ -526 +530 @@
                         break;
                 case SYSINFO_SUBTREE_TABLE:
-                        sysinfo_dump_internal(cur->subtree.table, depth + 1);
+                        sysinfo_dump_internal(cur->subtree.table, spaces + length);
                         break;
                 case SYSINFO_SUBTREE_FUNCTION:
-                        sysinfo_indent(depth + 1);
-                        printf("+ [generated subtree]\n");
+                        sysinfo_indent(spaces + length);
+                        printf("<generated subtree>\n");
                         break;
                 default:
-                        sysinfo_indent(depth + 1);
-                        printf("+ [unknown subtree]\n");
+                        sysinfo_indent(spaces + length);
+                        printf("<unknown subtree>\n");
                 }
-                
-                cur = cur->next;
         }
 }

uspace/app/sysinfo/sysinfo.c

@@ -92 +92 @@
 }
 
-static void print_keys(const char *path)
+static void print_spaces(size_t spaces)
+{
+        for (size_t i = 0; i < spaces; i++)
+                printf(" ");
+}
+
+static void print_keys(const char *path, size_t spaces)
 {
         size_t size;
@@ -103 +109 @@
                 /* Process each key with sanity checks */
                 size_t cur_size = str_nsize(keys + pos, size - pos);
+                if (keys[pos + cur_size] != 0)
+                        break;
+                
                 size_t path_size = str_size(path) + cur_size + 2;
                 char *cur_path = (char *) malloc(path_size);
@@ -108 +117 @@
                         break;
                 
-                if (path[0] != 0)
+                size_t length;
+                
+                if (path[0] != 0) {
+                        print_spaces(spaces);
+                        printf(".%s\n", keys + pos);
+                        length = str_length(keys + pos) + 1;
+                        
                         snprintf(cur_path, path_size, "%s.%s", path, keys + pos);
-                else
+                } else {
+                        printf("%s\n", keys + pos);
+                        length = str_length(keys + pos);
+                        
                         snprintf(cur_path, path_size, "%s", keys + pos);
+                }
                 
-                printf("%s\n", cur_path);
-                print_keys(cur_path);
+                print_keys(cur_path, spaces + length);
                 
                 free(cur_path);
@@ -127 +145 @@
         if (argc != 2) {
                 /* Print keys */
-                print_keys("");
+                print_keys("", 0);
                 return 0;
         }