Changeset 107f2e0 in mainline for uspace/lib/c/generic/async.c

Timestamp:

2011-08-19T16:56:41Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

f00af83

Parents:

cf22ada (diff), 45059d6b (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:

Merge mainline changes.

File:

• uspace/lib/c/generic/async.c (modified) (17 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;
+        task_id_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. */
@@ -203 +204 @@
 }
 
-void *async_get_client_data(void)
-{
-        assert(fibril_connection);
-        return fibril_connection->client->data;
-}
-
 /** Default fibril function that gets called to handle new connection.
  *
@@ -289 +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)));
 }
 
@@ -580 +577 @@
 }
 
+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);
+        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_id = client_id;
+                        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[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, 2);
+                destroy = true;
+        } else
+                destroy = false;
+        
+        futex_up(&async_futex);
+        
+        if (destroy) {
+                if (client->data)
+                        async_client_data_destroy(client->data);
+                
+                free(client);
+        }
+}
+
+void *async_get_client_data(void)
+{
+        assert(fibril_connection);
+        return fibril_connection->client->data;
+}
+
+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;
+        if (!client->data) {
+                async_client_put(client);
+                return NULL;
+        }
+
+        return client->data;
+}
+
+void async_put_client_data_by_id(task_id_t client_id)
+{
+        client_t *client = async_client_get(client_id, false);
+
+        assert(client);
+        assert(client->data);
+
+        /* Drop the reference we got in async_get_client_data_by_hash(). */
+        async_client_put(client);
+
+        /* Drop our own reference we got at the beginning of this function. */
+        async_client_put(client);
+}
+
 /** Wrapper for client connection fibril.
  *
@@ -598 +682 @@
          */
         fibril_connection = (connection_t *) arg;
-        
-        futex_down(&async_futex);
         
         /*
@@ -606 +688 @@
          * 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_id, true);
+        if (!client) {
+                ipc_answer_0(fibril_connection->callid, ENOMEM);
+                return 0;
+        }
+
         fibril_connection->client = client;
         
@@ -643 +706 @@
          * 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 +712 @@
          */
         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);
@@ -700 +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.
@@ -714 +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)
@@ -726 +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);
@@ -785 +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;
@@ -933 +979 @@
 {
         if (!hash_table_create(&client_hash_table, CLIENT_HASH_TABLE_BUCKETS,
-            1, &client_hash_table_ops))
+            2, &client_hash_table_ops))
                 abort();
         
@@ -1426 +1472 @@
                 return ENOENT;
         
-        sysarg_t task_hash;
+        task_id_t task_id;
+        sysarg_t task_id_lo;
+        sysarg_t task_id_hi;
         sysarg_t phone_hash;
         int rc = async_req_3_5(exch, IPC_M_CONNECT_TO_ME, arg1, arg2, arg3,
-            NULL, NULL, NULL, &task_hash, &phone_hash);
+            NULL, NULL, &task_id_lo, &task_id_hi, &phone_hash);
         if (rc != EOK)
                 return rc;
+
+        task_id = (task_id_t) MERGE_LOUP32(task_id_lo, task_id_hi);
         
         if (client_receiver != NULL)
-                async_new_connection(task_hash, phone_hash, 0, NULL,
+                async_new_connection(task_id, phone_hash, 0, NULL,
                     client_receiver, carg);
         
@@ -2429 +2479 @@
 }
 
+int async_state_change_start(async_exch_t *exch, sysarg_t arg1, sysarg_t arg2,
+    sysarg_t arg3, async_exch_t *other_exch)
+{
+        return async_req_5_0(exch, IPC_M_STATE_CHANGE_AUTHORIZE,
+            arg1, arg2, arg3, 0, other_exch->phone);
+}
+
+bool async_state_change_receive(ipc_callid_t *callid, sysarg_t *arg1,
+    sysarg_t *arg2, sysarg_t *arg3)
+{
+        assert(callid);
+
+        ipc_call_t call;
+        *callid = async_get_call(&call);
+
+        if (IPC_GET_IMETHOD(call) != IPC_M_STATE_CHANGE_AUTHORIZE)
+                return false;
+        
+        if (arg1)
+                *arg1 = IPC_GET_ARG1(call);
+        if (arg2)
+                *arg2 = IPC_GET_ARG2(call);
+        if (arg3)
+                *arg3 = IPC_GET_ARG3(call);
+
+        return true;
+}
+
+int async_state_change_finalize(ipc_callid_t callid, async_exch_t *other_exch)
+{
+        return ipc_answer_1(callid, EOK, other_exch->phone);
+}
+
 /** @}
  */