Changeset 156b6406 in mainline for uspace/lib/c/include/futex.h

Timestamp:

2012-12-04T16:42:06Z (11 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

b188002

Parents:

b7acf38

Message:

Differentiated futexes when used with mutex semantics from those with semaphore semantics.

File:

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

uspace/lib/c/include/futex.h

@@ -55 +55 @@
 #define FUTEX_INITIALIZE(val) {{ (val) }, 0}
 
-#define futex_down(fut) \
+#define futex_lock(fut) \
 ({ \
         rcu_read_lock(); \
         (fut)->upgraded = rcu_access(_upgrade_futexes); \
         if ((fut)->upgraded) \
-                (void) _futex_down((fut)); \
+                (void) futex_down((fut)); \
 })
 
-#define futex_trydown(fut) \
+#define futex_trylock(fut) \
 ({ \
         rcu_read_lock(); \
         int _upgraded = rcu_access(_upgrade_futexes); \
         if (_upgraded) { \
-                int _acquired = _futex_trydown((fut)); \
+                int _acquired = futex_trydown((fut)); \
                 if (!_acquired) { \
                         rcu_read_unlock(); \
@@ -81 +81 @@
 })
                 
-#define futex_up(fut) \
+#define futex_unlock(fut) \
 ({ \
         if ((fut)->upgraded) \
-                (void) _futex_up((fut)); \
+                (void) futex_up((fut)); \
         rcu_read_unlock(); \
 })
@@ -96 +96 @@
 #define FUTEX_INITIALIZE(val) {{ (val) }}
 
-#define futex_down(fut)     (void)_futex_down((fut))
-#define futex_trydown(fut)  _futex_trydown((fut))
-#define futex_up(fut)       (void)_futex_up((fut))
+#define futex_lock(fut)     (void) futex_down((fut))
+#define futex_trylock(fut)  futex_trydown((fut))
+#define futex_unlock(fut)   (void) futex_up((fut))
                 
 #endif
@@ -112 +112 @@
  *
  */
-static inline int _futex_trydown(futex_t *futex)
+static inline int futex_trydown(futex_t *futex)
 {
         return cas(&futex->val, 1, 0);
@@ -126 +126 @@
  *
  */
-static inline int _futex_down(futex_t *futex)
+static inline int futex_down(futex_t *futex)
 {
         if ((atomic_signed_t) atomic_predec(&futex->val) < 0)
@@ -142 +142 @@
  *
  */
-static inline int _futex_up(futex_t *futex)
+static inline int futex_up(futex_t *futex)
 {
         if ((atomic_signed_t) atomic_postinc(&futex->val) < 0)