Changes in uspace/lib/c/generic/async/client.c [fb0ec570:ab6edb6] 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 */
@@ -190 +191 @@
 }
 
+
 /** Mutex protecting inactive_exch_list and avail_phone_cv.
  *
@@ -241 +243 @@
         assert(arg);
 
-        futex_down(&async_futex);
+        futex_lock(&async_futex);
 
         amsg_t *msg = (amsg_t *) arg;
@@ -266 +268 @@
         }
 
-        futex_up(&async_futex);
+        futex_unlock(&async_futex);
 }
 
@@ -355 +357 @@
         amsg_t *msg = (amsg_t *) amsgid;
 
-        futex_down(&async_futex);
+        futex_lock(&async_futex);
 
         assert(!msg->forget);
@@ -361 +363 @@
 
         if (msg->done) {
-                futex_up(&async_futex);
+                futex_unlock(&async_futex);
                 goto done;
         }
@@ -370 +372 @@
 
         /* Leave the async_futex locked when entering this function */
-        fibril_switch(FIBRIL_TO_MANAGER);
-
-        /* Futex is up automatically after fibril_switch */
+        fibril_switch(FIBRIL_FROM_BLOCKED);
+        futex_unlock(&async_futex);
 
 done:
@@ -401 +402 @@
         amsg_t *msg = (amsg_t *) amsgid;
 
-        futex_down(&async_futex);
+        futex_lock(&async_futex);
 
         assert(!msg->forget);
@@ -407 +408 @@
 
         if (msg->done) {
-                futex_up(&async_futex);
+                futex_unlock(&async_futex);
                 goto done;
         }
@@ -443 +444 @@
 
         /* Leave the async_futex locked when entering this function */
-        fibril_switch(FIBRIL_TO_MANAGER);
-
-        /* Futex is up automatically after fibril_switch */
+        fibril_switch(FIBRIL_FROM_BLOCKED);
+        futex_unlock(&async_futex);
 
         if (!msg->done)
@@ -475 +475 @@
         assert(!msg->destroyed);
 
-        futex_down(&async_futex);
+        futex_lock(&async_futex);
 
         if (msg->done) {
@@ -484 +484 @@
         }
 
-        futex_up(&async_futex);
+        futex_unlock(&async_futex);
 }
 
@@ -504 +504 @@
         tv_add_diff(&awaiter.to_event.expires, timeout);
 
-        futex_down(&async_futex);
+        futex_lock(&async_futex);
 
         async_insert_timeout(&awaiter);
 
         /* Leave the async_futex locked when entering this function */
-        fibril_switch(FIBRIL_TO_MANAGER);
-
-        /* Futex is up automatically after fibril_switch() */
+        fibril_switch(FIBRIL_FROM_BLOCKED);
+        futex_unlock(&async_futex);
 }