Changeset 89c57b6 in mainline for uspace/lib/c/include/fibril_synch.h

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/include/fibril_synch.h (modified) (6 diffs)

uspace/lib/c/include/fibril_synch.h

@@ -43 +43 @@
 
 typedef struct {
+        fibril_owner_info_t oi;         /* Keep this the first thing. */
         int counter;
         link_t waiters;
 } fibril_mutex_t;
 
-#define FIBRIL_MUTEX_INITIALIZE(name) \
-        fibril_mutex_t name = { \
+#define FIBRIL_MUTEX_INITIALIZER(name) \
+        { \
+                .oi = { \
+                        .owned_by = NULL \
+                }, \
                 .counter = 1, \
                 .waiters = { \
@@ -55 +59 @@
                 } \
         }
+        
+#define FIBRIL_MUTEX_INITIALIZE(name) \
+        fibril_mutex_t name = FIBRIL_MUTEX_INITIALIZER(name) 
 
 typedef struct {
+        fibril_owner_info_t oi; /* Keep this the first thing. */
         unsigned writers;
         unsigned readers;
@@ -62 +70 @@
 } fibril_rwlock_t;
 
-#define FIBRIL_RWLOCK_INITIALIZE(name) \
-        fibril_rwlock_t name = { \
+#define FIBRIL_RWLOCK_INITIALIZER(name) \
+        { \
+                .oi = { \
+                        .owned_by = NULL \
+                }, \
                 .readers = 0, \
                 .writers = 0, \
@@ -72 +83 @@
         }
 
+#define FIBRIL_RWLOCK_INITIALIZE(name) \
+        fibril_rwlock_t name = FIBRIL_RWLOCK_INITIALIZER(name)
+
 typedef struct {
         link_t waiters;
 } fibril_condvar_t;
 
-#define FIBRIL_CONDVAR_INITIALIZE(name) \
-        fibril_condvar_t name = { \
+#define FIBRIL_CONDVAR_INITIALIZER(name) \
+        { \
                 .waiters = { \
                         .next = &name.waiters, \
@@ -84 +98 @@
         }
 
+#define FIBRIL_CONDVAR_INITIALIZE(name) \
+        fibril_condvar_t name = FIBRIL_CONDVAR_INITIALIZER(name)
+
 extern void fibril_mutex_initialize(fibril_mutex_t *);
 extern void fibril_mutex_lock(fibril_mutex_t *);
 extern bool fibril_mutex_trylock(fibril_mutex_t *);
 extern void fibril_mutex_unlock(fibril_mutex_t *);
+extern bool fibril_mutex_is_locked(fibril_mutex_t *);
 
 extern void fibril_rwlock_initialize(fibril_rwlock_t *);
@@ -94 +112 @@
 extern void fibril_rwlock_read_unlock(fibril_rwlock_t *);
 extern void fibril_rwlock_write_unlock(fibril_rwlock_t *);
+extern bool fibril_rwlock_is_read_locked(fibril_rwlock_t *);
+extern bool fibril_rwlock_is_write_locked(fibril_rwlock_t *);
+extern bool fibril_rwlock_is_locked(fibril_rwlock_t *);
 
 extern void fibril_condvar_initialize(fibril_condvar_t *);