bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

proc_time impl for freebsd4

This commit is contained in:
Doug MacEachern 2006-01-02 21:51:02 +00:00
parent 3d4267a6a7
commit 6c3eda260b
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/os/darwin/darwin_sigar.c
View File

@ -42,6 +42,8 @@
#if defined (__FreeBSD__) && (__FreeBSD_version >= 500013) #if defined (__FreeBSD__) && (__FreeBSD_version >= 500013)
#define SIGAR_FREEBSD5 #define SIGAR_FREEBSD5
#else
#define SIGAR_FREEBSD4
#endif #endif
#ifdef SIGAR_FREEBSD5 #ifdef SIGAR_FREEBSD5
@ -961,6 +963,9 @@ static int get_proc_times(sigar_pid_t pid, sigar_proc_time_t *time)
int sigar_proc_time_get(sigar_t *sigar, sigar_pid_t pid, int sigar_proc_time_get(sigar_t *sigar, sigar_pid_t pid,
sigar_proc_time_t *proctime) sigar_proc_time_t *proctime)
{ {
#ifdef SIGAR_FREEBSD4
struct user user;
#endif
int status = sigar_get_pinfo(sigar, pid); int status = sigar_get_pinfo(sigar, pid);
struct kinfo_proc *pinfo = sigar->pinfo; struct kinfo_proc *pinfo = sigar->pinfo;
@ -973,16 +978,29 @@ int sigar_proc_time_get(sigar_t *sigar, sigar_pid_t pid,
return status; return status;
} }
proctime->start_time = tv2sec(pinfo->KI_START) * 1000; proctime->start_time = tv2sec(pinfo->KI_START) * 1000;
return SIGAR_OK;
#elif defined(SIGAR_FREEBSD5) #elif defined(SIGAR_FREEBSD5)
proctime->user = tv2sec(pinfo->ki_rusage.ru_utime); proctime->user = tv2sec(pinfo->ki_rusage.ru_utime);
proctime->sys = tv2sec(pinfo->ki_rusage.ru_stime); proctime->sys = tv2sec(pinfo->ki_rusage.ru_stime);
proctime->total = proctime->user + proctime->sys; proctime->total = proctime->user + proctime->sys;
proctime->start_time = tv2sec(pinfo->KI_START) * 1000; proctime->start_time = tv2sec(pinfo->KI_START) * 1000;
return SIGAR_OK;
#else #else
if (!sigar->kmem) {
return SIGAR_ENOTIMPL; return SIGAR_ENOTIMPL;
}
status = kread(sigar, &user, sizeof(user),
(u_long)pinfo->kp_proc.p_addr);
if (status != SIGAR_OK) {
return status;
}
proctime->user = tv2sec(user.u_stats.p_ru.ru_utime);
proctime->sys = tv2sec(user.u_stats.p_ru.ru_stime);
proctime->total = proctime->user + proctime->sys;
proctime->start_time = tv2sec(user.u_stats.p_start) * 1000;
#endif #endif
return SIGAR_OK;
} }
int sigar_proc_state_get(sigar_t *sigar, sigar_pid_t pid, int sigar_proc_state_get(sigar_t *sigar, sigar_pid_t pid,