Changeset d574c11 in mainline

Timestamp:

2025-06-17T13:27:48Z (4 days ago)

Author:

Miroslav Cimerman <mc@…>

Children:

66ef60b

Parents:

f0950d2

Message:

hr: fge: use malloc_waitok()

File:

• uspace/srv/bd/hr/fge.c (modified) (9 diffs)

uspace/srv/bd/hr/fge.c

@@ -52 +52 @@
 
 #include "fge.h"
+#include "util.h"
 
 static void *hr_fpool_make_storage(hr_fpool_t *, ssize_t *);
@@ -64 +65 @@
     size_t wu_storage_size)
 {
-        /* TODO: allow wu_storage_size to be 0 (we want to save mem) */
         assert(max_wus > 0 && wu_storage_size > 0);
 
@@ -102 +102 @@
                 result->fibrils[i] = fibril_create(fge_fibril, result);
                 fibril_start(result->fibrils[i]);
+                /* fibril_detach(result->fibrils[i]); */
         }
 
@@ -139 +140 @@
         assert(wu_cnt > 0);
 
-        /*
-         * XXX: we can also get rid of this malloc() call,
-         * somewhat...
-         *
-         * Have some fgroups also pre-allocated for maximum
-         * pre-allocation power :-)
-         */
-        hr_fgroup_t *result = malloc(sizeof(hr_fgroup_t));
-        if (result == NULL)
-                return NULL;
+        hr_fgroup_t *result = malloc_waitok(sizeof(hr_fgroup_t));
 
         result->reserved_cnt = 0;
@@ -169 +161 @@
                  */
                 size_t taking = parent->wu_storage_free_count;
-                result->own_mem = malloc(parent->wu_size * (wu_cnt - taking));
-                if (result->own_mem == NULL)
-                        goto bad;
+                result->own_mem = malloc_waitok(parent->wu_size * (wu_cnt - taking));
                 result->reserved_cnt = taking;
                 parent->wu_storage_free_count = 0;
@@ -178 +168 @@
         if (result->reserved_cnt > 0) {
                 result->memslots =
-                    malloc(sizeof(size_t) * result->reserved_cnt);
-                if (result->memslots == NULL)
-                        goto bad;
+                    malloc_waitok(sizeof(size_t) * result->reserved_cnt);
         }
 
@@ -198 +186 @@
 
         return result;
-
-bad:
-        parent->wu_storage_free_count += result->reserved_cnt;
-        fibril_mutex_unlock(&parent->lock);
-
-        if (result->memslots != NULL)
-                free(result->memslots);
-        if (result->own_mem != NULL)
-                free(result->own_mem);
-        free(result);
-
-        return NULL;
 }
 
@@ -217 +193 @@
 
         fibril_mutex_lock(&group->lock);
+
+        assert(group->submitted < group->wu_cnt);
 
         if (group->reserved_avail > 0) {
@@ -225 +203 @@
                 group->memslots[group->submitted] = memslot;
         } else {
+                assert(group->own_mem != NULL);
                 storage =
                     group->own_mem + group->pool->wu_size * group->own_used;