Changeset 231b3fd in mainline for uspace/lib/c/generic/async/server.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/server.c (modified) (2 diffs)

uspace/lib/c/generic/async/server.c

@@ -110 +110 @@
 #include <assert.h>
 #include <errno.h>
-#include <sys/time.h>
+#include <time.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -916 +916 @@
  *
  */
-bool async_get_call_timeout(ipc_call_t *call, suseconds_t usecs)
+bool async_get_call_timeout(ipc_call_t *call, usec_t usecs)
 {
         assert(call);
         assert(fibril_connection);
 
-        struct timeval tv;
-        struct timeval *expires = NULL;
+        struct timespec ts;
+        struct timespec *expires = NULL;
         if (usecs) {
-                getuptime(&tv);
-                tv_add_diff(&tv, usecs);
-                expires = &tv;
+                getuptime(&ts);
+                ts_add_diff(&ts, USEC2NSEC(usecs));
+                expires = &ts;
         }