Changes in uspace/lib/libc/generic/fibril_sync.c [bbb01b98:8619f25] in mainline

File:

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

uspace/lib/libc/generic/fibril_sync.c

@@ -36 +36 @@
 #include <fibril.h>
 #include <async.h>
-#include <async_priv.h>
 #include <adt/list.h>
 #include <futex.h>
-#include <sys/time.h>
-#include <errno.h>
 #include <assert.h>
 
@@ -66 +63 @@
         futex_down(&async_futex);
         if (fm->counter-- <= 0) {
-                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_t *f = (fibril_t *) fibril_get_id();
+                list_append(&f->link, &fm->waiters);
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
@@ -98 +90 @@
         if (fm->counter++ < 0) {
                 link_t *tmp;
-                awaiter_t *wdp;
+                fibril_t *f;
         
                 assert(!list_empty(&fm->waiters));
                 tmp = fm->waiters.next;
-                wdp = list_get_instance(tmp, awaiter_t, wu_event.link);
-                wdp->active = true;
-                wdp->wu_event.inlist = false;
-                list_remove(&wdp->wu_event.link);
-                fibril_add_ready(wdp->fid);
+                f = list_get_instance(tmp, fibril_t, link);
+                list_remove(&f->link);
+                fibril_add_ready((fid_t) f);
                 optimize_execution_power();
         }
@@ -130 +120 @@
         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(&wdata.wu_event.link, &frw->waiters);
+                list_append(&f->link, &frw->waiters);
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
@@ -150 +134 @@
         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(&wdata.wu_event.link, &frw->waiters);
+                list_append(&f->link, &frw->waiters);
                 fibril_switch(FIBRIL_TO_MANAGER);
         } else {
@@ -180 +158 @@
         while (!list_empty(&frw->waiters)) {
                 link_t *tmp = frw->waiters.next;
-                awaiter_t *wdp;
-                fibril_t *f;
-                
-                wdp = list_get_instance(tmp, awaiter_t, wu_event.link);
-                f = (fibril_t *) wdp->fid;
+                fibril_t *f = list_get_instance(tmp, fibril_t, link);
                 
                 if (f->flags & FIBRIL_WRITER) {
                         if (frw->readers)
                                 break;
-                        wdp->active = true;
-                        wdp->wu_event.inlist = false;
-                        list_remove(&wdp->wu_event.link);
-                        fibril_add_ready(wdp->fid);
+                        list_remove(&f->link);
+                        fibril_add_ready((fid_t) f);
                         frw->writers++;
                         optimize_execution_power();
                         break;
                 } else {
-                        wdp->active = true;
-                        wdp->wu_event.inlist = false;
-                        list_remove(&wdp->wu_event.link);
-                        fibril_add_ready(wdp->fid);
+                        list_remove(&f->link);
+                        fibril_add_ready((fid_t) f);
                         frw->readers++;
                         optimize_execution_power();
@@ -224 +194 @@
 }
 
-int
-fibril_condvar_wait_timeout(fibril_condvar_t *fcv, fibril_mutex_t *fm,
-    suseconds_t timeout)
-{
-        awaiter_t wdata;
-
-        if (timeout < 0)
-                return ETIMEOUT;
-
-        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);
-        if (timeout) {
-                gettimeofday(&wdata.to_event.expires, NULL);
-                tv_add(&wdata.to_event.expires, timeout);
-                async_insert_timeout(&wdata);
-        }
-        list_append(&wdata.wu_event.link, &fcv->waiters);
+void fibril_condvar_wait(fibril_condvar_t *fcv, fibril_mutex_t *fm)
+{
+        fibril_t *f = (fibril_t *) fibril_get_id();
+
+        futex_down(&async_futex);
+        list_append(&f->link, &fcv->waiters);
         _fibril_mutex_unlock_unsafe(fm);
         fibril_switch(FIBRIL_TO_MANAGER);
         fibril_mutex_lock(fm);
-
-        /* async_futex not held after fibril_switch() */
-        futex_down(&async_futex);
-        if (wdata.to_event.inlist)
-                list_remove(&wdata.to_event.link);
-        if (wdata.wu_event.inlist)
-                list_remove(&wdata.wu_event.link);
-        futex_up(&async_futex);
-        
-        return wdata.to_event.occurred ? ETIMEOUT : EOK;
-}
-
-void fibril_condvar_wait(fibril_condvar_t *fcv, fibril_mutex_t *fm)
-{
-        int rc;
-
-        rc = fibril_condvar_wait_timeout(fcv, fm, 0);
-        assert(rc == EOK);
 }
 
@@ -276 +208 @@
 {
         link_t *tmp;
-        awaiter_t *wdp;
+        fibril_t *f;
 
         futex_down(&async_futex);
         while (!list_empty(&fcv->waiters)) {
                 tmp = fcv->waiters.next;
-                wdp = list_get_instance(tmp, awaiter_t, wu_event.link);
-                list_remove(&wdp->wu_event.link);
-                wdp->wu_event.inlist = false;
-                if (!wdp->active) {
-                        wdp->active = true;
-                        fibril_add_ready(wdp->fid);
-                        optimize_execution_power();
-                        if (once)
-                                break;
-                }
+                f = list_get_instance(tmp, fibril_t, link);
+                list_remove(&f->link);
+                fibril_add_ready((fid_t) f);
+                optimize_execution_power();
+                if (once)
+                        break;
         }
         futex_up(&async_futex);