Changeset 97c7682 in mainline for uspace/lib/c/generic/fibril_synch.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/lib/c/generic/fibril_synch.c (modified) (4 diffs)

uspace/lib/c/generic/fibril_synch.c

@@ -112 +112 @@
                 awaiter_t wdata;
 
+                awaiter_initialize(&wdata);
                 wdata.fid = fibril_get_id();
-                wdata.active = false;
                 wdata.wu_event.inlist = true;
-                link_initialize(&wdata.wu_event.link);
                 list_append(&wdata.wu_event.link, &fm->waiters);
                 check_for_deadlock(&fm->oi);
@@ -205 +204 @@
                 awaiter_t wdata;
 
+                awaiter_initialize(&wdata);
                 wdata.fid = (fid_t) f;
-                wdata.active = false;
                 wdata.wu_event.inlist = true;
-                link_initialize(&wdata.wu_event.link);
                 f->flags &= ~FIBRIL_WRITER;
                 list_append(&wdata.wu_event.link, &frw->waiters);
@@ -233 +231 @@
                 awaiter_t wdata;
 
+                awaiter_initialize(&wdata);
                 wdata.fid = (fid_t) f;
-                wdata.active = false;
                 wdata.wu_event.inlist = true;
-                link_initialize(&wdata.wu_event.link);
                 f->flags |= FIBRIL_WRITER;
                 list_append(&wdata.wu_event.link, &frw->waiters);
@@ -375 +372 @@
                 return ETIMEOUT;
 
+        awaiter_initialize(&wdata);
         wdata.fid = fibril_get_id();
-        wdata.active = false;
-        
         wdata.to_event.inlist = timeout > 0;
-        wdata.to_event.occurred = false;
-        link_initialize(&wdata.to_event.link);
-
         wdata.wu_event.inlist = true;
-        link_initialize(&wdata.wu_event.link);
 
         futex_down(&async_futex);