Changeset 231b3fd in mainline for uspace/lib/c/generic/async/client.c

Timestamp:

2018-08-25T21:35:26Z (7 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/generic/async/client.c (modified) (3 diffs)

uspace/lib/c/generic/async/client.c

@@ -110 +110 @@
 #include <assert.h>
 #include <errno.h>
-#include <sys/time.h>
+#include <time.h>
 #include <barrier.h>
 #include <stdbool.h>
@@ -342 +342 @@
  *
  */
-errno_t async_wait_timeout(aid_t amsgid, errno_t *retval, suseconds_t timeout)
+errno_t async_wait_timeout(aid_t amsgid, errno_t *retval, usec_t timeout)
 {
         if (amsgid == 0) {
@@ -359 +359 @@
                 timeout = 0;
 
-        struct timeval expires;
+        struct timespec expires;
         getuptime(&expires);
-        tv_add_diff(&expires, timeout);
+        ts_add_diff(&expires, USEC2NSEC(timeout));
 
         errno_t rc = fibril_wait_timeout(&msg->received, &expires);