Changes in kernel/generic/src/synch/semaphore.c [5df7928:df4ed85] in mainline

File:

• kernel/generic/src/synch/semaphore.c (modified) (5 diffs)

kernel/generic/src/synch/semaphore.c

@@ -33 +33 @@
 /**
  * @file
- * @brief Semaphores.
+ * @brief       Semaphores.
  */
 
@@ -47 +47 @@
  * Initialize semaphore.
  *
- * @param sem Semaphore.
+ * @param s Semaphore.
  * @param val Maximal number of threads allowed to enter critical section.
- *
  */
-void semaphore_initialize(semaphore_t *sem, int val)
+void semaphore_initialize(semaphore_t *s, int val)
 {
-        waitq_initialize(&sem->wq);
-        waitq_count_set(&sem->wq, val);
+        ipl_t ipl;
+        
+        waitq_initialize(&s->wq);
+        
+        ipl = interrupts_disable();
+
+        spinlock_lock(&s->wq.lock);
+        s->wq.missed_wakeups = val;
+        spinlock_unlock(&s->wq.lock);
+
+        interrupts_restore(ipl);
 }
 
@@ -62 +70 @@
  * Conditional mode and mode with timeout can be requested.
  *
- * @param sem   Semaphore.
- * @param usec  Timeout in microseconds.
+ * @param s Semaphore.
+ * @param usec Timeout in microseconds.
  * @param flags Select mode of operation.
  *
@@ -70 +78 @@
  *
  * @return See comment for waitq_sleep_timeout().
- *
  */
-int _semaphore_down_timeout(semaphore_t *sem, uint32_t usec, unsigned int flags)
+int _semaphore_down_timeout(semaphore_t *s, uint32_t usec, int flags)
 {
-        return waitq_sleep_timeout(&sem->wq, usec, flags);
+        return waitq_sleep_timeout(&s->wq, usec, flags); 
 }
 
@@ -82 +89 @@
  *
  * @param s Semaphore.
- *
  */
-void semaphore_up(semaphore_t *sem)
+void semaphore_up(semaphore_t *s)
 {
-        waitq_wakeup(&sem->wq, WAKEUP_FIRST);
-}
-
-/** 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);
+        waitq_wakeup(&s->wq, WAKEUP_FIRST);
 }