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

Timestamp:

2018-06-26T17:34:23Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

b59318e

Parents:

38e3427

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-25 20:50:53)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-26 17:34:23)

Message:

Improve the debugging options for futexes.

File:

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

uspace/lib/c/include/futex.h

@@ -39 +39 @@
 #include <errno.h>
 #include <libc.h>
+#include <time.h>
 
 typedef struct futex {
         atomic_t val;
+#ifdef CONFIG_DEBUG_FUTEX
+        _Atomic void *owner;
+#endif
 } futex_t;
 
 extern void futex_initialize(futex_t *futex, int value);
+
+#ifdef CONFIG_DEBUG_FUTEX
+
+#define FUTEX_INITIALIZE(val) {{ (val) }, NULL }
+#define FUTEX_INITIALIZER     FUTEX_INITIALIZE(1)
+
+void __futex_assert_is_locked(futex_t *, const char *);
+void __futex_assert_is_not_locked(futex_t *, const char *);
+void __futex_lock(futex_t *, const char *);
+void __futex_unlock(futex_t *, const char *);
+bool __futex_trylock(futex_t *, const char *);
+void __futex_give_to(futex_t *, void *, const char *);
+
+#define futex_lock(futex) __futex_lock((futex), #futex)
+#define futex_unlock(futex) __futex_unlock((futex), #futex)
+#define futex_trylock(futex) __futex_trylock((futex), #futex)
+
+#define futex_give_to(futex, new_owner) __futex_give_to((futex), (new_owner), #futex)
+#define futex_assert_is_locked(futex) __futex_assert_is_locked((futex), #futex)
+#define futex_assert_is_not_locked(futex) __futex_assert_is_not_locked((futex), #futex)
+
+#else
 
 #define FUTEX_INITIALIZE(val) {{ (val) }}
@@ -52 +78 @@
 #define futex_trylock(fut)  futex_trydown((fut))
 #define futex_unlock(fut)   (void) futex_up((fut))
+
+#define futex_give_to(fut, owner) ((void)0)
+#define futex_assert_is_locked(fut) assert((atomic_signed_t) (fut)->val.count <= 0)
+#define futex_assert_is_not_locked(fut) ((void)0)
+
+#endif
 
 /** Try to down the futex.