Index: kernel/Makefile =================================================================== --- kernel/Makefile (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ kernel/Makefile (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -230,9 +230,5 @@ generic/src/security/cap.c \ generic/src/sysinfo/sysinfo.c \ - generic/src/ps/ps.c \ - generic/src/ps/cpu.c \ - generic/src/ps/load.c \ - generic/src/ps/uptime.c \ - generic/src/ps/mem.c + generic/src/sysinfo/stats.c ## Kernel console support Index: kernel/generic/include/mm/frame.h =================================================================== --- kernel/generic/include/mm/frame.h (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ kernel/generic/include/mm/frame.h (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -169,11 +169,11 @@ extern bool zone_merge(size_t, size_t); extern void zone_merge_all(void); -extern uint64_t zone_total_size(void); -extern void zone_busy_and_free(uint64_t *out_busy, uint64_t *out_free); +extern uint64_t zones_total_size(void); +extern void zones_stats(uint64_t *, uint64_t *, uint64_t *, uint64_t *); /* * Console functions */ -extern void zone_print_list(void); +extern void zones_print_list(void); extern void zone_print_one(size_t); Index: kernel/generic/include/proc/task.h =================================================================== --- kernel/generic/include/proc/task.h (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ kernel/generic/include/proc/task.h (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -56,6 +56,5 @@ #include #include - -#include +#include struct thread; @@ -81,5 +80,5 @@ task_id_t taskid; /** Task security context. */ - context_id_t context; + context_id_t context; /** Number of references (i.e. threads). */ @@ -89,10 +88,10 @@ /** Task capabilities. */ - cap_t capabilities; + cap_t capabilities; /* IPC stuff */ answerbox_t answerbox; /**< Communication endpoint */ phone_t phones[IPC_MAX_PHONES]; - task_ipc_info_t ipc_info; /**< IPC statistics */ + stats_ipc_t ipc_info; /**< IPC statistics */ /** * Active asynchronous messages. It is used for limiting uspace to @@ -120,5 +119,5 @@ mutex_t futexes_lock; /** B+tree of futexes referenced by this task. */ - btree_t futexes; + btree_t futexes; /** Accumulated accounting. */ Index: kernel/generic/include/proc/thread.h =================================================================== --- kernel/generic/include/proc/thread.h (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ kernel/generic/include/proc/thread.h (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -69,6 +69,21 @@ #define THREAD_FLAG_NOATTACH (1 << 3) -/* We need state_t enum definition */ -#include +/** 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; /** Thread structure. There is one per thread. */ Index: kernel/generic/include/ps/cpuinfo.h =================================================================== --- kernel/generic/include/ps/cpuinfo.h (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * 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_CPU_H_ -#define KERN_PS_CPU_H_ - -typedef struct { - unsigned int id; - uint16_t frequency_mhz; - uint64_t idle_ticks; - uint64_t busy_ticks; -} uspace_cpu_info_t; - -#endif - -/** @} - */ Index: kernel/generic/include/ps/load.h =================================================================== --- kernel/generic/include/ps/load.h (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * 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_LOAD_H_ -#define KERN_PS_LOAD_H_ - -extern void get_avenrun(unsigned long *loads, int shift); -extern void kload_thread(void *); -extern int sys_ps_get_load(unsigned long *user_load); - -#endif - -/** @} - */ Index: kernel/generic/include/ps/meminfo.h =================================================================== --- kernel/generic/include/ps/meminfo.h (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ (revision ) @@ -1,53 +1,0 @@ -/* - * 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_MEM_H_ -#define KERN_PS_MEM_H_ - -#ifdef KERNEL -#include -#else -#include -#endif - -typedef struct { - uint64_t total; - uint64_t used; - uint64_t free; -} uspace_mem_info_t; - -#endif - -/** @} - */ Index: kernel/generic/include/ps/ps.h =================================================================== --- kernel/generic/include/ps/ps.h (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ (revision ) @@ -1,51 +1,0 @@ -/* - * 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_PS_H_ -#define KERN_PS_PS_H_ - -#include -#include -#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(thread_info_t *uspace_infos, size_t size); -extern int sys_ps_get_cpu_info(uspace_cpu_info_t *uspace_cpu); -extern int sys_ps_get_mem_info(uspace_mem_info_t *mem_info); - -#endif - -/** @} - */ Index: kernel/generic/include/ps/taskinfo.h =================================================================== --- kernel/generic/include/ps/taskinfo.h (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ (revision ) @@ -1,98 +1,0 @@ -/* - * 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 { - uint64_t call_sent; - uint64_t call_recieved; - uint64_t answer_sent; - uint64_t answer_recieved; - uint64_t irq_notif_recieved; - uint64_t forwarded; -} task_ipc_info_t; - -typedef struct { - task_id_t taskid; - char name[TASK_NAME_BUFLEN]; - uint64_t virt_mem; - int thread_count; - uint64_t ucycles; - uint64_t kcycles; - task_ipc_info_t ipc_info; -} 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; - task_id_t taskid; - state_t state; - int priority; - uint64_t ucycles; - uint64_t kcycles; - unsigned int cpu; -} thread_info_t; - - -#endif - -/** @} - */ Index: kernel/generic/include/ps/uptime.h =================================================================== --- kernel/generic/include/ps/uptime.h (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ (revision ) @@ -1,43 +1,0 @@ -/* - * 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_UPTIME_H_ -#define KERN_PS_UPTIME_H_ - -extern int sys_ps_get_uptime(uint64_t *user_load); - -#endif - -/** @} - */ Index: kernel/generic/include/syscall/syscall.h =================================================================== --- kernel/generic/include/syscall/syscall.h (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ kernel/generic/include/syscall/syscall.h (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -71,5 +71,5 @@ SYS_IPC_REGISTER_IRQ, SYS_IPC_UNREGISTER_IRQ, - + SYS_EVENT_SUBSCRIBE, @@ -89,13 +89,5 @@ SYS_DEBUG_ENABLE_CONSOLE, SYS_DEBUG_DISABLE_CONSOLE, - - SYS_PS_GET_CPU_INFO, - SYS_PS_GET_MEM_INFO, - SYS_PS_GET_TASKS, - SYS_PS_GET_TASK_INFO, - SYS_PS_GET_THREADS, - SYS_PS_GET_UPTIME, - SYS_PS_GET_LOAD, - + SYS_IPC_CONNECT_KBOX, SYSCALL_END Index: kernel/generic/include/sysinfo/abi.h =================================================================== --- kernel/generic/include/sysinfo/abi.h (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) +++ kernel/generic/include/sysinfo/abi.h (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2010 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 generic + * @{ + */ +/** @file + */ + +#ifndef KERN_ABI_H_ +#define KERN_ABI_H_ + +#define LOAD_STEPS 3 +#define TASK_NAME_BUFLEN 20 + +typedef struct { + unsigned int id; + uint16_t frequency_mhz; + uint64_t idle_ticks; + uint64_t busy_ticks; +} stats_cpu_t; + +typedef struct { + uint64_t total; + uint64_t unavail; + uint64_t used; + uint64_t free; +} stats_physmem_t; + +typedef struct { + uint64_t call_sent; + uint64_t call_recieved; + uint64_t answer_sent; + uint64_t answer_recieved; + uint64_t irq_notif_recieved; + uint64_t forwarded; +} stats_ipc_t; + +typedef struct { + char name[TASK_NAME_BUFLEN]; + size_t virtmem; + size_t threads; + uint64_t ucycles; + uint64_t kcycles; + stats_ipc_t ipc_info; +} stats_task_t; + +typedef uint32_t load_t; + +#endif + +/** @} + */ Index: kernel/generic/include/sysinfo/stats.h =================================================================== --- kernel/generic/include/sysinfo/stats.h (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) +++ kernel/generic/include/sysinfo/stats.h (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2010 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 generic + * @{ + */ +/** @file + */ + +#ifndef KERN_STATS_H_ +#define KERN_STATS_H_ + +extern void kload(void *arg); +extern void stats_init(void); + +#endif + +/** @} + */ Index: kernel/generic/include/sysinfo/sysinfo.h =================================================================== --- kernel/generic/include/sysinfo/sysinfo.h (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ kernel/generic/include/sysinfo/sysinfo.h (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -59,5 +59,4 @@ typedef unative_t (*sysinfo_fn_val_t)(struct sysinfo_item *); typedef void *(*sysinfo_fn_data_t)(struct sysinfo_item *, size_t *); -typedef struct sysinfo_item *(*sysinfo_fn_subtree_t)(const char *); typedef struct { @@ -73,7 +72,17 @@ } sysinfo_item_val_t; +typedef struct { + sysinfo_item_val_type_t tag; + union { + unative_t val; + sysinfo_data_t data; + }; +} sysinfo_return_t; + +typedef sysinfo_return_t (*sysinfo_fn_subtree_t)(const char *); + typedef union { struct sysinfo_item *table; - sysinfo_fn_subtree_t find_item; + sysinfo_fn_subtree_t get_data; } sysinfo_subtree_t; @@ -90,25 +99,18 @@ } sysinfo_item_t; -typedef struct { - sysinfo_item_val_type_t tag; - union { - unative_t val; - sysinfo_data_t data; - }; -} sysinfo_return_t; - -extern void sysinfo_init(void); - extern void sysinfo_set_item_val(const char *, sysinfo_item_t **, unative_t); extern void sysinfo_set_item_data(const char *, sysinfo_item_t **, void *, size_t); -extern void sysinfo_set_item_val_fn(const char *, sysinfo_item_t **, +extern void sysinfo_set_item_fn_val(const char *, sysinfo_item_t **, sysinfo_fn_val_t); -extern void sysinfo_set_item_data_fn(const char *, sysinfo_item_t **, +extern void sysinfo_set_item_fn_data(const char *, sysinfo_item_t **, sysinfo_fn_data_t); extern void sysinfo_set_item_undefined(const char *, sysinfo_item_t **); -extern sysinfo_return_t sysinfo_get_item(const char *, sysinfo_item_t **); -extern void sysinfo_dump(sysinfo_item_t **, unsigned int); +extern void sysinfo_set_subtree_fn(const char *, sysinfo_item_t **, + sysinfo_fn_subtree_t); + +extern void sysinfo_init(void); +extern void sysinfo_dump(sysinfo_item_t *); unative_t sys_sysinfo_get_tag(void *, size_t); Index: kernel/generic/src/console/cmd.c =================================================================== --- kernel/generic/src/console/cmd.c (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ kernel/generic/src/console/cmd.c (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -886,5 +886,5 @@ int cmd_sysinfo(cmd_arg_t * argv) { - sysinfo_dump(NULL, 0); + sysinfo_dump(NULL); return 1; } @@ -935,5 +935,5 @@ int cmd_zones(cmd_arg_t * argv) { - zone_print_list(); + zones_print_list(); return 1; } Index: kernel/generic/src/cpu/cpu.c =================================================================== --- kernel/generic/src/cpu/cpu.c (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ kernel/generic/src/cpu/cpu.c (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -75,6 +75,4 @@ cpus[i].id = i; - cpus[i].idle_ticks = 0; - cpus[i].busy_ticks = 0; spinlock_initialize(&cpus[i].lock, "cpu_t.lock"); @@ -97,6 +95,4 @@ cpu_identify(); cpu_arch_init(); - - sysinfo_set_item_val("cpu.count", NULL, config.cpu_count); } Index: kernel/generic/src/main/kinit.c =================================================================== --- kernel/generic/src/main/kinit.c (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ kernel/generic/src/main/kinit.c (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -67,5 +67,5 @@ #include #include -#include +#include #ifdef CONFIG_SMP @@ -123,4 +123,5 @@ } else panic("Unable to create kmp thread."); + thread_join(thread); thread_detach(thread); @@ -151,4 +152,11 @@ arch_post_smp_init(); + /* Start thread computing system load */ + thread = thread_create(kload, NULL, TASK, 0, "kload", false); + if (thread != NULL) + thread_ready(thread); + else + printf("Unable to create kload thread\n"); + #ifdef CONFIG_KCONSOLE if (stdin) { @@ -164,11 +172,4 @@ #endif /* CONFIG_KCONSOLE */ - /* Start thread computing system load */ - thread = thread_create(kload_thread, NULL, TASK, 0, "kload", false); - if (thread != NULL) - thread_ready(thread); - else - printf("Unable to create kload thread\n"); - interrupts_enable(); Index: kernel/generic/src/main/main.c =================================================================== --- kernel/generic/src/main/main.c (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ kernel/generic/src/main/main.c (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -85,4 +85,5 @@ #include #include +#include /** Global configuration structure. */ @@ -225,5 +226,5 @@ printf("Detected %" PRIs " CPU(s), %" PRIu64" MiB free memory\n", - config.cpu_count, SIZE2MB(zone_total_size())); + config.cpu_count, SIZE2MB(zones_total_size())); LOG_EXEC(cpu_init()); @@ -249,4 +250,5 @@ LOG_EXEC(event_init()); LOG_EXEC(klog_init()); + LOG_EXEC(stats_init()); /* Index: kernel/generic/src/mm/frame.c =================================================================== --- kernel/generic/src/mm/frame.c (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ kernel/generic/src/mm/frame.c (revision 9dae191e774f517d5430fc726e4aef5787b1fcd0) @@ -1202,5 +1202,5 @@ /** Return total size of all zones. */ -uint64_t zone_total_size(void) +uint64_t zones_total_size(void) { ipl_t ipl = interrupts_disable(); @@ -1218,28 +1218,37 @@ } -void zone_busy_and_free(uint64_t *out_busy, uint64_t *out_free) -{ +void zones_stats(uint64_t *total, uint64_t *unavail, uint64_t *busy, + uint64_t *free) +{ + ASSERT(total != NULL); + ASSERT(unavail != NULL); + ASSERT(busy != NULL); + ASSERT(free != NULL); + ipl_t ipl = interrupts_disable(); spinlock_lock(&zones.lock); - - uint64_t busy = 0, free = 0; + + *total = 0; + *unavail = 0; + *busy = 0; + *free = 0; + size_t i; for (i = 0; i < zones.count; i++) { - bool available = zone_flags_available(zones.info[i].flags); - /* Do not count reserved memory */ - if (available) { - busy += (uint64_t) FRAMES2SIZE(zones.info[i].busy_count); - free += (uint64_t) FRAMES2SIZE(zones.info[i].free_count); - } - } - + *total += (uint64_t) FRAMES2SIZE(zones.info[i].count); + + if (zone_flags_available(zones.info[i].flags)) { + *busy += (uint64_t) FRAMES2SIZE(zones.info[i].busy_count); + *free += (uint64_t) FRAMES2SIZE(zones.info[i].free_count); + } else + *unavail += (uint64_t) FRAMES2SIZE(zones.info[i].count); + } + spinlock_unlock(&zones.lock); interrupts_restore(ipl); - *out_busy = busy; - *out_free = free; } /** Prints list of zones. */ -void zone_print_list(void) +void zones_print_list(void) { #ifdef __32_BITS__ Index: kernel/generic/src/ps/cpu.c =================================================================== --- kernel/generic/src/ps/cpu.c (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ (revision ) @@ -1,68 +1,0 @@ -/* - * 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 genericps - * @{ - */ - -/** - * @file - * @brief CPU listing. - */ - -#include -#include -#include -#include -#include - -#define WRITE_CPU_INFO(dst, i, src) copy_to_uspace(dst+i, src, sizeof(uspace_cpu_info_t)) - -int sys_ps_get_cpu_info(uspace_cpu_info_t *uspace_cpu) -{ - size_t i; - uspace_cpu_info_t cpuinfo; - ipl_t ipl; - ipl = interrupts_disable(); - - for (i = 0; i < config.cpu_count; ++i) { - spinlock_lock(&cpus[i].lock); - cpuinfo.id = cpus[i].id; - cpuinfo.frequency_mhz = cpus[i].frequency_mhz; - cpuinfo.busy_ticks = cpus[i].busy_ticks; - cpuinfo.idle_ticks = cpus[i].idle_ticks; - spinlock_unlock(&cpus[i].lock); - WRITE_CPU_INFO(uspace_cpu, i, &cpuinfo); - } - - interrupts_restore(ipl); - return 0; -} - -/** @} - */ Index: kernel/generic/src/ps/load.c =================================================================== --- kernel/generic/src/ps/load.c (revision c39a1038071eb342ce574c2266ba22c16f055453) +++ (revision ) @@ -1,134 +1,0 @@ -/* - * 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 genericload - * @{ - */ - -/** - * @file - * @brief System load computation. - */ - -#include -#include -#include -#include -#include -#include -#include