Index: kernel/generic/include/ps/cpuinfo.h =================================================================== --- kernel/generic/include/ps/cpuinfo.h (revision 62550dcebaf6572f33fa63e95f98ecc3f61f4cec) +++ kernel/generic/include/ps/cpuinfo.h (revision 62550dcebaf6572f33fa63e95f98ecc3f61f4cec) @@ -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 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 79edc36068b3e69b1d1719de0dc8332601090c30) +++ kernel/generic/include/ps/load.h (revision 62550dcebaf6572f33fa63e95f98ecc3f61f4cec) @@ -33,6 +33,6 @@ */ -#ifndef KERN_LOAD_H_ -#define KERN_LOAD_H_ +#ifndef KERN_PS_LOAD_H_ +#define KERN_PS_LOAD_H_ extern void get_avenrun(unsigned long *loads, int shift); Index: kernel/generic/include/ps/ps.h =================================================================== --- kernel/generic/include/ps/ps.h (revision 79edc36068b3e69b1d1719de0dc8332601090c30) +++ kernel/generic/include/ps/ps.h (revision 62550dcebaf6572f33fa63e95f98ecc3f61f4cec) @@ -33,12 +33,14 @@ */ -#ifndef KERN_PS_H_ -#define KERN_PS_H_ +#ifndef KERN_PS_PS_H_ +#define KERN_PS_PS_H_ #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(task_id_t *uspace_id, thread_info_t *uspace_infos, size_t size); +extern int sys_ps_get_cpu_info(uspace_cpu_info_t *uspace_cpu); #endif Index: kernel/generic/include/ps/uptime.h =================================================================== --- kernel/generic/include/ps/uptime.h (revision 79edc36068b3e69b1d1719de0dc8332601090c30) +++ kernel/generic/include/ps/uptime.h (revision 62550dcebaf6572f33fa63e95f98ecc3f61f4cec) @@ -33,6 +33,6 @@ */ -#ifndef KERN_UPTIME_H_ -#define KERN_UPTIME_H_ +#ifndef KERN_PS_UPTIME_H_ +#define KERN_PS_UPTIME_H_ extern int sys_ps_get_uptime(uint64_t *user_load); Index: kernel/generic/include/syscall/syscall.h =================================================================== --- kernel/generic/include/syscall/syscall.h (revision 79edc36068b3e69b1d1719de0dc8332601090c30) +++ kernel/generic/include/syscall/syscall.h (revision 62550dcebaf6572f33fa63e95f98ecc3f61f4cec) @@ -88,4 +88,5 @@ SYS_DEBUG_DISABLE_CONSOLE, + SYS_PS_GET_CPU_INFO, SYS_PS_GET_TASKS, SYS_PS_GET_TASK_INFO, Index: kernel/generic/src/cpu/cpu.c =================================================================== --- kernel/generic/src/cpu/cpu.c (revision 79edc36068b3e69b1d1719de0dc8332601090c30) +++ kernel/generic/src/cpu/cpu.c (revision 62550dcebaf6572f33fa63e95f98ecc3f61f4cec) @@ -48,4 +48,5 @@ #include #include +#include cpu_t *cpus; @@ -96,4 +97,6 @@ cpu_identify(); cpu_arch_init(); + + sysinfo_set_item_val("cpu.count", NULL, config.cpu_count); } Index: kernel/generic/src/proc/scheduler.c =================================================================== --- kernel/generic/src/proc/scheduler.c (revision 79edc36068b3e69b1d1719de0dc8332601090c30) +++ kernel/generic/src/proc/scheduler.c (revision 62550dcebaf6572f33fa63e95f98ecc3f61f4cec) @@ -202,5 +202,7 @@ */ + spinlock_lock(&CPU->lock); CPU->idle = true; + spinlock_unlock(&CPU->lock); cpu_sleep(); goto loop; Index: kernel/generic/src/ps/cpu.c =================================================================== --- kernel/generic/src/ps/cpu.c (revision 62550dcebaf6572f33fa63e95f98ecc3f61f4cec) +++ kernel/generic/src/ps/cpu.c (revision 62550dcebaf6572f33fa63e95f98ecc3f61f4cec) @@ -0,0 +1,68 @@ +/* + * 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/syscall/syscall.c =================================================================== --- kernel/generic/src/syscall/syscall.c (revision 79edc36068b3e69b1d1719de0dc8332601090c30) +++ kernel/generic/src/syscall/syscall.c (revision 62550dcebaf6572f33fa63e95f98ecc3f61f4cec) @@ -170,4 +170,5 @@ /* Ps calls */ + (syshandler_t) sys_ps_get_cpu_info, (syshandler_t) sys_ps_get_tasks, (syshandler_t) sys_ps_get_task_info,