Changes in kernel/generic/src/sysinfo/sysinfo.c [bab75df6:abf6c01] in mainline

File:

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

kernel/generic/src/sysinfo/sysinfo.c

@@ -204 +204 @@
 
                 *psubtree =
-                    (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0);
-                assert(*psubtree);
+                    (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, FRAME_ATOMIC);
+                if (!*psubtree)
+                        return NULL;
 
                 /* Fill in item name up to the delimiter */
                 (*psubtree)->name = str_ndup(name, i);
-                assert((*psubtree)->name);
+                if (!(*psubtree)->name) {
+                        slab_free(sysinfo_item_cache, *psubtree);
+                        return NULL;
+                }
 
                 /* Create subtree items */
                 if (name[i] == '.') {
                         (*psubtree)->subtree_type = SYSINFO_SUBTREE_TABLE;
-                        return sysinfo_create_path(name + i + 1,
+                        sysinfo_item_t *item = sysinfo_create_path(name + i + 1,
                             &((*psubtree)->subtree.table));
+                        if (!item) {
+                                free((*psubtree)->name);
+                                slab_free(sysinfo_item_cache, *psubtree);
+                        }
+                        return item;
                 }
 
@@ -271 +280 @@
 
                         sysinfo_item_t *item =
-                            (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0);
-                        assert(item);
+                            (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, FRAME_ATOMIC);
+                        if (!item)
+                                return NULL;
 
                         cur->next = item;
@@ -278 +288 @@
                         /* Fill in item name up to the delimiter */
                         item->name = str_ndup(name, i);
-                        assert(item->name);
+                        if (!item->name) {
+                                slab_free(sysinfo_item_cache, item);
+                                return NULL;
+                        }
 
                         /* Create subtree items */
                         if (name[i] == '.') {
                                 item->subtree_type = SYSINFO_SUBTREE_TABLE;
-                                return sysinfo_create_path(name + i + 1,
-                                    &(item->subtree.table));
+                                sysinfo_item_t *sub = sysinfo_create_path(
+                                    name + i + 1, &(item->subtree.table));
+                                if (!sub) {
+                                        free(item->name);
+                                        slab_free(sysinfo_item_cache, item);
+                                        return NULL;
+                                }
+                                return sub;
                         }
 
@@ -294 +313 @@
         }
 
-        /* Unreachable */
-        assert(false);
-        return NULL;
+        unreachable();
 }
 
@@ -320 +337 @@
                 item->val_type = SYSINFO_VAL_VAL;
                 item->val.val = val;
+        } else {
+                printf("Could not set sysinfo item %s.\n", name);
         }
 
@@ -352 +371 @@
                 item->val.data.data = data;
                 item->val.data.size = size;
+        } else {
+                printf("Could not set sysinfo item %s.\n", name);
         }
 
@@ -380 +401 @@
                 item->val.gen_val.fn = fn;
                 item->val.gen_val.data = data;
+        } else {
+                printf("Could not set sysinfo item %s.\n", name);
         }
 
@@ -413 +436 @@
                 item->val.gen_data.fn = fn;
                 item->val.gen_data.data = data;
+        } else {
+                printf("Could not set sysinfo item %s.\n", name);
         }
 
@@ -436 +461 @@
         if (item != NULL)
                 item->val_type = SYSINFO_VAL_UNDEFINED;
+        else
+                printf("Could not set sysinfo item %s.\n", name);
 
         mutex_unlock(&sysinfo_lock);
@@ -468 +495 @@
                 item->subtree.generator.fn = fn;
                 item->subtree.generator.data = data;
+        } else {
+                printf("Could not set sysinfo item %s.\n", name);
         }
 
@@ -656 +685 @@
                 return ret;
 
-        char *path = (char *) nfmalloc(size + 1);
-        assert(path);
+        // TODO: Change this so that allocation is not needed.
+        char *path = malloc(size + 1);
+        if (!path)
+                return ret;
 
         if ((copy_from_uspace(path, ptr, size + 1) == 0) &&
@@ -765 +796 @@
                 return ret;
 
-        char *path = (char *) nfmalloc(size + 1);
-        assert(path);
+        // TODO: Change this so that allocation is not needed.
+        char *path = malloc(size + 1);
+        if (!path)
+                return ret;
 
         if ((copy_from_uspace(path, ptr, size + 1) == 0) &&