Changeset 45cbcaf4 in mainline

Timestamp:

2012-08-13T17:56:15Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

14c5005

Parents:

3a58347

Message:

avoid deadlocks by replacing gettimeofday() with getuptime() in lib/async.c and lib/fibril_sync.c

Location:

uspace/lib/c/generic

Files:

• async.c (modified) (5 diffs)
• fibril_synch.c (modified) (1 diff)

uspace/lib/c/generic/async.c

@@ -637 +637 @@
         
         if (usecs) {
-                gettimeofday(&conn->wdata.to_event.expires, NULL);
+                getuptime(&conn->wdata.to_event.expires);
                 tv_add(&conn->wdata.to_event.expires, usecs);
         } else
@@ -966 +966 @@
 {
         struct timeval tv;
-        gettimeofday(&tv, NULL);
+        getuptime(&tv);
         
         futex_down(&async_futex);
@@ -1023 +1023 @@
                         
                         struct timeval tv;
-                        gettimeofday(&tv, NULL);
+                        getuptime(&tv);
                         
                         if (tv_gteq(&tv, &waiter->to_event.expires)) {
@@ -1330 +1330 @@
                 timeout = 0;
 
-        gettimeofday(&msg->wdata.to_event.expires, NULL);
+        getuptime(&msg->wdata.to_event.expires);
         tv_add(&msg->wdata.to_event.expires, timeout);
         
@@ -1412 +1412 @@
         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);
         

uspace/lib/c/generic/fibril_synch.c

@@ -379 +379 @@
         futex_down(&async_futex);
         if (timeout) {
-                gettimeofday(&wdata.to_event.expires, NULL);
+                getuptime(&wdata.to_event.expires);
                 tv_add(&wdata.to_event.expires, timeout);
                 async_insert_timeout(&wdata);