Index: kernel/generic/src/main/main.c =================================================================== --- kernel/generic/src/main/main.c (revision 5c03bd305cb06f94360a0aa18b2c1a9ab52a88ef) +++ kernel/generic/src/main/main.c (revision 9e889f6e4cdd51976ec8196b2e70a587d1cb4451) @@ -78,4 +78,5 @@ #include #include +#include #include #include @@ -279,4 +280,5 @@ thread_init(); futex_init(); + sys_waitq_init(); sysinfo_set_item_data("boot_args", NULL, bargs, str_size(bargs) + 1); Index: kernel/generic/src/proc/thread.c =================================================================== --- kernel/generic/src/proc/thread.c (revision 5c03bd305cb06f94360a0aa18b2c1a9ab52a88ef) +++ kernel/generic/src/proc/thread.c (revision 9e889f6e4cdd51976ec8196b2e70a587d1cb4451) @@ -48,4 +48,5 @@ #include #include +#include #include #include @@ -520,4 +521,5 @@ ipc_cleanup(); futex_task_cleanup(); + sys_waitq_task_cleanup(); LOG("Cleanup of task %" PRIu64 " completed.", TASK->taskid); } Index: kernel/generic/src/synch/syswaitq.c =================================================================== --- kernel/generic/src/synch/syswaitq.c (revision 9e889f6e4cdd51976ec8196b2e70a587d1cb4451) +++ kernel/generic/src/synch/syswaitq.c (revision 9e889f6e4cdd51976ec8196b2e70a587d1cb4451) @@ -0,0 +1,173 @@ +/* + * Copyright (c) 2018 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 kernel_sync + * @{ + */ + +/** + * @file + * @brief Wrapper for using wait queue as a kobject. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include + +static slab_cache_t *waitq_cache; + +static void waitq_destroy(void *arg) +{ + waitq_t *wq = (waitq_t *) arg; + slab_free(waitq_cache, wq); +} + +static kobject_ops_t waitq_kobject_ops = { + .destroy = waitq_destroy +}; + +static bool waitq_cap_cleanup_cb(cap_t *cap, void *arg) +{ + kobject_t *kobj = cap_unpublish(cap->task, cap->handle, + KOBJECT_TYPE_WAITQ); + kobject_put(kobj); + cap_free(cap->task, cap->handle); + return true; +} + +/** Initialize the user waitq subsystem */ +void sys_waitq_init(void) +{ + waitq_cache = slab_cache_create("waitq_t", sizeof(waitq_t), 0, NULL, + NULL, 0); +} + +/** Clean-up all waitq capabilities held by the exiting task */ +void sys_waitq_task_cleanup(void) +{ + caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_WAITQ, + waitq_cap_cleanup_cb, NULL); +} + +/** Create a waitq for the current task + * + * @param[out] whandle Userspace address of the destination buffer that will + * receive the allocated waitq capability. + * + * @return Error code. + */ +sys_errno_t sys_waitq_create(cap_waitq_handle_t *whandle) +{ + waitq_t *wq = slab_alloc(waitq_cache, FRAME_ATOMIC); + if (!wq) + return (sys_errno_t) ENOMEM; + waitq_initialize(wq); + + kobject_t *kobj = (kobject_t *) malloc(sizeof(kobject_t)); + if (!kobj) { + slab_free(waitq_cache, wq); + return (sys_errno_t) ENOMEM; + } + kobject_initialize(kobj, KOBJECT_TYPE_WAITQ, wq, &waitq_kobject_ops); + + cap_handle_t handle; + errno_t rc = cap_alloc(TASK, &handle); + if (rc != EOK) { + slab_free(waitq_cache, wq); + free(kobj); + return (sys_errno_t) rc; + } + + rc = copy_to_uspace(whandle, &handle, sizeof(handle)); + if (rc != EOK) { + cap_free(TASK, handle); + free(kobj); + slab_free(waitq_cache, wq); + return (sys_errno_t) rc; + } + + cap_publish(TASK, handle, kobj); + + return (sys_errno_t) EOK; +} + +/** Sleep in the waitq + * + * @param whandle Waitq capability handle of the waitq in which to sleep. + * @param timeout Timeout in microseconds. + * + * @return Error code. + */ +sys_errno_t sys_waitq_sleep(cap_waitq_handle_t whandle, uintptr_t timeout) +{ + kobject_t *kobj = kobject_get(TASK, whandle, KOBJECT_TYPE_WAITQ); + if (!kobj) + return (sys_errno_t) ENOENT; + +#ifdef CONFIG_UDEBUG + udebug_stoppable_begin(); +#endif + + errno_t rc = waitq_sleep_timeout(kobj->waitq, timeout, + SYNCH_FLAGS_INTERRUPTIBLE | SYNCH_FLAGS_FUTEX, NULL); + +#ifdef CONFIG_UDEBUG + udebug_stoppable_end(); +#endif + + kobject_put(kobj); + + return (sys_errno_t) rc; +} + +/** Wakeup a thread sleeping in the waitq + * + * @param whandle Waitq capability handle of the waitq to invoke wakeup on. + * + * @return Error code. + */ +sys_errno_t sys_waitq_wakeup(cap_waitq_handle_t whandle) +{ + kobject_t *kobj = kobject_get(TASK, whandle, KOBJECT_TYPE_WAITQ); + if (!kobj) + return (sys_errno_t) ENOENT; + + waitq_wakeup(kobj->waitq, WAKEUP_FIRST); + + kobject_put(kobj); + return (sys_errno_t) EOK; +} + +/** @} + */ Index: kernel/generic/src/syscall/syscall.c =================================================================== --- kernel/generic/src/syscall/syscall.c (revision 5c03bd305cb06f94360a0aa18b2c1a9ab52a88ef) +++ kernel/generic/src/syscall/syscall.c (revision 9e889f6e4cdd51976ec8196b2e70a587d1cb4451) @@ -48,4 +48,5 @@ #include #include +#include #include #include @@ -136,4 +137,7 @@ /* Synchronization related syscalls. */ + [SYS_WAITQ_CREATE] = (syshandler_t) sys_waitq_create, + [SYS_WAITQ_SLEEP] = (syshandler_t) sys_waitq_sleep, + [SYS_WAITQ_WAKEUP] = (syshandler_t) sys_waitq_wakeup, [SYS_FUTEX_SLEEP] = (syshandler_t) sys_futex_sleep, [SYS_FUTEX_WAKEUP] = (syshandler_t) sys_futex_wakeup,