Changeset ccc3debf in mainline for uspace/lib/c/generic/async.c


Ignore:
Timestamp:
2012-09-17T13:18:41Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
619e6d56
Parents:
00b4a68 (diff), 289fa65 (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.
Message:

Merge from lp:rtc-helenos.

File:
1 edited

Legend:

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

    r00b4a68 rccc3debf  
    638638       
    639639        if (usecs) {
    640                 gettimeofday(&conn->wdata.to_event.expires, NULL);
     640                getuptime(&conn->wdata.to_event.expires);
    641641                tv_add(&conn->wdata.to_event.expires, usecs);
    642642        } else
     
    967967{
    968968        struct timeval tv;
    969         gettimeofday(&tv, NULL);
     969        getuptime(&tv);
    970970       
    971971        futex_down(&async_futex);
     
    10241024                       
    10251025                        struct timeval tv;
    1026                         gettimeofday(&tv, NULL);
     1026                        getuptime(&tv);
    10271027                       
    10281028                        if (tv_gteq(&tv, &waiter->to_event.expires)) {
     
    13311331                timeout = 0;
    13321332
    1333         gettimeofday(&msg->wdata.to_event.expires, NULL);
     1333        getuptime(&msg->wdata.to_event.expires);
    13341334        tv_add(&msg->wdata.to_event.expires, timeout);
    13351335       
     
    14131413        msg->wdata.fid = fibril_get_id();
    14141414       
    1415         gettimeofday(&msg->wdata.to_event.expires, NULL);
     1415        getuptime(&msg->wdata.to_event.expires);
    14161416        tv_add(&msg->wdata.to_event.expires, timeout);
    14171417       
Note: See TracChangeset for help on using the changeset viewer.