Changeset da1bafb in mainline for kernel/generic/src/synch/semaphore.c

Timestamp:

2010-05-24T18:57:31Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0095368

Parents:

666f492

Message:

major code revision

• replace spinlocks taken with interrupts disabled with irq_spinlocks
• change spacing (not indendation) to be tab-size independent
• use unsigned integer types where appropriate (especially bit flags)
• visual separation
• remove argument names in function prototypes
• string changes
• correct some formating directives
• replace various cryptic single-character variables (t, a, m, c, b, etc.) with proper identifiers (thread, task, timeout, as, itm, itc, etc.)
• unify some assembler constructs
• unused page table levels are now optimized out in compile time
• replace several ints (with boolean semantics) with bools
• use specifically sized types instead of generic types where appropriate (size_t, uint32_t, btree_key_t)
• improve comments
• split asserts with conjuction into multiple independent asserts

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 s Semaphore.
+ * @param sem Semaphore.
  * @param val Maximal number of threads allowed to enter critical section.
+ *
  */
-void semaphore_initialize(semaphore_t *s, int val)
+void semaphore_initialize(semaphore_t *sem, int val)
 {
-        ipl_t ipl;
+        waitq_initialize(&sem->wq);
         
-        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);
+        irq_spinlock_lock(&sem->wq.lock, true);
+        sem->wq.missed_wakeups = val;
+        irq_spinlock_unlock(&sem->wq.lock, true);
 }
 
@@ -70 +65 @@
  * Conditional mode and mode with timeout can be requested.
  *
- * @param s Semaphore.
- * @param usec Timeout in microseconds.
+ * @param sem   Semaphore.
+ * @param usec  Timeout in microseconds.
  * @param flags Select mode of operation.
  *
@@ -78 +73 @@
  *
  * @return See comment for waitq_sleep_timeout().
+ *
  */
-int _semaphore_down_timeout(semaphore_t *s, uint32_t usec, int flags)
+int _semaphore_down_timeout(semaphore_t *sem, uint32_t usec, unsigned int flags)
 {
-        return waitq_sleep_timeout(&s->wq, usec, flags); 
+        return waitq_sleep_timeout(&sem->wq, usec, flags);
 }
 
@@ -89 +85 @@
  *
  * @param s Semaphore.
+ *
  */
-void semaphore_up(semaphore_t *s)
+void semaphore_up(semaphore_t *sem)
 {
-        waitq_wakeup(&s->wq, WAKEUP_FIRST);
+        waitq_wakeup(&sem->wq, WAKEUP_FIRST);
 }