Changes in uspace/lib/c/generic/async/client.c [ab6edb6:fb0ec570] in mainline

File:

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

uspace/lib/c/generic/async/client.c

@@ -121 +121 @@
 #include <abi/mm/as.h>
 #include "../private/libc.h"
-#include "../private/fibril.h"
 
 /** Naming service session */
@@ -191 +190 @@
 }
 
-
 /** Mutex protecting inactive_exch_list and avail_phone_cv.
  *
@@ -243 +241 @@
         assert(arg);
 
-        futex_lock(&async_futex);
+        futex_down(&async_futex);
 
         amsg_t *msg = (amsg_t *) arg;
@@ -268 +266 @@
         }
 
-        futex_unlock(&async_futex);
+        futex_up(&async_futex);
 }
 
@@ -357 +355 @@
         amsg_t *msg = (amsg_t *) amsgid;
 
-        futex_lock(&async_futex);
+        futex_down(&async_futex);
 
         assert(!msg->forget);
@@ -363 +361 @@
 
         if (msg->done) {
-                futex_unlock(&async_futex);
+                futex_up(&async_futex);
                 goto done;
         }
@@ -372 +370 @@
 
         /* Leave the async_futex locked when entering this function */
-        fibril_switch(FIBRIL_FROM_BLOCKED);
-        futex_unlock(&async_futex);
+        fibril_switch(FIBRIL_TO_MANAGER);
+
+        /* Futex is up automatically after fibril_switch */
 
 done:
@@ -402 +401 @@
         amsg_t *msg = (amsg_t *) amsgid;
 
-        futex_lock(&async_futex);
+        futex_down(&async_futex);
 
         assert(!msg->forget);
@@ -408 +407 @@
 
         if (msg->done) {
-                futex_unlock(&async_futex);
+                futex_up(&async_futex);
                 goto done;
         }
@@ -444 +443 @@
 
         /* Leave the async_futex locked when entering this function */
-        fibril_switch(FIBRIL_FROM_BLOCKED);
-        futex_unlock(&async_futex);
+        fibril_switch(FIBRIL_TO_MANAGER);
+
+        /* Futex is up automatically after fibril_switch */
 
         if (!msg->done)
@@ -475 +475 @@
         assert(!msg->destroyed);
 
-        futex_lock(&async_futex);
+        futex_down(&async_futex);
 
         if (msg->done) {
@@ -484 +484 @@
         }
 
-        futex_unlock(&async_futex);
+        futex_up(&async_futex);
 }
 
@@ -504 +504 @@
         tv_add_diff(&awaiter.to_event.expires, timeout);
 
-        futex_lock(&async_futex);
+        futex_down(&async_futex);
 
         async_insert_timeout(&awaiter);
 
         /* Leave the async_futex locked when entering this function */
-        fibril_switch(FIBRIL_FROM_BLOCKED);
-        futex_unlock(&async_futex);
+        fibril_switch(FIBRIL_TO_MANAGER);
+
+        /* Futex is up automatically after fibril_switch() */
 }