diff --git a/bindings/java/src/jni/javasigar.c b/bindings/java/src/jni/javasigar.c index c5caa4f9..5dbc0028 100644 --- a/bindings/java/src/jni/javasigar.c +++ b/bindings/java/src/jni/javasigar.c @@ -1264,7 +1264,7 @@ JNIEXPORT jlong SIGAR_JNI(ptql_SigarProcessQuery_findProcess) return pid; } -JNIEXPORT jlongArray SIGAR_JNI(ptql_SigarProcessQuery_findProcesses) +JNIEXPORT jlongArray SIGAR_JNI(ptql_SigarProcessQuery_find) (JNIEnv *env, jobject obj, jobject sigar_obj) { int status; @@ -1283,7 +1283,7 @@ JNIEXPORT jlongArray SIGAR_JNI(ptql_SigarProcessQuery_findProcesses) re_impl_set(env, sigar, obj, &re); - status = sigar_ptql_query_find_processes(sigar, query, &proclist); + status = sigar_ptql_query_find(sigar, query, &proclist); sigar_ptql_re_impl_set(sigar, NULL, NULL); diff --git a/bindings/java/src/org/hyperic/sigar/ptql/ProcessFinder.java b/bindings/java/src/org/hyperic/sigar/ptql/ProcessFinder.java index d735bff8..7a2d6f5a 100644 --- a/bindings/java/src/org/hyperic/sigar/ptql/ProcessFinder.java +++ b/bindings/java/src/org/hyperic/sigar/ptql/ProcessFinder.java @@ -73,7 +73,7 @@ public class ProcessFinder { public long[] find(ProcessQuery query) throws SigarException { - return query.findProcesses(this.sigar); + return query.find(this.sigar); } } diff --git a/bindings/java/src/org/hyperic/sigar/ptql/ProcessQuery.java b/bindings/java/src/org/hyperic/sigar/ptql/ProcessQuery.java index 5166e6c5..a0b863e7 100644 --- a/bindings/java/src/org/hyperic/sigar/ptql/ProcessQuery.java +++ b/bindings/java/src/org/hyperic/sigar/ptql/ProcessQuery.java @@ -29,6 +29,6 @@ public interface ProcessQuery { public long findProcess(Sigar sigar) throws SigarException; - public long[] findProcesses(Sigar sigar) + public long[] find(Sigar sigar) throws SigarException; } diff --git a/bindings/java/src/org/hyperic/sigar/ptql/SigarProcessQuery.java b/bindings/java/src/org/hyperic/sigar/ptql/SigarProcessQuery.java index 33bb45d6..7f3846d5 100644 --- a/bindings/java/src/org/hyperic/sigar/ptql/SigarProcessQuery.java +++ b/bindings/java/src/org/hyperic/sigar/ptql/SigarProcessQuery.java @@ -40,7 +40,7 @@ public class SigarProcessQuery implements ProcessQuery { public native long findProcess(Sigar sigar) throws SigarException; - public native long[] findProcesses(Sigar sigar) + public native long[] find(Sigar sigar) throws SigarException; static boolean re(String haystack, String needle) { diff --git a/bindings/java/src/org/hyperic/sigar/test/TestPTQL.java b/bindings/java/src/org/hyperic/sigar/test/TestPTQL.java index 6f95e2cb..079c0574 100644 --- a/bindings/java/src/org/hyperic/sigar/test/TestPTQL.java +++ b/bindings/java/src/org/hyperic/sigar/test/TestPTQL.java @@ -119,7 +119,7 @@ public class TestPTQL extends SigarTestCase { } try { - long[] pids = query.findProcesses(sigar); + long[] pids = query.find(sigar); traceln(pids.length + " processes match: " + qs); diff --git a/include/sigar_ptql.h b/include/sigar_ptql.h index c4a359a1..f3b65127 100644 --- a/include/sigar_ptql.h +++ b/include/sigar_ptql.h @@ -41,8 +41,8 @@ SIGAR_DECLARE(int) sigar_ptql_query_find_process(sigar_t *sigar, sigar_ptql_query_t *query, sigar_pid_t *pid); -SIGAR_DECLARE(int) sigar_ptql_query_find_processes(sigar_t *sigar, - sigar_ptql_query_t *query, - sigar_proc_list_t *proclist); +SIGAR_DECLARE(int) sigar_ptql_query_find(sigar_t *sigar, + sigar_ptql_query_t *query, + sigar_proc_list_t *proclist); #endif /*SIGAR_PTQL_H*/ diff --git a/src/sigar_ptql.c b/src/sigar_ptql.c index f5262514..af45729f 100644 --- a/src/sigar_ptql.c +++ b/src/sigar_ptql.c @@ -1411,9 +1411,9 @@ SIGAR_DECLARE(int) sigar_ptql_query_find_process(sigar_t *sigar, return -1; } -SIGAR_DECLARE(int) sigar_ptql_query_find_processes(sigar_t *sigar, - sigar_ptql_query_t *query, - sigar_proc_list_t *proclist) +SIGAR_DECLARE(int) sigar_ptql_query_find(sigar_t *sigar, + sigar_ptql_query_t *query, + sigar_proc_list_t *proclist) { sigar_proc_list_t pids; int status;