Changeset b69bec5 in mainline

Timestamp:

2009-10-11T10:48:56Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bbb01b98

Parents:

854ad23

Message:

Make fibril RW-locks use the awaiter_t type for sleeping.
Timeouts are not supported.

File:

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

uspace/lib/libc/generic/fibril_sync.c

@@ -129 +129 @@
         if (frw->writers) {
                 fibril_t *f = (fibril_t *) fibril_get_id();
+                awaiter_t 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(&f->link, &frw->waiters);
+                list_append(&wdata.wu_event.link, &frw->waiters);
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
@@ -143 +149 @@
         if (frw->writers || frw->readers) {
                 fibril_t *f = (fibril_t *) fibril_get_id();
+                awaiter_t 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(&f->link, &frw->waiters);
+                list_append(&wdata.wu_event.link, &frw->waiters);
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
@@ -167 +179 @@
         while (!list_empty(&frw->waiters)) {
                 link_t *tmp = frw->waiters.next;
-                fibril_t *f = list_get_instance(tmp, fibril_t, link);
+                awaiter_t *wdp;
+                fibril_t *f;
+                
+                wdp = list_get_instance(tmp, awaiter_t, wu_event.link);
+                f = (fibril_t *) wdp->fid;
                 
                 if (f->flags & FIBRIL_WRITER) {
                         if (frw->readers)
                                 break;
-                        list_remove(&f->link);
-                        fibril_add_ready((fid_t) f);
+                        wdp->active = true;
+                        wdp->wu_event.inlist = false;
+                        list_remove(&wdp->wu_event.link);
+                        fibril_add_ready(wdp->fid);
                         frw->writers++;
                         optimize_execution_power();
                         break;
                 } else {
-                        list_remove(&f->link);
-                        fibril_add_ready((fid_t) f);
+                        wdp->active = true;
+                        wdp->wu_event.inlist = false;
+                        list_remove(&wdp->wu_event.link);
+                        fibril_add_ready(wdp->fid);
                         frw->readers++;
                         optimize_execution_power();