bdc1579a9c
* glibtop_machine.h: added fields for page size, clock ticks and
boot time. These are constants. Also added three new kstats.
* open.c (glibtop_get_kstats): Initialize kstats in *server.
We need to call this at init time (obviously) and each time
kstat_chain_update() says that kstat chain has changed. In this
case all kstat pointers and data are invalid, so we need to
reinitialize everything.
(glibtop_open_s): Made it call glibtop_get_kstats(). Added
initialization for run time constants in struct machine.
* cpu.c (glibtop_get_cpu_s): Call kstat_chain_update().
See if processor is on-line and set bits in xcpu_flags.
Added frequency (bad name, should have been ticks).
* swap.c (glibtop_get_swap_s): Call kstat_chain_update().
I probably broke vminfo_snaptime consistency. Fix later.
* uptime.c (glibtop_get_uptime_s): Implemented uptime and boot_time.
Still looking for a sane way to get idletime.
* mem.c (glibtop_get_mem_s): Implemented. Will use bunyip
module if it's loaded. Or when it gets loaded. kstat_chain_update()
is our friend. And with a friends like that...
* loadavg.c (glibtop_get_loadavg_s): Solaris 2.6 code brought
into sync with everything else.
* msg_limits.c (glibtop_init_msg_limits_s): Implemented.
* sem_limits.c (glibtop_get_sem_limits_s): Implemented.
Solaris takes kernel modularity too seriously. We can't get
IPC configuration data if the kernel module is not loaded and
it won't be loaded until some process actually asks for a
particular IPC resource. There's no way to tell our applications
about this. Possible API additions?
All three IPC functions should go into daemon, but I'm keeping
them in the normal library because I can't build daemon yet. All
praise 64 bits!
105 lines
2.9 KiB
C
105 lines
2.9 KiB
C
/* $Id$ */
|
|
|
|
/* Copyright (C) 1998-99 Martin Baulig
|
|
This file is part of LibGTop 1.0.
|
|
|
|
Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
|
|
|
|
LibGTop is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License,
|
|
or (at your option) any later version.
|
|
|
|
LibGTop is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with LibGTop; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include <glibtop.h>
|
|
#include <glibtop/error.h>
|
|
#include <glibtop/cpu.h>
|
|
|
|
#include <assert.h>
|
|
#include <sys/processor.h>
|
|
|
|
static const unsigned long _glibtop_sysdeps_cpu =
|
|
(1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) +
|
|
(1L << GLIBTOP_CPU_SYS) + (1L << GLIBTOP_CPU_IDLE) +
|
|
(1L << GLIBTOP_XCPU_TOTAL) + (1L << GLIBTOP_XCPU_USER) +
|
|
(1L << GLIBTOP_XCPU_SYS) + (1L << GLIBTOP_XCPU_IDLE) +
|
|
(1L << GLIBTOP_CPU_FREQUENCY) + (1L << GLIBTOP_XCPU_FLAGS);
|
|
|
|
/* Init function. */
|
|
|
|
void
|
|
glibtop_init_cpu_s (glibtop *server)
|
|
{
|
|
server->sysdeps.cpu = _glibtop_sysdeps_cpu;
|
|
}
|
|
|
|
/* Provides information about cpu usage. */
|
|
|
|
void
|
|
glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
|
|
{
|
|
kstat_ctl_t *kc = server->machine.kc;
|
|
cpu_stat_t cpu_stat;
|
|
processorid_t cpu;
|
|
int ncpu, found;
|
|
kid_t ret;
|
|
|
|
memset (buf, 0, sizeof (glibtop_cpu));
|
|
|
|
if(!kc)
|
|
return;
|
|
switch(kstat_chain_update(kc))
|
|
{
|
|
case -1: assert(0); /* Debugging purposes, shouldn't happen */
|
|
case 0: break;
|
|
default: glibtop_get_kstats(server);
|
|
}
|
|
ncpu = server->ncpu;
|
|
if (ncpu > GLIBTOP_NCPU)
|
|
ncpu = GLIBTOP_NCPU;
|
|
|
|
for (cpu = 0, found = 0; cpu < GLIBTOP_NCPU && found != ncpu; cpu++)
|
|
{
|
|
kstat_t *ksp = server->machine.cpu_stat_kstat [cpu];
|
|
if (!ksp) continue;
|
|
|
|
++found;
|
|
if(p_online(cpu, P_STATUS) == P_ONLINE)
|
|
buf->xcpu_flags |= (1L << cpu);
|
|
else
|
|
continue;
|
|
ret = kstat_read (kc, ksp, &cpu_stat);
|
|
|
|
if (ret == -1) {
|
|
glibtop_warn_io_r (server, "kstat_read (cpu_stat%d)", cpu);
|
|
continue;
|
|
}
|
|
|
|
buf->xcpu_idle [cpu] = cpu_stat.cpu_sysinfo.cpu [CPU_IDLE];
|
|
buf->xcpu_user [cpu] = cpu_stat.cpu_sysinfo.cpu [CPU_USER];
|
|
buf->xcpu_sys [cpu] = cpu_stat.cpu_sysinfo.cpu [CPU_KERNEL];
|
|
|
|
buf->xcpu_total [cpu] = buf->xcpu_idle [cpu] + buf->xcpu_user [cpu] +
|
|
buf->xcpu_sys [cpu];
|
|
|
|
buf->idle += cpu_stat.cpu_sysinfo.cpu [CPU_IDLE];
|
|
buf->user += cpu_stat.cpu_sysinfo.cpu [CPU_USER];
|
|
buf->sys += cpu_stat.cpu_sysinfo.cpu [CPU_KERNEL];
|
|
}
|
|
|
|
buf->total = buf->idle + buf->user + buf->sys;
|
|
buf->frequency = server->machine.ticks;
|
|
|
|
buf->flags = _glibtop_sysdeps_cpu;
|
|
}
|