Changeset da1bafb in mainline for kernel/generic/include/synch/rwlock.h

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/include/synch/rwlock.h (modified) (2 diffs)

kernel/generic/include/synch/rwlock.h

@@ -48 +48 @@
 
 typedef struct {
-        SPINLOCK_DECLARE(lock);
+        IRQ_SPINLOCK_DECLARE(lock);
+        
         /**
          * Mutex for writers, readers can bypass it if readers_in is positive.
+         *
          */
         mutex_t exclusive;
+        
         /** Number of readers in critical section. */
         size_t readers_in;
@@ -59 +62 @@
 #define rwlock_write_lock(rwl) \
         _rwlock_write_lock_timeout((rwl), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
+
 #define rwlock_read_lock(rwl) \
         _rwlock_read_lock_timeout((rwl), SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE)
+
 #define rwlock_write_trylock(rwl) \
         _rwlock_write_lock_timeout((rwl), SYNCH_NO_TIMEOUT, \
             SYNCH_FLAGS_NON_BLOCKING)
+
 #define rwlock_read_trylock(rwl) \
         _rwlock_read_lock_timeout((rwl), SYNCH_NO_TIMEOUT, \
             SYNCH_FLAGS_NON_BLOCKING)
+
 #define rwlock_write_lock_timeout(rwl, usec) \
         _rwlock_write_lock_timeout((rwl), (usec), SYNCH_FLAGS_NONE)
+
 #define rwlock_read_lock_timeout(rwl, usec) \
         _rwlock_read_lock_timeout((rwl), (usec), SYNCH_FLAGS_NONE)
 
-extern void rwlock_initialize(rwlock_t *rwl);
-extern void rwlock_read_unlock(rwlock_t *rwl);
-extern void rwlock_write_unlock(rwlock_t *rwl);
-extern int _rwlock_read_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags);
-extern int _rwlock_write_lock_timeout(rwlock_t *rwl, uint32_t usec, int flags);
+extern void rwlock_initialize(rwlock_t *);
+extern void rwlock_read_unlock(rwlock_t *);
+extern void rwlock_write_unlock(rwlock_t *);
+extern int _rwlock_read_lock_timeout(rwlock_t *, uint32_t, unsigned int);
+extern int _rwlock_write_lock_timeout(rwlock_t *, uint32_t, unsigned int);
 
 #endif