/* 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 */
(*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 */
(*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 */
(*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 (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) /* {{{ */
{
- jclass c_arraylist;
+ jclass c_dataset;
jmethodID m_constructor;
jmethodID m_add;
+ jobject o_type;
jobject o_dataset;
int i;
- /* Look up the java.util.ArrayList class */
- c_arraylist = (*jvm_env)->FindClass (jvm_env, "java.util.ArrayList");
- if (c_arraylist == NULL)
+ /* Look up the org.collectd.api.DataSet class */
+ c_dataset = (*jvm_env)->FindClass (jvm_env, "org.collectd.api.DataSet");
+ if (c_dataset == NULL)
{
ERROR ("java plugin: ctoj_data_set: Looking up the "
- "java.util.ArrayList class failed.");
+ "org.collectd.api.DataSet class failed.");
return (NULL);
}
- /* Search for the `ArrayList (int capacity)' constructor. */
+ /* Search for the `DataSet (String type)' constructor. */
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 "
- "`ArrayList (void)' constructor failed.");
+ "`DataSet (String)' constructor failed.");
return (NULL);
}
- /* Search for the `boolean add (Object element)' method. */
+ /* Search for the `void addDataSource (DataSource)' method. */
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 "
- "`add (Object)' method failed.");
+ "`addDataSource (DataSource)' method failed.");
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)
{
- 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);
}
+ /* 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;
- jboolean status;
o_datasource = ctoj_data_source (jvm_env, ds->ds + i);
if (o_datasource == 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++) */
static int ctoj_value_list_add_data_set (JNIEnv *jvm_env, /* {{{ */
jclass c_valuelist, jobject o_valuelist, const data_set_t *ds)
{
- jmethodID m_setdatasource;
+ jmethodID m_setdataset;
jobject o_dataset;
/* Look for the `void setDataSource (List<DataSource> ds)' method. */
- m_setdatasource = (*jvm_env)->GetMethodID (jvm_env, c_valuelist,
- "setDataSource", "(Ljava/util/List;)V");
- if (m_setdatasource == NULL)
+ m_setdataset = (*jvm_env)->GetMethodID (jvm_env, c_valuelist,
+ "setDataSet", "(Lorg.collectd.api.DataSet;)V");
+ if (m_setdataset == NULL)
{
ERROR ("java plugin: ctoj_value_list_add_data_set: "
- "Cannot find the `void setDataSource (List<DataSource> ds)' method.");
+ "Cannot find the `void setDataSet (DataSet)' method.");
return (-1);
}
- /* Create a List<DataSource> object. */
+ /* Create a DataSet object. */
o_dataset = ctoj_data_set (jvm_env, ds);
if (o_dataset == NULL)
{
/* Actually call the method. */
(*jvm_env)->CallVoidMethod (jvm_env,
- o_valuelist, m_setdatasource, o_dataset);
+ o_valuelist, m_setdataset, o_dataset);
/* Decrease reference counter on the List<DataSource> object. */
(*jvm_env)->DeleteLocalRef (jvm_env, o_dataset);
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);
*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 */
*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 */
static JNINativeMethod jni_api_functions[] =
{
{ "DispatchValues", "(Lorg/collectd/api/ValueList;)I", cjni_api_dispatch_values },
- { "GetDS", "(Ljava/lang/String;)Ljava/util/List;", cjni_api_get_ds }
+ { "GetDS", "(Ljava/lang/String;)Lorg/collectd/api/DataSet;", cjni_api_get_ds }
};
static size_t jni_api_functions_num = sizeof (jni_api_functions)
/ sizeof (jni_api_functions[0]);
return (0);
} /* }}} int cjni_config */
-static int cjni_read_one_plugin (JNIEnv *jvm_env, java_plugin_t *jp) /* {{{ */
-{
- int status;
-
- if ((jp == NULL)
- || ((jp->flags & CJNI_FLAG_ENABLED) == 0)
- || (jp->m_read == NULL))
- return (0);
-
- DEBUG ("java plugin: Calling: %s.Read()", jp->class_name);
-
- status = (*jvm_env)->CallIntMethod (jvm_env, jp->object_ptr,
- jp->m_read);
- if (status != 0)
- {
- ERROR ("java plugin: cjni_read_one_plugin: "
- "Calling `Read' on an `%s' object failed with status %i.",
- jp->class_name, status);
- return (-1);
- }
-
- return (0);
-} /* }}} int cjni_read_one_plugin */
-
-static int cjni_read_plugins (JNIEnv *jvm_env) /* {{{ */
-{
- size_t j;
-
- for (j = 0; j < java_plugins_num; j++)
- cjni_read_one_plugin (jvm_env, &java_plugins[j]);
-
- return (0);
-} /* }}} int cjni_read_plugins */
-
-static int cjni_read (void) /* {{{ */
-{
- JNIEnv *jvm_env;
- int status;
-
- if (jvm == NULL)
- {
- ERROR ("java plugin: cjni_read: jvm == NULL");
- return (-1);
- }
-
- jvm_env = cjni_thread_attach ();
- if (jvm_env == NULL)
- return (-1);
-
- cjni_read_plugins (jvm_env);
-
- status = cjni_thread_detach ();
- if (status != 0)
- return (-1);
-
- return (0);
-} /* }}} int cjni_read */
-
static int cjni_write_one_plugin (JNIEnv *jvm_env, /* {{{ */
java_plugin_t *jp, jobject vl_java)
{
return (0);
} /* }}} int cjni_write_one_plugin */
-static int cjni_write_plugins (JNIEnv *jvm_env, /* {{{ */
- const data_set_t *ds, const value_list_t *vl)
+static int cjni_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
+ user_data_t __attribute__((unused)) *user_data)
{
- size_t j;
-
+ JNIEnv *jvm_env;
+ java_plugin_t *jp;
jobject vl_java;
+ int status;
- vl_java = ctoj_value_list (jvm_env, ds, vl);
- if (vl_java == NULL)
+ if (jvm == NULL)
{
- ERROR ("java plugin: cjni_write_plugins: ctoj_value_list failed.");
+ ERROR ("java plugin: cjni_write: jvm == NULL");
return (-1);
}
- for (j = 0; j < java_plugins_num; j++)
- cjni_write_one_plugin (jvm_env, &java_plugins[j], vl_java);
-
- (*jvm_env)->DeleteLocalRef (jvm_env, vl_java);
-
- return (0);
-} /* }}} int cjni_write_plugins */
-
-static int cjni_write (const data_set_t *ds, const value_list_t *vl) /* {{{ */
-{
- JNIEnv *jvm_env;
- int status;
-
- if (jvm == NULL)
+ if ((user_data == NULL) || (user_data->data == NULL))
{
- ERROR ("java plugin: cjni_write: jvm == NULL");
+ ERROR ("java plugin: cjni_read: Invalid user data.");
return (-1);
}
if (jvm_env == NULL)
return (-1);
- cjni_write_plugins (jvm_env, ds, vl);
+ vl_java = ctoj_value_list (jvm_env, ds, vl);
+ if (vl_java == NULL)
+ {
+ ERROR ("java plugin: cjni_write_plugins: ctoj_value_list failed.");
+ return (-1);
+ }
+
+ jp = (java_plugin_t *) user_data->data;
+
+ cjni_write_one_plugin (jvm_env, jp, vl_java);
+
+ (*jvm_env)->DeleteLocalRef (jvm_env, vl_java);
status = cjni_thread_detach ();
if (status != 0)
return (0);
} /* }}} int cjni_shutdown */
+static int cjni_read_one_plugin (JNIEnv *jvm_env, java_plugin_t *jp) /* {{{ */
+{
+ int status;
+
+ if ((jp == NULL)
+ || ((jp->flags & CJNI_FLAG_ENABLED) == 0)
+ || (jp->m_read == NULL))
+ return (0);
+
+ DEBUG ("java plugin: Calling: %s.Read()", jp->class_name);
+
+ status = (*jvm_env)->CallIntMethod (jvm_env, jp->object_ptr,
+ jp->m_read);
+ if (status != 0)
+ {
+ ERROR ("java plugin: cjni_read_one_plugin: "
+ "Calling `Read' on an `%s' object failed with status %i.",
+ jp->class_name, status);
+ return (-1);
+ }
+
+ return (0);
+} /* }}} int cjni_read_one_plugin */
+
+static int cjni_read (user_data_t *user_data) /* {{{ */
+{
+ JNIEnv *jvm_env;
+ java_plugin_t *jp;
+ int status;
+
+ if (jvm == NULL)
+ {
+ ERROR ("java plugin: cjni_read: jvm == NULL");
+ return (-1);
+ }
+
+ if ((user_data == NULL) || (user_data->data == NULL))
+ {
+ ERROR ("java plugin: cjni_read: Invalid user data.");
+ return (-1);
+ }
+
+ jvm_env = cjni_thread_attach ();
+ if (jvm_env == NULL)
+ return (-1);
+
+ jp = (java_plugin_t *) user_data->data;
+
+ cjni_read_one_plugin (jvm_env, jp);
+
+ status = cjni_thread_detach ();
+ if (status != 0)
+ return (-1);
+
+ return (0);
+} /* }}} int cjni_read */
+
static int cjni_init_one_plugin (JNIEnv *jvm_env, java_plugin_t *jp) /* {{{ */
{
+ char plugin_name[128];
jmethodID constructor_id;
int status;
}
jp->flags |= CJNI_FLAG_ENABLED;
+ ssnprintf (plugin_name, sizeof (plugin_name), "java:%s", jp->class_name);
+ if (jp->m_read != NULL)
+ {
+ user_data_t ud;
+
+ memset (&ud, 0, sizeof (ud));
+ ud.data = jp;
+ ud.free_func = NULL;
+
+ plugin_register_complex_read (plugin_name, cjni_read, &ud);
+ }
+
+ if (jp->m_write != NULL)
+ {
+ user_data_t ud;
+
+ memset (&ud, 0, sizeof (ud));
+ ud.data = jp;
+ ud.free_func = NULL;
+
+ plugin_register_write (plugin_name, cjni_write, &ud);
+ }
+
return (0);
} /* }}} int cjni_init_one_plugin */
static int cjni_init_plugins (JNIEnv *jvm_env) /* {{{ */
{
- size_t j;
-
- int have_read;
- int have_write;
int have_shutdown;
+ size_t j;
- have_read = 0;
- have_write = 0;
have_shutdown = 0;
for (j = 0; j < java_plugins_num; j++)
{
cjni_init_one_plugin (jvm_env, &java_plugins[j]);
- if (java_plugins[j].m_read != NULL)
- have_read++;
- if (java_plugins[j].m_write != NULL)
- have_write++;
if (java_plugins[j].m_shutdown != NULL)
have_shutdown++;
}
- if (have_read > 0)
- plugin_register_read ("java", cjni_read);
- if (have_write > 0)
- plugin_register_write ("java", cjni_write);
if (have_shutdown > 0)
plugin_register_shutdown ("java", cjni_shutdown);
-
return (0);
} /* }}} int cjni_init_plugins */
projects / collectd.git / blobdiff