Changeset 5a5b087 in mainline for uspace/lib/c/generic/fibril_synch.c

Timestamp:

2015-06-07T12:13:42Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c3f7d37

Parents:

8dc9b72

Message:

Cannot free timer memory from timer fibril. Since timer→lockp can point to user-provided lock which may not exist beyond return from fibril_timer_destroy(), fibril_timer_destroy() must wait for timer fibril to terminate.

File:

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

uspace/lib/c/generic/fibril_synch.c

@@ -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);
 }