Changeset aaa3c457 in mainline for uspace/lib/c/generic/async

Timestamp:

2018-11-12T10:36:10Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a43dfcb

Parents:

3ce781f4 (diff), 6874bd2 (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.

git-author:

Jakub Jermář <jakub@…> (2018-11-12 10:36:10)

git-committer:

GitHub <noreply@…> (2018-11-12 10:36:10)

Message:

Merge pull request #56 from jermar/futexremoval

Remove kernel support for futexes in favor of waitq kobjects.

Location:

uspace/lib/c/generic/async

Files:

• client.c (modified) (3 diffs)
• ports.c (modified) (2 diffs)
• server.c (modified) (3 diffs)

uspace/lib/c/generic/async/client.c

@@ -122 +122 @@
 #include "../private/fibril.h"
 
-static FIBRIL_RMUTEX_INITIALIZE(message_mutex);
+static fibril_rmutex_t message_mutex;
 
 /** Naming service session */
@@ -173 +173 @@
 void __async_client_init(void)
 {
+        if (fibril_rmutex_initialize(&message_mutex) != EOK)
+                abort();
+
         session_ns.iface = 0;
         session_ns.mgmt = EXCHANGE_ATOMIC;
@@ -186 +189 @@
         fibril_mutex_initialize(&session_ns.mutex);
         session_ns.exchanges = 0;
+}
+
+void __async_client_fini(void)
+{
+        fibril_rmutex_destroy(&message_mutex);
 }
 

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

@@ -100 +100 @@
 
 /** Futex guarding the interface hash table. */
-static FIBRIL_RMUTEX_INITIALIZE(interface_mutex);
+static fibril_rmutex_t interface_mutex;
 static hash_table_t interface_hash_table;
 
@@ -292 +292 @@
 void __async_ports_init(void)
 {
+        if (fibril_rmutex_initialize(&interface_mutex) != EOK)
+                abort();
+
         if (!hash_table_create(&interface_hash_table, 0, 0,
             &interface_hash_table_ops))
                 abort();
 }
+
+void __async_ports_fini(void)
+{
+        fibril_rmutex_destroy(&interface_mutex);
+}

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

@@ -216 +216 @@
 }
 
-static FIBRIL_RMUTEX_INITIALIZE(client_mutex);
+static fibril_rmutex_t client_mutex;
 static hash_table_t client_hash_table;
 
 // TODO: lockfree notification_queue?
-static FIBRIL_RMUTEX_INITIALIZE(notification_mutex);
+static fibril_rmutex_t notification_mutex;
 static hash_table_t notification_hash_table;
 static LIST_INITIALIZE(notification_queue);
@@ -1013 +1013 @@
 void __async_server_init(void)
 {
+        if (fibril_rmutex_initialize(&client_mutex) != EOK)
+                abort();
+        if (fibril_rmutex_initialize(&notification_mutex) != EOK)
+                abort();
+
         if (!hash_table_create(&client_hash_table, 0, 0, &client_hash_table_ops))
                 abort();
@@ -1021 +1026 @@
 
         async_create_manager();
+}
+
+void __async_server_fini(void)
+{
+        fibril_rmutex_destroy(&client_mutex);
+        fibril_rmutex_destroy(&notification_mutex);
 }