Changeset 2965d18 in mainline for uspace/lib/c/generic/fibril.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/fibril.c (modified) (5 diffs)

uspace/lib/c/generic/fibril.c

@@ -476 +476 @@
 static void _fibril_switch_to(_switch_type_t type, fibril_t *dstf, bool locked)
 {
+        assert(fibril_self()->rmutex_locks == 0);
+
         if (!locked)
                 futex_lock(&fibril_futex);
@@ -633 +635 @@
 errno_t fibril_wait_timeout(fibril_event_t *event, const struct timeval *expires)
 {
+        assert(fibril_self()->rmutex_locks == 0);
+
         DPRINTF("### Fibril %p sleeping on event %p.\n", fibril_self(), event);
 
@@ -713 +717 @@
 void fibril_wait_for(fibril_event_t *event)
 {
+        assert(fibril_self()->rmutex_locks == 0);
+
         (void) fibril_wait_timeout(event, NULL);
 }
@@ -769 +775 @@
 void fibril_yield(void)
 {
+        if (fibril_self()->rmutex_locks > 0)
+                return;
+
         fibril_t *f = _ready_list_pop_nonblocking(false);
         if (f)
@@ -789 +798 @@
 int fibril_test_spawn_runners(int n)
 {
+        assert(fibril_self()->rmutex_locks == 0);
+
         if (!multithreaded) {
                 _ready_debug_check();