Changes in uspace/lib/c/generic/async.c [cdc8ee2d:c0699467] in mainline

File:

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

uspace/lib/c/generic/async.c

@@ -201 +201 @@
 {
         async_client_data_destroy = dtor;
+}
+
+void *async_get_client_data(void)
+{
+        assert(fibril_connection);
+        return fibril_connection->client->data;
 }
 
@@ -574 +580 @@
 }
 
-static client_t *async_client_get(sysarg_t client_hash, bool create)
-{
-        unsigned long key = client_hash;
-        client_t *client = NULL;
-
+/** Wrapper for client connection fibril.
+ *
+ * When a new connection arrives, a fibril with this implementing function is
+ * created. It calls client_connection() and does the final cleanup.
+ *
+ * @param arg Connection structure pointer.
+ *
+ * @return Always zero.
+ *
+ */
+static int connection_fibril(void *arg)
+{
+        assert(arg);
+        
+        /*
+         * Setup fibril-local connection pointer.
+         */
+        fibril_connection = (connection_t *) arg;
+        
         futex_down(&async_futex);
+        
+        /*
+         * 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.
+         */
+        
+        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 if (create) {
+        } else {
                 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);
+                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);
-        return client;
-}
-
-static void async_client_put(client_t *client)
-{
+        
+        fibril_connection->client = client;
+        
+        /*
+         * Call the connection handler function.
+         */
+        fibril_connection->cfibril(fibril_connection->callid,
+            &fibril_connection->call, fibril_connection->carg);
+        
+        /*
+         * Remove the reference for this client task connection.
+         */
         bool destroy;
-        unsigned long key = client->in_task_hash;
         
         futex_down(&async_futex);
@@ -620 +661 @@
                 free(client);
         }
-}
-
-void *async_get_client_data(void)
-{
-        assert(fibril_connection);
-        return fibril_connection->client->data;
-}
-
-void *async_get_client_data_by_hash(sysarg_t client_hash)
-{
-        client_t *client = async_client_get(client_hash, false);
-        if (!client)
-                return NULL;
-        if (!client->data) {
-                async_client_put(client);
-                return NULL;
-        }
-
-        return client->data;
-}
-
-void async_put_client_data_by_hash(sysarg_t client_hash)
-{
-        client_t *client = async_client_get(client_hash, 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.
- *
- * When a new connection arrives, a fibril with this implementing function is
- * created. It calls client_connection() and does the final cleanup.
- *
- * @param arg Connection structure pointer.
- *
- * @return Always zero.
- *
- */
-static int connection_fibril(void *arg)
-{
-        assert(arg);
-        
-        /*
-         * 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.
-         */
-
-        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;
-        
-        /*
-         * Call the connection handler function.
-         */
-        fibril_connection->cfibril(fibril_connection->callid,
-            &fibril_connection->call, fibril_connection->carg);
-        
-        /*
-         * Remove the reference for this client task connection.
-         */
-        async_client_put(client);
         
         /*
@@ -703 +666 @@
          */
         futex_down(&async_futex);
-        unsigned long key = fibril_connection->in_phone_hash;
+        key = fibril_connection->in_phone_hash;
         hash_table_remove(&conn_hash_table, &key, 1);
         futex_up(&async_futex);
@@ -2466 +2429 @@
 }
 
-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);
-}
-
 /** @}
  */