projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libiptc: avoid strict-aliasing warnings
[collectd.git]
/
src
/
java.c
diff --git
a/src/java.c
b/src/java.c
index
73fd566
..
87b189f
100644
(file)
--- a/
src/java.c
+++ b/
src/java.c
@@
-286,6
+286,10
@@
static jobject ctoj_value_to_number (JNIEnv *jvm_env, /* {{{ */
return (ctoj_jlong_to_number (jvm_env, (jlong) value.counter));
else if (ds_type == DS_TYPE_GAUGE)
return (ctoj_jdouble_to_number (jvm_env, (jdouble) value.gauge));
return (ctoj_jlong_to_number (jvm_env, (jlong) value.counter));
else if (ds_type == DS_TYPE_GAUGE)
return (ctoj_jdouble_to_number (jvm_env, (jdouble) value.gauge));
+ if (ds_type == DS_TYPE_DERIVE)
+ return (ctoj_jlong_to_number (jvm_env, (jlong) value.derive));
+ if (ds_type == DS_TYPE_ABSOLUTE)
+ return (ctoj_jlong_to_number (jvm_env, (jlong) value.absolute));
else
return (NULL);
} /* }}} jobject ctoj_value_to_number */
else
return (NULL);
} /* }}} jobject ctoj_value_to_number */
@@
-1044,33
+1048,39
@@
static int jtoc_value (JNIEnv *jvm_env, /* {{{ */
class_ptr = (*jvm_env)->GetObjectClass (jvm_env, object_ptr);
class_ptr = (*jvm_env)->GetObjectClass (jvm_env, object_ptr);
- if (ds_type == DS_TYPE_
COUNTER
)
+ if (ds_type == DS_TYPE_
GAUGE
)
{
{
- j
long tmp_long
;
+ j
double tmp_double
;
- status = jtoc_
long (jvm_env, &tmp_long
,
- class_ptr, object_ptr, "
long
Value");
+ status = jtoc_
double (jvm_env, &tmp_double
,
+ class_ptr, object_ptr, "
double
Value");
if (status != 0)
{
ERROR ("java plugin: jtoc_value: "
if (status != 0)
{
ERROR ("java plugin: jtoc_value: "
- "jtoc_
long
failed.");
+ "jtoc_
double
failed.");
return (-1);
}
return (-1);
}
- (*ret_value).
counter = (counter_t) tmp_long
;
+ (*ret_value).
gauge = (gauge_t) tmp_double
;
}
else
{
}
else
{
- j
double tmp_double
;
+ j
long tmp_long
;
- status = jtoc_
double (jvm_env, &tmp_double
,
- class_ptr, object_ptr, "
double
Value");
+ status = jtoc_
long (jvm_env, &tmp_long
,
+ class_ptr, object_ptr, "
long
Value");
if (status != 0)
{
ERROR ("java plugin: jtoc_value: "
if (status != 0)
{
ERROR ("java plugin: jtoc_value: "
- "jtoc_
double
failed.");
+ "jtoc_
long
failed.");
return (-1);
}
return (-1);
}
- (*ret_value).gauge = (gauge_t) tmp_double;
+
+ if (ds_type == DS_TYPE_DERIVE)
+ (*ret_value).derive = (derive_t) tmp_long;
+ else if (ds_type == DS_TYPE_ABSOLUTE)
+ (*ret_value).absolute = (absolute_t) tmp_long;
+ else
+ (*ret_value).counter = (counter_t) tmp_long;
}
return (0);
}
return (0);