add ptql error messages
This commit is contained in:
1 parent
b3d43367ef
commit
c2f6979c7e
4 files changed
+97
-47
No files matched your search
@@ -1226,23 +1226,16 @@ JNIEXPORT void SIGAR_JNI(ptql_SigarProcessQuery_create)
|
||||
jboolean is_copy;
|
||||
const char *ptql;
|
||||
sigar_ptql_query_t *query;
|
||||
sigar_ptql_error_t error;
|
||||
|
||||
ptql = JENV->GetStringUTFChars(env, jptql, &is_copy);
|
||||
status = sigar_ptql_query_create(&query, (char *)ptql);
|
||||
status = sigar_ptql_query_create(&query, (char *)ptql, &error);
|
||||
if (is_copy) {
|
||||
JENV->ReleaseStringUTFChars(env, jptql, ptql);
|
||||
}
|
||||
|
||||
if (status != SIGAR_OK) {
|
||||
char buf[1024], *msg=buf;
|
||||
if (status == SIGAR_PTQL_MALFORMED_QUERY) {
|
||||
msg = "Malformed query";
|
||||
}
|
||||
else {
|
||||
sigar_strerror_get(status, buf, sizeof(buf));
|
||||
}
|
||||
|
||||
sigar_throw_ptql_malformed(env, msg);
|
||||
sigar_throw_ptql_malformed(env, error.message);
|
||||
}
|
||||
else {
|
||||
sigar_set_pointer(env, obj, query);
|
||||
|
||||
@@ -94,7 +94,8 @@ public class TestPTQL extends SigarTestCase {
|
||||
"Statex.Name.eq=foo",
|
||||
"State.Name.eqx=foo",
|
||||
"State.Name.Xeq=foo",
|
||||
"State.Name.eq=$2",
|
||||
"State.Name.eq=foo,Args.*.eq=$3",
|
||||
"State.Name.eq=$1",
|
||||
"State.State.eq=read",
|
||||
"Args.x.eq=foo",
|
||||
"Time.Sys.gt=x",
|
||||
@@ -102,6 +103,7 @@ public class TestPTQL extends SigarTestCase {
|
||||
"Cpu.Percent.ge=x",
|
||||
"Port.foo.eq=8080",
|
||||
"Port.tcp.gt=8080",
|
||||
"Port.tcp.eq=http",
|
||||
"Cpu.Sys.ew=lots",
|
||||
"",
|
||||
null,
|
||||
|
||||
Reference in new issue
Block a user