Changeset 62550dce in mainline for kernel


Ignore:
Timestamp:
2010-04-01T21:31:25Z (15 years ago)
Author:
Stanislav Kozina <stanislav.kozina@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
dd6c71c
Parents:
79edc36
Message:

ps -c echoes info about CPU's
cpu count is accessible through sysinfo("cpu.count")

Location:
kernel
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    r79edc36 r62550dce  
    231231        generic/src/sysinfo/sysinfo.c \
    232232        generic/src/ps/ps.c \
     233        generic/src/ps/cpu.c \
    233234        generic/src/ps/load.c \
    234235        generic/src/ps/uptime.c

  • kernel/generic/include/ps/load.h

    r79edc36 r62550dce  
    3333 */
    3434
    35 #ifndef KERN_LOAD_H_
    36 #define KERN_LOAD_H_
     35#ifndef KERN_PS_LOAD_H_
     36#define KERN_PS_LOAD_H_
    3737
    3838extern void get_avenrun(unsigned long *loads, int shift);

  • kernel/generic/include/ps/ps.h

    r79edc36 r62550dce  
    3333 */
    3434
    35 #ifndef KERN_PS_H_
    36 #define KERN_PS_H_
     35#ifndef KERN_PS_PS_H_
     36#define KERN_PS_PS_H_
    3737
    3838#include <ps/taskinfo.h>
     39#include <ps/cpuinfo.h>
    3940
    4041extern size_t sys_ps_get_tasks(task_id_t *uspace_ids, size_t size);
    4142extern int sys_ps_get_task_info(task_id_t *uspace_id, task_info_t *uspace_info);
    4243extern int sys_ps_get_threads(task_id_t *uspace_id, thread_info_t *uspace_infos, size_t size);
     44extern int sys_ps_get_cpu_info(uspace_cpu_info_t *uspace_cpu);
    4345
    4446#endif

  • kernel/generic/include/ps/uptime.h

    r79edc36 r62550dce  
    3333 */
    3434
    35 #ifndef KERN_UPTIME_H_
    36 #define KERN_UPTIME_H_
     35#ifndef KERN_PS_UPTIME_H_
     36#define KERN_PS_UPTIME_H_
    3737
    3838extern int sys_ps_get_uptime(uint64_t *user_load);

  • kernel/generic/include/syscall/syscall.h

    r79edc36 r62550dce  
    8888        SYS_DEBUG_DISABLE_CONSOLE,
    8989
     90        SYS_PS_GET_CPU_INFO,
    9091        SYS_PS_GET_TASKS,
    9192        SYS_PS_GET_TASK_INFO,

  • kernel/generic/src/cpu/cpu.c

    r79edc36 r62550dce  
    4848#include <adt/list.h>
    4949#include <print.h>
     50#include <sysinfo/sysinfo.h>
    5051
    5152cpu_t *cpus;
    … …  
    9697        cpu_identify();
    9798        cpu_arch_init();
     99
     100        sysinfo_set_item_val("cpu.count", NULL, config.cpu_count);
    98101}
    99102

  • kernel/generic/src/proc/scheduler.c

    r79edc36 r62550dce  
    202202                 */
    203203
     204                 spinlock_lock(&CPU->lock);
    204205                 CPU->idle = true;
     206                 spinlock_unlock(&CPU->lock);
    205207                 cpu_sleep();
    206208                 goto loop;

  • kernel/generic/src/syscall/syscall.c

    r79edc36 r62550dce  
    170170
    171171        /* Ps calls */
     172        (syshandler_t) sys_ps_get_cpu_info,
    172173        (syshandler_t) sys_ps_get_tasks,
    173174        (syshandler_t) sys_ps_get_task_info,
Note: See TracChangeset for help on using the changeset viewer.