Changeset 597fa24 in mainline for kernel/generic/include/synch

Timestamp:

2025-04-09T16:19:40Z (9 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

9f945464, a188131

Parents:

3e7948c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-09 16:08:09)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-09 16:19:40)

Message:

Enable static initialization of kernel synchronization primitives

Location:

kernel/generic/include/synch

Files:

• condvar.h (modified) (1 diff)
• mutex.h (modified) (1 diff)
• semaphore.h (modified) (1 diff)
• waitq.h (modified) (1 diff)

kernel/generic/include/synch/condvar.h

@@ -46 +46 @@
 } condvar_t;
 
+#define CONDVAR_INITIALIZER(name) (condvar_t) { \
+        .wq = WAITQ_INITIALIZER((name).wq), \
+}
+
+#define CONDVAR_INITIALIZE(name) \
+        condvar_t name = CONDVAR_INITIALIZER(name)
+
 #ifdef CONFIG_SMP
 #define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \

kernel/generic/include/synch/mutex.h

@@ -56 +56 @@
 } mutex_t;
 
+#define MUTEX_INITIALIZER(name, mtype) (mutex_t) { \
+        .type = (mtype), \
+        .sem = SEMAPHORE_INITIALIZER((name).sem, 1), \
+        .owner = NULL, \
+        .nesting = 0, \
+}
+
+#define MUTEX_INITIALIZE(name, mtype) \
+        mutex_t name = MUTEX_INITIALIZER(name, mtype)
+
 extern void mutex_initialize(mutex_t *, mutex_type_t);
 extern bool mutex_locked(mutex_t *);

kernel/generic/include/synch/semaphore.h

@@ -45 +45 @@
 } semaphore_t;
 
+#define SEMAPHORE_INITIALIZER(name, count) (semaphore_t) { \
+        .wq = WAITQ_INITIALIZER_WITH_COUNT((name).wq, count), \
+}
+
+#define SEMAPHORE_INITIALIZE(name, count) \
+        semaphore_t name = SEMAPHORE_INITIALIZER(name, count)
+
 extern void semaphore_initialize(semaphore_t *, int);
 extern errno_t semaphore_down_timeout(semaphore_t *, uint32_t);

kernel/generic/include/synch/waitq.h

@@ -40 +40 @@
 #include <abi/synch.h>
 #include <adt/list.h>
+
+#define WAITQ_INITIALIZER_WITH_COUNT(name, count) (waitq_t) { \
+        .lock = IRQ_SPINLOCK_INITIALIZER(#name ".lock"), \
+        .sleepers = LIST_INITIALIZER((name).sleepers), \
+        .wakeup_balance = (count), \
+}
+
+#define WAITQ_INITIALIZER(name) WAITQ_INITIALIZER_WITH_COUNT(name, 0)
+
+#define WAITQ_INITIALIZE_WITH_COUNT(name, count) \
+        waitq_t name = WAITQ_INITIALIZER_WITH_COUNT(name, count)
+
+#define WAITQ_INITIALIZE(name) \
+        waitq_t name = WAITQ_INITIALIZER(name)
 
 /** Wait queue structure.