Changeset 8080262 in mainline for uspace/lib/c/generic/async/server.c

Timestamp:

2018-07-30T18:55:22Z (6 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:

2965d18

Parents:

b4c8a7b

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-30 18:07:46)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-30 18:55:22)

Message:

Replace remaining explicit uses of futex_t outside fibril implementation, and get rid of async_futex.

File:

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

uspace/lib/c/generic/async/server.c

@@ -111 +111 @@
 #include <errno.h>
 #include <sys/time.h>
-#include <libarch/barrier.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -125 +124 @@
 #define DPRINTF(...)  ((void) 0)
 
-/** Async framework global futex */
-futex_t async_futex = FUTEX_INITIALIZER;
-
 /** Call data */
 typedef struct {
@@ -250 +246 @@
 static sysarg_t notification_avail = 0;
 
-/* The remaining structures are guarded by async_futex. */
+static FIBRIL_RMUTEX_INITIALIZE(conn_mutex);
 static hash_table_t conn_hash_table;
 
@@ -430 +426 @@
          * Remove myself from the connection hash table.
          */
-        futex_lock(&async_futex);
+        fibril_rmutex_lock(&conn_mutex);
         hash_table_remove(&conn_hash_table, &(conn_key_t){
                 .task_id = fibril_connection->in_task_id,
                 .phone_hash = fibril_connection->in_phone_hash
         });
-        futex_unlock(&async_futex);
+        fibril_rmutex_unlock(&conn_mutex);
 
         /*
@@ -517 +513 @@
         /* Add connection to the connection hash table */
 
-        futex_lock(&async_futex);
+        fibril_rmutex_lock(&conn_mutex);
         hash_table_insert(&conn_hash_table, &conn->link);
-        futex_unlock(&async_futex);
-
-        fibril_add_ready(conn->fid);
+        fibril_rmutex_unlock(&conn_mutex);
+
+        fibril_start(conn->fid);
 
         return conn->fid;
@@ -618 +614 @@
         assert(call);
 
-        futex_lock(&async_futex);
+        fibril_rmutex_lock(&conn_mutex);
 
         ht_link_t *link = hash_table_find(&conn_hash_table, &(conn_key_t){
@@ -625 +621 @@
         });
         if (!link) {
-                futex_unlock(&async_futex);
+                fibril_rmutex_unlock(&conn_mutex);
                 return false;
         }
@@ -634 +630 @@
         msg_t *msg = malloc(sizeof(*msg));
         if (!msg) {
-                futex_unlock(&async_futex);
+                fibril_rmutex_unlock(&conn_mutex);
                 return false;
         }
@@ -644 +640 @@
                 conn->close_chandle = call->cap_handle;
 
+        fibril_rmutex_unlock(&conn_mutex);
+
         /* If the connection fibril is waiting for an event, activate it */
         fibril_notify(&conn->msg_arrived);
-
-        futex_unlock(&async_futex);
         return true;
 }
@@ -960 +956 @@
         }
 
-        futex_lock(&async_futex);
+        fibril_rmutex_lock(&conn_mutex);
 
         /* If nothing in queue, wait until something arrives */
@@ -974 +970 @@
                         memset(call, 0, sizeof(ipc_call_t));
                         IPC_SET_IMETHOD(*call, IPC_M_PHONE_HUNGUP);
-                        futex_unlock(&async_futex);
+                        fibril_rmutex_unlock(&conn_mutex);
                         return true;
                 }
 
                 // TODO: replace with cvar
-                futex_unlock(&async_futex);
+                fibril_rmutex_unlock(&conn_mutex);
 
                 errno_t rc = fibril_wait_timeout(&conn->msg_arrived, expires);
@@ -985 +981 @@
                         return false;
 
-                futex_lock(&async_futex);
+                fibril_rmutex_lock(&conn_mutex);
         }
 
@@ -995 +991 @@
         free(msg);
 
-        futex_unlock(&async_futex);
+        fibril_rmutex_unlock(&conn_mutex);
         return true;
 }