Changeset 95c675b in mainline for uspace/lib/c/generic/async.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

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

uspace/lib/c/generic/async.c

@@ -106 +106 @@
 #include <fibril.h>
 #include <adt/hash_table.h>
+#include <adt/hash.h>
 #include <adt/list.h>
 #include <assert.h>
@@ -587 +588 @@
 };
 
-/** Compute hash into the connection hash table based on the source phone hash.
- *
- * @param key Pointer to source phone hash.
+typedef struct {
+        task_id_t task_id;
+        sysarg_t phone_hash;
+} conn_key_t;
+
+/** Compute hash into the connection hash table
+ *
+ * The hash is based on the source task ID and the source phone hash. The task
+ * ID is included in the hash because a phone hash alone might not be unique
+ * while we still track connections for killed tasks due to kernel's recycling
+ * of phone structures.
+ *
+ * @param key Pointer to the connection key structure.
  *
  * @return Index into the connection hash table.
@@ -596 +607 @@
 static size_t conn_key_hash(void *key)
 {
-        sysarg_t in_phone_hash = *(sysarg_t *) key;
-        return in_phone_hash;
+        conn_key_t *ck = (conn_key_t *) key;
+
+        size_t hash = 0;
+        hash = hash_combine(hash, LOWER32(ck->task_id));
+        hash = hash_combine(hash, UPPER32(ck->task_id));
+        hash = hash_combine(hash, ck->phone_hash);
+        return hash;
 }
 
@@ -603 +619 @@
 {
         connection_t *conn = hash_table_get_inst(item, connection_t, link);
-        return conn_key_hash(&conn->in_phone_hash);
+        return conn_key_hash(&(conn_key_t){
+                .task_id = conn->in_task_id,
+                .phone_hash = conn->in_phone_hash
+        });
 }
 
 static bool conn_key_equal(void *key, const ht_link_t *item)
 {
-        sysarg_t in_phone_hash = *(sysarg_t *) key;
+        conn_key_t *ck = (conn_key_t *) key;
         connection_t *conn = hash_table_get_inst(item, connection_t, link);
-        return (in_phone_hash == conn->in_phone_hash);
+        return ((ck->task_id == conn->in_task_id) &&
+            (ck->phone_hash == conn->in_phone_hash));
 }
 
@@ -716 +736 @@
          */
         futex_down(&async_futex);
-        hash_table_remove(&conn_hash_table, &fibril_connection->in_phone_hash);
+        hash_table_remove(&conn_hash_table, &(conn_key_t){
+                .task_id = fibril_connection->in_task_id,
+                .phone_hash = fibril_connection->in_phone_hash
+        });
         futex_up(&async_futex);
         
@@ -951 +974 @@
         futex_down(&async_futex);
         
-        ht_link_t *link = hash_table_find(&conn_hash_table, &call->in_phone_hash);
+        ht_link_t *link = hash_table_find(&conn_hash_table, &(conn_key_t){
+                .task_id = call->in_task_id,
+                .phone_hash = call->in_phone_hash
+        });
         if (!link) {
                 futex_up(&async_futex);
@@ -1022 +1048 @@
  *
  * @param inr     IRQ number.
- * @param devno   Device number of the device generating inr.
  * @param handler Notification handler.
  * @param data    Notification handler client data.
  * @param ucode   Top-half pseudocode handler.
  *
- * @return Zero on success or a negative error code.
- *
- */
-int async_irq_subscribe(int inr, int devno,
-    async_notification_handler_t handler, void *data, const irq_code_t *ucode)
+ * @return IRQ capability handle on success.
+ * @return Negative error code.
+ *
+ */
+int async_irq_subscribe(int inr, async_notification_handler_t handler,
+    void *data, const irq_code_t *ucode)
 {
         notification_t *notification =
@@ -1051 +1077 @@
         futex_up(&async_futex);
         
-        return ipc_irq_subscribe(inr, devno, imethod, ucode);
+        return ipc_irq_subscribe(inr, imethod, ucode);
 }
 
 /** Unsubscribe from IRQ notification.
  *
- * @param inr     IRQ number.
- * @param devno   Device number of the device generating inr.
+ * @param cap     IRQ capability handle. 
  *
  * @return Zero on success or a negative error code.
  *
  */
-int async_irq_unsubscribe(int inr, int devno)
+int async_irq_unsubscribe(int cap)
 {
         // TODO: Remove entry from hash table
         //       to avoid memory leak
         
-        return ipc_irq_unsubscribe(inr, devno);
+        return ipc_irq_unsubscribe(cap);
 }
 
@@ -1358 +1383 @@
                 async_new_connection(call->in_task_id, in_phone_hash, callid,
                     call, handler, data);
-                return;
-        }
-        
-        /* Cloned connection */
-        if (IPC_GET_IMETHOD(*call) == IPC_M_CLONE_ESTABLISH) {
-                // TODO: Currently ignores ports altogether
-                
-                /* Open new connection with fibril, etc. */
-                async_new_connection(call->in_task_id, IPC_GET_ARG5(*call),
-                    callid, call, fallback_port_handler, fallback_port_data);
                 return;
         }
