Changes in uspace/lib/c/generic/async.c [3815efb:8869f7b] in mainline

File:

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

uspace/lib/c/generic/async.c

@@ -160 +160 @@
         
         /** Messages that should be delivered to this fibril. */
-        list_t msg_queue;
+        link_t msg_queue;
         
         /** Identification of the opening call. */
@@ -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. */
@@ -173 +171 @@
         
         /** Fibril function that will be used to handle the connection. */
-        async_client_conn_t cfibril;
+        void (*cfibril)(ipc_callid_t, ipc_call_t *);
 } connection_t;
 
@@ -215 +213 @@
  * @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)
+ *
+ */
+static void default_client_connection(ipc_callid_t callid, ipc_call_t *call)
 {
         ipc_answer_0(callid, ENOENT);
@@ -230 +226 @@
  * @param callid Hash of the incoming call.
  * @param call   Data of the incoming call.
- * @param arg    Local argument.
  *
  */
@@ -238 +233 @@
 
 static async_client_conn_t client_connection = default_client_connection;
-static async_interrupt_handler_t interrupt_received = default_interrupt_received;
+static async_client_conn_t interrupt_received = default_interrupt_received;
 
 /** Setter for client_connection function pointer.
@@ -255 +250 @@
  *             notification fibril.
  */
-void async_set_interrupt_received(async_interrupt_handler_t intr)
+void async_set_interrupt_received(async_client_conn_t intr)
 {
         interrupt_received = intr;
@@ -361 +356 @@
         wd->to_event.inlist = true;
         
-        link_t *tmp = timeout_list.head.next;
-        while (tmp != &timeout_list.head) {
+        link_t *tmp = timeout_list.next;
+        while (tmp != &timeout_list) {
                 awaiter_t *cur
                     = list_get_instance(tmp, awaiter_t, to_event.link);
@@ -372 +367 @@
         }
         
-        list_insert_before(&wd->to_event.link, tmp);
+        list_append(&wd->to_event.link, tmp);
 }
 
@@ -569 +564 @@
         }
         
-        msg_t *msg = list_get_instance(list_first(&conn->msg_queue), msg_t, link);
+        msg_t *msg = list_get_instance(conn->msg_queue.next, msg_t, link);
         list_remove(&msg->link);
         
@@ -638 +633 @@
          */
         fibril_connection->cfibril(fibril_connection->callid,
-            &fibril_connection->call, fibril_connection->carg);
+            &fibril_connection->call);
         
         /*
@@ -675 +670 @@
         while (!list_empty(&fibril_connection->msg_queue)) {
                 msg_t *msg =
-                    list_get_instance(list_first(&fibril_connection->msg_queue),
-                    msg_t, link);
+                    list_get_instance(fibril_connection->msg_queue.next, msg_t,
+                    link);
                 
                 list_remove(&msg->link);
@@ -709 +704 @@
  * @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.
@@ -716 +710 @@
 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, void *carg)
+    async_client_conn_t cfibril)
 {
         connection_t *conn = malloc(sizeof(*conn));
@@ -731 +725 @@
         conn->callid = callid;
         conn->close_callid = 0;
-        conn->carg = carg;
         
         if (call)
@@ -786 +779 @@
                 /* Open new connection with fibril, etc. */
                 async_new_connection(call->in_task_hash, IPC_GET_ARG5(*call),
-                    callid, call, client_connection, NULL);
+                    callid, call, client_connection);
                 return;
         }
@@ -806 +799 @@
         futex_down(&async_futex);
         
-        link_t *cur = list_first(&timeout_list);
-        while (cur != NULL) {
+        link_t *cur = timeout_list.next;
+        while (cur != &timeout_list) {
                 awaiter_t *waiter =
                     list_get_instance(cur, awaiter_t, to_event.link);
@@ -813 +806 @@
                 if (tv_gt(&waiter->to_event.expires, &tv))
                         break;
+                
+                cur = cur->next;
                 
                 list_remove(&waiter->to_event.link);
@@ -826 +821 @@
                         fibril_add_ready(waiter->fid);
                 }
-                
-                cur = list_first(&timeout_list);
         }
         
@@ -854 +847 @@
                 suseconds_t timeout;
                 if (!list_empty(&timeout_list)) {
-                        awaiter_t *waiter = list_get_instance(
-                            list_first(&timeout_list), awaiter_t, to_event.link);
+                        awaiter_t *waiter = list_get_instance(timeout_list.next,
+                            awaiter_t, to_event.link);
                         
                         struct timeval tv;
@@ -1421 +1414 @@
  */
 int async_connect_to_me(async_exch_t *exch, sysarg_t arg1, sysarg_t arg2,
-    sysarg_t arg3, async_client_conn_t client_receiver, void *carg)
+    sysarg_t arg3, async_client_conn_t client_receiver)
 {
         if (exch == NULL)
@@ -1435 +1428 @@
         if (client_receiver != NULL)
                 async_new_connection(task_hash, phone_hash, 0, NULL,
-                    client_receiver, carg);
+                    client_receiver);
         
         return EOK;
@@ -1731 +1724 @@
                  */
                 exch = (async_exch_t *)
-                    list_get_instance(list_first(&sess->exch_list),
-                    async_exch_t, sess_link);
-                
+                    list_get_instance(sess->exch_list.next, async_exch_t, sess_link);
                 list_remove(&exch->sess_link);
                 list_remove(&exch->global_link);
@@ -1745 +1736 @@
                         exch = (async_exch_t *) malloc(sizeof(async_exch_t));
                         if (exch != NULL) {
-                                link_initialize(&exch->sess_link);
-                                link_initialize(&exch->global_link);
+                                list_initialize(&exch->sess_link);
+                                list_initialize(&exch->global_link);
                                 exch->sess = sess;
                                 exch->phone = sess->phone;
@@ -1763 +1754 @@
                                 exch = (async_exch_t *) malloc(sizeof(async_exch_t));
                                 if (exch != NULL) {
-                                        link_initialize(&exch->sess_link);
-                                        link_initialize(&exch->global_link);
+                                        list_initialize(&exch->sess_link);
+                                        list_initialize(&exch->global_link);
                                         exch->sess = sess;
                                         exch->phone = phone;
@@ -1776 +1767 @@
                                  */
                                 exch = (async_exch_t *)
-                                    list_get_instance(list_first(&inactive_exch_list),
-                                    async_exch_t, global_link);
-                                
+                                    list_get_instance(inactive_exch_list.next, async_exch_t,
+                                    global_link);
                                 list_remove(&exch->sess_link);
                                 list_remove(&exch->global_link);
@@ -1818 +1808 @@
         async_sess_t *sess = exch->sess;
         
-        atomic_dec(&sess->refcnt);
-        
         if (sess->mgmt == EXCHANGE_SERIALIZE)
                 fibril_mutex_unlock(&sess->mutex);