Changeset 33c2952 in mainline for uspace/lib/c/generic/async.c

Timestamp:

2012-11-07T21:00:02Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

dcb0751

Parents:

fc89e32 (diff), 94795812 (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:

Merged with mainline.

File:

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

uspace/lib/c/generic/async.c

@@ -416 +416 @@
         .key_hash = client_key_hash,
         .key_equal = client_key_equal,
-        .equal = 0,
-        .remove_callback = 0
+        .equal = NULL,
+        .remove_callback = NULL
 };
 
@@ -452 +452 @@
         .key_hash = conn_key_hash,
         .key_equal = conn_key_equal,
-        .equal = 0,
-        .remove_callback = 0
+        .equal = NULL,
+        .remove_callback = NULL
 };
 
@@ -628 +628 @@
         
         if (usecs) {
-                gettimeofday(&conn->wdata.to_event.expires, NULL);
+                getuptime(&conn->wdata.to_event.expires);
                 tv_add(&conn->wdata.to_event.expires, usecs);
         } else
@@ -947 +947 @@
 {
         struct timeval tv;
-        gettimeofday(&tv, NULL);
+        getuptime(&tv);
         
         futex_down(&async_futex);
@@ -1004 +1004 @@
                         
                         struct timeval tv;
-                        gettimeofday(&tv, NULL);
+                        getuptime(&tv);
                         
                         if (tv_gteq(&tv, &waiter->to_event.expires)) {
@@ -1309 +1309 @@
                 timeout = 0;
 
-        gettimeofday(&msg->wdata.to_event.expires, NULL);
+        getuptime(&msg->wdata.to_event.expires);
         tv_add(&msg->wdata.to_event.expires, timeout);
         
@@ -1391 +1391 @@
         msg->wdata.fid = fibril_get_id();
         
-        gettimeofday(&msg->wdata.to_event.expires, NULL);
+        getuptime(&msg->wdata.to_event.expires);
         tv_add(&msg->wdata.to_event.expires, timeout);