Changeset c0d814a in mainline for kernel/generic/include

Timestamp:

2025-04-10T20:02:30Z (9 months ago)

Author:

GitHub <noreply@…>

Children:

b8b031f

Parents:

a92290d (diff), 90dd8aee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Wayne Thornton <wmthornton-dev@…> (2025-04-10 20:02:30)

git-committer:

GitHub <noreply@…> (2025-04-10 20:02:30)

Message:

Merge pull request #6 from HelenOS/master

Merge pending changes from downstream helenos/master

Location:

kernel/generic/include

Files:

• console/console.h (modified) (1 diff)
• synch/condvar.h (modified) (2 diffs)
• synch/mutex.h (modified) (2 diffs)

kernel/generic/include/console/console.h

@@ -76 +76 @@
 extern sysarg_t sys_debug_console(void);
 
+extern void console_lock(void);
+extern void console_unlock(void);
+
 #endif /* KERN_CONSOLE_H_ */
 

kernel/generic/include/synch/condvar.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2025 Jiří Zárevúcky
  * All rights reserved.
  *
@@ -53 +54 @@
         condvar_t name = CONDVAR_INITIALIZER(name)
 
-#ifdef CONFIG_SMP
-#define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \
-        _condvar_wait_timeout_spinlock_impl((cv), (lock), (usec), (flags))
-#else
-#define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \
-        _condvar_wait_timeout_spinlock_impl((cv), NULL, (usec), (flags))
-#endif
-
 extern void condvar_initialize(condvar_t *cv);
 extern void condvar_signal(condvar_t *cv);
 extern void condvar_broadcast(condvar_t *cv);
 
-extern errno_t condvar_wait(condvar_t *cv, mutex_t *mtx);
-extern errno_t condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec);
+extern errno_t __condvar_wait_mutex(condvar_t *cv, mutex_t *mtx);
+extern errno_t __condvar_wait_spinlock(condvar_t *cv, spinlock_t *mtx);
+extern errno_t __condvar_wait_irq_spinlock(condvar_t *cv, irq_spinlock_t *mtx);
+extern errno_t __condvar_wait_timeout_mutex(condvar_t *cv, mutex_t *mtx, uint32_t usec);
+extern errno_t __condvar_wait_timeout_spinlock(condvar_t *cv, spinlock_t *mtx, uint32_t usec);
+extern errno_t __condvar_wait_timeout_irq_spinlock(condvar_t *cv, irq_spinlock_t *mtx, uint32_t usec);
 
-extern errno_t _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock,
-    uint32_t usec, int flags);
-extern errno_t _condvar_wait_timeout_irq_spinlock(condvar_t *cv,
-    irq_spinlock_t *irq_lock, uint32_t usec, int flags);
+#define condvar_wait(cv, mtx) (_Generic((mtx), \
+        mutex_t *: __condvar_wait_mutex, \
+        spinlock_t *: __condvar_wait_spinlock, \
+        irq_spinlock_t *: __condvar_wait_irq_spinlock \
+)(cv, mtx))
+
+#define condvar_wait_timeout(cv, mtx, usec) (_Generic((mtx), \
+        mutex_t *: __condvar_wait_timeout_mutex, \
+        spinlock_t *: __condvar_wait_timeout_spinlock, \
+        irq_spinlock_t *: __condvar_wait_timeout_irq_spinlock \
+)(cv, mtx))
 
 #endif

kernel/generic/include/synch/mutex.h

@@ -44 +44 @@
         MUTEX_PASSIVE,
         MUTEX_RECURSIVE,
-        MUTEX_ACTIVE
 } mutex_type_t;
 
@@ -51 +50 @@
 typedef struct {
         mutex_type_t type;
+        int nesting;
         semaphore_t sem;
-        struct thread *owner;
-        unsigned nesting;
+        _Atomic(struct thread *) owner;
 } mutex_t;
 
 #define MUTEX_INITIALIZER(name, mtype) (mutex_t) { \
         .type = (mtype), \
+        .nesting = 0, \
         .sem = SEMAPHORE_INITIALIZER((name).sem, 1), \
         .owner = NULL, \
-        .nesting = 0, \
 }