Changeset dc747e3 in mainline for generic/include/synch

Timestamp:

2005-12-15T10:27:59Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7dd2561

Parents:

3fc03fd

Message:

Add SPINLOCK_DECLARE and SPINLOCK_INITIALIZE macros.
SPINLOCK_DECLARE is to be used instead of direct spinlock_t declarations
in dynamically allocated structures on which spinlock_initialize() is called after
their creation.
SPINLOCK_INITIALIZE is to be used instead of direct spinlock_t declarations
of global spinlocks. It declares and initializes the spinlock.
Moreover, both macros are empty on UP so that -Wall warnings about unused structures
get supressed.

Location:

generic/include/synch

Files:

• rwlock.h (modified) (2 diffs)
• spinlock.h (modified) (2 diffs)
• waitq.h (modified) (1 diff)

generic/include/synch/rwlock.h

@@ -34 +34 @@
 #include <synch/mutex.h>
 #include <synch/synch.h>
+#include <synch/spinlock.h>
 
 enum rwlock_type {
@@ -42 +43 @@
 
 struct rwlock {
-        spinlock_t lock;
+        SPINLOCK_DECLARE(lock);
         mutex_t exclusive;      /**< Mutex for writers, readers can bypass it if readers_in is positive. */
         count_t readers_in;     /**< Number of readers in critical section. */

generic/include/synch/spinlock.h

@@ -42 +42 @@
 };
 
+/*
+ * SPINLOCK_DECLARE is to be used for dynamically allocated spinlocks,
+ * where the lock gets initialized in run time.
+ */
+#define SPINLOCK_DECLARE(slname)        spinlock_t slname
+
+/*
+ * SPINLOCK_INITIALIZE is to be used for statically allocated spinlocks.
+ * It declares and initializes the lock.
+ */
+#ifdef CONFIG_DEBUG_SPINLOCK
+#define SPINLOCK_INITIALIZE(slname)     \
+        spinlock_t slname = {           \
+                .name = #slname,        \
+                .val = 0                \
+        }
+#else
+#define SPINLOCK_INITIALIZE(slname)     \
+        spinlock_t slname = {           \
+                .val = 0                \
+        }
+#endif
+
 extern void spinlock_initialize(spinlock_t *sl, char *name);
 extern void spinlock_lock(spinlock_t *sl);
@@ -49 +72 @@
 #else
 
-struct spinlock {
-};
+/* On UP systems, spinlocks are effectively left out. */
+#define SPINLOCK_DECLARE(name)
+#define SPINLOCK_INITIALIZE(name)
 
 #define spinlock_initialize(x,name)

generic/include/synch/waitq.h

@@ -46 +46 @@
          * Must be acquired before T.lock for each T of type thread_t.
          */
-        spinlock_t lock;
+        SPINLOCK_DECLARE(lock);
 
         int missed_wakeups;     /**< Number of waitq_wakeup() calls that didn't find a thread to wake up. */