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

Add proper thread_cpu impl for OS X

This commit is contained in:
Doug MacEachern 2007-01-24 21:43:43 +00:00
parent b685acc18a
commit 6eb5f9db0b
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-01-24 Doug MacEachern <dougm@hyperic.com>
* Add proper thread_cpu impl for OS X
2007-01-23 Doug MacEachern <dougm@hyperic.com> 2007-01-23 Doug MacEachern <dougm@hyperic.com>
* Fix proc_mem.size on HP-UX * Fix proc_mem.size on HP-UX

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

@ -29,6 +29,8 @@
#include <mach/mach_traps.h> #include <mach/mach_traps.h>
#include <mach/mach_port.h> #include <mach/mach_port.h>
#include <mach/task.h> #include <mach/task.h>
#include <mach/thread_act.h>
#include <mach/thread_info.h>
#include <mach/vm_map.h> #include <mach/vm_map.h>
#include <mach/shared_memory_server.h> #include <mach/shared_memory_server.h>
#include <Gestalt.h> #include <Gestalt.h>
@ -796,6 +798,9 @@ int sigar_proc_cred_get(sigar_t *sigar, sigar_pid_t pid,
#define tval2msec(tval) \ #define tval2msec(tval) \
((tval.seconds * SIGAR_MSEC) + (tval.microseconds / 1000)) ((tval.seconds * SIGAR_MSEC) + (tval.microseconds / 1000))
#define tval2nsec(tval) \
(SIGAR_SEC2NANO((tval).seconds) + SIGAR_MICROSEC2NANO((tval).microseconds))
static int get_proc_times(sigar_pid_t pid, sigar_proc_time_t *time) static int get_proc_times(sigar_pid_t pid, sigar_proc_time_t *time)
{ {
unsigned int count; unsigned int count;
@ -1331,6 +1336,24 @@ int sigar_thread_cpu_get(sigar_t *sigar,
sigar_uint64_t id, sigar_uint64_t id,
sigar_thread_cpu_t *cpu) sigar_thread_cpu_t *cpu)
{ {
#ifdef DARWIN
mach_port_t self = mach_thread_self();
thread_basic_info_data_t info;
mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
kern_return_t status;
status = thread_info(self, THREAD_BASIC_INFO,
(thread_info_t)&info, &count);
if (status != KERN_SUCCESS) {
return errno;
}
mach_port_deallocate(mach_task_self(), self);
cpu->user = tval2nsec(info.user_time);
cpu->sys = tval2nsec(info.system_time);
cpu->total = cpu->user + cpu->sys;
#else
/* XXX this is not per-thread, it is for the whole-process. /* XXX this is not per-thread, it is for the whole-process.
* just want to use for the shell time command at the moment. * just want to use for the shell time command at the moment.
*/ */
@ -1340,6 +1363,7 @@ int sigar_thread_cpu_get(sigar_t *sigar,
cpu->user = TIME_NSEC(usage.ru_utime); cpu->user = TIME_NSEC(usage.ru_utime);
cpu->sys = TIME_NSEC(usage.ru_stime); cpu->sys = TIME_NSEC(usage.ru_stime);
cpu->total = TIME_NSEC(usage.ru_utime) + TIME_NSEC(usage.ru_stime); cpu->total = TIME_NSEC(usage.ru_utime) + TIME_NSEC(usage.ru_stime);
#endif
return SIGAR_OK; return SIGAR_OK;
} }