#include "collectd.h"
#include "plugin.h"
#include "common.h"
+#include "filter_chain.h"
#include <pthread.h>
#include <jni.h>
typedef struct java_plugin_class_s java_plugin_class_t;
/* }}} */
-struct java_plugin_config_s /* {{{ */
-{
- char *name;
- oconfig_item_t *ci;
-};
-typedef struct java_plugin_config_s java_plugin_config_t;
-/* }}} */
-
-#define CB_TYPE_CONFIG 1
-#define CB_TYPE_INIT 2
-#define CB_TYPE_READ 3
-#define CB_TYPE_WRITE 4
-#define CB_TYPE_FLUSH 5
-#define CB_TYPE_SHUTDOWN 6
-#define CB_TYPE_LOG 7
+#define CB_TYPE_CONFIG 1
+#define CB_TYPE_INIT 2
+#define CB_TYPE_READ 3
+#define CB_TYPE_WRITE 4
+#define CB_TYPE_FLUSH 5
+#define CB_TYPE_SHUTDOWN 6
+#define CB_TYPE_LOG 7
+#define CB_TYPE_NOTIFICATION 8
+#define CB_TYPE_MATCH 9
+#define CB_TYPE_TARGET 10
struct cjni_callback_info_s /* {{{ */
{
char *name;
static java_plugin_class_t *java_classes_list = NULL;
static size_t java_classes_list_len;
-/* List of `config_item_t's for Java plugins */
-static java_plugin_config_t *java_plugin_configs = NULL;
-static size_t java_plugin_configs_num = 0;
-
/* List of config, init, and shutdown callbacks. */
static cjni_callback_info_t *java_callbacks = NULL;
static size_t java_callbacks_num = 0;
user_data_t *ud);
static int cjni_flush (int timeout, const char *identifier, user_data_t *ud);
static void cjni_log (int severity, const char *message, user_data_t *ud);
+static int cjni_notification (const notification_t *n, user_data_t *ud);
+
+static int cjni_match_create (const oconfig_item_t *ci, void **user_data);
+static int cjni_match_destroy (void **user_data);
+static int cjni_match_match (const data_set_t *ds, const value_list_t *vl,
+ notification_meta_t **meta, void **user_data);
/*
* C to Java conversion functions
status = ctoj_string (jvm_env, str, \
c_valuelist, o_valuelist, method_name); \
if (status != 0) { \
- ERROR ("java plugin: ctoj_value_list: jtoc_string (%s) failed.", \
+ ERROR ("java plugin: ctoj_value_list: ctoj_string (%s) failed.", \
method_name); \
(*jvm_env)->DeleteLocalRef (jvm_env, o_valuelist); \
return (NULL); \
}
return (o_valuelist);
-} /* }}} int ctoj_value_list */
+} /* }}} jobject ctoj_value_list */
+
+/* Convert a notification_t to a org.collectd.api.Notification */
+static jobject ctoj_notification (JNIEnv *jvm_env, /* {{{ */
+ const notification_t *n)
+{
+ jclass c_notification;
+ jmethodID m_constructor;
+ jobject o_notification;
+ int status;
+
+ /* First, create a new Notification instance..
+ * Look up the class.. */
+ c_notification = (*jvm_env)->FindClass (jvm_env,
+ "org.collectd.api.Notification");
+ if (c_notification == NULL)
+ {
+ ERROR ("java plugin: ctoj_notification: "
+ "FindClass (org.collectd.api.Notification) failed.");
+ return (NULL);
+ }
+
+ /* Lookup the `Notification ()' constructor. */
+ m_constructor = (*jvm_env)->GetMethodID (jvm_env, c_notification,
+ "<init>", "()V");
+ if (m_constructor == NULL)
+ {
+ ERROR ("java plugin: ctoj_notification: Cannot find the "
+ "`Notification ()' constructor.");
+ return (NULL);
+ }
+
+ /* Create a new instance. */
+ o_notification = (*jvm_env)->NewObject (jvm_env, c_notification,
+ m_constructor);
+ if (o_notification == NULL)
+ {
+ ERROR ("java plugin: ctoj_notification: Creating a new Notification "
+ "instance failed.");
+ return (NULL);
+ }
+
+ /* Set the strings.. */
+#define SET_STRING(str,method_name) do { \
+ status = ctoj_string (jvm_env, str, \
+ c_notification, o_notification, method_name); \
+ if (status != 0) { \
+ ERROR ("java plugin: ctoj_notification: ctoj_string (%s) failed.", \
+ method_name); \
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_notification); \
+ return (NULL); \
+ } } while (0)
+
+ SET_STRING (n->host, "setHost");
+ SET_STRING (n->plugin, "setPlugin");
+ SET_STRING (n->plugin_instance, "setPluginInstance");
+ SET_STRING (n->type, "setType");
+ SET_STRING (n->type_instance, "setTypeInstance");
+ SET_STRING (n->message, "setMessage");
+
+#undef SET_STRING
+
+ /* Set the `time' member. Java stores time in milliseconds. */
+ status = ctoj_long (jvm_env, ((jlong) n->time) * ((jlong) 1000),
+ c_notification, o_notification, "setTime");
+ if (status != 0)
+ {
+ ERROR ("java plugin: ctoj_notification: ctoj_long (setTime) failed.");
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_notification);
+ return (NULL);
+ }
+
+ /* Set the `interval' member.. */
+ status = ctoj_int (jvm_env, (jint) n->severity,
+ c_notification, o_notification, "setSeverity");
+ if (status != 0)
+ {
+ ERROR ("java plugin: ctoj_notification: ctoj_int (setSeverity) failed.");
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_notification);
+ return (NULL);
+ }
+
+ return (o_notification);
+} /* }}} jobject ctoj_notification */
/*
* Java to C conversion functions
*/
/* Call a `String <method> ()' method. */
static int jtoc_string (JNIEnv *jvm_env, /* {{{ */
- char *buffer, size_t buffer_size,
+ char *buffer, size_t buffer_size, int empty_okay,
jclass class_ptr, jobject object_ptr, const char *method_name)
{
jmethodID method_id;
}
string_obj = (*jvm_env)->CallObjectMethod (jvm_env, object_ptr, method_id);
- if (string_obj == NULL)
+ if ((string_obj == NULL) && (empty_okay == 0))
{
ERROR ("java plugin: jtoc_string: CallObjectMethod (%s) failed.",
method_name);
return (-1);
}
+ else if ((string_obj == NULL) && (empty_okay != 0))
+ {
+ memset (buffer, 0, buffer_size);
+ return (0);
+ }
c_str = (*jvm_env)->GetStringUTFChars (jvm_env, string_obj, 0);
if (c_str == NULL)
return (0);
} /* }}} int jtoc_string */
+/* Call an `int <method> ()' method. */
+static int jtoc_int (JNIEnv *jvm_env, /* {{{ */
+ jint *ret_value,
+ jclass class_ptr, jobject object_ptr, const char *method_name)
+{
+ jmethodID method_id;
+
+ method_id = (*jvm_env)->GetMethodID (jvm_env, class_ptr,
+ method_name, "()I");
+ if (method_id == NULL)
+ {
+ ERROR ("java plugin: jtoc_int: Cannot find method `int %s ()'.",
+ method_name);
+ return (-1);
+ }
+
+ *ret_value = (*jvm_env)->CallIntMethod (jvm_env, object_ptr, method_id);
+
+ return (0);
+} /* }}} int jtoc_int */
+
/* Call a `long <method> ()' method. */
static int jtoc_long (JNIEnv *jvm_env, /* {{{ */
jlong *ret_value,
method_name, "()D");
if (method_id == NULL)
{
- ERROR ("java plugin: jtoc_string: Cannot find method `double %s ()'.",
+ ERROR ("java plugin: jtoc_double: Cannot find method `double %s ()'.",
method_name);
return (-1);
}
return (-1);
}
-#define SET_STRING(buffer,method) do { \
- status = jtoc_string (jvm_env, buffer, sizeof (buffer), \
+ /* eo == empty okay */
+#define SET_STRING(buffer,method, eo) do { \
+ status = jtoc_string (jvm_env, buffer, sizeof (buffer), eo, \
class_ptr, object_ptr, method); \
if (status != 0) { \
ERROR ("java plugin: jtoc_value_list: jtoc_string (%s) failed.", \
return (-1); \
} } while (0)
- SET_STRING(vl->type, "getType");
+ SET_STRING(vl->type, "getType", /* empty = */ 0);
ds = plugin_get_ds (vl->type);
if (ds == NULL)
return (-1);
}
- SET_STRING(vl->host, "getHost");
- SET_STRING(vl->plugin, "getPlugin");
- SET_STRING(vl->plugin_instance, "getPluginInstance");
- SET_STRING(vl->type_instance, "getTypeInstance");
+ SET_STRING(vl->host, "getHost", /* empty = */ 0);
+ SET_STRING(vl->plugin, "getPlugin", /* empty = */ 0);
+ SET_STRING(vl->plugin_instance, "getPluginInstance", /* empty = */ 1);
+ SET_STRING(vl->type_instance, "getTypeInstance", /* empty = */ 1);
#undef SET_STRING
return (0);
} /* }}} int jtoc_value_list */
+/* Convert a org.collectd.api.Notification to a notification_t. */
+static int jtoc_notification (JNIEnv *jvm_env, notification_t *n, /* {{{ */
+ jobject object_ptr)
+{
+ jclass class_ptr;
+ int status;
+ jlong tmp_long;
+ jint tmp_int;
+
+ class_ptr = (*jvm_env)->GetObjectClass (jvm_env, object_ptr);
+ if (class_ptr == NULL)
+ {
+ ERROR ("java plugin: jtoc_notification: GetObjectClass failed.");
+ return (-1);
+ }
+
+ /* eo == empty okay */
+#define SET_STRING(buffer,method, eo) do { \
+ status = jtoc_string (jvm_env, buffer, sizeof (buffer), eo, \
+ class_ptr, object_ptr, method); \
+ if (status != 0) { \
+ ERROR ("java plugin: jtoc_notification: jtoc_string (%s) failed.", \
+ method); \
+ return (-1); \
+ } } while (0)
+
+ SET_STRING (n->host, "getHost", /* empty = */ 1);
+ SET_STRING (n->plugin, "getPlugin", /* empty = */ 1);
+ SET_STRING (n->plugin_instance, "getPluginInstance", /* empty = */ 1);
+ SET_STRING (n->type, "getType", /* empty = */ 1);
+ SET_STRING (n->type_instance, "getTypeInstance", /* empty = */ 1);
+ SET_STRING (n->message, "getMessage", /* empty = */ 0);
+
+#undef SET_STRING
+
+ status = jtoc_long (jvm_env, &tmp_long, class_ptr, object_ptr, "getTime");
+ if (status != 0)
+ {
+ ERROR ("java plugin: jtoc_notification: jtoc_long (getTime) failed.");
+ return (-1);
+ }
+ /* Java measures time in milliseconds. */
+ n->time = (time_t) (tmp_long / ((jlong) 1000));
+
+ status = jtoc_int (jvm_env, &tmp_int,
+ class_ptr, object_ptr, "getSeverity");
+ if (status != 0)
+ {
+ ERROR ("java plugin: jtoc_notification: jtoc_int (getSeverity) failed.");
+ return (-1);
+ }
+ n->severity = (int) tmp_int;
+
+ return (0);
+} /* }}} int jtoc_notification */
/*
* Functions accessible from Java
*/
return (status);
} /* }}} jint cjni_api_dispatch_values */
+static jint JNICALL cjni_api_dispatch_notification (JNIEnv *jvm_env, /* {{{ */
+ jobject this, jobject o_notification)
+{
+ notification_t n;
+ int status;
+
+ memset (&n, 0, sizeof (n));
+ n.meta = NULL;
+
+ status = jtoc_notification (jvm_env, &n, o_notification);
+ if (status != 0)
+ {
+ ERROR ("java plugin: cjni_api_dispatch_notification: jtoc_notification failed.");
+ return (-1);
+ }
+
+ status = plugin_dispatch_notification (&n);
+
+ return (status);
+} /* }}} jint cjni_api_dispatch_notification */
+
static jobject JNICALL cjni_api_get_ds (JNIEnv *jvm_env, /* {{{ */
jobject this, jobject o_string_type)
{
return (0);
} /* }}} jint cjni_api_register_log */
+static jint JNICALL cjni_api_register_notification (JNIEnv *jvm_env, /* {{{ */
+ jobject this, jobject o_name, jobject o_notification)
+{
+ user_data_t ud;
+ cjni_callback_info_t *cbi;
+
+ cbi = cjni_callback_info_create (jvm_env, o_name, o_notification,
+ CB_TYPE_NOTIFICATION);
+ if (cbi == NULL)
+ return (-1);
+
+ DEBUG ("java plugin: Registering new notification callback: %s", cbi->name);
+
+ memset (&ud, 0, sizeof (ud));
+ ud.data = (void *) cbi;
+ ud.free_func = cjni_callback_info_destroy;
+
+ plugin_register_notification (cbi->name, cjni_notification, &ud);
+
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_notification);
+
+ return (0);
+} /* }}} jint cjni_api_register_notification */
+
+static jint JNICALL cjni_api_register_match (JNIEnv *jvm_env, /* {{{ */
+ jobject this, jobject o_name, jobject o_match)
+{
+ match_proc_t proc;
+ int status;
+ const char *c_name;
+
+ c_name = (*jvm_env)->GetStringUTFChars (jvm_env, o_name, 0);
+ if (c_name == NULL)
+ {
+ ERROR ("java plugin: cjni_api_register_match: "
+ "GetStringUTFChars failed.");
+ return (-1);
+ }
+
+ status = cjni_callback_register (jvm_env, o_name, o_match, CB_TYPE_MATCH);
+ if (status != 0)
+ {
+ (*jvm_env)->ReleaseStringUTFChars (jvm_env, o_name, c_name);
+ return (-1);
+ }
+
+ memset (&proc, 0, sizeof (proc));
+ proc.create = cjni_match_create;
+ proc.destroy = cjni_match_destroy;
+ proc.match = cjni_match_match;
+
+ status = fc_register_match (c_name, proc);
+ if (status != 0)
+ {
+ ERROR ("java plugin: cjni_api_register_match: "
+ "fc_register_match failed.");
+ (*jvm_env)->ReleaseStringUTFChars (jvm_env, o_name, c_name);
+ return (-1);
+ }
+
+ (*jvm_env)->ReleaseStringUTFChars (jvm_env, o_name, c_name);
+
+ return (0);
+} /* }}} jint cjni_api_register_match */
+
static void JNICALL cjni_api_log (JNIEnv *jvm_env, /* {{{ */
jobject this, jint severity, jobject o_message)
{
"(Lorg/collectd/api/ValueList;)I",
cjni_api_dispatch_values },
+ { "dispatchNotification",
+ "(Lorg/collectd/api/Notification;)I",
+ cjni_api_dispatch_notification },
+
{ "getDS",
"(Ljava/lang/String;)Lorg/collectd/api/DataSet;",
cjni_api_get_ds },
"(Ljava/lang/String;Lorg/collectd/api/CollectdLogInterface;)I",
cjni_api_register_log },
+ { "registerNotification",
+ "(Ljava/lang/String;Lorg/collectd/api/CollectdNotificationInterface;)I",
+ cjni_api_register_notification },
+
+ { "registerMatch",
+ "(Ljava/lang/String;Lorg/collectd/api/CollectdMatchFactoryInterface;)I",
+ cjni_api_register_match },
+
{ "log",
"(ILjava/lang/String;)V",
cjni_api_log },
method_signature = "(ILjava/lang/String;)V";
break;
+ case CB_TYPE_NOTIFICATION:
+ method_name = "notification";
+ method_signature = "(Lorg/collectd/api/Notification;)I";
+ break;
+
+ case CB_TYPE_MATCH:
+ method_name = "createMatch";
+ method_signature = "(Lorg/collectd/api/OConfigItem;)"
+ "Lorg/collectd/api/CollectdMatchInterface;";
+ break;
+
default:
ERROR ("java plugin: cjni_callback_info_create: Unknown type: %#x",
type);
type_str = "shutdown";
break;
+ case CB_TYPE_MATCH:
+ type_str = "match";
+ break;
+
default:
type_str = "<unknown>";
}
return (0);
} /* }}} int cjni_callback_register */
-/* Increase the reference counter to the JVM for this thread. If it was zero,
- * attach the JVM first. */
-static JNIEnv *cjni_thread_attach (void) /* {{{ */
+/* Callback for `pthread_key_create'. It frees the data contained in
+ * `jvm_env_key' and prints a warning if the reference counter is not zero. */
+static void cjni_jvm_env_destroy (void *args) /* {{{ */
{
cjni_jvm_env_t *cjni_env;
- JNIEnv *jvm_env;
- cjni_env = pthread_getspecific (jvm_env_key);
- if (cjni_env == NULL)
- {
- /* This pointer is free'd in `cjni_jvm_env_destroy'. */
- cjni_env = (cjni_jvm_env_t *) malloc (sizeof (*cjni_env));
- if (cjni_env == NULL)
- {
- ERROR ("java plugin: cjni_thread_attach: malloc failed.");
- return (NULL);
- }
- memset (cjni_env, 0, sizeof (*cjni_env));
- cjni_env->reference_counter = 0;
- cjni_env->jvm_env = NULL;
+ if (args == NULL)
+ return;
- pthread_setspecific (jvm_env_key, cjni_env);
- }
+ cjni_env = (cjni_jvm_env_t *) args;
if (cjni_env->reference_counter > 0)
{
- cjni_env->reference_counter++;
- jvm_env = cjni_env->jvm_env;
+ ERROR ("java plugin: cjni_jvm_env_destroy: "
+ "cjni_env->reference_counter = %i;", cjni_env->reference_counter);
}
- else
- {
- int status;
- JavaVMAttachArgs args;
-
- assert (cjni_env->jvm_env == NULL);
-
- memset (&args, 0, sizeof (args));
- args.version = JNI_VERSION_1_2;
-
- status = (*jvm)->AttachCurrentThread (jvm, (void *) &jvm_env, (void *) &args);
- if (status != 0)
- {
- ERROR ("java plugin: cjni_thread_attach: AttachCurrentThread failed "
- "with status %i.", status);
- return (NULL);
- }
- cjni_env->reference_counter = 1;
- cjni_env->jvm_env = jvm_env;
+ if (cjni_env->jvm_env != NULL)
+ {
+ ERROR ("java plugin: cjni_jvm_env_destroy: cjni_env->jvm_env = %p;",
+ (void *) cjni_env->jvm_env);
}
- DEBUG ("java plugin: cjni_thread_attach: cjni_env->reference_counter = %i",
- cjni_env->reference_counter);
- assert (jvm_env != NULL);
- return (jvm_env);
-} /* }}} JNIEnv *cjni_thread_attach */
+ /* The pointer is allocated in `cjni_thread_attach' */
+ free (cjni_env);
+} /* }}} void cjni_jvm_env_destroy */
-/* Decrease the reference counter of this thread. If it reaches zero, detach
- * from the JVM. */
-static int cjni_thread_detach (void) /* {{{ */
+/* Register ``native'' functions with the JVM. Native functions are C-functions
+ * that can be called by Java code. */
+static int cjni_init_native (JNIEnv *jvm_env) /* {{{ */
{
- cjni_jvm_env_t *cjni_env;
+ jclass api_class_ptr;
int status;
- cjni_env = pthread_getspecific (jvm_env_key);
- if (cjni_env == NULL)
+ api_class_ptr = (*jvm_env)->FindClass (jvm_env, "org.collectd.api.Collectd");
+ if (api_class_ptr == NULL)
{
- ERROR ("java plugin: cjni_thread_detach: pthread_getspecific failed.");
+ ERROR ("cjni_init_native: Cannot find API class `org.collectd.api.Collectd'.");
return (-1);
}
- assert (cjni_env->reference_counter > 0);
- assert (cjni_env->jvm_env != NULL);
-
- cjni_env->reference_counter--;
- DEBUG ("java plugin: cjni_thread_detach: cjni_env->reference_counter = %i",
- cjni_env->reference_counter);
-
- if (cjni_env->reference_counter > 0)
- return (0);
-
- status = (*jvm)->DetachCurrentThread (jvm);
+ status = (*jvm_env)->RegisterNatives (jvm_env, api_class_ptr,
+ jni_api_functions, (jint) jni_api_functions_num);
if (status != 0)
{
- ERROR ("java plugin: cjni_thread_detach: DetachCurrentThread failed "
- "with status %i.", status);
- }
+ ERROR ("cjni_init_native: RegisterNatives failed with status %i.", status);
+ return (-1);
+ }
- cjni_env->reference_counter = 0;
- cjni_env->jvm_env = NULL;
+ return (0);
+} /* }}} int cjni_init_native */
+
+/* Create the JVM. This is called when the first thread tries to access the JVM
+ * via cjni_thread_attach. */
+static int cjni_create_jvm (void) /* {{{ */
+{
+ JNIEnv *jvm_env;
+ JavaVMInitArgs vm_args;
+ JavaVMOption vm_options[jvm_argc];
+
+ int status;
+ size_t i;
+
+ if (jvm != NULL)
+ return (0);
+
+ status = pthread_key_create (&jvm_env_key, cjni_jvm_env_destroy);
+ if (status != 0)
+ {
+ ERROR ("java plugin: cjni_create_jvm: pthread_key_create failed "
+ "with status %i.", status);
+ return (-1);
+ }
+ jvm_env = NULL;
+
+ memset (&vm_args, 0, sizeof (vm_args));
+ vm_args.version = JNI_VERSION_1_2;
+ vm_args.options = vm_options;
+ vm_args.nOptions = (jint) jvm_argc;
+
+ for (i = 0; i < jvm_argc; i++)
+ {
+ DEBUG ("java plugin: cjni_create_jvm: jvm_argv[%zu] = %s",
+ i, jvm_argv[i]);
+ vm_args.options[i].optionString = jvm_argv[i];
+ }
+ /*
+ vm_args.options[0].optionString = "-verbose:jni";
+ vm_args.options[1].optionString = "-Djava.class.path=/home/octo/collectd/bindings/java";
+ */
+
+ status = JNI_CreateJavaVM (&jvm, (void **) &jvm_env, (void **) &vm_args);
+ if (status != 0)
+ {
+ ERROR ("java plugin: cjni_create_jvm: "
+ "JNI_CreateJavaVM failed with status %i.",
+ status);
+ return (-1);
+ }
+ assert (jvm != NULL);
+ assert (jvm_env != NULL);
+
+ /* Call RegisterNatives */
+ status = cjni_init_native (jvm_env);
+ if (status != 0)
+ {
+ ERROR ("java plugin: cjni_create_jvm: cjni_init_native failed.");
+ return (-1);
+ }
+
+ DEBUG ("java plugin: The JVM has been created.");
return (0);
-} /* }}} JNIEnv *cjni_thread_attach */
+} /* }}} int cjni_create_jvm */
-/* Callback for `pthread_key_create'. It frees the data contained in
- * `jvm_env_key' and prints a warning if the reference counter is not zero. */
-static void cjni_jvm_env_destroy (void *args) /* {{{ */
+/* Increase the reference counter to the JVM for this thread. If it was zero,
+ * attach the JVM first. */
+static JNIEnv *cjni_thread_attach (void) /* {{{ */
{
cjni_jvm_env_t *cjni_env;
+ JNIEnv *jvm_env;
- if (args == NULL)
- return;
+ /* If we're the first thread to access the JVM, we'll have to create it
+ * first.. */
+ if (jvm == NULL)
+ {
+ int status;
- cjni_env = (cjni_jvm_env_t *) args;
+ status = cjni_create_jvm ();
+ if (status != 0)
+ {
+ ERROR ("java plugin: cjni_thread_attach: cjni_create_jvm failed.");
+ return (NULL);
+ }
+ }
+ assert (jvm != NULL);
+
+ cjni_env = pthread_getspecific (jvm_env_key);
+ if (cjni_env == NULL)
+ {
+ /* This pointer is free'd in `cjni_jvm_env_destroy'. */
+ cjni_env = (cjni_jvm_env_t *) malloc (sizeof (*cjni_env));
+ if (cjni_env == NULL)
+ {
+ ERROR ("java plugin: cjni_thread_attach: malloc failed.");
+ return (NULL);
+ }
+ memset (cjni_env, 0, sizeof (*cjni_env));
+ cjni_env->reference_counter = 0;
+ cjni_env->jvm_env = NULL;
+
+ pthread_setspecific (jvm_env_key, cjni_env);
+ }
if (cjni_env->reference_counter > 0)
{
- ERROR ("java plugin: cjni_jvm_env_destroy: "
- "cjni_env->reference_counter = %i;", cjni_env->reference_counter);
+ cjni_env->reference_counter++;
+ jvm_env = cjni_env->jvm_env;
}
+ else
+ {
+ int status;
+ JavaVMAttachArgs args;
- if (cjni_env->jvm_env != NULL)
+ assert (cjni_env->jvm_env == NULL);
+
+ memset (&args, 0, sizeof (args));
+ args.version = JNI_VERSION_1_2;
+
+ status = (*jvm)->AttachCurrentThread (jvm, (void *) &jvm_env, (void *) &args);
+ if (status != 0)
+ {
+ ERROR ("java plugin: cjni_thread_attach: AttachCurrentThread failed "
+ "with status %i.", status);
+ return (NULL);
+ }
+
+ cjni_env->reference_counter = 1;
+ cjni_env->jvm_env = jvm_env;
+ }
+
+ DEBUG ("java plugin: cjni_thread_attach: cjni_env->reference_counter = %i",
+ cjni_env->reference_counter);
+ assert (jvm_env != NULL);
+ return (jvm_env);
+} /* }}} JNIEnv *cjni_thread_attach */
+
+/* Decrease the reference counter of this thread. If it reaches zero, detach
+ * from the JVM. */
+static int cjni_thread_detach (void) /* {{{ */
+{
+ cjni_jvm_env_t *cjni_env;
+ int status;
+
+ cjni_env = pthread_getspecific (jvm_env_key);
+ if (cjni_env == NULL)
{
- ERROR ("java plugin: cjni_jvm_env_destroy: cjni_env->jvm_env = %p;",
- (void *) cjni_env->jvm_env);
+ ERROR ("java plugin: cjni_thread_detach: pthread_getspecific failed.");
+ return (-1);
}
- /* The pointer is allocated in `cjni_thread_attach' */
- free (cjni_env);
-} /* }}} void cjni_jvm_env_destroy */
+ assert (cjni_env->reference_counter > 0);
+ assert (cjni_env->jvm_env != NULL);
+
+ cjni_env->reference_counter--;
+ DEBUG ("java plugin: cjni_thread_detach: cjni_env->reference_counter = %i",
+ cjni_env->reference_counter);
+
+ if (cjni_env->reference_counter > 0)
+ return (0);
+
+ status = (*jvm)->DetachCurrentThread (jvm);
+ if (status != 0)
+ {
+ ERROR ("java plugin: cjni_thread_detach: DetachCurrentThread failed "
+ "with status %i.", status);
+ }
+
+ cjni_env->reference_counter = 0;
+ cjni_env->jvm_env = NULL;
+
+ return (0);
+} /* }}} JNIEnv *cjni_thread_attach */
-/* Boring configuration functions.. {{{ */
static int cjni_config_add_jvm_arg (oconfig_item_t *ci) /* {{{ */
{
char **tmp;
return (-1);
}
+ if (jvm != NULL)
+ {
+ ERROR ("java plugin: All `JVMArg' options MUST appear before all "
+ "`LoadPlugin' options! The JVM is already started and I have to "
+ "ignore this argument: %s",
+ ci->values[0].value.string);
+ return (-1);
+ }
+
tmp = (char **) realloc (jvm_argv, sizeof (char *) * (jvm_argc + 1));
if (tmp == NULL)
{
static int cjni_config_load_plugin (oconfig_item_t *ci) /* {{{ */
{
- java_plugin_class_t *tmp;
+ JNIEnv *jvm_env;
+ java_plugin_class_t *class;
+ jmethodID constructor_id;
if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
{
return (-1);
}
- tmp = (java_plugin_class_t *) realloc (java_classes_list,
+ jvm_env = cjni_thread_attach ();
+ if (jvm_env == NULL)
+ return (-1);
+
+ class = (java_plugin_class_t *) realloc (java_classes_list,
(java_classes_list_len + 1) * sizeof (*java_classes_list));
- if (tmp == NULL)
+ if (class == NULL)
{
ERROR ("java plugin: realloc failed.");
+ cjni_thread_detach ();
return (-1);
}
- java_classes_list = tmp;
- tmp = java_classes_list + java_classes_list_len;
+ java_classes_list = class;
+ class = java_classes_list + java_classes_list_len;
- memset (tmp, 0, sizeof (*tmp));
- tmp->name = strdup (ci->values[0].value.string);
- if (tmp->name == NULL)
+ memset (class, 0, sizeof (*class));
+ class->name = strdup (ci->values[0].value.string);
+ if (class->name == NULL)
{
ERROR ("java plugin: strdup failed.");
+ cjni_thread_detach ();
return (-1);
}
- tmp->class = NULL;
- tmp->object = NULL;
+ class->class = NULL;
+ class->object = NULL;
+
+ DEBUG ("java plugin: Loading class %s", class->name);
+
+ class->class = (*jvm_env)->FindClass (jvm_env, class->name);
+ if (class->class == NULL)
+ {
+ ERROR ("java plugin: cjni_config_load_plugin: FindClass (%s) failed.",
+ class->name);
+ cjni_thread_detach ();
+ free (class->name);
+ return (-1);
+ }
+
+ constructor_id = (*jvm_env)->GetMethodID (jvm_env, class->class,
+ "<init>", "()V");
+ if (constructor_id == NULL)
+ {
+ ERROR ("java plugin: cjni_config_load_plugin: "
+ "Could not find the constructor for `%s'.",
+ class->name);
+ cjni_thread_detach ();
+ free (class->name);
+ return (-1);
+ }
+
+ class->object = (*jvm_env)->NewObject (jvm_env, class->class,
+ constructor_id);
+ if (class->object == NULL)
+ {
+ ERROR ("java plugin: cjni_config_load_plugin: "
+ "Could create a new `%s' object.",
+ class->name);
+ cjni_thread_detach ();
+ free (class->name);
+ return (-1);
+ }
+
+ (*jvm_env)->NewGlobalRef (jvm_env, class->object);
+ cjni_thread_detach ();
java_classes_list_len++;
static int cjni_config_plugin_block (oconfig_item_t *ci) /* {{{ */
{
- java_plugin_config_t *tmp;
- char *name;
+ JNIEnv *jvm_env;
+ cjni_callback_info_t *cbi;
+ jobject o_ocitem;
+ const char *name;
+ int status;
size_t i;
if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
return (-1);
}
- name = strdup (ci->values[0].value.string);
- if (name == NULL)
+ name = ci->values[0].value.string;
+
+ cbi = NULL;
+ for (i = 0; i < java_callbacks_num; i++)
{
- ERROR ("java plugin: cjni_config_plugin_block: strdup faiiled.");
- return (-1);
+ if (java_callbacks[i].type != CB_TYPE_CONFIG)
+ continue;
+
+ if (strcmp (name, java_callbacks[i].name) != 0)
+ continue;
+
+ cbi = java_callbacks + i;
+ break;
}
- for (i = 0; i < java_plugin_configs_num; i++)
+ if (cbi == NULL)
{
- if (strcmp (java_plugin_configs[i].name, name) == 0)
- {
- WARNING ("java plugin: There is more than one <Plugin \"%s\"> block. "
- "This is currently not supported - "
- "only the first block will be used!",
- name);
- free (name);
- return (0);
- }
+ NOTICE ("java plugin: Configuration block for `%s' found, but no such "
+ "configuration callback has been registered. Please make sure, the "
+ "`LoadPlugin' lines precede the `Plugin' blocks.",
+ name);
+ return (0);
}
- tmp = (java_plugin_config_t *) realloc (java_plugin_configs,
- (java_plugin_configs_num + 1) * sizeof (*java_plugin_configs));
- if (tmp == NULL)
- {
- ERROR ("java plugin: cjni_config_plugin_block: realloc failed.");
- free (name);
+ DEBUG ("java plugin: Configuring %s", name);
+
+ jvm_env = cjni_thread_attach ();
+ if (jvm_env == NULL)
return (-1);
- }
- java_plugin_configs = tmp;
- tmp = java_plugin_configs + java_plugin_configs_num;
- tmp->name = name;
- tmp->ci = oconfig_clone (ci);
- if (tmp->ci == NULL)
+ o_ocitem = ctoj_oconfig_item (jvm_env, ci);
+ if (o_ocitem == NULL)
{
- ERROR ("java plugin: cjni_config_plugin_block: "
- "oconfig_clone failed for `%s'.",
- name);
- free (name);
+ ERROR ("java plugin: cjni_config_plugin_block: ctoj_oconfig_item failed.");
+ cjni_thread_detach ();
return (-1);
}
- DEBUG ("java plugin: cjni_config_plugin_block: "
- "Successfully copied config for `%s'.",
- name);
+ status = (*jvm_env)->CallIntMethod (jvm_env,
+ cbi->object, cbi->method, o_ocitem);
- java_plugin_configs_num++;
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_ocitem);
+ cjni_thread_detach ();
return (0);
} /* }}} int cjni_config_plugin_block */
DEBUG ("java plugin: jvm_argc = %zu;", jvm_argc);
DEBUG ("java plugin: java_classes_list_len = %zu;", java_classes_list_len);
- DEBUG ("java plugin: java_plugin_configs_num = %zu;",
- java_plugin_configs_num);
if ((success == 0) && (errors > 0))
{
return (0);
} /* }}} int cjni_config */
-/* }}} */
/* Free the data contained in the `user_data_t' pointer passed to `cjni_read'
* and `cjni_write'. In particular, delete the global reference to the Java
DEBUG ("java plugin: cjni_callback_info_destroy (arg = %p);", arg);
+ cbi = (cjni_callback_info_t *) arg;
+
+ /* This condition can occurr when shutting down. */
+ if (jvm == NULL)
+ {
+ sfree (cbi);
+ return;
+ }
+
if (arg == NULL)
return;
return;
}
- cbi = (cjni_callback_info_t *) arg;
-
(*jvm_env)->DeleteGlobalRef (jvm_env, cbi->object);
cbi->method = NULL;
JNIEnv *jvm_env;
cjni_callback_info_t *cbi;
int status;
+ int ret_status;
if (jvm == NULL)
{
cbi = (cjni_callback_info_t *) ud->data;
- status = (*jvm_env)->CallIntMethod (jvm_env, cbi->object,
+ ret_status = (*jvm_env)->CallIntMethod (jvm_env, cbi->object,
cbi->method);
status = cjni_thread_detach ();
return (-1);
}
- return (status);
+ return (ret_status);
} /* }}} int cjni_read */
/* Call the CB_TYPE_WRITE callback pointed to by the `user_data_t' pointer. */
cjni_callback_info_t *cbi;
jobject vl_java;
int status;
+ int ret_status;
if (jvm == NULL)
{
return (-1);
}
- status = (*jvm_env)->CallIntMethod (jvm_env,
+ ret_status = (*jvm_env)->CallIntMethod (jvm_env,
cbi->object, cbi->method, vl_java);
(*jvm_env)->DeleteLocalRef (jvm_env, vl_java);
return (-1);
}
- return (status);
+ return (ret_status);
} /* }}} int cjni_write */
/* Call the CB_TYPE_FLUSH callback pointed to by the `user_data_t' pointer. */
cjni_callback_info_t *cbi;
jobject o_identifier;
int status;
+ int ret_status;
if (jvm == NULL)
{
}
}
- status = (*jvm_env)->CallIntMethod (jvm_env,
+ ret_status = (*jvm_env)->CallIntMethod (jvm_env,
cbi->object, cbi->method, (jint) timeout, o_identifier);
(*jvm_env)->DeleteLocalRef (jvm_env, o_identifier);
return (-1);
}
- return (status);
+ return (ret_status);
} /* }}} int cjni_flush */
/* Call the CB_TYPE_LOG callback pointed to by the `user_data_t' pointer. */
(*jvm_env)->DeleteLocalRef (jvm_env, o_message);
cjni_thread_detach ();
-} /* }}} int cjni_log */
+} /* }}} void cjni_log */
-/* Iterate over `java_classes_list' and create one object of each class. This
- * will trigger the object's constructors, to the objects can register callback
- * methods. */
-static int cjni_load_plugins (JNIEnv *jvm_env) /* {{{ */
+/* Call the CB_TYPE_NOTIFICATION callback pointed to by the `user_data_t'
+ * pointer. */
+static int cjni_notification (const notification_t *n, /* {{{ */
+ user_data_t *ud)
{
+ JNIEnv *jvm_env;
+ cjni_callback_info_t *cbi;
+ jobject o_notification;
+ int status;
+ int ret_status;
+
+ if (jvm == NULL)
+ {
+ ERROR ("java plugin: cjni_read: jvm == NULL");
+ return (-1);
+ }
+
+ if ((ud == NULL) || (ud->data == NULL))
+ {
+ ERROR ("java plugin: cjni_read: Invalid user data.");
+ return (-1);
+ }
+
+ jvm_env = cjni_thread_attach ();
+ if (jvm_env == NULL)
+ return (-1);
+
+ cbi = (cjni_callback_info_t *) ud->data;
+
+ o_notification = ctoj_notification (jvm_env, n);
+ if (o_notification == NULL)
+ {
+ ERROR ("java plugin: cjni_notification: ctoj_notification failed.");
+ return (-1);
+ }
+
+ ret_status = (*jvm_env)->CallIntMethod (jvm_env,
+ cbi->object, cbi->method, o_notification);
+
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_notification);
+
+ status = cjni_thread_detach ();
+ if (status != 0)
+ {
+ ERROR ("java plugin: cjni_read: cjni_thread_detach failed.");
+ return (-1);
+ }
+
+ return (ret_status);
+} /* }}} int cjni_notification */
+
+/* Callbacks for matches implemented in Java */
+static int cjni_match_create (const oconfig_item_t *ci, /* {{{ */
+ void **user_data)
+{
+ JNIEnv *jvm_env;
+ cjni_callback_info_t *cbi_ret;
+ cjni_callback_info_t *cbi_factory;
+ const char *name;
+ jobject o_ci;
size_t i;
- for (i = 0; i < java_classes_list_len; i++)
+ cbi_ret = NULL;
+ o_ci = NULL;
+ jvm_env = NULL;
+
+#define BAIL_OUT(status) \
+ if (cbi_ret != NULL) { \
+ free (cbi_ret->name); \
+ if ((jvm_env != NULL) && (cbi_ret->object != NULL)) \
+ (*jvm_env)->DeleteLocalRef (jvm_env, cbi_ret->object); \
+ } \
+ free (cbi_ret); \
+ if (jvm_env != NULL) { \
+ if (o_ci != NULL) \
+ (*jvm_env)->DeleteLocalRef (jvm_env, o_ci); \
+ cjni_thread_detach (); \
+ } \
+ return (status)
+
+ if (jvm == NULL)
{
- java_plugin_class_t *class;
- jmethodID constructor_id;
+ ERROR ("java plugin: cjni_read: jvm == NULL");
+ BAIL_OUT (-1);
+ }
- class = java_classes_list + i;
+ jvm_env = cjni_thread_attach ();
+ if (jvm_env == NULL)
+ {
+ BAIL_OUT (-1);
+ }
- DEBUG ("java plugin: Loading class %s", class->name);
+ /* This is the name of the match we should create. */
+ name = ci->values[0].value.string;
- class->class = (*jvm_env)->FindClass (jvm_env, class->name);
- if (class->class == NULL)
- {
- ERROR ("java plugin: cjni_load_plugins: FindClass (%s) failed.",
- class->name);
+ /* Lets see if we have a matching factory here.. */
+ cbi_factory = NULL;
+ for (i = 0; i < java_callbacks_num; i++)
+ {
+ if (java_callbacks[i].type != CB_TYPE_MATCH)
continue;
- }
- constructor_id = (*jvm_env)->GetMethodID (jvm_env, class->class,
- "<init>", "()V");
- if (constructor_id == NULL)
- {
- ERROR ("java plugin: cjni_load_plugins: Could not find the constructor for `%s'.",
- class->name);
+ if (strcmp (name, java_callbacks[i].name) != 0)
continue;
- }
- class->object = (*jvm_env)->NewObject (jvm_env, class->class,
- constructor_id);
- if (class->object == NULL)
- {
- ERROR ("java plugin: cjni_load_plugins: Could create a new `%s' object.",
- class->name);
- continue;
- }
+ cbi_factory = java_callbacks + i;
+ break;
+ }
+
+ /* Nope, no factory for that name.. */
+ if (cbi_factory == NULL)
+ {
+ ERROR ("java plugin: cjni_match_create: "
+ "No such match factory registered: %s",
+ name);
+ BAIL_OUT (-1);
+ }
- (*jvm_env)->NewGlobalRef (jvm_env, class->object);
- } /* for (i = 0; i < java_classes_list_len; i++) */
+ /* We convert `ci' to its Java equivalent.. */
+ o_ci = ctoj_oconfig_item (jvm_env, ci);
+ if (o_ci == NULL)
+ {
+ ERROR ("java plugin: cjni_match_create: ctoj_oconfig_item failed.");
+ BAIL_OUT (-1);
+ }
+
+ /* Allocate a new callback info structure. This is going to be our user_data
+ * pointer. */
+ cbi_ret = (cjni_callback_info_t *) malloc (sizeof (*cbi_ret));
+ if (cbi_ret == NULL)
+ {
+ ERROR ("java plugin: cjni_match_create: ctoj_oconfig_item failed.");
+ BAIL_OUT (-1);
+ }
+ memset (cbi_ret, 0, sizeof (*cbi_ret));
+ cbi_ret->object = NULL;
+
+ /* Lets fill the callback info structure.. First, the name: */
+ cbi_ret->name = strdup (name);
+ if (cbi_ret->name == NULL)
+ {
+ ERROR ("java plugin: cjni_match_create: strdup failed.");
+ BAIL_OUT (-1);
+ }
+
+ /* Then call the factory method so it creates a new object for us. */
+ cbi_ret->object = (*jvm_env)->CallObjectMethod (jvm_env,
+ cbi_factory->object, cbi_factory->method, o_ci);
+ if (cbi_ret->object == NULL)
+ {
+ ERROR ("java plugin: cjni_match_create: CallObjectMethod failed.");
+ BAIL_OUT (-1);
+ }
+
+ /* This is the class of the match. It is possibly different from the class of
+ * the match-factory! */
+ cbi_ret->class = (*jvm_env)->GetObjectClass (jvm_env, cbi_ret->object);
+ if (cbi_ret->class == NULL)
+ {
+ ERROR ("java plugin: cjni_match_create: GetObjectClass failed.");
+ BAIL_OUT (-1);
+ }
+
+ /* Lookup the `int match (DataSet, ValueList)' method. */
+ cbi_ret->method = (*jvm_env)->GetMethodID (jvm_env, cbi_ret->class,
+ "match", "(Lorg/collectd/api/DataSet;Lorg/collectd/api/ValueList;)I");
+ if (cbi_ret->method == NULL)
+ {
+ ERROR ("java plugin: cjni_match_create: GetMethodID failed.");
+ BAIL_OUT (-1);
+ }
+
+ /* We have everything we hoped for. Now we add a new global reference so this
+ * match isn't freed immediately after we return.. */
+ (*jvm_env)->NewGlobalRef (jvm_env, cbi_ret->object);
+
+ /* Return the newly created match via the user_data pointer. */
+ *user_data = (void *) cbi_ret;
+
+ cjni_thread_detach ();
+ DEBUG ("java plugin: cjni_match_create: Successfully created a `%s' match.",
+ cbi_ret->name);
+
+ /* Success! */
return (0);
-} /* }}} int cjni_load_plugins */
+#undef BAIL_OUT
+} /* }}} int cjni_match_create */
-/* Iterate over `java_plugin_configs' and `java_callbacks' and call all
- * `config' callback methods for which a configuration is available. */
-static int cjni_config_plugins (JNIEnv *jvm_env) /* {{{ */
+static int cjni_match_destroy (void **user_data) /* {{{ */
{
+ cjni_callback_info_destroy (*user_data);
+ *user_data = NULL;
+
+ return (0);
+} /* }}} int cjni_match_destroy */
+
+static int cjni_match_match (const data_set_t *ds, /* {{{ */
+ const value_list_t *vl, notification_meta_t **meta, void **user_data)
+{
+ JNIEnv *jvm_env;
+ cjni_callback_info_t *cbi;
+ jobject o_vl;
+ jobject o_ds;
+ int ret_status;
int status;
- size_t i;
- size_t j;
- for (i = 0; i < java_plugin_configs_num; i++)
+ if (jvm == NULL)
{
- jobject o_ocitem;
+ ERROR ("java plugin: cjni_match_match: jvm == NULL");
+ return (-1);
+ }
- if (java_plugin_configs[i].ci == NULL)
- continue;
+ jvm_env = cjni_thread_attach ();
+ if (jvm_env == NULL)
+ return (-1);
- for (j = 0; j < java_callbacks_num; j++)
- {
- if (java_callbacks[j].type != CB_TYPE_CONFIG)
- continue;
+ cbi = (cjni_callback_info_t *) *user_data;
- if (strcmp (java_plugin_configs[i].name, java_callbacks[j].name) == 0)
- break;
- }
+ o_vl = ctoj_value_list (jvm_env, ds, vl);
+ if (o_vl == NULL)
+ {
+ ERROR ("java plugin: cjni_match_match: ctoj_value_list failed.");
+ cjni_thread_detach ();
+ return (-1);
+ }
- if (j >= java_callbacks_num)
- {
- NOTICE ("java plugin: Configuration for `%s' is present, but no such "
- "configuration callback has been registered.",
- java_plugin_configs[i].name);
- continue;
- }
+ o_ds = ctoj_data_set (jvm_env, ds);
+ if (o_ds == NULL)
+ {
+ ERROR ("java plugin: cjni_match_match: ctoj_value_list failed.");
+ cjni_thread_detach ();
+ return (-1);
+ }
- DEBUG ("java plugin: Configuring %s", java_plugin_configs[i].name);
+ ret_status = (*jvm_env)->CallIntMethod (jvm_env, cbi->object, cbi->method,
+ o_ds, o_vl);
- o_ocitem = ctoj_oconfig_item (jvm_env, java_plugin_configs[i].ci);
- if (o_ocitem == NULL)
- {
- ERROR ("java plugin: cjni_config_plugins: ctoj_oconfig_item failed.");
- continue;
- }
+ DEBUG ("java plugin: cjni_match_match: Method returned %i.", ret_status);
- status = (*jvm_env)->CallIntMethod (jvm_env,
- java_callbacks[j].object, java_callbacks[j].method, o_ocitem);
- WARNING ("java plugin: Config callback for `%s' returned status %i.",
- java_plugin_configs[i].name, status);
- } /* for (i = 0; i < java_plugin_configs; i++) */
+ status = cjni_thread_detach ();
+ if (status != 0)
+ ERROR ("java plugin: cjni_read: cjni_thread_detach failed.");
- return (0);
-} /* }}} int cjni_config_plugins */
+ return (ret_status);
+} /* }}} int cjni_match_match */
/* Iterate over `java_callbacks' and call all CB_TYPE_INIT callbacks. */
static int cjni_init_plugins (JNIEnv *jvm_env) /* {{{ */
sfree (java_classes_list);
/* Destroy the JVM */
+ DEBUG ("java plugin: Destroying the JVM.");
(*jvm)->DestroyJavaVM (jvm);
jvm = NULL;
jvm_env = NULL;
jvm_argc = 0;
sfree (jvm_argv);
- /* Free the copied configuration */
- for (i = 0; i < java_plugin_configs_num; i++)
- {
- sfree (java_plugin_configs[i].name);
- oconfig_free (java_plugin_configs[i].ci);
- }
- java_plugin_configs_num = 0;
- sfree (java_plugin_configs);
-
return (0);
} /* }}} int cjni_shutdown */
-/* Register ``native'' functions with the JVM. Native functions are C-functions
- * that can be called by Java code. */
-static int cjni_init_native (JNIEnv *jvm_env) /* {{{ */
-{
- jclass api_class_ptr;
- int status;
-
- api_class_ptr = (*jvm_env)->FindClass (jvm_env, "org.collectd.api.Collectd");
- if (api_class_ptr == NULL)
- {
- ERROR ("cjni_init_native: Cannot find API class `org.collectd.api.Collectd'.");
- return (-1);
- }
-
- status = (*jvm_env)->RegisterNatives (jvm_env, api_class_ptr,
- jni_api_functions, (jint) jni_api_functions_num);
- if (status != 0)
- {
- ERROR ("cjni_init_native: RegisterNatives failed with status %i.", status);
- return (-1);
- }
-
- return (0);
-} /* }}} int cjni_init_native */
-
/* Initialization: Create a JVM, load all configured classes and call their
* `config' and `init' callback methods. */
static int cjni_init (void) /* {{{ */
{
JNIEnv *jvm_env;
- JavaVMInitArgs vm_args;
- JavaVMOption vm_options[jvm_argc];
-
- int status;
- size_t i;
-
- if (jvm != NULL)
- return (0);
-
- status = pthread_key_create (&jvm_env_key, cjni_jvm_env_destroy);
- if (status != 0)
- {
- ERROR ("java plugin: cjni_init: pthread_key_create failed "
- "with status %i.", status);
- return (-1);
- }
-
- jvm_env = NULL;
-
- memset (&vm_args, 0, sizeof (vm_args));
- vm_args.version = JNI_VERSION_1_2;
- vm_args.options = vm_options;
- vm_args.nOptions = (jint) jvm_argc;
-
- for (i = 0; i < jvm_argc; i++)
- {
- DEBUG ("java plugin: cjni_init: jvm_argv[%zu] = %s", i, jvm_argv[i]);
- vm_args.options[i].optionString = jvm_argv[i];
- }
- /*
- vm_args.options[0].optionString = "-verbose:jni";
- vm_args.options[1].optionString = "-Djava.class.path=/home/octo/collectd/bindings/java";
- */
- status = JNI_CreateJavaVM (&jvm, (void **) &jvm_env, (void **) &vm_args);
- if (status != 0)
+ if (jvm == NULL)
{
- ERROR ("cjni_init: JNI_CreateJavaVM failed with status %i.",
- status);
+ ERROR ("java plugin: cjni_match_match: jvm == NULL");
return (-1);
}
- assert (jvm != NULL);
- assert (jvm_env != NULL);
- /* Call RegisterNatives */
- status = cjni_init_native (jvm_env);
- if (status != 0)
- {
- ERROR ("cjni_init: cjni_init_native failed.");
+ jvm_env = cjni_thread_attach ();
+ if (jvm_env == NULL)
return (-1);
- }
- cjni_load_plugins (jvm_env);
- cjni_config_plugins (jvm_env);
cjni_init_plugins (jvm_env);
+ cjni_thread_detach ();
return (0);
} /* }}} int cjni_init */
projects / collectd.git / blobdiff