Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/Makefile (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) @@ -45,4 +45,5 @@ app/tetris \ app/trace \ + app/ps \ srv/clip \ srv/devmap \ Index: uspace/app/ps/Makefile =================================================================== --- uspace/app/ps/Makefile (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) +++ uspace/app/ps/Makefile (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) @@ -0,0 +1,36 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 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. +# + +USPACE_PREFIX = ../.. +BINARY = ps + +SOURCES = \ + ps.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/ps/ps.c =================================================================== --- uspace/app/ps/ps.c (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) +++ uspace/app/ps/ps.c (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) @@ -0,0 +1,119 @@ +/* + * 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 ps + * @brief Task lister. + * @{ + */ +/** + * @file + */ + +#include +#include +#include +#include +#include +#include +/* #include */ +#include + +#define TASK_COUNT 10 +#define THREAD_COUNT 50 + +static void list_tasks(void) +{ + int task_count = TASK_COUNT; + task_id_t *tasks = malloc(task_count * sizeof(task_id_t)); + int result = get_task_ids(tasks, sizeof(task_id_t) * task_count); + + while (result > task_count) { + task_count *= 2; + tasks = realloc(tasks, task_count * sizeof(task_id_t)); + result = get_task_ids(tasks, sizeof(task_id_t) * task_count); + } + + printf(" ID Threads Pages [k]Cycles Name\n"); + + int i; + for (i = 0; i < result; ++i) { + task_info_t taskinfo; + get_task_info(tasks[i], &taskinfo); + printf("%8llu %8u %8u %12llu %s\n", tasks[i], taskinfo.thread_count, + taskinfo.pages, taskinfo.cycles / 1000, taskinfo.name); + } +} + +static void list_threads(task_id_t taskid) +{ + int thread_count = THREAD_COUNT; + thread_info_t *threads = malloc(thread_count * sizeof(thread_info_t)); + int result = get_task_threads(taskid, threads, sizeof(thread_info_t) * thread_count); + + while (result > thread_count) { + thread_count *= 2; + threads = realloc(threads, thread_count * sizeof(thread_info_t)); + result = get_task_threads(taskid, threads, sizeof(thread_info_t) * thread_count); + } + + int i; + printf(" ID State Prio [k]Cycles\n"); + for (i = 0; i < result; ++i) { + printf("%6llu %8d %6d %12llu\n", threads[i].tid, threads[i].state, + threads[i].priority, threads[i].cycles / 1000); + } +} + +int main(int argc, char *argv[]) +{ + --argc; ++argv; + + if (argc > 0) + { + if (str_cmp(*argv, "-t") == 0) { + --argc; ++argv; + if (argc != 1) { + printf("Bad argument count!\n"); + exit(1); + } + task_id_t taskid = strtol(*argv, NULL, 10); + list_threads(taskid); + } else { + printf("Unknown argument %s!\n", *argv); + exit(1); + } + + } else { + list_tasks(); + } + + return 0; +} + +/** @} + */ Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 63f89665fc0283c1661274dc636d5a66e03d48b4) +++ uspace/lib/c/Makefile (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) @@ -90,5 +90,6 @@ generic/vfs/vfs.c \ generic/vfs/canonify.c \ - generic/stacktrace.c + generic/stacktrace.c \ + generic/ps.c SOURCES = \ Index: uspace/lib/c/generic/ps.c =================================================================== --- uspace/lib/c/generic/ps.c (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) +++ uspace/lib/c/generic/ps.c (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 libc + * @{ + */ +/** @file + */ + +#include +#include +#include +#include + +/** Get the list of task ids. + * + * @param ids Pointer to space where list of ids will be stored. + * @param size Total size of allocated space under ids. + * + * @return Count of written task ids. If higher than size, there + * was not enough space. + * + */ +size_t get_task_ids(task_id_t *ids, size_t size) +{ + return __SYSCALL2(SYS_PS_GET_TASKS, (sysarg_t) ids, (sysarg_t) size); +} + +/** Get task info. + * + * @param id Id of the task to get info about. + * @param info Pointer to out info struct. + * + * @return 0 on success. + * + */ +int get_task_info(task_id_t id, task_info_t *info) +{ + return __SYSCALL2(SYS_PS_GET_TASK_INFO, (sysarg_t) &id, (sysarg_t) info); +} + +/** Get thread infos of the selected task. + * + * @param taskid Id of the selected task. + * @param infos Pointer to out array of thread_info_t structures. + * @param size Size of the infos array. + * + * @return 0 on success. + * + */ +int get_task_threads(task_id_t taskid, thread_info_t *infos, size_t size) +{ + return __SYSCALL3(SYS_PS_GET_THREADS, (sysarg_t) &taskid, (sysarg_t) infos, + (sysarg_t) size); +} + +/** @} + */ Index: uspace/lib/c/include/ps.h =================================================================== --- uspace/lib/c/include/ps.h (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) +++ uspace/lib/c/include/ps.h (revision 18b5402c52a19cabb1ecd9b32bd8d5dc8862b22a) @@ -0,0 +1,48 @@ +/* + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_PS_H_ +#define LIBC_PS_H_ + +#include +#include + +extern size_t get_task_ids(task_id_t *ids, size_t size); +extern int get_task_info(task_id_t id, task_info_t *info); +extern int get_task_threads(task_id_t taskid, thread_info_t *infos, size_t size); + +#endif + +/** @} + */