summaryrefslogtreecommitdiff
path: root/sysdeps/freebsd/proctime.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/freebsd/proctime.c')
-rw-r--r--sysdeps/freebsd/proctime.c185
1 files changed, 21 insertions, 164 deletions
diff --git a/sysdeps/freebsd/proctime.c b/sysdeps/freebsd/proctime.c
index b7bd595c..25239910 100644
--- a/sysdeps/freebsd/proctime.c
+++ b/sysdeps/freebsd/proctime.c
@@ -28,9 +28,8 @@
#include <glibtop_suid.h>
-#ifdef __FreeBSD__
+#include <sys/time.h>
#include <osreldate.h>
-#endif
static const unsigned long _glibtop_sysdeps_proc_time =
(1L << GLIBTOP_PROC_TIME_RTIME) + (1L << GLIBTOP_PROC_TIME_FREQUENCY);
@@ -53,63 +52,6 @@ glibtop_init_proc_time_p (glibtop *server)
/* Taken from /usr/src/sys/kern/kern_resource.c */
-/*
- * Transform the running time and tick information in proc p into user,
- * system, and interrupt time usage.
- */
-
-#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
-
-static void
-calcru(p, up, sp, ip)
- struct proc *p;
- struct timeval *up;
- struct timeval *sp;
- struct timeval *ip;
-{
- quad_t totusec;
- u_quad_t u, st, ut, it, tot;
- long sec, usec;
- struct timeval tv;
-
- st = p->p_sticks;
- ut = p->p_uticks;
- it = p->p_iticks;
-
- tot = st + ut + it;
- if (tot == 0) {
- st = 1;
- tot = 1;
- }
-
- sec = p->p_rtime.tv_sec;
- usec = p->p_rtime.tv_usec;
-
- totusec = (quad_t)sec * 1000000 + usec;
-
- if (totusec < 0) {
- /* XXX no %qd in kernel. Truncate. */
- fprintf (stderr, "calcru: negative time: %ld usec\n",
- (long)totusec);
- totusec = 0;
- }
-
-
- u = totusec;
- st = (u * st) / tot;
- sp->tv_sec = st / 1000000;
- sp->tv_usec = st % 1000000;
- ut = (u * ut) / tot;
- up->tv_sec = ut / 1000000;
- up->tv_usec = ut % 1000000;
- if (ip != NULL) {
- it = (u * it) / tot;
- ip->tv_sec = it / 1000000;
- ip->tv_usec = it % 1000000;
- }
-}
-#endif /* !__FreeBSD__ */
-
/* Provides detailed information about a process. */
void
@@ -117,13 +59,9 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
pid_t pid)
{
struct kinfo_proc *pinfo;
-#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || (defined(OpenBSD) && (OpenBSD >= 199912))
- register struct rusage *rup;
-#else
- struct user *u_addr = (struct user *)USRSTACK;
-#endif
- struct pstats pstats;
+ struct clockinfo ci;
int count;
+ size_t len;
glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0);
@@ -132,123 +70,42 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
/* It does not work for the swapper task. */
if (pid == 0) return;
-#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
- if (server->sysdeps.proc_time == 0)
- return;
-#endif
+ glibtop_suid_enter (server);
/* Get the process information */
pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
if ((pinfo == NULL) || (count != 1)) {
glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
+ glibtop_suid_leave (server);
return;
}
-#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
- buf->rtime = pinfo [0].ki_runtime;
-#elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013)
- buf->rtime = pinfo [0].kp_proc.p_runtime;
-#else
- buf->rtime = tv2sec (pinfo [0].kp_proc.p_rtime);
-#endif
-
- buf->frequency = 1000000;
- buf->flags = _glibtop_sysdeps_proc_time;
+ glibtop_suid_leave (server);
-#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || (defined(OpenBSD) && (OpenBSD >= 199912))
- glibtop_suid_enter (server);
+ buf->rtime = pinfo [0].ki_runtime * 1e-6;
- if (kvm_read (server->machine.kd,
- (unsigned long) pinfo [0].kp_proc.p_stats,
- &pstats, sizeof (pstats)) != sizeof (pstats)) {
- glibtop_warn_io_r (server, "kvm_read (pstats)");
+ len = sizeof (ci);
+ if (sysctlbyname ("kern.clockrate", &ci, &len, NULL, 0)) {
+ glibtop_warn_io_r (server, "sysctl (kern.clockrate) (%d)", pid);
+ glibtop_suid_leave (server);
return;
}
- glibtop_suid_leave (server);
-
- rup = &pstats.p_ru;
- calcru(&(pinfo [0]).kp_proc,
- &rup->ru_utime, &rup->ru_stime, NULL);
-
- buf->utime = tv2sec (pstats.p_ru.ru_utime);
- buf->stime = tv2sec (pstats.p_ru.ru_stime);
-
- buf->cutime = tv2sec (pstats.p_cru.ru_utime);
- buf->cstime = tv2sec (pstats.p_cru.ru_stime);
+ buf->frequency = (ci.stathz ? ci.stathz : ci.hz);
+ buf->flags = _glibtop_sysdeps_proc_time;
- buf->start_time = (guint64) pstats.p_start.tv_sec;
+ buf->rtime *= buf->frequency;
- buf->flags |= _glibtop_sysdeps_proc_time_user;
-#else
-#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
-#if (__FreeBSD_version >= 500016) || defined(__FreeBSD_kernel__)
if ((pinfo [0].ki_flag & PS_INMEM)) {
+ buf->utime = (pinfo [0].ki_runtime * 1e-6) * buf->frequency;
+ buf->stime = tv2sec (pinfo [0].ki_rusage.ru_stime) * buf->frequency;
+ buf->cutime = tv2sec (pinfo [0].ki_childtime) * buf->frequency;
+#if (__FreeBSD_version >= 600006) || defined(__FreeBSD_kernel__)
+ buf->cstime = tv2sec (pinfo [0].ki_rusage_ch.ru_stime) * buf->frequency;
#else
- if ((pinfo [0].ki_flag & P_INMEM)) {
-#endif
- buf->utime = pinfo [0].ki_runtime;
- buf->stime = tv2sec (pinfo [0].ki_rusage.ru_stime);
- buf->cutime = tv2sec (pinfo [0].ki_childtime);
-#if (__FreeBSD_version >= 600000) || (__FreeBSD_kernel_version >= 600000)
- buf->cstime = tv2sec (pinfo [0].ki_rusage_ch.ru_stime);
-#else
- buf->cstime = 0;
+ buf->cstime = 0;
#endif
buf->start_time = tv2sec (pinfo [0].ki_start);
- buf->flags = _glibtop_sysdeps_proc_time_user;
+ buf->flags |= _glibtop_sysdeps_proc_time_user;
}
-
- glibtop_suid_enter (server);
-
-#elif (__FreeBSD_version <= 500013)
-
- if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
- kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
- (unsigned long) &u_addr->u_stats,
- (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
- {
-
- buf->utime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_utime);
- buf->stime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_stime);
- buf->cutime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_utime);
- buf->cstime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_stime);
- buf->start_time = tv2sec (pinfo[0].kp_eproc.e_stats.p_start);
- buf->flags = _glibtop_sysdeps_proc_time_user;
- glibtop_suid_leave (server);
- }
-#else
-
- if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
- kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
- (unsigned long) &u_addr->u_stats,
- (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
- {
- /* This is taken form the kernel source code of
- * FreeBSD 2.2.6. */
-
- /* Well, we just do the same getrusage () does ... */
-
- register struct rusage *rup;
-
- glibtop_suid_leave (server);
-
- rup = &pstats.p_ru;
- calcru(&(pinfo [0]).kp_proc,
- &rup->ru_utime, &rup->ru_stime, NULL);
-
- buf->utime = tv2sec (pstats.p_ru.ru_utime);
- buf->stime = tv2sec (pstats.p_ru.ru_stime);
-
- buf->cutime = tv2sec (pstats.p_cru.ru_utime);
- buf->cstime = tv2sec (pstats.p_cru.ru_stime);
-
- buf->start_time = tv2sec (pstats.p_start);
-
- buf->flags = _glibtop_sysdeps_proc_time_user;
- }
-#endif
- glibtop_suid_leave (server);
-#endif
}
-
View Lorry Controller Status