Index: uspace/lib/libblock/libblock.c =================================================================== --- uspace/lib/libblock/libblock.c (revision fb623e2feb545b72f2f3dca3e41febed93271cf4) +++ uspace/lib/libblock/libblock.c (revision 1e4cadad49fbe94a308f6f74c331537fbfc59425) @@ -47,5 +47,5 @@ #include #include -#include +#include #include #include Index: uspace/lib/libblock/libblock.h =================================================================== --- uspace/lib/libblock/libblock.h (revision fb623e2feb545b72f2f3dca3e41febed93271cf4) +++ uspace/lib/libblock/libblock.h (revision 1e4cadad49fbe94a308f6f74c331537fbfc59425) @@ -36,9 +36,9 @@ #ifndef LIBBLOCK_LIBBLOCK_H_ -#define LIBBLOCK_LIBBLOCK_H_ +#define LIBBLOCK_LIBBLOCK_H_ #include #include "../../srv/vfs/vfs.h" -#include +#include #include #include Index: uspace/lib/libc/Makefile.build =================================================================== --- uspace/lib/libc/Makefile.build (revision fb623e2feb545b72f2f3dca3e41febed93271cf4) +++ uspace/lib/libc/Makefile.build (revision 1e4cadad49fbe94a308f6f74c331537fbfc59425) @@ -57,5 +57,5 @@ generic/string.c \ generic/fibril.c \ - generic/fibril_sync.c \ + generic/fibril_synch.c \ generic/pcb.c \ generic/smc.c \ Index: uspace/lib/libc/generic/fibril_sync.c =================================================================== --- uspace/lib/libc/generic/fibril_sync.c (revision fb623e2feb545b72f2f3dca3e41febed93271cf4) +++ (revision ) @@ -1,308 +1,0 @@ -/* - * Copyright (c) 2009 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static void optimize_execution_power(void) -{ - /* - * When waking up a worker fibril previously blocked in fibril - * synchronization, chances are that there is an idle manager fibril - * waiting for IPC, that could start executing the awakened worker - * fibril right away. We try to detect this and bring the manager - * fibril back to fruitful work. - */ - if (atomic_get(&threads_in_ipc_wait) > 0) - ipc_poke(); -} - -void fibril_mutex_initialize(fibril_mutex_t *fm) -{ - fm->counter = 1; - list_initialize(&fm->waiters); -} - -void fibril_mutex_lock(fibril_mutex_t *fm) -{ - 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_switch(FIBRIL_TO_MANAGER); - } else { - futex_up(&async_futex); - } -} - -bool fibril_mutex_trylock(fibril_mutex_t *fm) -{ - bool locked = false; - - futex_down(&async_futex); - if (fm->counter > 0) { - fm->counter--; - locked = true; - } - futex_up(&async_futex); - - return locked; -} - -static void _fibril_mutex_unlock_unsafe(fibril_mutex_t *fm) -{ - assert(fm->counter <= 0); - if (fm->counter++ < 0) { - link_t *tmp; - awaiter_t *wdp; - - 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); - optimize_execution_power(); - } -} - -void fibril_mutex_unlock(fibril_mutex_t *fm) -{ - futex_down(&async_futex); - _fibril_mutex_unlock_unsafe(fm); - futex_up(&async_futex); -} - -void fibril_rwlock_initialize(fibril_rwlock_t *frw) -{ - frw->writers = 0; - frw->readers = 0; - list_initialize(&frw->waiters); -} - -void fibril_rwlock_read_lock(fibril_rwlock_t *frw) -{ - futex_down(&async_futex); - 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); - fibril_switch(FIBRIL_TO_MANAGER); - } else { - frw->readers++; - futex_up(&async_futex); - } -} - -void fibril_rwlock_write_lock(fibril_rwlock_t *frw) -{ - futex_down(&async_futex); - 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); - fibril_switch(FIBRIL_TO_MANAGER); - } else { - frw->writers++; - futex_up(&async_futex); - } -} - -static void _fibril_rwlock_common_unlock(fibril_rwlock_t *frw) -{ - futex_down(&async_futex); - assert(frw->readers || (frw->writers == 1)); - if (frw->readers) { - if (--frw->readers) - goto out; - } else { - frw->writers--; - } - - assert(!frw->readers && !frw->writers); - - 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; - - 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); - 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); - frw->readers++; - optimize_execution_power(); - } - } -out: - futex_up(&async_futex); -} - -void fibril_rwlock_read_unlock(fibril_rwlock_t *frw) -{ - _fibril_rwlock_common_unlock(frw); -} - -void fibril_rwlock_write_unlock(fibril_rwlock_t *frw) -{ - _fibril_rwlock_common_unlock(frw); -} - -void fibril_condvar_initialize(fibril_condvar_t *fcv) -{ - list_initialize(&fcv->waiters); -} - -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); - _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); -} - -static void _fibril_condvar_wakeup_common(fibril_condvar_t *fcv, bool once) -{ - link_t *tmp; - awaiter_t *wdp; - - 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; - } - } - futex_up(&async_futex); -} - -void fibril_condvar_signal(fibril_condvar_t *fcv) -{ - _fibril_condvar_wakeup_common(fcv, true); -} - -void fibril_condvar_broadcast(fibril_condvar_t *fcv) -{ - _fibril_condvar_wakeup_common(fcv, false); -} - -/** @} - */ Index: uspace/lib/libc/generic/fibril_synch.c =================================================================== --- uspace/lib/libc/generic/fibril_synch.c (revision 1e4cadad49fbe94a308f6f74c331537fbfc59425) +++ uspace/lib/libc/generic/fibril_synch.c (revision 1e4cadad49fbe94a308f6f74c331537fbfc59425) @@ -0,0 +1,308 @@ +/* + * Copyright (c) 2009 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void optimize_execution_power(void) +{ + /* + * When waking up a worker fibril previously blocked in fibril + * synchronization, chances are that there is an idle manager fibril + * waiting for IPC, that could start executing the awakened worker + * fibril right away. We try to detect this and bring the manager + * fibril back to fruitful work. + */ + if (atomic_get(&threads_in_ipc_wait) > 0) + ipc_poke(); +} + +void fibril_mutex_initialize(fibril_mutex_t *fm) +{ + fm->counter = 1; + list_initialize(&fm->waiters); +} + +void fibril_mutex_lock(fibril_mutex_t *fm) +{ + 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_switch(FIBRIL_TO_MANAGER); + } else { + futex_up(&async_futex); + } +} + +bool fibril_mutex_trylock(fibril_mutex_t *fm) +{ + bool locked = false; + + futex_down(&async_futex); + if (fm->counter > 0) { + fm->counter--; + locked = true; + } + futex_up(&async_futex); + + return locked; +} + +static void _fibril_mutex_unlock_unsafe(fibril_mutex_t *fm) +{ + assert(fm->counter <= 0); + if (fm->counter++ < 0) { + link_t *tmp; + awaiter_t *wdp; + + 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); + optimize_execution_power(); + } +} + +void fibril_mutex_unlock(fibril_mutex_t *fm) +{ + futex_down(&async_futex); + _fibril_mutex_unlock_unsafe(fm); + futex_up(&async_futex); +} + +void fibril_rwlock_initialize(fibril_rwlock_t *frw) +{ + frw->writers = 0; + frw->readers = 0; + list_initialize(&frw->waiters); +} + +void fibril_rwlock_read_lock(fibril_rwlock_t *frw) +{ + futex_down(&async_futex); + 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); + fibril_switch(FIBRIL_TO_MANAGER); + } else { + frw->readers++; + futex_up(&async_futex); + } +} + +void fibril_rwlock_write_lock(fibril_rwlock_t *frw) +{ + futex_down(&async_futex); + 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); + fibril_switch(FIBRIL_TO_MANAGER); + } else { + frw->writers++; + futex_up(&async_futex); + } +} + +static void _fibril_rwlock_common_unlock(fibril_rwlock_t *frw) +{ + futex_down(&async_futex); + assert(frw->readers || (frw->writers == 1)); + if (frw->readers) { + if (--frw->readers) + goto out; + } else { + frw->writers--; + } + + assert(!frw->readers && !frw->writers); + + 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; + + 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); + 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); + frw->readers++; + optimize_execution_power(); + } + } +out: + futex_up(&async_futex); +} + +void fibril_rwlock_read_unlock(fibril_rwlock_t *frw) +{ + _fibril_rwlock_common_unlock(frw); +} + +void fibril_rwlock_write_unlock(fibril_rwlock_t *frw) +{ + _fibril_rwlock_common_unlock(frw); +} + +void fibril_condvar_initialize(fibril_condvar_t *fcv) +{ + list_initialize(&fcv->waiters); +} + +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); + _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); +} + +static void _fibril_condvar_wakeup_common(fibril_condvar_t *fcv, bool once) +{ + link_t *tmp; + awaiter_t *wdp; + + 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; + } + } + futex_up(&async_futex); +} + +void fibril_condvar_signal(fibril_condvar_t *fcv) +{ + _fibril_condvar_wakeup_common(fcv, true); +} + +void fibril_condvar_broadcast(fibril_condvar_t *fcv) +{ + _fibril_condvar_wakeup_common(fcv, false); +} + +/** @} + */ Index: uspace/lib/libc/include/fibril_sync.h =================================================================== --- uspace/lib/libc/include/fibril_sync.h (revision fb623e2feb545b72f2f3dca3e41febed93271cf4) +++ (revision ) @@ -1,107 +1,0 @@ -/* - * Copyright (c) 2009 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libc - * @{ - */ -/** @file - */ - -#ifndef LIBC_FIBRIL_SYNC_H_ -#define LIBC_FIBRIL_SYNC_H_ - -#include -#include -#include -#include -#include - -typedef struct { - int counter; - link_t waiters; -} fibril_mutex_t; - -#define FIBRIL_MUTEX_INITIALIZE(name) \ - fibril_mutex_t name = { \ - .counter = 1, \ - .waiters = { \ - .prev = &name.waiters, \ - .next = &name.waiters, \ - } \ - } - -typedef struct { - unsigned writers; - unsigned readers; - link_t waiters; -} fibril_rwlock_t; - -#define FIBRIL_RWLOCK_INITIALIZE(name) \ - fibril_rwlock_t name = { \ - .readers = 0, \ - .writers = 0, \ - .waiters = { \ - .prev = &name.waiters, \ - .next = &name.waiters, \ - } \ - } - -typedef struct { - link_t waiters; -} fibril_condvar_t; - -#define FIBRIL_CONDVAR_INITIALIZE(name) \ - fibril_condvar_t name = { \ - .waiters = { \ - .next = &name.waiters, \ - .prev = &name.waiters, \ - } \ - } - -extern void fibril_mutex_initialize(fibril_mutex_t *); -extern void fibril_mutex_lock(fibril_mutex_t *); -extern bool fibril_mutex_trylock(fibril_mutex_t *); -extern void fibril_mutex_unlock(fibril_mutex_t *); - -extern void fibril_rwlock_initialize(fibril_rwlock_t *); -extern void fibril_rwlock_read_lock(fibril_rwlock_t *); -extern void fibril_rwlock_write_lock(fibril_rwlock_t *); -extern void fibril_rwlock_read_unlock(fibril_rwlock_t *); -extern void fibril_rwlock_write_unlock(fibril_rwlock_t *); - -extern void fibril_condvar_initialize(fibril_condvar_t *); -extern int fibril_condvar_wait_timeout(fibril_condvar_t *, fibril_mutex_t *, - suseconds_t); -extern void fibril_condvar_wait(fibril_condvar_t *, fibril_mutex_t *); -extern void fibril_condvar_signal(fibril_condvar_t *); -extern void fibril_condvar_broadcast(fibril_condvar_t *); - -#endif - -/** @} - */ Index: uspace/lib/libc/include/fibril_synch.h =================================================================== --- uspace/lib/libc/include/fibril_synch.h (revision 1e4cadad49fbe94a308f6f74c331537fbfc59425) +++ uspace/lib/libc/include/fibril_synch.h (revision 1e4cadad49fbe94a308f6f74c331537fbfc59425) @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2009 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_FIBRIL_SYNCH_H_ +#define LIBC_FIBRIL_SYNCH_H_ + +#include +#include +#include +#include +#include + +typedef struct { + int counter; + link_t waiters; +} fibril_mutex_t; + +#define FIBRIL_MUTEX_INITIALIZE(name) \ + fibril_mutex_t name = { \ + .counter = 1, \ + .waiters = { \ + .prev = &name.waiters, \ + .next = &name.waiters, \ + } \ + } + +typedef struct { + unsigned writers; + unsigned readers; + link_t waiters; +} fibril_rwlock_t; + +#define FIBRIL_RWLOCK_INITIALIZE(name) \ + fibril_rwlock_t name = { \ + .readers = 0, \ + .writers = 0, \ + .waiters = { \ + .prev = &name.waiters, \ + .next = &name.waiters, \ + } \ + } + +typedef struct { + link_t waiters; +} fibril_condvar_t; + +#define FIBRIL_CONDVAR_INITIALIZE(name) \ + fibril_condvar_t name = { \ + .waiters = { \ + .next = &name.waiters, \ + .prev = &name.waiters, \ + } \ + } + +extern void fibril_mutex_initialize(fibril_mutex_t *); +extern void fibril_mutex_lock(fibril_mutex_t *); +extern bool fibril_mutex_trylock(fibril_mutex_t *); +extern void fibril_mutex_unlock(fibril_mutex_t *); + +extern void fibril_rwlock_initialize(fibril_rwlock_t *); +extern void fibril_rwlock_read_lock(fibril_rwlock_t *); +extern void fibril_rwlock_write_lock(fibril_rwlock_t *); +extern void fibril_rwlock_read_unlock(fibril_rwlock_t *); +extern void fibril_rwlock_write_unlock(fibril_rwlock_t *); + +extern void fibril_condvar_initialize(fibril_condvar_t *); +extern int fibril_condvar_wait_timeout(fibril_condvar_t *, fibril_mutex_t *, + suseconds_t); +extern void fibril_condvar_wait(fibril_condvar_t *, fibril_mutex_t *); +extern void fibril_condvar_signal(fibril_condvar_t *); +extern void fibril_condvar_broadcast(fibril_condvar_t *); + +#endif + +/** @} + */