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

Timestamp:

2011-06-17T16:48:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

f3a605be

Parents:

df8110d3 (diff), 98caf49 (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) (14 diffs)

uspace/lib/c/generic/async.c

@@ -166 +166 @@
         /** Call data of the opening call. */
         ipc_call_t call;
+        /** Local argument or NULL if none. */
+        void *carg;
         
         /** Identification of the closing call. */
@@ -171 +173 @@
         
         /** Fibril function that will be used to handle the connection. */
-        void (*cfibril)(ipc_callid_t, ipc_call_t *);
+        async_client_conn_t cfibril;
 } connection_t;
 
@@ -211 +213 @@
  * This function is defined as a weak symbol - to be redefined in user code.
  *
- * @param callid Hash of the incoming call.
- * @param call   Data of the incoming call.
- *
- */
-static void default_client_connection(ipc_callid_t callid, ipc_call_t *call)
+ * @param callid        Hash of the incoming call.
+ * @param call          Data of the incoming call.
+ * @param arg           Local argument
+ *
+ */
+static void default_client_connection(ipc_callid_t callid, ipc_call_t *call,
+    void *arg)
 {
         ipc_answer_0(callid, ENOENT);
@@ -224 +228 @@
  * This function is defined as a weak symbol - to be redefined in user code.
  *
- * @param callid Hash of the incoming call.
- * @param call   Data of the incoming call.
+ * @param callid        Hash of the incoming call.
+ * @param call          Data of the incoming call.
+ * @param arg           Local argument.
  *
  */
@@ -233 +238 @@
 
 static async_client_conn_t client_connection = default_client_connection;
-static async_client_conn_t interrupt_received = default_interrupt_received;
+static async_interrupt_handler_t interrupt_received = default_interrupt_received;
 
 /** Setter for client_connection function pointer.
@@ -250 +255 @@
  *             notification fibril.
  */
-void async_set_interrupt_received(async_client_conn_t intr)
+void async_set_interrupt_received(async_interrupt_handler_t intr)
 {
         interrupt_received = intr;
@@ -633 +638 @@
          */
         fibril_connection->cfibril(fibril_connection->callid,
-            &fibril_connection->call);
+            &fibril_connection->call, fibril_connection->carg);
         
         /*
@@ -704 +709 @@
  * @param cfibril       Fibril function that should be called upon opening the
  *                      connection.
+ * @param carg          Extra argument to pass to the connection fibril
  *
  * @return New fibril id or NULL on failure.
@@ -710 +716 @@
 fid_t async_new_connection(sysarg_t in_task_hash, sysarg_t in_phone_hash,
     ipc_callid_t callid, ipc_call_t *call,
-    async_client_conn_t cfibril)
+    async_client_conn_t cfibril, void *carg)
 {
         connection_t *conn = malloc(sizeof(*conn));
@@ -725 +731 @@
         conn->callid = callid;
         conn->close_callid = 0;
+        conn->carg = carg;
         
         if (call)
@@ -779 +786 @@
                 /* Open new connection with fibril, etc. */
                 async_new_connection(call->in_task_hash, IPC_GET_ARG5(*call),
-                    callid, call, client_connection);
+                    callid, call, client_connection, NULL);
                 return;
         }
@@ -1414 +1421 @@
  */
 int async_connect_to_me(async_exch_t *exch, sysarg_t arg1, sysarg_t arg2,
-    sysarg_t arg3, async_client_conn_t client_receiver)
+    sysarg_t arg3, async_client_conn_t client_receiver, void *carg)
 {
         if (exch == NULL)
@@ -1428 +1435 @@
         if (client_receiver != NULL)
                 async_new_connection(task_hash, phone_hash, 0, NULL,
-                    client_receiver);
+                    client_receiver, carg);
         
         return EOK;
@@ -1808 +1815 @@
         async_sess_t *sess = exch->sess;
         
+        atomic_dec(&sess->refcnt);
+        
         if (sess->mgmt == EXCHANGE_SERIALIZE)
                 fibril_mutex_unlock(&sess->mutex);