Changeset 45c8eea in mainline for uspace/lib/c/generic/async

Timestamp:

2018-11-11T15:47:39Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f4cb6c5f

Parents:

269bc459

git-author:

Jakub Jermar <jakub@…> (2018-11-10 17:49:44)

git-committer:

Jakub Jermar <jakub@…> (2018-11-11 15:47:39)

Message:

Preallocate waitq handle during initialization

Do not clutter futex_down_composable() with the preallocation of the
wait queue handle and do it single-threadedly in futex_initialize().

Location:

uspace/lib/c/generic/async

Files:

• client.c (modified) (2 diffs)
• ports.c (modified) (2 diffs)
• server.c (modified) (2 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;

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))

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();