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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/async/client.c

    re2625b1a r231b3fd  
    110110#include <assert.h>
    111111#include <errno.h>
    112 #include <sys/time.h>
     112#include <time.h>
    113113#include <barrier.h>
    114114#include <stdbool.h>
     
    342342 *
    343343 */
    344 errno_t async_wait_timeout(aid_t amsgid, errno_t *retval, suseconds_t timeout)
     344errno_t async_wait_timeout(aid_t amsgid, errno_t *retval, usec_t timeout)
    345345{
    346346        if (amsgid == 0) {
     
    359359                timeout = 0;
    360360
    361         struct timeval expires;
     361        struct timespec expires;
    362362        getuptime(&expires);
    363         tv_add_diff(&expires, timeout);
     363        ts_add_diff(&expires, USEC2NSEC(timeout));
    364364
    365365        errno_t rc = fibril_wait_timeout(&msg->received, &expires);
Note: See TracChangeset for help on using the changeset viewer.