@@ -2085 +2100 @@
         
         return EOK;
-}
-
-/** Wrapper for making IPC_M_CLONE_ESTABLISH calls using the async framework.
- *
- * Ask for a cloned connection to some service.
- *
- * @param mgmt Exchange management style.
- * @param exch Exchange for sending the message.
- *
- * @return New session on success or NULL on error.
- *
- */
-async_sess_t *async_clone_establish(exch_mgmt_t mgmt, async_exch_t *exch)
-{
-        if (exch == NULL) {
-                errno = ENOENT;
-                return NULL;
-        }
-        
-        async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t));
-        if (sess == NULL) {
-                errno = ENOMEM;
-                return NULL;
-        }
-        
-        ipc_call_t result;
-        
-        amsg_t *msg = amsg_create();
-        if (!msg) {
-                free(sess);
-                errno = ENOMEM;
-                return NULL;
-        }
-        
-        msg->dataptr = &result;
-        msg->wdata.active = true;
-        
-        ipc_call_async_0(exch->phone, IPC_M_CLONE_ESTABLISH, msg,
-            reply_received);
-        
-        sysarg_t rc;
-        async_wait_for((aid_t) msg, &rc);
-        
-        if (rc != EOK) {
-                errno = rc;
-                free(sess);
-                return NULL;
-        }
-        
-        int phone = (int) IPC_GET_ARG5(result);
-        
-        if (phone < 0) {
-                errno = phone;
-                free(sess);
-                return NULL;
-        }
-        
-        sess->iface = 0;
-        sess->mgmt = mgmt;
-        sess->phone = phone;
-        sess->arg1 = 0;
-        sess->arg2 = 0;
-        sess->arg3 = 0;
-        
-        fibril_mutex_initialize(&sess->remote_state_mtx);
-        sess->remote_state_data = NULL;
-        
-        list_initialize(&sess->exch_list);
-        fibril_mutex_initialize(&sess->mutex);
-        atomic_set(&sess->refcnt, 0);
-        
-        return sess;
 }
 
@@ -3127 +3070 @@
 }
 
-/** Wrapper for sending an exchange over different exchange for cloning
- *
- * @param exch       Exchange to be used for sending.
- * @param clone_exch Exchange to be cloned.
- *
- */
-int async_exchange_clone(async_exch_t *exch, async_exch_t *clone_exch)
-{
-        return async_req_1_0(exch, IPC_M_CONNECTION_CLONE, clone_exch->phone);
-}
-
-/** Wrapper for receiving the IPC_M_CONNECTION_CLONE calls.
- *
- * If the current call is IPC_M_CONNECTION_CLONE then a new
- * async session is created for the accepted phone.
- *
- * @param mgmt Exchange management style.
- *
- * @return New async session or NULL on failure.
- *
- */
-async_sess_t *async_clone_receive(exch_mgmt_t mgmt)
-{
-        /* Accept the phone */
-        ipc_call_t call;
-        ipc_callid_t callid = async_get_call(&call);
-        int phone = (int) IPC_GET_ARG1(call);
-        
-        if ((IPC_GET_IMETHOD(call) != IPC_M_CONNECTION_CLONE) ||
-            (phone < 0)) {
-                async_answer_0(callid, EINVAL);
-                return NULL;
-        }
-        
-        async_sess_t *sess = (async_sess_t *) malloc(sizeof(async_sess_t));
-        if (sess == NULL) {
-                async_answer_0(callid, ENOMEM);
-                return NULL;
-        }
-        
-        sess->iface = 0;
-        sess->mgmt = mgmt;
-        sess->phone = phone;
-        sess->arg1 = 0;
-        sess->arg2 = 0;
-        sess->arg3 = 0;
-        
-        fibril_mutex_initialize(&sess->remote_state_mtx);
-        sess->remote_state_data = NULL;
-        
-        list_initialize(&sess->exch_list);
-        fibril_mutex_initialize(&sess->mutex);
-        atomic_set(&sess->refcnt, 0);
-        
-        /* Acknowledge the cloned phone */
-        async_answer_0(callid, EOK);
-        
-        return sess;
-}
-
 /** Wrapper for receiving the IPC_M_CONNECT_TO_ME calls.
  *