Changeset 3842a955 in mainline for uspace/lib/c/generic/async.c

Timestamp:

2011-06-19T15:59:42Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

26e7d6d

Parents:

9724d7f (diff), 74464e8 (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) (13 diffs)

uspace/lib/c/generic/async.c

@@ -160 +160 @@
         
         /** Messages that should be delivered to this fibril. */
-        link_t msg_queue;
+        list_t msg_queue;
         
         /** Identification of the opening call. */
@@ -361 +361 @@
         wd->to_event.inlist = true;
         
-        link_t *tmp = timeout_list.next;
-        while (tmp != &timeout_list) {
+        link_t *tmp = timeout_list.head.next;
+        while (tmp != &timeout_list.head) {
                 awaiter_t *cur
                     = list_get_instance(tmp, awaiter_t, to_event.link);
@@ -372 +372 @@
         }
         
-        list_append(&wd->to_event.link, tmp);
+        list_insert_before(&wd->to_event.link, tmp);
 }
 
@@ -569 +569 @@
         }
         
-        msg_t *msg = list_get_instance(conn->msg_queue.next, msg_t, link);
+        msg_t *msg = list_get_instance(list_first(&conn->msg_queue), msg_t, link);
         list_remove(&msg->link);
         
@@ -675 +675 @@
         while (!list_empty(&fibril_connection->msg_queue)) {
                 msg_t *msg =
-                    list_get_instance(fibril_connection->msg_queue.next, msg_t,
-                    link);
+                    list_get_instance(list_first(&fibril_connection->msg_queue),
+                    msg_t, link);
                 
                 list_remove(&msg->link);
@@ -806 +806 @@
         futex_down(&async_futex);
         
-        link_t *cur = timeout_list.next;
-        while (cur != &timeout_list) {
+        link_t *cur = list_first(&timeout_list);
+        while (cur != NULL) {
                 awaiter_t *waiter =
                     list_get_instance(cur, awaiter_t, to_event.link);
@@ -813 +813 @@
                 if (tv_gt(&waiter->to_event.expires, &tv))
                         break;
-                
-                cur = cur->next;
                 
                 list_remove(&waiter->to_event.link);
@@ -828 +826 @@
                         fibril_add_ready(waiter->fid);
                 }
+                
+                cur = list_first(&timeout_list);
         }
         
@@ -854 +854 @@
                 suseconds_t timeout;
                 if (!list_empty(&timeout_list)) {
-                        awaiter_t *waiter = list_get_instance(timeout_list.next,
-                            awaiter_t, to_event.link);
+                        awaiter_t *waiter = list_get_instance(
+                            list_first(&timeout_list), awaiter_t, to_event.link);
                         
                         struct timeval tv;
@@ -1731 +1731 @@
                  */
                 exch = (async_exch_t *)
-                    list_get_instance(sess->exch_list.next, async_exch_t, sess_link);
+                    list_get_instance(list_first(&sess->exch_list),
+                    async_exch_t, sess_link);
+                
                 list_remove(&exch->sess_link);
                 list_remove(&exch->global_link);
@@ -1743 +1745 @@
                         exch = (async_exch_t *) malloc(sizeof(async_exch_t));
                         if (exch != NULL) {
-                                list_initialize(&exch->sess_link);
-                                list_initialize(&exch->global_link);
+                                link_initialize(&exch->sess_link);
+                                link_initialize(&exch->global_link);
                                 exch->sess = sess;
                                 exch->phone = sess->phone;
@@ -1761 +1763 @@
                                 exch = (async_exch_t *) malloc(sizeof(async_exch_t));
                                 if (exch != NULL) {
-                                        list_initialize(&exch->sess_link);
-                                        list_initialize(&exch->global_link);
+                                        link_initialize(&exch->sess_link);
+                                        link_initialize(&exch->global_link);
                                         exch->sess = sess;
                                         exch->phone = phone;
@@ -1774 +1776 @@
                                  */
                                 exch = (async_exch_t *)
-                                    list_get_instance(inactive_exch_list.next, async_exch_t,
-                                    global_link);
+                                    list_get_instance(list_first(&inactive_exch_list),
+                                    async_exch_t, global_link);
+                                
                                 list_remove(&exch->sess_link);
                                 list_remove(&exch->global_link);