oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various tweaks for OpenBSD uptime calculation

Browse Source 
- implement uptime.boot_time
- put CP_IDLE instead of 0 in uptime->idletime
This commit is contained in:
Jasper Lievisse Adriaanse
2011-06-16 13:02:11 +02:00
parent f8c573b78c
commit 7f14f4409d
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sysdeps/openbsd/uptime.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: uptime.c,v 1.3 2011/05/23 19:35:57 jasper Exp $ */ /* $OpenBSD: uptime.c,v 1.6 2011/06/01 07:24:49 jasper Exp $ */
/* Copyright (C) 1998-99 Martin Baulig /* Copyright (C) 1998-99 Martin Baulig
This file is part of LibGTop 1.0. This file is part of LibGTop 1.0.
@@ -28,10 +28,9 @@
#include <glibtop/cpu.h> #include <glibtop/cpu.h>
#include <glibtop_suid.h>
static const unsigned long _glibtop_sysdeps_uptime = static const unsigned long _glibtop_sysdeps_uptime =
(1L << GLIBTOP_UPTIME_UPTIME) + (1L << GLIBTOP_UPTIME_IDLETIME); (1L << GLIBTOP_UPTIME_UPTIME) + (1L << GLIBTOP_UPTIME_IDLETIME) +
(1UL << GLIBTOP_UPTIME_BOOT_TIME);
static const unsigned long _required_cpu_flags = static const unsigned long _required_cpu_flags =
(1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_IDLE) + (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_IDLE) +
@@ -51,10 +50,10 @@ void
glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf) glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf)
{ {
time_t now; time_t now;
time_t uptime;
int mib[2]; int mib[2];
struct timeval boottime; struct timeval boottime;
size_t size; size_t size;
glibtop_cpu cpu;
mib[0] = CTL_KERN; mib[0] = CTL_KERN;
mib[1] = KERN_BOOTTIME; mib[1] = KERN_BOOTTIME;
@@ -63,8 +62,14 @@ glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf)
boottime.tv_sec != 0) { boottime.tv_sec != 0) {
time(&now); time(&now);
buf->uptime = now - boottime.tv_sec; buf->uptime = now - boottime.tv_sec;
/* XXX: don't know a useful value to put here. */ buf->boot_time = boottime.tv_sec;
buf->idletime = 0;
buf->flags = _glibtop_sysdeps_uptime;
} }
glibtop_get_cpu_p (server, &cpu);
/* Put something clever in buf->idletime: CP_IDLE. */
buf->idletime = (double) cpu.idle / (double) cpu.frequency;
buf->idletime /= (double) (server->ncpu + 1);
buf->flags = _glibtop_sysdeps_uptime;
} }