Changeset 58775d30 in mainline for uspace/lib/c/generic/async.c

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2003739

Parents:

6069061 (diff), 795e2bf (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:

Mainline changes

File:

• uspace/lib/c/generic/async.c (modified) (5 diffs)

uspace/lib/c/generic/async.c

@@ -167 +167 @@
 
 /** Async framework global futex */
-atomic_t async_futex = FUTEX_INITIALIZER;
+futex_t async_futex = FUTEX_INITIALIZER;
 
 /** Number of threads waiting for IPC in the kernel. */
@@ -820 +820 @@
         if (usecs) {
                 getuptime(&conn->wdata.to_event.expires);
-                tv_add(&conn->wdata.to_event.expires, usecs);
+                tv_add_diff(&conn->wdata.to_event.expires, usecs);
         } else
                 conn->wdata.to_event.inlist = false;
@@ -1214 +1214 @@
 
                         } else {
-                                timeout = tv_sub(&waiter->to_event.expires, &tv);
+                                timeout = tv_sub_diff(&waiter->to_event.expires,
+                                    &tv);
                                 futex_up(&async_futex);
                         }
@@ -1505 +1506 @@
 
         getuptime(&msg->wdata.to_event.expires);
-        tv_add(&msg->wdata.to_event.expires, timeout);
+        tv_add_diff(&msg->wdata.to_event.expires, timeout);
         
         /*
@@ -1587 +1588 @@
         
         getuptime(&msg->wdata.to_event.expires);
-        tv_add(&msg->wdata.to_event.expires, timeout);
+        tv_add_diff(&msg->wdata.to_event.expires, timeout);
         
         futex_down(&async_futex);