Changes in uspace/lib/c/generic/fibril_synch.c [5a5b087:7f9d97f3] in mainline

File:

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

uspace/lib/c/generic/fibril_synch.c

@@ -461 +461 @@
                         if (rc == ETIMEOUT && timer->state == fts_active) {
                                 timer->state = fts_fired;
-                                timer->handler_fid = fibril_get_id();
+                                timer->handler_running = true;
                                 fibril_mutex_unlock(timer->lockp);
                                 timer->fun(timer->arg);
                                 fibril_mutex_lock(timer->lockp);
-                                timer->handler_fid = 0;
+                                timer->handler_running = false;
                         }
                         break;
@@ -477 +477 @@
         /* 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 +525 @@
         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);
 }
 
@@ -614 +608 @@
         assert(fibril_mutex_is_locked(timer->lockp));
 
-        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();
-                }
-
+        while (timer->handler_running)
                 fibril_condvar_wait(&timer->cv, timer->lockp);
-        }
 
         old_state = timer->state;