Changeset 4687fcd4 in mainline for uspace/lib/c/generic/async.c

Timestamp:

2011-01-29T10:19:04Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

72e19f50

Parents:

67a1b78 (diff), a09128c (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.

Message:

Changes from devel, break stuff.

File:

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

uspace/lib/c/generic/async.c

@@ -134 +134 @@
 
 typedef struct {
+        sysarg_t in_task_hash;
+        link_t link;
+        int refcnt;
+        void *data;
+} client_t;
+
+typedef struct {
         awaiter_t wdata;
         
@@ -139 +146 @@
         link_t link;
         
+        /** Incoming client task hash. */
+        sysarg_t in_task_hash;
         /** Incoming phone hash. */
         sysarg_t in_phone_hash;
         
+        /** Link to the client tracking structure. */
+        client_t *client;
+
         /** Messages that should be delivered to this fibril. */
         link_t msg_queue;
@@ -160 +172 @@
 fibril_local connection_t *FIBRIL_connection;
 
+static void *default_client_data_constructor(void)
+{
+        return NULL;
+}
+
+static void default_client_data_destructor(void *data)
+{
+}
+
+static async_client_data_ctor_t async_client_data_create =
+    default_client_data_constructor;
+static async_client_data_dtor_t async_client_data_destroy =
+    default_client_data_destructor;
+
+void async_set_client_data_constructor(async_client_data_ctor_t ctor)
+{
+        async_client_data_create = ctor;
+}
+
+void async_set_client_data_destructor(async_client_data_dtor_t dtor)
+{
+        async_client_data_destroy = dtor;
+}
+
+void *async_client_data_get(void)
+{
+        assert(FIBRIL_connection);
+
+        return FIBRIL_connection->client->data;
+}
+
 static void default_client_connection(ipc_callid_t callid, ipc_call_t *call);
 static void default_interrupt_received(ipc_callid_t callid, ipc_call_t *call);
@@ -174 +217 @@
 static async_client_conn_t interrupt_received = default_interrupt_received;
 
+static hash_table_t client_hash_table;
 static hash_table_t conn_hash_table;
 static LIST_INITIALIZE(timeout_list);
 
-#define CONN_HASH_TABLE_CHAINS  32
+#define CLIENT_HASH_TABLE_BUCKETS       32
+#define CONN_HASH_TABLE_BUCKETS         32
+
+static hash_index_t client_hash(unsigned long *key)
+{
+        assert(key);
+        return (((*key) >> 4) % CLIENT_HASH_TABLE_BUCKETS); 
+}
+
+static int client_compare(unsigned long key[], hash_count_t keys, link_t *item)
+{
+        client_t *cl = hash_table_get_instance(item, client_t, link);
+        return (key[0] == cl->in_task_hash);
+}
+
+static void client_remove(link_t *item)
+{
+}
+
+/** Operations for the client hash table. */
+static hash_table_operations_t client_hash_table_ops = {
+        .hash = client_hash,
+        .compare = client_compare,
+        .remove_callback = client_remove
+};
 
 /** Compute hash into the connection hash table based on the source phone hash.
@@ -189 +257 @@
 {
         assert(key);
-        return (((*key) >> 4) % CONN_HASH_TABLE_CHAINS);
+        return (((*key) >> 4) % CONN_HASH_TABLE_BUCKETS);
 }
 
@@ -480 +548 @@
 static int connection_fibril(void *arg)
 {
+        unsigned long key;
+        client_t *cl;
+        link_t *lnk;
+        bool destroy = false;
+
         /*
-         * Setup fibril-local connection pointer and call client_connection().
-         *
+         * Setup fibril-local connection pointer.
          */
         FIBRIL_connection = (connection_t *) arg;
+
+        /*
+         * Add our reference for the current connection in the client task
+         * tracking structure. If this is the first reference, create and
+         * hash in a new tracking structure.
+         */
+        futex_down(&async_futex);
+        key = FIBRIL_connection->in_task_hash;
+        lnk = hash_table_find(&client_hash_table, &key);
+        if (lnk) {
+                cl = hash_table_get_instance(lnk, client_t, link);
+                cl->refcnt++;
+        } else {
+                cl = malloc(sizeof(client_t));
+                if (!cl) {
+                        ipc_answer_0(FIBRIL_connection->callid, ENOMEM);
+                        futex_up(&async_futex);
+                        return 0;
+                }
+                cl->in_task_hash = FIBRIL_connection->in_task_hash;
+                async_serialize_start();
+                cl->data = async_client_data_create();
+                async_serialize_end();
+                cl->refcnt = 1;
+                hash_table_insert(&client_hash_table, &key, &cl->link);
+        }
+        futex_up(&async_futex);
+
+        FIBRIL_connection->client = cl;
+
+        /*
+         * Call the connection handler function.
+         */
         FIBRIL_connection->cfibril(FIBRIL_connection->callid,
             &FIBRIL_connection->call);
         
-        /* Remove myself from the connection hash table */
+        /*
+         * Remove the reference for this client task connection.
+         */
         futex_down(&async_futex);
-        unsigned long key = FIBRIL_connection->in_phone_hash;
+        if (--cl->refcnt == 0) {
+                hash_table_remove(&client_hash_table, &key, 1);
+                destroy = true;
+        }
+        futex_up(&async_futex);
+
+        if (destroy) {
+                if (cl->data)
+                        async_client_data_destroy(cl->data);
+                free(cl);
+        }
+
+        /*
+         * Remove myself from the connection hash table.
+         */
+        futex_down(&async_futex);
+        key = FIBRIL_connection->in_phone_hash;
         hash_table_remove(&conn_hash_table, &key, 1);
         futex_up(&async_futex);
         
-        /* Answer all remaining messages with EHANGUP */
+        /*
+         * Answer all remaining messages with EHANGUP.
+         */
         while (!list_empty(&FIBRIL_connection->msg_queue)) {
                 msg_t *msg;
@@ -505 +630 @@
         }
         
+        /*
+         * If the connection was hung-up, answer the last call,
+         * i.e. IPC_M_PHONE_HUNGUP.
+         */
         if (FIBRIL_connection->close_callid)
                 ipc_answer_0(FIBRIL_connection->close_callid, EOK);
@@ -517 +646 @@
  * particular fibrils.
  *
+ * @param in_task_hash  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.
@@ -529 +659 @@
  *
  */
-fid_t async_new_connection(sysarg_t in_phone_hash, ipc_callid_t callid,
-    ipc_call_t *call, void (*cfibril)(ipc_callid_t, ipc_call_t *))
+fid_t async_new_connection(sysarg_t in_task_hash, sysarg_t in_phone_hash,
+    ipc_callid_t callid, ipc_call_t *call,
+    void (*cfibril)(ipc_callid_t, ipc_call_t *))
 {
         connection_t *conn = malloc(sizeof(*conn));
@@ -539 +670 @@
         }
         
+        conn->in_task_hash = in_task_hash;
         conn->in_phone_hash = in_phone_hash;
         list_initialize(&conn->msg_queue);
@@ -592 +724 @@
         case IPC_M_CONNECT_ME_TO:
                 /* Open new connection with fibril etc. */
-                async_new_connection(IPC_GET_ARG5(*call), callid, call,
-                    client_connection);
+                async_new_connection(call->in_task_hash, IPC_GET_ARG5(*call),
+                    callid, call, client_connection);
                 goto out;
         }
@@ -744 +876 @@
 int __async_init(void)
 {
-        if (!hash_table_create(&conn_hash_table, CONN_HASH_TABLE_CHAINS, 1,
-            &conn_hash_table_ops)) {
-                printf("%s: Cannot create async hash table\n", "libc");
+        if (!hash_table_create(&client_hash_table, CLIENT_HASH_TABLE_BUCKETS, 1,
+            &client_hash_table_ops) || !hash_table_create(&conn_hash_table,
+            CONN_HASH_TABLE_BUCKETS, 1, &conn_hash_table_ops)) {
                 return ENOMEM;
         }