projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
92f3813
)
java plugin: Change the API to use the `DataSet' class.
author
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 10:29:12 +0000
(11:29 +0100)
committer
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 10:31:49 +0000
(11:31 +0100)
bindings/java/org/collectd/api/CollectdAPI.java
patch
|
blob
|
history
bindings/java/org/collectd/api/DataSet.java
patch
|
blob
|
history
bindings/java/org/collectd/api/OConfigItem.java
patch
|
blob
|
history
bindings/java/org/collectd/api/OConfigValue.java
patch
|
blob
|
history
bindings/java/org/collectd/api/ValueList.java
patch
|
blob
|
history
src/java.c
patch
|
blob
|
history
diff --git
a/bindings/java/org/collectd/api/CollectdAPI.java
b/bindings/java/org/collectd/api/CollectdAPI.java
index
89d9c16
..
167112f
100644
(file)
--- a/
bindings/java/org/collectd/api/CollectdAPI.java
+++ b/
bindings/java/org/collectd/api/CollectdAPI.java
@@
-21,15
+21,11
@@
package org.collectd.api;
package org.collectd.api;
-import java.util.List;
-import org.collectd.api.ValueList;
-import org.collectd.api.DataSource;
-
public class CollectdAPI
{
native public static int DispatchValues (ValueList vl);
public class CollectdAPI
{
native public static int DispatchValues (ValueList vl);
- native public static
List<DataSource>
GetDS (String type);
+ native public static
DataSet
GetDS (String type);
} /* class CollectdAPI */
/* vim: set sw=2 sts=2 et fdm=marker : */
} /* class CollectdAPI */
/* vim: set sw=2 sts=2 et fdm=marker : */
diff --git
a/bindings/java/org/collectd/api/DataSet.java
b/bindings/java/org/collectd/api/DataSet.java
index
ff5107d
..
9823073
100644
(file)
--- a/
bindings/java/org/collectd/api/DataSet.java
+++ b/
bindings/java/org/collectd/api/DataSet.java
@@
-24,6
+24,11
@@
package org.collectd.api;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
+/**
+ * Java representation of collectd/src/plugin.h:data_set_t structure.
+ *
+ * @author Florian Forster <octo at verplant.org>
+ */
public class DataSet
{
private String _type;
public class DataSet
{
private String _type;
diff --git
a/bindings/java/org/collectd/api/OConfigItem.java
b/bindings/java/org/collectd/api/OConfigItem.java
index
781af09
..
4c6a778
100644
(file)
--- a/
bindings/java/org/collectd/api/OConfigItem.java
+++ b/
bindings/java/org/collectd/api/OConfigItem.java
@@
-24,6
+24,11
@@
package org.collectd.api;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
+/**
+ * Java representation of collectd/src/liboconfig/oconfig.h:oconfig_item_t structure.
+ *
+ * @author Florian Forster <octo at verplant.org>
+ */
public class OConfigItem
{
private String _key = null;
public class OConfigItem
{
private String _key = null;
diff --git
a/bindings/java/org/collectd/api/OConfigValue.java
b/bindings/java/org/collectd/api/OConfigValue.java
index
5b40e66
..
1ebafff
100644
(file)
--- a/
bindings/java/org/collectd/api/OConfigValue.java
+++ b/
bindings/java/org/collectd/api/OConfigValue.java
@@
-21,6
+21,11
@@
package org.collectd.api;
package org.collectd.api;
+/**
+ * Java representation of collectd/src/liboconfig/oconfig.h:oconfig_value_t structure.
+ *
+ * @author Florian Forster <octo at verplant.org>
+ */
public class OConfigValue
{
public static final int OCONFIG_TYPE_STRING = 0;
public class OConfigValue
{
public static final int OCONFIG_TYPE_STRING = 0;
diff --git
a/bindings/java/org/collectd/api/ValueList.java
b/bindings/java/org/collectd/api/ValueList.java
index
61cfdd7
..
4ba3018
100644
(file)
--- a/
bindings/java/org/collectd/api/ValueList.java
+++ b/
bindings/java/org/collectd/api/ValueList.java
@@
-26,10
+26,10
@@
import java.util.List;
*/
public class ValueList extends PluginData {
*/
public class ValueList extends PluginData {
- List<Number> _values = new ArrayList<Number>();
-
List<DataSource> _ds = new ArrayList<DataSource>()
;
+
private
List<Number> _values = new ArrayList<Number>();
+
private DataSet _ds
;
- long _interval;
+
private
long _interval;
public ValueList() {
public ValueList() {
@@
-43,7
+43,7
@@
public class ValueList extends PluginData {
this((PluginData)vl);
_interval = vl._interval;
_values.addAll(vl.getValues());
this((PluginData)vl);
_interval = vl._interval;
_values.addAll(vl.getValues());
-
_ds.addAll(vl._ds)
;
+
_ds = vl._ds
;
}
public List<Number> getValues() {
}
public List<Number> getValues() {
@@
-63,19
+63,30
@@
public class ValueList extends PluginData {
_values.clear ();
}
_values.clear ();
}
+ /**
+ * @deprecated Use {@link #getDataSet()} instead.
+ */
public List<DataSource> getDataSource() {
public List<DataSource> getDataSource() {
- if (_ds.size() > 0) {
- return _ds;
- }
- else {
+ if (_ds == null)
return null;
return null;
- }
+ return _ds.getDataSources ();
+ }
+
+ public DataSet getDataSet () {
+ return _ds;
}
}
- public void setDataS
ource(List<DataSource>
ds) {
+ public void setDataS
et (DataSet
ds) {
_ds = ds;
}
_ds = ds;
}
+ /**
+ * @deprecated Use {@link #setDataSet(DataSet)} instead.
+ */
+ public void setDataSource(List<DataSource> dsrc) {
+ _ds = new DataSet (_type, dsrc);
+ }
+
public long getInterval() {
return _interval;
}
public long getInterval() {
return _interval;
}
@@
-107,3
+118,5
@@
public class ValueList extends PluginData {
return sb.toString();
}
}
return sb.toString();
}
}
+
+/* vim: set sw=4 sts=4 et : */
diff --git
a/src/java.c
b/src/java.c
index
e871bbf
..
6d9b753
100644
(file)
--- a/
src/java.c
+++ b/
src/java.c
@@
-111,9
+111,6
@@
static int ctoj_string (JNIEnv *jvm_env, /* {{{ */
/* Decrease reference counter on the java.lang.String object. */
(*jvm_env)->DeleteLocalRef (jvm_env, o_string);
/* Decrease reference counter on the java.lang.String object. */
(*jvm_env)->DeleteLocalRef (jvm_env, o_string);
- DEBUG ("java plugin: ctoj_string: ->%s (%s);",
- method_name, (string != NULL) ? string : "");
-
return (0);
} /* }}} int ctoj_string */
return (0);
} /* }}} int ctoj_string */
@@
-135,9
+132,6
@@
static int ctoj_int (JNIEnv *jvm_env, /* {{{ */
(*jvm_env)->CallVoidMethod (jvm_env, object_ptr, m_set, value);
(*jvm_env)->CallVoidMethod (jvm_env, object_ptr, m_set, value);
- DEBUG ("java plugin: ctoj_int: ->%s (%i);",
- method_name, (int) value);
-
return (0);
} /* }}} int ctoj_int */
return (0);
} /* }}} int ctoj_int */
@@
-159,9
+153,6
@@
static int ctoj_long (JNIEnv *jvm_env, /* {{{ */
(*jvm_env)->CallVoidMethod (jvm_env, object_ptr, m_set, value);
(*jvm_env)->CallVoidMethod (jvm_env, object_ptr, m_set, value);
- DEBUG ("java plugin: ctoj_long: ->%s (%"PRIi64");",
- method_name, (int64_t) value);
-
return (0);
} /* }}} int ctoj_long */
return (0);
} /* }}} int ctoj_long */
@@
-183,9
+174,6
@@
static int ctoj_double (JNIEnv *jvm_env, /* {{{ */
(*jvm_env)->CallVoidMethod (jvm_env, object_ptr, m_set, value);
(*jvm_env)->CallVoidMethod (jvm_env, object_ptr, m_set, value);
- DEBUG ("java plugin: ctoj_double: ->%s (%g);",
- method_name, (double) value);
-
return (0);
} /* }}} int ctoj_double */
return (0);
} /* }}} int ctoj_double */
@@
-556,56
+544,67
@@
static jobject ctoj_oconfig_item (JNIEnv *jvm_env, /* {{{ */
return (o_ocitem);
} /* }}} jobject ctoj_oconfig_item */
return (o_ocitem);
} /* }}} jobject ctoj_oconfig_item */
-/* Convert a data_set_t to a
java.util.List<DataSource>
*/
+/* Convert a data_set_t to a
org.collectd.api.DataSet
*/
static jobject ctoj_data_set (JNIEnv *jvm_env, const data_set_t *ds) /* {{{ */
{
static jobject ctoj_data_set (JNIEnv *jvm_env, const data_set_t *ds) /* {{{ */
{
- jclass c_
arraylis
t;
+ jclass c_
datase
t;
jmethodID m_constructor;
jmethodID m_add;
jmethodID m_constructor;
jmethodID m_add;
+ jobject o_type;
jobject o_dataset;
int i;
jobject o_dataset;
int i;
- /* Look up the
java.util.ArrayLis
t class */
- c_
arraylist = (*jvm_env)->FindClass (jvm_env, "java.util.ArrayLis
t");
- if (c_
arraylis
t == NULL)
+ /* Look up the
org.collectd.api.DataSe
t class */
+ c_
dataset = (*jvm_env)->FindClass (jvm_env, "org.collectd.api.DataSe
t");
+ if (c_
datase
t == NULL)
{
ERROR ("java plugin: ctoj_data_set: Looking up the "
{
ERROR ("java plugin: ctoj_data_set: Looking up the "
- "
java.util.ArrayLis
t class failed.");
+ "
org.collectd.api.DataSe
t class failed.");
return (NULL);
}
return (NULL);
}
- /* Search for the `
ArrayList (int capacity
)' constructor. */
+ /* Search for the `
DataSet (String type
)' constructor. */
m_constructor = (*jvm_env)->GetMethodID (jvm_env,
m_constructor = (*jvm_env)->GetMethodID (jvm_env,
- c_
arraylist, "<init>", "(
)V");
+ c_
dataset, "<init>", "(Ljava.lang.String;
)V");
if (m_constructor == NULL)
{
ERROR ("java plugin: ctoj_data_set: Looking up the "
if (m_constructor == NULL)
{
ERROR ("java plugin: ctoj_data_set: Looking up the "
- "`
ArrayList (void
)' constructor failed.");
+ "`
DataSet (String
)' constructor failed.");
return (NULL);
}
return (NULL);
}
- /* Search for the `
boolean add (Object element
)' method. */
+ /* Search for the `
void addDataSource (DataSource
)' method. */
m_add = (*jvm_env)->GetMethodID (jvm_env,
m_add = (*jvm_env)->GetMethodID (jvm_env,
- c_
arraylist, "add", "(Ljava/lang/Object;)Z
");
+ c_
dataset, "addDataSource", "(Lorg.collectd.api.DataSource;)V
");
if (m_add == NULL)
{
ERROR ("java plugin: ctoj_data_set: Looking up the "
if (m_add == NULL)
{
ERROR ("java plugin: ctoj_data_set: Looking up the "
- "`add
(Object
)' method failed.");
+ "`add
DataSource (DataSource
)' method failed.");
return (NULL);
}
return (NULL);
}
- o_dataset = (*jvm_env)->NewObject (jvm_env, c_arraylist, m_constructor);
+ o_type = (*jvm_env)->NewStringUTF (jvm_env, ds->type);
+ if (o_type == NULL)
+ {
+ ERROR ("java plugin: ctoj_data_set: Creating a String object failed.");
+ return (NULL);
+ }
+
+ o_dataset = (*jvm_env)->NewObject (jvm_env,
+ c_dataset, m_constructor, o_type);
if (o_dataset == NULL)
{
if (o_dataset == NULL)
{
- ERROR ("java plugin: ctoj_data_set:
"
-
"Creating an ArrayList object failed."
);
+ ERROR ("java plugin: ctoj_data_set:
Creating a DataSet object failed.");
+
(*jvm_env)->DeleteLocalRef (jvm_env, o_type
);
return (NULL);
}
return (NULL);
}
+ /* Decrease reference counter on the java.lang.String object. */
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_type);
+
for (i = 0; i < ds->ds_num; i++)
{
jobject o_datasource;
for (i = 0; i < ds->ds_num; i++)
{
jobject o_datasource;
- jboolean status;
o_datasource = ctoj_data_source (jvm_env, ds->ds + i);
if (o_datasource == NULL)
o_datasource = ctoj_data_source (jvm_env, ds->ds + i);
if (o_datasource == NULL)
@@
-616,15
+615,7
@@
static jobject ctoj_data_set (JNIEnv *jvm_env, const data_set_t *ds) /* {{{ */
return (NULL);
}
return (NULL);
}
- status = (*jvm_env)->CallBooleanMethod (jvm_env,
- o_dataset, m_add, o_datasource);
- if (!status)
- {
- ERROR ("java plugin: ctoj_data_set: ArrayList.add returned FALSE.");
- (*jvm_env)->DeleteLocalRef (jvm_env, o_datasource);
- (*jvm_env)->DeleteLocalRef (jvm_env, o_dataset);
- return (NULL);
- }
+ (*jvm_env)->CallVoidMethod (jvm_env, o_dataset, m_add, o_datasource);
(*jvm_env)->DeleteLocalRef (jvm_env, o_datasource);
} /* for (i = 0; i < ds->ds_num; i++) */
(*jvm_env)->DeleteLocalRef (jvm_env, o_datasource);
} /* for (i = 0; i < ds->ds_num; i++) */
@@
-666,20
+657,20
@@
static int ctoj_value_list_add_value (JNIEnv *jvm_env, /* {{{ */
static int ctoj_value_list_add_data_set (JNIEnv *jvm_env, /* {{{ */
jclass c_valuelist, jobject o_valuelist, const data_set_t *ds)
{
static int ctoj_value_list_add_data_set (JNIEnv *jvm_env, /* {{{ */
jclass c_valuelist, jobject o_valuelist, const data_set_t *ds)
{
- jmethodID m_setdatas
ource
;
+ jmethodID m_setdatas
et
;
jobject o_dataset;
/* Look for the `void setDataSource (List<DataSource> ds)' method. */
jobject o_dataset;
/* Look for the `void setDataSource (List<DataSource> ds)' method. */
- m_setdatas
ource
= (*jvm_env)->GetMethodID (jvm_env, c_valuelist,
- "setDataS
ource", "(Ljava/util/Lis
t;)V");
- if (m_setdatas
ource
== NULL)
+ m_setdatas
et
= (*jvm_env)->GetMethodID (jvm_env, c_valuelist,
+ "setDataS
et", "(Lorg.collectd.api.DataSe
t;)V");
+ if (m_setdatas
et
== NULL)
{
ERROR ("java plugin: ctoj_value_list_add_data_set: "
{
ERROR ("java plugin: ctoj_value_list_add_data_set: "
- "Cannot find the `void setDataS
ource (List<DataSource> ds
)' method.");
+ "Cannot find the `void setDataS
et (DataSet
)' method.");
return (-1);
}
return (-1);
}
- /* Create a
List<DataSource>
object. */
+ /* Create a
DataSet
object. */
o_dataset = ctoj_data_set (jvm_env, ds);
if (o_dataset == NULL)
{
o_dataset = ctoj_data_set (jvm_env, ds);
if (o_dataset == NULL)
{
@@
-690,7
+681,7
@@
static int ctoj_value_list_add_data_set (JNIEnv *jvm_env, /* {{{ */
/* Actually call the method. */
(*jvm_env)->CallVoidMethod (jvm_env,
/* Actually call the method. */
(*jvm_env)->CallVoidMethod (jvm_env,
- o_valuelist, m_setdatas
ource
, o_dataset);
+ o_valuelist, m_setdatas
et
, o_dataset);
/* Decrease reference counter on the List<DataSource> object. */
(*jvm_env)->DeleteLocalRef (jvm_env, o_dataset);
/* Decrease reference counter on the List<DataSource> object. */
(*jvm_env)->DeleteLocalRef (jvm_env, o_dataset);
@@
-839,8
+830,6
@@
static int jtoc_string (JNIEnv *jvm_env, /* {{{ */
return (-1);
}
return (-1);
}
- DEBUG ("java plugin: jtoc_string: ->%s() = %s", method_name, c_str);
-
sstrncpy (buffer, c_str, buffer_size);
(*jvm_env)->ReleaseStringUTFChars (jvm_env, string_obj, c_str);
sstrncpy (buffer, c_str, buffer_size);
(*jvm_env)->ReleaseStringUTFChars (jvm_env, string_obj, c_str);
@@
-866,9
+855,6
@@
static int jtoc_long (JNIEnv *jvm_env, /* {{{ */
*ret_value = (*jvm_env)->CallLongMethod (jvm_env, object_ptr, method_id);
*ret_value = (*jvm_env)->CallLongMethod (jvm_env, object_ptr, method_id);
- DEBUG ("java plugin: jtoc_long: ->%s() = %li",
- method_name, (long int) *ret_value);
-
return (0);
} /* }}} int jtoc_long */
return (0);
} /* }}} int jtoc_long */
@@
-889,9
+875,6
@@
static int jtoc_double (JNIEnv *jvm_env, /* {{{ */
*ret_value = (*jvm_env)->CallDoubleMethod (jvm_env, object_ptr, method_id);
*ret_value = (*jvm_env)->CallDoubleMethod (jvm_env, object_ptr, method_id);
- DEBUG ("java plugin: jtoc_double: ->%s() = %g",
- method_name, (double) *ret_value);
-
return (0);
} /* }}} int jtoc_double */
return (0);
} /* }}} int jtoc_double */
@@
-1164,7
+1147,7
@@
static jobject JNICALL cjni_api_get_ds (JNIEnv *jvm_env, /* {{{ */
static JNINativeMethod jni_api_functions[] =
{
{ "DispatchValues", "(Lorg/collectd/api/ValueList;)I", cjni_api_dispatch_values },
static JNINativeMethod jni_api_functions[] =
{
{ "DispatchValues", "(Lorg/collectd/api/ValueList;)I", cjni_api_dispatch_values },
- { "GetDS", "(Ljava/lang/String;)L
java/util/Lis
t;", cjni_api_get_ds }
+ { "GetDS", "(Ljava/lang/String;)L
org/collectd/api/DataSe
t;", cjni_api_get_ds }
};
static size_t jni_api_functions_num = sizeof (jni_api_functions)
/ sizeof (jni_api_functions[0]);
};
static size_t jni_api_functions_num = sizeof (jni_api_functions)
/ sizeof (jni_api_functions[0]);