Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision 4db1fbf7ba8464cc0ba04d663a9a284673fdd25b) +++ uspace/lib/c/generic/async.c (revision 9c81703396899b0f387e719f5279bbd14aa89698) @@ -104,5 +104,5 @@ #include #include -#include "priv/async.h" +#include "private/async.h" atomic_t async_futex = FUTEX_INITIALIZER; Index: uspace/lib/c/generic/fibril_synch.c =================================================================== --- uspace/lib/c/generic/fibril_synch.c (revision 4db1fbf7ba8464cc0ba04d663a9a284673fdd25b) +++ uspace/lib/c/generic/fibril_synch.c (revision 9c81703396899b0f387e719f5279bbd14aa89698) @@ -43,5 +43,5 @@ #include #include -#include "priv/async.h" +#include "private/async.h" static void optimize_execution_power(void) Index: uspace/lib/c/generic/libc.c =================================================================== --- uspace/lib/c/generic/libc.c (revision 4db1fbf7ba8464cc0ba04d663a9a284673fdd25b) +++ uspace/lib/c/generic/libc.c (revision 9c81703396899b0f387e719f5279bbd14aa89698) @@ -41,5 +41,4 @@ */ -#include #include #include @@ -52,6 +51,5 @@ #include #include - -extern int main(int argc, char *argv[]); +#include "private/libc.h" void _exit(int status) Index: uspace/lib/c/generic/priv/async.h =================================================================== --- uspace/lib/c/generic/priv/async.h (revision 4db1fbf7ba8464cc0ba04d663a9a284673fdd25b) +++ (revision ) @@ -1,86 +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_PRIV_ASYNC_H_ -#define LIBC_PRIV_ASYNC_H_ - -#include -#include -#include -#include - -/** Structures of this type are used to track the timeout events. */ -typedef struct { - /** If true, this struct is in the timeout list. */ - bool inlist; - - /** Timeout list link. */ - link_t link; - - /** If true, we have timed out. */ - bool occurred; - - /** Expiration time. */ - struct timeval expires; -} to_event_t; - -/** Structures of this type are used to track the wakeup events. */ -typedef struct { - /** If true, this struct is in a synchronization object wait queue. */ - bool inlist; - - /** Wait queue linkage. */ - link_t link; -} wu_event_t; - -/** Structures of this type represent a waiting fibril. */ -typedef struct { - /** Identification of and link to the waiting fibril. */ - fid_t fid; - - /** If true, this fibril is currently active. */ - bool active; - - /** Timeout wait data. */ - to_event_t to_event; - /** Wakeup wait data. */ - wu_event_t wu_event; -} awaiter_t; - -extern void async_insert_timeout(awaiter_t *); - -#endif - -/** @} - */ Index: uspace/lib/c/generic/private/async.h =================================================================== --- uspace/lib/c/generic/private/async.h (revision 9c81703396899b0f387e719f5279bbd14aa89698) +++ uspace/lib/c/generic/private/async.h (revision 9c81703396899b0f387e719f5279bbd14aa89698) @@ -0,0 +1,86 @@ +/* + * 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_PRIVATE_ASYNC_H_ +#define LIBC_PRIVATE_ASYNC_H_ + +#include +#include +#include +#include + +/** Structures of this type are used to track the timeout events. */ +typedef struct { + /** If true, this struct is in the timeout list. */ + bool inlist; + + /** Timeout list link. */ + link_t link; + + /** If true, we have timed out. */ + bool occurred; + + /** Expiration time. */ + struct timeval expires; +} to_event_t; + +/** Structures of this type are used to track the wakeup events. */ +typedef struct { + /** If true, this struct is in a synchronization object wait queue. */ + bool inlist; + + /** Wait queue linkage. */ + link_t link; +} wu_event_t; + +/** Structures of this type represent a waiting fibril. */ +typedef struct { + /** Identification of and link to the waiting fibril. */ + fid_t fid; + + /** If true, this fibril is currently active. */ + bool active; + + /** Timeout wait data. */ + to_event_t to_event; + /** Wakeup wait data. */ + wu_event_t wu_event; +} awaiter_t; + +extern void async_insert_timeout(awaiter_t *); + +#endif + +/** @} + */ Index: uspace/lib/c/generic/private/libc.h =================================================================== --- uspace/lib/c/generic/private/libc.h (revision 9c81703396899b0f387e719f5279bbd14aa89698) +++ uspace/lib/c/generic/private/libc.h (revision 9c81703396899b0f387e719f5279bbd14aa89698) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2011 Martin Decky + * 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_PRIVATE_LIBC_H_ +#define LIBC_PRIVATE_LIBC_H_ + +extern int main(int, char *[]); +extern void __main(void *); +extern void __exit(void); + +#endif + +/** @} + */