Changes in uspace/lib/c/include/fibril_synch.h [7f122e3:63f8966] in mainline

File:

• uspace/lib/c/include/fibril_synch.h (modified) (5 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_INITIALIZER(name) \
-        { \
-                .oi = { \
-                        .owned_by = NULL \
-                }, \
+#define FIBRIL_MUTEX_INITIALIZE(name) \
+        fibril_mutex_t name = { \
                 .counter = 1, \
                 .waiters = { \
@@ -59 +55 @@
                 } \
         }
-        
-#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;
@@ -70 +62 @@
 } fibril_rwlock_t;
 
-#define FIBRIL_RWLOCK_INITIALIZER(name) \
-        { \
-                .oi = { \
-                        .owned_by = NULL \
-                }, \
+#define FIBRIL_RWLOCK_INITIALIZE(name) \
+        fibril_rwlock_t name = { \
                 .readers = 0, \
                 .writers = 0, \
@@ -83 +72 @@
         }
 
-#define FIBRIL_RWLOCK_INITIALIZE(name) \
-        fibril_rwlock_t name = FIBRIL_RWLOCK_INITIALIZER(name)
-
 typedef struct {
         link_t waiters;
 } fibril_condvar_t;
 
-#define FIBRIL_CONDVAR_INITIALIZER(name) \
-        { \
+#define FIBRIL_CONDVAR_INITIALIZE(name) \
+        fibril_condvar_t name = { \
                 .waiters = { \
                         .next = &name.waiters, \
@@ -97 +83 @@
                 } \
         }
-
-#define FIBRIL_CONDVAR_INITIALIZE(name) \
-        fibril_condvar_t name = FIBRIL_CONDVAR_INITIALIZER(name)
 
 extern void fibril_mutex_initialize(fibril_mutex_t *);