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

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:

40abf56

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.

File:

• uspace/lib/c/generic/async/ports.c (modified) (7 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;