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

use sigar_t.pids

This commit is contained in:
Doug MacEachern 2007-12-21 22:42:52 +00:00
parent 71635f2c1c
commit bb3b9dd280
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/sigar_ptql.c
View File

@ -1434,9 +1434,9 @@ SIGAR_DECLARE(int) sigar_ptql_query_find_process(sigar_t *sigar,
sigar_ptql_query_t *query, sigar_ptql_query_t *query,
sigar_pid_t *pid) sigar_pid_t *pid)
{ {
sigar_proc_list_t pids;
int status; int status;
int i, matches=0; int i, matches=0;
sigar_proc_list_t *pids;
if ((query->branches.number == 1) && if ((query->branches.number == 1) &&
(query->branches.data[0].op_flags & PTQL_OP_FLAG_PID)) (query->branches.data[0].op_flags & PTQL_OP_FLAG_PID))
@ -1445,17 +1445,18 @@ SIGAR_DECLARE(int) sigar_ptql_query_find_process(sigar_t *sigar,
return ptql_pid_get(sigar, &query->branches.data[0], pid); return ptql_pid_get(sigar, &query->branches.data[0], pid);
} }
status = sigar_proc_list_get(sigar, &pids); status = sigar_proc_list_get(sigar, NULL);
if (status != SIGAR_OK) { if (status != SIGAR_OK) {
return status; return status;
} }
pids = sigar->pids;
for (i=0; i<pids.number; i++) { for (i=0; i<pids->number; i++) {
int query_status = int query_status =
sigar_ptql_query_match(sigar, query, pids.data[i]); sigar_ptql_query_match(sigar, query, pids->data[i]);
if (query_status == SIGAR_OK) { if (query_status == SIGAR_OK) {
*pid = pids.data[i]; *pid = pids->data[i];
matches++; matches++;
} }
else if (query_status == SIGAR_ENOTIMPL) { else if (query_status == SIGAR_ENOTIMPL) {
@ -1465,8 +1466,6 @@ SIGAR_DECLARE(int) sigar_ptql_query_find_process(sigar_t *sigar,
} /* else ok, e.g. permission denied */ } /* else ok, e.g. permission denied */
} }
sigar_proc_list_destroy(sigar, &pids);
if (status != SIGAR_OK) { if (status != SIGAR_OK) {
return status; return status;
} }
@ -1491,24 +1490,25 @@ SIGAR_DECLARE(int) sigar_ptql_query_find(sigar_t *sigar,
sigar_ptql_query_t *query, sigar_ptql_query_t *query,
sigar_proc_list_t *proclist) sigar_proc_list_t *proclist)
{ {
sigar_proc_list_t pids;
int status; int status;
int i; int i;
sigar_proc_list_t *pids;
status = sigar_proc_list_get(sigar, &pids); status = sigar_proc_list_get(sigar, NULL);
if (status != SIGAR_OK) { if (status != SIGAR_OK) {
return status; return status;
} }
pids = sigar->pids;
sigar_proc_list_create(proclist); sigar_proc_list_create(proclist);
for (i=0; i<pids.number; i++) { for (i=0; i<pids->number; i++) {
int query_status = int query_status =
sigar_ptql_query_match(sigar, query, pids.data[i]); sigar_ptql_query_match(sigar, query, pids->data[i]);
if (query_status == SIGAR_OK) { if (query_status == SIGAR_OK) {
SIGAR_PROC_LIST_GROW(proclist); SIGAR_PROC_LIST_GROW(proclist);
proclist->data[proclist->number++] = pids.data[i]; proclist->data[proclist->number++] = pids->data[i];
} }
else if (query_status == SIGAR_ENOTIMPL) { else if (query_status == SIGAR_ENOTIMPL) {
/* let caller know query is invalid. */ /* let caller know query is invalid. */
@ -1517,8 +1517,6 @@ SIGAR_DECLARE(int) sigar_ptql_query_find(sigar_t *sigar,
} }
} }
sigar_proc_list_destroy(sigar, &pids);
if (status != SIGAR_OK) { if (status != SIGAR_OK) {
sigar_proc_list_destroy(sigar, proclist); sigar_proc_list_destroy(sigar, proclist);
return status; return status;