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

[SIGAR-69] Fix osx process state

This commit is contained in:
Doug MacEachern 2007-10-20 14:55:19 +00:00
parent 8ff408bb44
commit 39446b928b
1 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -714,6 +714,9 @@ int sigar_os_proc_list_get(sigar_t *sigar,
if (proc[i].KI_FLAG & P_SYSTEM) { if (proc[i].KI_FLAG & P_SYSTEM) {
continue; continue;
} }
if (proc[i].KI_PID == 0) {
continue;
}
SIGAR_PROC_LIST_GROW(proclist); SIGAR_PROC_LIST_GROW(proclist);
proclist->data[proclist->number++] = proc[i].KI_PID; proclist->data[proclist->number++] = proc[i].KI_PID;
} }
@ -957,13 +960,44 @@ int sigar_proc_time_get(sigar_t *sigar, sigar_pid_t pid,
} }
#ifdef DARWIN #ifdef DARWIN
/* thread state mapping derived from ps.tproj */
static const char const thread_states[] = {
/*0*/ '-',
/*1*/ SIGAR_PROC_STATE_RUN,
/*2*/ SIGAR_PROC_STATE_ZOMBIE,
/*3*/ SIGAR_PROC_STATE_SLEEP,
/*4*/ SIGAR_PROC_STATE_IDLE,
/*5*/ SIGAR_PROC_STATE_STOP,
/*6*/ SIGAR_PROC_STATE_STOP,
/*7*/ '?'
};
static int thread_state_get(thread_basic_info_data_t *info)
{
switch (info->run_state) {
case TH_STATE_RUNNING:
return 1;
case TH_STATE_UNINTERRUPTIBLE:
return 2;
case TH_STATE_WAITING:
return (info->sleep_time > 20) ? 4 : 3;
case TH_STATE_STOPPED:
return 5;
case TH_STATE_HALTED:
return 6;
default:
return 7;
}
}
static int sigar_proc_threads_get(sigar_t *sigar, sigar_pid_t pid, static int sigar_proc_threads_get(sigar_t *sigar, sigar_pid_t pid,
sigar_proc_state_t *procstate) sigar_proc_state_t *procstate)
{ {
mach_port_t task, self = mach_task_self(); mach_port_t task, self = mach_task_self();
kern_return_t status; kern_return_t status;
thread_array_t threads; thread_array_t threads;
mach_msg_type_number_t count; mach_msg_type_number_t count, i;
int state = TH_STATE_HALTED + 1;
status = task_for_pid(self, pid, &task); status = task_for_pid(self, pid, &task);
if (status != KERN_SUCCESS) { if (status != KERN_SUCCESS) {
@ -976,9 +1010,25 @@ static int sigar_proc_threads_get(sigar_t *sigar, sigar_pid_t pid,
} }
procstate->threads = count; procstate->threads = count;
for (i=0; i<count; i++) {
mach_msg_type_number_t info_count = THREAD_BASIC_INFO_COUNT;
thread_basic_info_data_t info;
status = thread_info(threads[i], THREAD_BASIC_INFO,
(thread_info_t)&info, &info_count);
if (status == KERN_SUCCESS) {
int tstate = thread_state_get(&info);
if (tstate < state) {
state = tstate;
}
}
}
vm_deallocate(self, (vm_address_t)threads, sizeof(thread_t) * count); vm_deallocate(self, (vm_address_t)threads, sizeof(thread_t) * count);
procstate->state = thread_states[state];
return SIGAR_OK; return SIGAR_OK;
} }
#endif #endif
@ -1003,8 +1053,7 @@ int sigar_proc_state_get(sigar_t *sigar, sigar_pid_t pid,
#ifdef DARWIN #ifdef DARWIN
sigar_proc_threads_get(sigar, pid, procstate); sigar_proc_threads_get(sigar, pid, procstate);
#endif #else
switch (pinfo->KI_STAT) { switch (pinfo->KI_STAT) {
case SIDL: case SIDL:
procstate->state = 'D'; procstate->state = 'D';
@ -1022,6 +1071,7 @@ int sigar_proc_state_get(sigar_t *sigar, sigar_pid_t pid,
procstate->state = 'Z'; procstate->state = 'Z';
break; break;
} }
#endif
return SIGAR_OK; return SIGAR_OK;
} }