Changeset 04803bf in mainline for uspace/lib/c/include/fibril_synch.h

Timestamp:

2011-03-21T22:00:17Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• uspace/lib/c/include/fibril_synch.h (moved) (moved from uspace/lib/libc/include/fibril_sync.h ) (7 diffs)

uspace/lib/c/include/fibril_synch.h

@@ -33 +33 @@
  */
 
-#ifndef LIBC_FIBRIL_SYNC_H_
-#define LIBC_FIBRIL_SYNC_H_
+#ifndef LIBC_FIBRIL_SYNCH_H_
+#define LIBC_FIBRIL_SYNCH_H_
 
 #include <async.h>
@@ -40 +40 @@
 #include <adt/list.h>
 #include <libarch/tls.h>
+#include <sys/time.h>
 
 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 = { \
@@ -54 +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;
@@ -61 +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, \
@@ -71 +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, \
@@ -83 +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 *);
@@ -93 +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 *);
+extern int fibril_condvar_wait_timeout(fibril_condvar_t *, fibril_mutex_t *,
+    suseconds_t);
 extern void fibril_condvar_wait(fibril_condvar_t *, fibril_mutex_t *);
 extern void fibril_condvar_signal(fibril_condvar_t *);