Changeset f1fae414 in mainline for uspace/lib/c/generic/fibril.c

Timestamp:

2011-06-22T01:34: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:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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/fibril.c (modified) (3 diffs)

uspace/lib/c/generic/fibril.c

@@ -222 +222 @@
         fibril_t *dstf;
         if ((stype == FIBRIL_TO_MANAGER) || (stype == FIBRIL_FROM_DEAD)) {
-                dstf = list_get_instance(manager_list.next, fibril_t, link);
+                dstf = list_get_instance(list_first(&manager_list), fibril_t,
+                    link);
                 if (serialization_count && stype == FIBRIL_TO_MANAGER) {
                         serialized_threads++;
@@ -233 +234 @@
         } else {
                 if (!list_empty(&serialized_list)) {
-                        dstf = list_get_instance(serialized_list.next, fibril_t,
-                            link);
+                        dstf = list_get_instance(list_first(&serialized_list),
+                            fibril_t, link);
                         serialized_threads--;
                 } else {
-                        dstf = list_get_instance(ready_list.next, fibril_t,
-                            link);
+                        dstf = list_get_instance(list_first(&ready_list),
+                            fibril_t, link);
                 }
         }
@@ -326 +327 @@
         
         if (!list_empty(&manager_list))
-                list_remove(manager_list.next);
+                list_remove(list_first(&manager_list));
         
         futex_up(&fibril_futex);