Changeset 4c78104 in mainline

Timestamp:

2023-02-09T16:55:34Z (14 months ago)

Author:

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

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e994898

Parents:

c0b54c9

Message:

Get rid of waitq_count_get/set

Location:

kernel/generic

Files:

• include/synch/semaphore.h (modified) (1 diff)
• include/synch/waitq.h (modified) (2 diffs)
• src/synch/mutex.c (modified) (1 diff)
• src/synch/semaphore.c (modified) (2 diffs)
• src/synch/waitq.c (modified) (2 diffs)

kernel/generic/include/synch/semaphore.h

@@ -51 +51 @@
 extern void semaphore_down(semaphore_t *);
 extern void semaphore_up(semaphore_t *);
-extern int semaphore_count_get(semaphore_t *);
 
 #endif

kernel/generic/include/synch/waitq.h

@@ -72 +72 @@
 
 extern void waitq_initialize(waitq_t *);
+extern void waitq_initialize_with_count(waitq_t *, int);
 extern errno_t waitq_sleep(waitq_t *);
 extern errno_t waitq_sleep_timeout(waitq_t *, uint32_t, unsigned int, bool *);
@@ -81 +82 @@
 extern void _waitq_wakeup_unsafe(waitq_t *, wakeup_mode_t);
 extern void waitq_interrupt_sleep(struct thread *);
-extern int waitq_count_get(waitq_t *);
-extern void waitq_count_set(waitq_t *, int val);
 
 #endif

kernel/generic/src/synch/mutex.c

@@ -66 +66 @@
 bool mutex_locked(mutex_t *mtx)
 {
-        return semaphore_count_get(&mtx->sem) <= 0;
+        bool success = semaphore_trydown(&mtx->sem);
+        if (success) {
+                semaphore_up(&mtx->sem);
+        }
+        return !success;
 }
 

kernel/generic/src/synch/semaphore.c

@@ -52 +52 @@
 void semaphore_initialize(semaphore_t *sem, int val)
 {
-        waitq_initialize(&sem->wq);
-        if (val != 0)
-                waitq_count_set(&sem->wq, val);
+        waitq_initialize_with_count(&sem->wq, val);
 }
 
@@ -100 +98 @@
 }
 
-/** Get the semaphore counter value.
- *
- * @param sem           Semaphore.
- * @return              The number of threads that can down the semaphore
- *                      without blocking.
- */
-int semaphore_count_get(semaphore_t *sem)
-{
-        return waitq_count_get(&sem->wq);
-}
-
 /** @}
  */

kernel/generic/src/synch/waitq.c

@@ -75 +75 @@
         irq_spinlock_initialize(&wq->lock, "wq.lock");
         list_initialize(&wq->sleepers);
+}
+
+void waitq_initialize_with_count(waitq_t *wq, int count)
+{
+        memsetb(wq, sizeof(*wq), 0);
+        irq_spinlock_initialize(&wq->lock, "wq.lock");
+        list_initialize(&wq->sleepers);
+        wq->missed_wakeups = count;
 }
 
@@ -545 +553 @@
 }
 
-/** Get the missed wakeups count.
- *
- * @param wq    Pointer to wait queue.
- * @return      The wait queue's missed_wakeups count.
- */
-int waitq_count_get(waitq_t *wq)
-{
-        int cnt;
-
-        irq_spinlock_lock(&wq->lock, true);
-        cnt = wq->missed_wakeups;
-        irq_spinlock_unlock(&wq->lock, true);
-
-        return cnt;
-}
-
-/** Set the missed wakeups count.
- *
- * @param wq    Pointer to wait queue.
- * @param val   New value of the missed_wakeups count.
- */
-void waitq_count_set(waitq_t *wq, int val)
-{
-        irq_spinlock_lock(&wq->lock, true);
-        wq->missed_wakeups = val;
-        irq_spinlock_unlock(&wq->lock, true);
-}
-
 /** @}
  */