Chillcraft/libgtop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make CPU load retrieval work.

Browse Source 
It would sort of work on 64 bits arches, and not work at all no 32 bit arches.
Now works on both, and take CP_INTR correctly into account.
This commit is contained in:
Jasper Lievisse Adriaanse
2011-06-16 12:57:43 +02:00
parent 46706961ac
commit 49641cc363
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sysdeps/openbsd/cpu.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: cpu.c,v 1.4 2011/05/24 12:37:15 jasper Exp $ */ /* $OpenBSD: cpu.c,v 1.6 2011/05/31 14:19:18 jasper Exp $ */
/* Copyright (C) 1998 Joshua Sled /* Copyright (C) 1998 Joshua Sled
This file is part of LibGTop 1.0. This file is part of LibGTop 1.0.
@@ -34,7 +34,7 @@ static const unsigned long _glibtop_sysdeps_cpu =
(1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) + (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) +
(1L << GLIBTOP_CPU_NICE) + (1L << GLIBTOP_CPU_SYS) + (1L << GLIBTOP_CPU_NICE) + (1L << GLIBTOP_CPU_SYS) +
(1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY) + (1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_FREQUENCY) +
(1L << GLIBTOP_CPU_IOWAIT); (1L << GLIBTOP_CPU_IRQ);
/* MIB array for sysctl */ /* MIB array for sysctl */
static int mib_length=2; static int mib_length=2;
@@ -54,7 +54,7 @@ _glibtop_init_cpu_p (glibtop *server)
void void
glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf) glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
{ {
guint64 cpts [CPUSTATES]; gulong cpts [CPUSTATES];
/* sysctl vars*/ /* sysctl vars*/
struct clockinfo ci; struct clockinfo ci;
@@ -89,20 +89,14 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
buf->sys = cpts [CP_SYS]; buf->sys = cpts [CP_SYS];
/* set idle time */ /* set idle time */
buf->idle = cpts [CP_IDLE]; buf->idle = cpts [CP_IDLE];
/* set iowait (really just interrupt) time */ /* set interrupt time */
buf->iowait = cpts [CP_INTR]; buf->irq = cpts [CP_INTR];
/* set frequency */ /* set frequency */
/*
FIXME -- is hz, tick, profhz or stathz wanted?
buf->frequency = sysctl("kern.clockrate", ...);
struct clockinfo
*/
buf->frequency = ci.hz; buf->frequency = ci.hz;
/* set total */ /* set total */
buf->total = cpts [CP_USER] + cpts [CP_NICE] buf->total = cpts [CP_USER] + cpts [CP_NICE]
+ cpts [CP_SYS] + cpts [CP_IDLE]; + cpts [CP_SYS] + cpts [CP_IDLE] + cpts [CP_INTR];
/* Set the flags last. */ /* Set the flags last. */
buf->flags = _glibtop_sysdeps_cpu; buf->flags = _glibtop_sysdeps_cpu;