Changeset f1fae414 in mainline for uspace/lib/c/generic/fibril_synch.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_synch.c (modified) (3 diffs)

uspace/lib/c/generic/fibril_synch.c

@@ -148 +148 @@
                 fibril_t *f;
         
-                assert(!list_empty(&fm->waiters));
-                tmp = fm->waiters.next;
+                tmp = list_first(&fm->waiters);
+                assert(tmp != NULL);
                 wdp = list_get_instance(tmp, awaiter_t, wu_event.link);
                 wdp->active = true;
@@ -279 +279 @@
         
         while (!list_empty(&frw->waiters)) {
-                link_t *tmp = frw->waiters.next;
+                link_t *tmp = list_first(&frw->waiters);
                 awaiter_t *wdp;
                 fibril_t *f;
@@ -422 +422 @@
         futex_down(&async_futex);
         while (!list_empty(&fcv->waiters)) {
-                tmp = fcv->waiters.next;
+                tmp = list_first(&fcv->waiters);
                 wdp = list_get_instance(tmp, awaiter_t, wu_event.link);
                 list_remove(&wdp->wu_event.link);