Index: kernel/generic/include/proc/thread.h =================================================================== --- kernel/generic/include/proc/thread.h (revision d99c1d2ba8c7b2c687d430f2e9fd237046606545) +++ kernel/generic/include/proc/thread.h (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) @@ -69,21 +69,6 @@ #define THREAD_FLAG_NOATTACH (1 << 3) -/** Thread states. */ -typedef enum { - /** It is an error, if thread is found in this state. */ - Invalid, - /** State of a thread that is currently executing on some CPU. */ - Running, - /** Thread in this state is waiting for an event. */ - Sleeping, - /** State of threads in a run queue. */ - Ready, - /** Threads are in this state before they are first readied. */ - Entering, - /** After a thread calls thread_exit(), it is put into Exiting state. */ - Exiting, - /** Threads that were not detached but exited are Lingering. */ - Lingering -} state_t; +/* We need state_t enum definition */ +#include /** Thread structure. There is one per thread. */ Index: kernel/generic/include/ps/ps.h =================================================================== --- kernel/generic/include/ps/ps.h (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) +++ kernel/generic/include/ps/ps.h (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2010 Stanislav Kozina + * 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 generic + * @{ + */ +/** @file + */ + +#ifndef KERN_PS_H_ +#define KERN_PS_H_ + +#include + +extern size_t sys_ps_get_tasks(task_id_t *uspace_ids, size_t size); +extern int sys_ps_get_task_info(task_id_t *uspace_id, task_info_t *uspace_info); +extern int sys_ps_get_threads(task_id_t *uspace_id, thread_info_t *uspace_infos, size_t size); + +#endif + +/** @} + */ Index: kernel/generic/include/ps/taskinfo.h =================================================================== --- kernel/generic/include/ps/taskinfo.h (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) +++ kernel/generic/include/ps/taskinfo.h (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2010 Stanislav Kozina + * 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 generic + * @{ + */ +/** @file taskinfo.h Contains all thread and task defs common for + * kernel and uspace. + */ + +#ifndef KERN_PS_TASKINFO_H_ +#define KERN_PS_TASKINFO_H_ + +#ifdef KERNEL +#include +#else +#include +#endif + +#define TASK_NAME_BUFLEN 20 + +typedef struct { + char name[TASK_NAME_BUFLEN]; + size_t pages; + int thread_count; + uint64_t cycles; +} task_info_t; + +/** Thread states. */ +typedef enum { + /** It is an error, if thread is found in this state. */ + Invalid, + /** State of a thread that is currently executing on some CPU. */ + Running, + /** Thread in this state is waiting for an event. */ + Sleeping, + /** State of threads in a run queue. */ + Ready, + /** Threads are in this state before they are first readied. */ + Entering, + /** After a thread calls thread_exit(), it is put into Exiting state. */ + Exiting, + /** Threads that were not detached but exited are Lingering. */ + Lingering +} state_t; + +typedef struct { + thread_id_t tid; + state_t state; + int priority; + uint64_t cycles; +} thread_info_t; + + +#endif + +/** @} + */ Index: kernel/generic/include/syscall/syscall.h =================================================================== --- kernel/generic/include/syscall/syscall.h (revision d99c1d2ba8c7b2c687d430f2e9fd237046606545) +++ kernel/generic/include/syscall/syscall.h (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) @@ -87,4 +87,9 @@ SYS_DEBUG_ENABLE_CONSOLE, SYS_DEBUG_DISABLE_CONSOLE, + + SYS_PS_GET_TASKS, + SYS_PS_GET_TASK_INFO, + SYS_PS_GET_THREADS, + SYS_IPC_CONNECT_KBOX, SYSCALL_END