Changeset 854ad23 in mainline

Timestamp:

2009-10-11T10:32:40Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b69bec5

Parents:

cadfa8e

Message:

Make fibril mutexes use the awaiter_t type for sleeping.
Timeouts are not supported.

File:

• uspace/lib/libc/generic/fibril_sync.c (modified) (2 diffs)

uspace/lib/libc/generic/fibril_sync.c

@@ -66 +66 @@
         futex_down(&async_futex);
         if (fm->counter-- <= 0) {
-                fibril_t *f = (fibril_t *) fibril_get_id();
-                list_append(&f->link, &fm->waiters);
+                awaiter_t 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);
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
@@ -93 +98 @@
         if (fm->counter++ < 0) {
                 link_t *tmp;
-                fibril_t *f;
+                awaiter_t *wdp;
         
                 assert(!list_empty(&fm->waiters));
                 tmp = fm->waiters.next;
-                f = list_get_instance(tmp, fibril_t, link);
-                list_remove(&f->link);
-                fibril_add_ready((fid_t) f);
+                wdp = list_get_instance(tmp, awaiter_t, wu_event.link);
+                wdp->wu_event.inlist = false;
+                list_remove(&wdp->wu_event.link);
+                fibril_add_ready(wdp->fid);
                 optimize_execution_power();
         }