Changes in uspace/lib/c/include/fibril_synch.h [3e6a98c5:7c15d6f] in mainline

File:

• uspace/lib/c/include/fibril_synch.h (modified) (3 diffs)

uspace/lib/c/include/fibril_synch.h

@@ -116 +116 @@
         /** Timer has fired and has not been cleared since */
         fts_fired,
-        /** Timer is being destroyed */
-        fts_cleanup
+        /** Timer fibril is requested to terminate */
+        fts_cleanup,
+        /** Timer fibril acknowledged termination */
+        fts_clean
 } fibril_timer_state_t;
 
@@ -129 +131 @@
 typedef struct {
         fibril_mutex_t lock;
+        fibril_mutex_t *lockp;
         fibril_condvar_t cv;
         fid_t fibril;
         fibril_timer_state_t state;
+        /** FID of fibril executing handler or 0 if handler is not running */
+        fid_t handler_fid;
 
         suseconds_t delay;
@@ -160 +165 @@
 extern void fibril_condvar_broadcast(fibril_condvar_t *);
 
-extern fibril_timer_t *fibril_timer_create(void);
+extern fibril_timer_t *fibril_timer_create(fibril_mutex_t *);
 extern void fibril_timer_destroy(fibril_timer_t *);
 extern void fibril_timer_set(fibril_timer_t *, suseconds_t, fibril_timer_fun_t,
     void *);
+extern void fibril_timer_set_locked(fibril_timer_t *, suseconds_t,
+    fibril_timer_fun_t, void *);
 extern fibril_timer_state_t fibril_timer_clear(fibril_timer_t *);
+extern fibril_timer_state_t fibril_timer_clear_locked(fibril_timer_t *);
 
 #endif