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

Merge branch 'sigar-1.6'

This commit is contained in:
Doug MacEachern 2009-06-17 17:57:39 -07:00
parent 0008c56119 af75428ab6
commit e81c50eeca
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@
#include <mach/thread_info.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 <mach-o/dyld.h>
#define __OPENTRANSPORTPROVIDERS__ #define __OPENTRANSPORTPROVIDERS__
#include <Gestalt.h> #include <Gestalt.h>
#include <CFString.h> #include <CFString.h>
@ -1885,10 +1886,36 @@ int sigar_proc_exe_get(sigar_t *sigar, sigar_pid_t pid,
#endif #endif
} }
#ifdef DARWIN
static int sigar_dlinfo_modules(sigar_t *sigar, sigar_proc_modules_t *procmods)
{
uint32_t i, count = _dyld_image_count();
for (i=0; i<count; i++) {
int status;
const char *name =
_dyld_get_image_name(i);
if (name == NULL) {
continue;
}
status =
procmods->module_getter(procmods->data,
(char *)name, strlen(name));
if (status != SIGAR_OK) {
/* not an error; just stop iterating */
break;
}
}
return SIGAR_OK;
}
#endif /* DARWIN */
int sigar_proc_modules_get(sigar_t *sigar, sigar_pid_t pid, int sigar_proc_modules_get(sigar_t *sigar, sigar_pid_t pid,
sigar_proc_modules_t *procmods) sigar_proc_modules_t *procmods)
{ {
#ifdef SIGAR_HAS_DLINFO_MODULES #if defined(SIGAR_HAS_DLINFO_MODULES) || defined(DARWIN)
if (pid == sigar_pid_get(sigar)) { if (pid == sigar_pid_get(sigar)) {
return sigar_dlinfo_modules(sigar, procmods); return sigar_dlinfo_modules(sigar, procmods);
} }