Changeset 231b3fd in mainline for uspace/lib/c/include/fibril_synch.h

Timestamp:

2018-08-25T21:35:26Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (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.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

File:

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

uspace/lib/c/include/fibril_synch.h

@@ -39 +39 @@
 #include <adt/list.h>
 #include <tls.h>
-#include <sys/time.h>
+#include <time.h>
 #include <stdbool.h>
 
@@ -138 +138 @@
         fid_t handler_fid;
 
-        suseconds_t delay;
+        usec_t delay;
         fibril_timer_fun_t fun;
         void *arg;
@@ -181 +181 @@
 extern void fibril_condvar_initialize(fibril_condvar_t *);
 extern errno_t fibril_condvar_wait_timeout(fibril_condvar_t *, fibril_mutex_t *,
-    suseconds_t);
+    usec_t);
 extern void fibril_condvar_wait(fibril_condvar_t *, fibril_mutex_t *);
 extern void fibril_condvar_signal(fibril_condvar_t *);
@@ -188 +188 @@
 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,
+extern void fibril_timer_set(fibril_timer_t *, usec_t, fibril_timer_fun_t,
     void *);
-extern void fibril_timer_set_locked(fibril_timer_t *, suseconds_t,
+extern void fibril_timer_set_locked(fibril_timer_t *, usec_t,
     fibril_timer_fun_t, void *);
 extern fibril_timer_state_t fibril_timer_clear(fibril_timer_t *);
@@ -198 +198 @@
 extern void fibril_semaphore_up(fibril_semaphore_t *);
 extern void fibril_semaphore_down(fibril_semaphore_t *);
-extern errno_t fibril_semaphore_down_timeout(fibril_semaphore_t *, suseconds_t);
+extern errno_t fibril_semaphore_down_timeout(fibril_semaphore_t *, usec_t);
 extern void fibril_semaphore_close(fibril_semaphore_t *);
 
@@ -205 +205 @@
 extern void mpsc_destroy(mpsc_t *);
 extern errno_t mpsc_send(mpsc_t *, const void *);
-extern errno_t mpsc_receive(mpsc_t *, void *, const struct timeval *);
+extern errno_t mpsc_receive(mpsc_t *, void *, const struct timespec *);
 extern void mpsc_close(mpsc_t *);