Changeset fb4d788 in mainline for uspace/lib/c/generic/fibril_synch.c

Timestamp:

2015-07-28T11:28:14Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce32 (diff), 47726b5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from the mainline

File:

• uspace/lib/c/generic/fibril_synch.c (modified) (7 diffs)

uspace/lib/c/generic/fibril_synch.c

@@ -105 +105 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
 
-        if (fibril_get_sercount() != 0)
-                abort();
-
         futex_down(&async_futex);
         if (fm->counter-- <= 0) {
@@ -197 +194 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
         
-        if (fibril_get_sercount() != 0)
-                abort();
-
         futex_down(&async_futex);
         if (frw->writers) {
@@ -224 +218 @@
         fibril_t *f = (fibril_t *) fibril_get_id();
         
-        if (fibril_get_sercount() != 0)
-                abort();
-
         futex_down(&async_futex);
         if (frw->writers || frw->readers) {
@@ -461 +452 @@
                         if (rc == ETIMEOUT && timer->state == fts_active) {
                                 timer->state = fts_fired;
-                                timer->handler_running = true;
+                                timer->handler_fid = fibril_get_id();
                                 fibril_mutex_unlock(timer->lockp);
                                 timer->fun(timer->arg);
                                 fibril_mutex_lock(timer->lockp);
-                                timer->handler_running = false;
+                                timer->handler_fid = 0;
                         }
                         break;
@@ -477 +468 @@
         /* Acknowledge timer fibril has finished cleanup. */
         timer->state = fts_clean;
+        fibril_condvar_broadcast(&timer->cv);
         fibril_mutex_unlock(timer->lockp);
-        free(timer);
 
         return 0;
@@ -525 +516 @@
         timer->state = fts_cleanup;
         fibril_condvar_broadcast(&timer->cv);
+
+        /* Wait for timer fibril to terminate */
+        while (timer->state != fts_clean)
+                fibril_condvar_wait(&timer->cv, timer->lockp);
         fibril_mutex_unlock(timer->lockp);
+
+        free(timer);
 }
 
@@ -608 +605 @@
         assert(fibril_mutex_is_locked(timer->lockp));
 
-        while (timer->handler_running)
+        while (timer->handler_fid != 0) {
+                if (timer->handler_fid == fibril_get_id()) {
+                        printf("Deadlock detected.\n");
+                        stacktrace_print();
+                        printf("Fibril %zx is trying to clear timer %p from "
+                            "inside its handler %p.\n",
+                            fibril_get_id(), timer, timer->fun);
+                        abort();
+                }
+
                 fibril_condvar_wait(&timer->cv, timer->lockp);
+        }
 
         old_state = timer->state;