Index: uspace/lib/libc/include/async.h =================================================================== --- uspace/lib/libc/include/async.h (revision b9641eeb737a9022842c9dc2556368e72417519c) +++ uspace/lib/libc/include/async.h (revision bc1f1c27820ae147ea90ebc58ae2f9a5e0b343ca) @@ -37,5 +37,5 @@ #include -#include +#include #include #include @@ -46,5 +46,5 @@ static inline void async_manager(void) { - psthread_schedule_next_adv(PS_TO_MANAGER); + fibril_schedule_next_adv(FIBRIL_TO_MANAGER); } @@ -102,5 +102,5 @@ -pstid_t async_new_connection(ipcarg_t in_phone_hash,ipc_callid_t callid, +fid_t async_new_connection(ipcarg_t in_phone_hash,ipc_callid_t callid, ipc_call_t *call, void (*cthread)(ipc_callid_t,ipc_call_t *)); @@ -121,10 +121,10 @@ static inline void async_serialize_start(void) { - psthread_inc_sercount(); + fibril_inc_sercount(); } static inline void async_serialize_end(void) { - psthread_dec_sercount(); + fibril_dec_sercount(); } Index: uspace/lib/libc/include/fibril.h =================================================================== --- uspace/lib/libc/include/fibril.h (revision bc1f1c27820ae147ea90ebc58ae2f9a5e0b343ca) +++ uspace/lib/libc/include/fibril.h (revision bc1f1c27820ae147ea90ebc58ae2f9a5e0b343ca) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2006 Ondrej Palkovsky + * 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_H_ +#define LIBC_FIBRIL_H_ + +#include +#include +#include + +#ifndef context_set +#define context_set(c, _pc, stack, size, ptls) \ + (c)->pc = (sysarg_t) (_pc); \ + (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ + (c)->tls = (sysarg_t) (ptls); +#endif /* context_set */ + +#define FIBRIL_SERIALIZED 1 + +typedef enum { + FIBRIL_SLEEP, + FIBRIL_PREEMPT, + FIBRIL_TO_MANAGER, + FIBRIL_FROM_MANAGER, + FIBRIL_FROM_DEAD +} fibril_switch_type_t; + +typedef sysarg_t fid_t; + +struct fibril { + link_t link; + context_t ctx; + void *stack; + void *arg; + int (*func)(void *); + tcb_t *tcb; + + struct fibril *clean_after_me; + struct fibril *joiner; + int joinee_retval; + int retval; + int flags; +}; +typedef struct fibril fibril_t; + +extern int context_save(context_t *c); +extern void context_restore(context_t *c) __attribute__ ((noreturn)); + +extern fid_t fibril_create(int (*func)(void *), void *arg); +extern int fibril_join(fid_t fid); +extern fibril_t *fibril_setup(void); +extern void fibril_teardown(fibril_t *f); +extern int fibril_schedule_next_adv(fibril_switch_type_t stype); +extern void fibril_add_ready(fid_t fid); +extern void fibril_add_manager(fid_t fid); +extern void fibril_remove_manager(void); +extern fid_t fibril_get_id(void); +extern void fibril_inc_sercount(void); +extern void fibril_dec_sercount(void); + +static inline int fibril_schedule_next(void) { + return fibril_schedule_next_adv(FIBRIL_PREEMPT); +} + +#endif + +/** @} + */ Index: uspace/lib/libc/include/psthread.h =================================================================== --- uspace/lib/libc/include/psthread.h (revision b9641eeb737a9022842c9dc2556368e72417519c) +++ (revision ) @@ -1,99 +1,0 @@ -/* - * Copyright (c) 2006 Ondrej Palkovsky - * 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_PSTHREAD_H_ -#define LIBC_PSTHREAD_H_ - -#include -#include -#include - -#ifndef context_set -#define context_set(c, _pc, stack, size, ptls) \ - (c)->pc = (sysarg_t) (_pc); \ - (c)->sp = ((sysarg_t) (stack)) + (size) - SP_DELTA; \ - (c)->tls = (sysarg_t) (ptls); -#endif /* context_set */ - -#define PSTHREAD_SERIALIZED 1 - -typedef enum { - PS_SLEEP, - PS_PREEMPT, - PS_TO_MANAGER, - PS_FROM_MANAGER, - PS_FROM_DEAD -} pschange_type; - -typedef sysarg_t pstid_t; - -struct psthread_data { - link_t link; - context_t ctx; - void *stack; - void *arg; - int (*func)(void *); - tcb_t *tcb; - - struct psthread_data *clean_after_me; - struct psthread_data *joiner; - int joinee_retval; - int retval; - int flags; -}; -typedef struct psthread_data psthread_data_t; - -extern int context_save(context_t *c); -extern void context_restore(context_t *c) __attribute__ ((noreturn)); - -pstid_t psthread_create(int (*func)(void *), void *arg); -int psthread_join(pstid_t psthrid); -psthread_data_t * psthread_setup(void); -void psthread_teardown(psthread_data_t *pt); -int psthread_schedule_next_adv(pschange_type ctype); -void psthread_add_ready(pstid_t ptid); -void psthread_add_manager(pstid_t psthrid); -void psthread_remove_manager(void); -pstid_t psthread_get_id(void); -void psthread_inc_sercount(void); -void psthread_dec_sercount(void); - -static inline int psthread_schedule_next(void) { - return psthread_schedule_next_adv(PS_PREEMPT); -} - -#endif - -/** @} - */