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

require Service ptql in sigar_sevices_query

This commit is contained in:
Doug MacEachern 2008-04-01 23:18:55 +00:00
parent 7579374e47
commit 05ae74a5df
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sigar_ptql.c
View File

@ -142,6 +142,9 @@ typedef struct {
#define branch_strstr(branch, s1, s2) \ #define branch_strstr(branch, s1, s2) \
(IS_ICASE(branch) ? sigar_strcasestr(s1, s2) : strstr(s1, s2)) (IS_ICASE(branch) ? sigar_strcasestr(s1, s2) : strstr(s1, s2))
#define IS_PID_SERVICE_QUERY(branch) \
(branch->flags >= PTQL_PID_SERVICE_NAME)
static void data_free(void *data) static void data_free(void *data)
{ {
free(data); free(data);
@ -890,8 +893,15 @@ int sigar_services_query(char *ptql,
} }
if (query->branches.number == 1) { if (query->branches.number == 1) {
status = ptql_branch_t *branch = &query->branches.data[0];
sigar_services_walk(walker, &query->branches.data[0]);
if (IS_PID_SERVICE_QUERY(branch)) {
status = sigar_services_walk(walker, branch);
}
else {
ptql_error(error, "Invalid Service query: %s", ptql);
status = SIGAR_PTQL_MALFORMED_QUERY;
}
} }
else { else {
ptql_error(error, "Too many queries (%d), must be (1)", ptql_error(error, "Too many queries (%d), must be (1)",
@ -950,7 +960,7 @@ static int ptql_pid_list_get(sigar_t *sigar,
int status, i; int status, i;
sigar_pid_t match_pid; sigar_pid_t match_pid;
if (branch->flags >= PTQL_PID_SERVICE_NAME) { if (IS_PID_SERVICE_QUERY(branch)) {
if ((branch->flags > PTQL_PID_SERVICE_NAME) || if ((branch->flags > PTQL_PID_SERVICE_NAME) ||
(branch->op_name != PTQL_OP_EQ)) (branch->op_name != PTQL_OP_EQ))
{ {