Changeset e2ab36f1 in mainline for uspace/lib/c/generic/async.c

Timestamp:

2011-08-19T12:38:09Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

36b16bc, 9247c02c

Parents:

903bac0a

Message:

Track client data by client task ID instead of client task hash.

File:

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

uspace/lib/c/generic/async.c

@@ -112 +112 @@
 #include <mem.h>
 #include <stdlib.h>
+#include <macros.h>
 #include "private/async.h"
 
@@ -138 +139 @@
         link_t link;
         
-        sysarg_t in_task_hash;
+        sysarg_t in_task_id;
         atomic_t refcnt;
         void *data;
@@ -150 +151 @@
         link_t link;
         
-        /** Incoming client task hash. */
-        sysarg_t in_task_hash;
+        /** Incoming client task ID. */
+        task_id_t in_task_id;
         
         /** Incoming phone hash. */
@@ -283 +284 @@
 {
         assert(key);
+        assert(keys == 2);
         assert(item);
         
         client_t *client = hash_table_get_instance(item, client_t, link);
-        return (key[0] == client->in_task_hash);
+        return (key[0] == LOWER32(client->in_task_id) &&
+            (key[1] == UPPER32(client->in_task_id)));
 }
 
@@ -574 +577 @@
 }
 
-static client_t *async_client_get(sysarg_t client_hash, bool create)
-{
-        unsigned long key = client_hash;
+static client_t *async_client_get(task_id_t client_id, bool create)
+{
+        unsigned long key[2] = {
+                LOWER32(client_id),
+                UPPER32(client_id),
+        };
         client_t *client = NULL;
 
         futex_down(&async_futex);
-        link_t *lnk = hash_table_find(&client_hash_table, &key);
+        link_t *lnk = hash_table_find(&client_hash_table, key);
         if (lnk) {
                 client = hash_table_get_instance(lnk, client_t, link);
@@ -587 +593 @@
                 client = malloc(sizeof(client_t));
                 if (client) {
-                        client->in_task_hash = client_hash;
+                        client->in_task_id = client_id;
                         client->data = async_client_data_create();
                 
                         atomic_set(&client->refcnt, 1);
-                        hash_table_insert(&client_hash_table, &key, &client->link);
+                        hash_table_insert(&client_hash_table, key, &client->link);
                 }
         }
@@ -602 +608 @@
 {
         bool destroy;
-        unsigned long key = client->in_task_hash;
+        unsigned long key[2] = {
+                LOWER32(client->in_task_id),
+                UPPER32(client->in_task_id)
+        };
         
         futex_down(&async_futex);
         
         if (atomic_predec(&client->refcnt) == 0) {
-                hash_table_remove(&client_hash_table, &key, 1);
+                hash_table_remove(&client_hash_table, key, 2);
                 destroy = true;
         } else
@@ -628 +637 @@
 }
 
-void *async_get_client_data_by_hash(sysarg_t client_hash)
-{
-        client_t *client = async_client_get(client_hash, false);
+void *async_get_client_data_by_id(task_id_t client_id)
+{
+        client_t *client = async_client_get(client_id, false);
         if (!client)
                 return NULL;
@@ -641 +650 @@
 }
 
-void async_put_client_data_by_hash(sysarg_t client_hash)
-{
-        client_t *client = async_client_get(client_hash, false);
+void async_put_client_data_by_id(task_id_t client_id)
+{
+        client_t *client = async_client_get(client_id, false);
 
         assert(client);
@@ -680 +689 @@
          */
 
-        client_t *client = async_client_get(fibril_connection->in_task_hash, true);
+        client_t *client = async_client_get(fibril_connection->in_task_id, true);
         if (!client) {
                 ipc_answer_0(fibril_connection->callid, ENOMEM);
@@ -737 +746 @@
  * particular fibrils.
  *
- * @param in_task_hash  Identification of the incoming connection.
+ * @param in_task_id    Identification of the incoming connection.
  * @param in_phone_hash Identification of the incoming connection.
  * @param callid        Hash of the opening IPC_M_CONNECT_ME_TO call.
@@ -751 +760 @@
  *
  */
-fid_t async_new_connection(sysarg_t in_task_hash, sysarg_t in_phone_hash,
+fid_t async_new_connection(task_id_t in_task_id, sysarg_t in_phone_hash,
     ipc_callid_t callid, ipc_call_t *call,
     async_client_conn_t cfibril, void *carg)
@@ -763 +772 @@
         }
         
-        conn->in_task_hash = in_task_hash;
+        conn->in_task_id = in_task_id;
         conn->in_phone_hash = in_phone_hash;
         list_initialize(&conn->msg_queue);
@@ -822 +831 @@
         case IPC_M_CONNECT_ME_TO:
                 /* Open new connection with fibril, etc. */
-                async_new_connection(call->in_task_hash, IPC_GET_ARG5(*call),
+                async_new_connection(call->in_task_id, IPC_GET_ARG5(*call),
                     callid, call, client_connection, NULL);
                 return;
@@ -970 +979 @@
 {
         if (!hash_table_create(&client_hash_table, CLIENT_HASH_TABLE_BUCKETS,
-            1, &client_hash_table_ops))
+            2, &client_hash_table_ops))
                 abort();