Changeset 9bde0d5 in mainline for uspace/lib/c/generic/async

Timestamp:

2018-07-18T19:56:43Z (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:

42f5860

Parents:

40abf56a

git-author:

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

git-committer:

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

Message:

Replace a bunch of direct uses of futex_t.

Location:

uspace/lib/c/generic/async

Files:

• ports.c (modified) (7 diffs)
• server.c (modified) (16 diffs)

uspace/lib/c/generic/async/ports.c

@@ -99 +99 @@
 
 /** Futex guarding the interface hash table. */
-static futex_t interface_futex = FUTEX_INITIALIZER;
+static FIBRIL_RMUTEX_INITIALIZE(interface_mutex);
 static hash_table_t interface_hash_table;
 
@@ -205 +205 @@
         interface_t *interface;
 
-        futex_lock(&interface_futex);
+        fibril_rmutex_lock(&interface_mutex);
 
         ht_link_t *link = hash_table_find(&interface_hash_table, &iface);
@@ -214 +214 @@
 
         if (!interface) {
-                futex_unlock(&interface_futex);
+                fibril_rmutex_unlock(&interface_mutex);
                 return ENOMEM;
         }
@@ -220 +220 @@
         port_t *port = async_new_port(interface, handler, data);
         if (!port) {
-                futex_unlock(&interface_futex);
+                fibril_rmutex_unlock(&interface_mutex);
                 return ENOMEM;
         }
@@ -226 +226 @@
         *port_id = port->id;
 
-        futex_unlock(&interface_futex);
+        fibril_rmutex_unlock(&interface_mutex);
 
         return EOK;
@@ -252 +252 @@
         port_t *port = NULL;
 
-        futex_lock(&interface_futex);
+        fibril_rmutex_lock(&interface_mutex);
 
         ht_link_t *link = hash_table_find(&interface_hash_table, &iface);
@@ -264 +264 @@
         }
 
-        futex_unlock(&interface_futex);
+        fibril_rmutex_unlock(&interface_mutex);
 
         return port;

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

@@ -234 +234 @@
 }
 
-static futex_t client_futex = FUTEX_INITIALIZER;
+static FIBRIL_RMUTEX_INITIALIZE(client_mutex);
 static hash_table_t client_hash_table;
 
 // TODO: lockfree notification_queue?
-static futex_t notification_futex = FUTEX_INITIALIZER;
+static FIBRIL_RMUTEX_INITIALIZE(notification_mutex);
 static hash_table_t notification_hash_table;
 static LIST_INITIALIZE(notification_queue);
@@ -339 +339 @@
         client_t *client = NULL;
 
-        futex_lock(&client_futex);
+        fibril_rmutex_lock(&client_mutex);
         ht_link_t *link = hash_table_find(&client_hash_table, &client_id);
         if (link) {
@@ -346 +346 @@
         } else if (create) {
                 // TODO: move the malloc out of critical section
+                /* malloc() is rmutex safe. */
                 client = malloc(sizeof(client_t));
                 if (client) {
@@ -356 +357 @@
         }
 
-        futex_unlock(&client_futex);
+        fibril_rmutex_unlock(&client_mutex);
         return client;
 }
@@ -364 +365 @@
         bool destroy;
 
-        futex_lock(&client_futex);
+        fibril_rmutex_lock(&client_mutex);
 
         if (atomic_predec(&client->refcnt) == 0) {
@@ -372 +373 @@
                 destroy = false;
 
-        futex_unlock(&client_futex);
+        fibril_rmutex_unlock(&client_mutex);
 
         if (destroy) {
@@ -693 +694 @@
                 fibril_semaphore_down(&notification_semaphore);
 
-                futex_lock(&notification_futex);
+                fibril_rmutex_lock(&notification_mutex);
 
                 /*
@@ -727 +728 @@
                         list_remove(&notification->qlink);
 
-                futex_unlock(&notification_futex);
+                fibril_rmutex_unlock(&notification_mutex);
 
                 if (handler)
@@ -766 +767 @@
         assert(call);
 
-        futex_lock(&notification_futex);
+        fibril_rmutex_lock(&notification_mutex);
 
         notification_msg_t *m = list_pop(&notification_freelist,
@@ -772 +773 @@
 
         if (!m) {
-                futex_unlock(&notification_futex);
+                fibril_rmutex_unlock(&notification_mutex);
                 m = malloc(sizeof(notification_msg_t));
                 if (!m) {
@@ -779 +780 @@
                 }
 
-                futex_lock(&notification_futex);
+                fibril_rmutex_lock(&notification_mutex);
                 notification_freelist_total++;
         }
@@ -789 +790 @@
                 // TODO: Make sure this can't happen and turn it into assert.
                 notification_freelist_total--;
-                futex_unlock(&notification_futex);
+                fibril_rmutex_unlock(&notification_mutex);
                 free(m);
                 return;
@@ -804 +805 @@
                 list_append(&notification->qlink, &notification_queue);
 
-        futex_unlock(&notification_futex);
+        fibril_rmutex_unlock(&notification_mutex);
 
         fibril_semaphore_up(&notification_semaphore);
@@ -829 +830 @@
         fid_t fib = 0;
 
-        futex_lock(&notification_futex);
+        fibril_rmutex_lock(&notification_mutex);
 
         if (notification_avail == 0) {
@@ -835 +836 @@
                 fib = fibril_create(notification_fibril_func, NULL);
                 if (fib == 0) {
-                        futex_unlock(&notification_futex);
+                        fibril_rmutex_unlock(&notification_mutex);
                         free(notification);
                         return NULL;
@@ -847 +848 @@
         hash_table_insert(&notification_hash_table, &notification->htlink);
 
-        futex_unlock(&notification_futex);
+        fibril_rmutex_unlock(&notification_mutex);
 
         if (imethod == 0) {