Changeset 2965d18 in mainline for uspace/lib/c/generic/futex.c

Timestamp:

2018-07-30T20:15:38Z (7 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:

d4b7b29

Parents:

8080262

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-30 19:53:13)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-30 20:15:38)

Message:

Add debug counter for rmutex locks.

File:

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

uspace/lib/c/generic/futex.c

@@ -43 +43 @@
 
 //#define DPRINTF(...) kio_printf(__VA_ARGS__)
-#define DPRINTF(...) ((void)0)
+#define DPRINTF(...) dummy_printf(__VA_ARGS__)
 
 /** Initialize futex counter.
@@ -84 +84 @@
          * They should compile to regular load/stores, but simple assignments
          * would be UB by definition.
+         * The proper ordering is ensured by the surrounding futex operation.
          */
 
@@ -94 +95 @@
         assert(prev_owner == NULL);
         __atomic_store_n(&futex->owner, self, __ATOMIC_RELAXED);
-
-        atomic_inc(&self->futex_locks);
 }
 
@@ -104 +103 @@
         __futex_assert_is_locked(futex, name);
         __atomic_store_n(&futex->owner, NULL, __ATOMIC_RELAXED);
-        atomic_dec(&self->futex_locks);
         futex_up(futex);
 }
@@ -117 +115 @@
 
                 __atomic_store_n(&futex->owner, self, __ATOMIC_RELAXED);
-
-                atomic_inc(&self->futex_locks);
 
                 DPRINTF("Trylock on futex %s (%p) by fibril %p succeeded.\n", name, futex, self);
@@ -135 +131 @@
 
         __futex_assert_is_locked(futex, name);
-        atomic_dec(&self->futex_locks);
-        atomic_inc(&no->futex_locks);
         __atomic_store_n(&futex->owner, new_owner, __ATOMIC_RELAXED);
 }