Changeset 8137d36 in mainline

Timestamp:

2024-12-23T12:00:16Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

eb31781

Parents:

37a9c1e

Message:

hr: fge: style

File:

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

uspace/srv/bd/hr/fge.c

@@ -59 +59 @@
 
 static void *hr_fpool_make_storage(hr_fpool_t *, ssize_t *);
+static void hr_fpool_group_epilogue(hr_fpool_t *);
 static errno_t fge_fibril(void *);
 static errno_t wu_queue_init(wu_queue_t *, size_t);
@@ -183 +184 @@
 }
 
-static void *hr_fpool_make_storage(hr_fpool_t *pool, ssize_t *rmemslot)
-{
-        fibril_mutex_lock(&pool->lock);
-        ssize_t memslot = hr_fpool_get_free_slot(pool);
-        assert(memslot != -1);
-
-        bitmap_set(&pool->bitmap, memslot, 1);
-
-        fibril_mutex_unlock(&pool->lock);
-
-        if (rmemslot)
-                *rmemslot = memslot;
-
-        return pool->wu_storage + pool->wu_size * memslot;
-}
-
 hr_fgroup_t *hr_fgroup_create(hr_fpool_t *parent, size_t wu_cnt)
 {
@@ -225 +210 @@
                 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->reserved_cnt = taking;
                 parent->wu_storage_free_count = 0;
-                if (result->own_mem == NULL)
-                        goto bad;
         }
 
@@ -313 +298 @@
 }
 
-static void hr_fpool_group_epilogue(hr_fpool_t *pool)
-{
-        fibril_mutex_lock(&pool->lock);
-
-        pool->active_groups--;
-        if (pool->active_groups == 0)
-                fibril_condvar_signal(&pool->all_wus_done);
-
-        fibril_mutex_unlock(&pool->lock);
-}
-
 errno_t hr_fgroup_wait(hr_fgroup_t *group, size_t *rokay, size_t *rfailed)
 {
@@ -355 +329 @@
 
         return rc;
+}
+
+static void *hr_fpool_make_storage(hr_fpool_t *pool, ssize_t *rmemslot)
+{
+        fibril_mutex_lock(&pool->lock);
+        ssize_t memslot = hr_fpool_get_free_slot(pool);
+        assert(memslot != -1);
+
+        bitmap_set(&pool->bitmap, memslot, 1);
+
+        fibril_mutex_unlock(&pool->lock);
+
+        if (rmemslot)
+                *rmemslot = memslot;
+
+        return pool->wu_storage + pool->wu_size * memslot;
+}
+
+static void hr_fpool_group_epilogue(hr_fpool_t *pool)
+{
+        fibril_mutex_lock(&pool->lock);
+
+        pool->active_groups--;
+        if (pool->active_groups == 0)
+                fibril_condvar_signal(&pool->all_wus_done);
+
+        fibril_mutex_unlock(&pool->lock);
 }