Changeset 26fbb7bb in mainline

Timestamp:

2011-08-17T13:19:46Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

455f190

Parents:

9bf51e64

Message:

Factor out code for getting and dropping references to client_t's.

File:

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

uspace/lib/c/generic/async.c

@@ -580 +580 @@
 }
 
+static client_t *async_client_get(sysarg_t client_hash, bool create)
+{
+        unsigned long key = client_hash;
+        client_t *client = NULL;
+
+        futex_down(&async_futex);
+        link_t *lnk = hash_table_find(&client_hash_table, &key);
+        if (lnk) {
+                client = hash_table_get_instance(lnk, client_t, link);
+                atomic_inc(&client->refcnt);
+        } else if (create) {
+                client = malloc(sizeof(client_t));
+                if (client) {
+                        client->in_task_hash = client_hash;
+                        client->data = async_client_data_create();
+                
+                        atomic_set(&client->refcnt, 1);
+                        hash_table_insert(&client_hash_table, &key, &client->link);
+                }
+        }
+
+        futex_up(&async_futex);
+        return client;
+}
+
+static void async_client_put(client_t *client)
+{
+        bool destroy;
+        unsigned long key = client->in_task_hash;
+        
+        futex_down(&async_futex);
+        
+        if (atomic_predec(&client->refcnt) == 0) {
+                hash_table_remove(&client_hash_table, &key, 1);
+                destroy = true;
+        } else
+                destroy = false;
+        
+        futex_up(&async_futex);
+        
+        if (destroy) {
+                if (client->data)
+                        async_client_data_destroy(client->data);
+                
+                free(client);
+        }
+}
+
 /** Wrapper for client connection fibril.
  *
@@ -598 +646 @@
          */
         fibril_connection = (connection_t *) arg;
-        
-        futex_down(&async_futex);
         
         /*
@@ -606 +652 @@
          * hash in a new tracking structure.
          */
-        
-        unsigned long key = fibril_connection->in_task_hash;
-        link_t *lnk = hash_table_find(&client_hash_table, &key);
-        
-        client_t *client;
-        
-        if (lnk) {
-                client = hash_table_get_instance(lnk, client_t, link);
-                atomic_inc(&client->refcnt);
-        } else {
-                client = malloc(sizeof(client_t));
-                if (!client) {
-                        ipc_answer_0(fibril_connection->callid, ENOMEM);
-                        futex_up(&async_futex);
-                        return 0;
-                }
-                
-                client->in_task_hash = fibril_connection->in_task_hash;
-                client->data = async_client_data_create();
-                
-                atomic_set(&client->refcnt, 1);
-                hash_table_insert(&client_hash_table, &key, &client->link);
-        }
-        
-        futex_up(&async_futex);
-        
+
+        client_t *client = async_client_get(fibril_connection->in_task_hash, true);
+        if (!client) {
+                ipc_answer_0(fibril_connection->callid, ENOMEM);
+                return 0;
+        }
+
         fibril_connection->client = client;
         
@@ -643 +670 @@
          * Remove the reference for this client task connection.
          */
-        bool destroy;
-        
-        futex_down(&async_futex);
-        
-        if (atomic_predec(&client->refcnt) == 0) {
-                hash_table_remove(&client_hash_table, &key, 1);
-                destroy = true;
-        } else
-                destroy = false;
-        
-        futex_up(&async_futex);
-        
-        if (destroy) {
-                if (client->data)
-                        async_client_data_destroy(client->data);
-                
-                free(client);
-        }
+        async_client_put(client);
         
         /*
@@ -666 +676 @@
          */
         futex_down(&async_futex);
-        key = fibril_connection->in_phone_hash;
+        unsigned long key = fibril_connection->in_phone_hash;
         hash_table_remove(&conn_hash_table, &key, 1);
         futex_up(&async_futex);