Changeset 055a68a in mainline for uspace/lib/c/generic/async.c
- Timestamp:
- 2015-04-23T23:47:40Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a18a8b9
- Parents:
- acb8766e (diff), dcba819 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/async.c
racb8766e r055a68a 820 820 if (usecs) { 821 821 getuptime(&conn->wdata.to_event.expires); 822 tv_add (&conn->wdata.to_event.expires, usecs);822 tv_add_diff(&conn->wdata.to_event.expires, usecs); 823 823 } else 824 824 conn->wdata.to_event.inlist = false; … … 1214 1214 1215 1215 } else { 1216 timeout = tv_sub(&waiter->to_event.expires, &tv); 1216 timeout = tv_sub_diff(&waiter->to_event.expires, 1217 &tv); 1217 1218 futex_up(&async_futex); 1218 1219 } … … 1505 1506 1506 1507 getuptime(&msg->wdata.to_event.expires); 1507 tv_add (&msg->wdata.to_event.expires, timeout);1508 tv_add_diff(&msg->wdata.to_event.expires, timeout); 1508 1509 1509 1510 /* … … 1587 1588 1588 1589 getuptime(&msg->wdata.to_event.expires); 1589 tv_add (&msg->wdata.to_event.expires, timeout);1590 tv_add_diff(&msg->wdata.to_event.expires, timeout); 1590 1591 1591 1592 futex_down(&async_futex);
Note:
See TracChangeset
for help on using the changeset viewer.