Changeset 8119363 in mainline for uspace/lib/c/generic/async/client.c

Timestamp:

2018-06-26T17:35:40Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

6e569bf

Parents:

fbfe59d (diff), e768aea (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:

Merge some preliminary async/fibril framework changes.

File:

• uspace/lib/c/generic/async/client.c (modified) (12 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 */
@@ -241 +242 @@
         assert(arg);
 
-        futex_down(&async_futex);
+        futex_lock(&async_futex);
 
         amsg_t *msg = (amsg_t *) arg;
@@ -266 +267 @@
         }
 
-        futex_up(&async_futex);
+        futex_unlock(&async_futex);
 }
 
@@ -355 +356 @@
         amsg_t *msg = (amsg_t *) amsgid;
 
-        futex_down(&async_futex);
+        futex_lock(&async_futex);
 
         assert(!msg->forget);
@@ -361 +362 @@
 
         if (msg->done) {
-                futex_up(&async_futex);
+                futex_unlock(&async_futex);
                 goto done;
         }
@@ -370 +371 @@
 
         /* 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 +401 @@
         amsg_t *msg = (amsg_t *) amsgid;
 
-        futex_down(&async_futex);
+        futex_lock(&async_futex);
 
         assert(!msg->forget);
@@ -407 +407 @@
 
         if (msg->done) {
-                futex_up(&async_futex);
+                futex_unlock(&async_futex);
                 goto done;
         }
@@ -443 +443 @@
 
         /* 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 +474 @@
         assert(!msg->destroyed);
 
-        futex_down(&async_futex);
+        futex_lock(&async_futex);
 
         if (msg->done) {
@@ -484 +483 @@
         }
 
-        futex_up(&async_futex);
+        futex_unlock(&async_futex);
 }
 
@@ -504 +503 @@
         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);
 }