X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fjava.c;h=2d310c6f4c2947f2df3cf311d8d7f8c496aaa03b;hb=fb9f56e5af1a63d94c80a2ea6f067aeb7787f397;hp=6b0c2e1798816a90f0ef7613d46feb71800dc14d;hpb=531779b6deedaf8cb6249c3009380b064cd80c8b;p=collectd.git

diff --git a/src/java.c b/src/java.c
index 6b0c2e17..2d310c6f 100644
--- a/src/java.c
+++ b/src/java.c
@@ -35,32 +35,48 @@
 /*
  * Types
  */
-struct java_plugin_s /* {{{ */
+struct cjni_jvm_env_s /* {{{ */
 {
-  char *class_name;
-  jclass class_ptr;
-  jobject object_ptr;
-
-  oconfig_item_t *ci;
+  JNIEnv *jvm_env;
+  int reference_counter;
+};
+typedef struct cjni_jvm_env_s cjni_jvm_env_t;
+/* }}} */
 
-#define CJNI_FLAG_ENABLED 0x0001
-  int flags;
+struct java_plugin_class_s /* {{{ */
+{
+  char     *name;
+  jclass    class;
+  jobject   object;
+};
+typedef struct java_plugin_class_s java_plugin_class_t;
+/* }}} */
 
-  jmethodID m_config;
-  jmethodID m_init;
-  jmethodID m_read;
-  jmethodID m_write;
-  jmethodID m_shutdown;
+struct java_plugin_config_s /* {{{ */
+{
+  char *name;
+  oconfig_item_t *ci;
 };
-typedef struct java_plugin_s java_plugin_t;
+typedef struct java_plugin_config_s java_plugin_config_t;
 /* }}} */
 
-struct cjni_jvm_env_s /* {{{ */
+#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
+struct cjni_callback_info_s /* {{{ */
 {
-  JNIEnv *jvm_env;
-  int reference_counter;
+  char     *name;
+  int       type;
+  jclass    class;
+  jobject   object;
+  jmethodID method;
 };
-typedef struct cjni_jvm_env_s cjni_jvm_env_t;
+typedef struct cjni_callback_info_s cjni_callback_info_t;
 /* }}} */
 
 /*
@@ -69,11 +85,40 @@ typedef struct cjni_jvm_env_s cjni_jvm_env_t;
 static JavaVM *jvm = NULL;
 static pthread_key_t jvm_env_key;
 
+/* Configuration options for the JVM. */
 static char **jvm_argv = NULL;
 static size_t jvm_argc = 0;
 
-static java_plugin_t *java_plugins     = NULL;
-static size_t         java_plugins_num = 0;
+/* List of class names to load */
+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;
+static pthread_mutex_t       java_callbacks_lock = PTHREAD_MUTEX_INITIALIZER;
+
+/*
+ * Prototypes
+ *
+ * Mostly functions that are needed by the Java interface (``native'')
+ * functions.
+ */
+static void cjni_callback_info_destroy (void *arg);
+static cjni_callback_info_t *cjni_callback_info_create (JNIEnv *jvm_env,
+    jobject o_name, jobject o_callback, int type);
+static int cjni_callback_register (JNIEnv *jvm_env, jobject o_name,
+    jobject o_callback, int type);
+static int cjni_read (user_data_t *user_data);
+static int cjni_write (const data_set_t *ds, const value_list_t *vl,
+    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);
 
 /* 
  * C to Java conversion functions
@@ -111,9 +156,6 @@ static int ctoj_string (JNIEnv *jvm_env, /* {{{ */
   /* 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 */
 
@@ -135,9 +177,6 @@ static int ctoj_int (JNIEnv *jvm_env, /* {{{ */
 
   (*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 */
 
@@ -159,9 +198,6 @@ static int ctoj_long (JNIEnv *jvm_env, /* {{{ */
 
   (*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 */
 
@@ -183,9 +219,6 @@ static int ctoj_double (JNIEnv *jvm_env, /* {{{ */
 
   (*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 */
 
@@ -257,7 +290,7 @@ static jobject ctoj_value_to_number (JNIEnv *jvm_env, /* {{{ */
     return (NULL);
 } /* }}} jobject ctoj_value_to_number */
 
-/* Convert a data_source_t to a org.collectd.protocol.DataSource */
+/* Convert a data_source_t to a org.collectd.api.DataSource */
 static jobject ctoj_data_source (JNIEnv *jvm_env, /* {{{ */
     const data_source_t *dsrc)
 {
@@ -268,11 +301,11 @@ static jobject ctoj_data_source (JNIEnv *jvm_env, /* {{{ */
 
   /* Look up the DataSource class */
   c_datasource = (*jvm_env)->FindClass (jvm_env,
-      "org.collectd.protocol.DataSource");
+      "org.collectd.api.DataSource");
   if (c_datasource == NULL)
   {
     ERROR ("java plugin: ctoj_data_source: "
-        "FindClass (org.collectd.protocol.DataSource) failed.");
+        "FindClass (org.collectd.api.DataSource) failed.");
     return (NULL);
   }
 
@@ -556,56 +589,67 @@ static jobject ctoj_oconfig_item (JNIEnv *jvm_env, /* {{{ */
   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_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_arraylist, m_constructor);
+  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)
@@ -616,15 +660,7 @@ static jobject ctoj_data_set (JNIEnv *jvm_env, const data_set_t *ds) /* {{{ */
       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++) */
@@ -666,20 +702,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)
 {
-  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)
   {
@@ -690,7 +726,7 @@ static int ctoj_value_list_add_data_set (JNIEnv *jvm_env, /* {{{ */
 
   /* 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);
@@ -698,6 +734,7 @@ static int ctoj_value_list_add_data_set (JNIEnv *jvm_env, /* {{{ */
   return (0);
 } /* }}} int ctoj_value_list_add_data_set */
 
+/* Convert a value_list_t (and data_set_t) to a org.collectd.api.ValueList */
 static jobject ctoj_value_list (JNIEnv *jvm_env, /* {{{ */
     const data_set_t *ds, const value_list_t *vl)
 {
@@ -710,11 +747,11 @@ static jobject ctoj_value_list (JNIEnv *jvm_env, /* {{{ */
   /* First, create a new ValueList instance..
    * Look up the class.. */
   c_valuelist = (*jvm_env)->FindClass (jvm_env,
-      "org.collectd.protocol.ValueList");
+      "org.collectd.api.ValueList");
   if (c_valuelist == NULL)
   {
     ERROR ("java plugin: ctoj_value_list: "
-        "FindClass (org.collectd.protocol.ValueList) failed.");
+        "FindClass (org.collectd.api.ValueList) failed.");
     return (NULL);
   }
 
@@ -801,11 +838,95 @@ static jobject ctoj_value_list (JNIEnv *jvm_env, /* {{{ */
   }
 
   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: jtoc_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,
     jclass class_ptr, jobject object_ptr, const char *method_name)
@@ -839,8 +960,6 @@ static int jtoc_string (JNIEnv *jvm_env, /* {{{ */
     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);
@@ -849,6 +968,7 @@ static int jtoc_string (JNIEnv *jvm_env, /* {{{ */
   return (0);
 } /* }}} int jtoc_string */
 
+/* Call a `long <method> ()' method. */
 static int jtoc_long (JNIEnv *jvm_env, /* {{{ */
     jlong *ret_value,
     jclass class_ptr, jobject object_ptr, const char *method_name)
@@ -866,12 +986,10 @@ static int jtoc_long (JNIEnv *jvm_env, /* {{{ */
 
   *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 */
 
+/* Call a `double <method> ()' method. */
 static int jtoc_double (JNIEnv *jvm_env, /* {{{ */
     jdouble *ret_value,
     jclass class_ptr, jobject object_ptr, const char *method_name)
@@ -889,9 +1007,6 @@ static int jtoc_double (JNIEnv *jvm_env, /* {{{ */
 
   *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 */
 
@@ -935,6 +1050,8 @@ static int jtoc_value (JNIEnv *jvm_env, /* {{{ */
   return (0);
 } /* }}} int jtoc_value */
 
+/* Read a List<Number>, convert it to `value_t' and add it to the given
+ * `value_list_t'. */
 static int jtoc_values_array (JNIEnv *jvm_env, /* {{{ */
     const data_set_t *ds, value_list_t *vl,
     jclass class_ptr, jobject object_ptr)
@@ -999,7 +1116,7 @@ static int jtoc_values_array (JNIEnv *jvm_env, /* {{{ */
     BAIL_OUT (-1);
   }
 
-  values = calloc (values_num, sizeof (value_t));
+  values = (value_t *) calloc (values_num, sizeof (value_t));
   if (values == NULL)
   {
     ERROR ("java plugin: jtoc_values_array: calloc failed.");
@@ -1038,7 +1155,7 @@ static int jtoc_values_array (JNIEnv *jvm_env, /* {{{ */
   return (0);
 } /* }}} int jtoc_values_array */
 
-/* Convert a org.collectd.protocol.ValueList to a value_list_t. */
+/* Convert a org.collectd.api.ValueList to a value_list_t. */
 static int jtoc_value_list (JNIEnv *jvm_env, value_list_t *vl, /* {{{ */
     jobject object_ptr)
 {
@@ -1161,17 +1278,395 @@ static jobject JNICALL cjni_api_get_ds (JNIEnv *jvm_env, /* {{{ */
   return (o_dataset);
 } /* }}} jint cjni_api_get_ds */
 
-static JNINativeMethod jni_api_functions[] =
+static jint JNICALL cjni_api_register_config (JNIEnv *jvm_env, /* {{{ */
+    jobject this, jobject o_name, jobject o_config)
+{
+  return (cjni_callback_register (jvm_env, o_name, o_config, CB_TYPE_CONFIG));
+} /* }}} jint cjni_api_register_config */
+
+static jint JNICALL cjni_api_register_init (JNIEnv *jvm_env, /* {{{ */
+    jobject this, jobject o_name, jobject o_config)
+{
+  return (cjni_callback_register (jvm_env, o_name, o_config, CB_TYPE_INIT));
+} /* }}} jint cjni_api_register_init */
+
+static jint JNICALL cjni_api_register_read (JNIEnv *jvm_env, /* {{{ */
+    jobject this, jobject o_name, jobject o_read)
+{
+  user_data_t ud;
+  cjni_callback_info_t *cbi;
+
+  cbi = cjni_callback_info_create (jvm_env, o_name, o_read, CB_TYPE_READ);
+  if (cbi == NULL)
+    return (-1);
+
+  DEBUG ("java plugin: Registering new read callback: %s", cbi->name);
+
+  memset (&ud, 0, sizeof (ud));
+  ud.data = (void *) cbi;
+  ud.free_func = cjni_callback_info_destroy;
+
+  plugin_register_complex_read (cbi->name, cjni_read, &ud);
+
+  (*jvm_env)->DeleteLocalRef (jvm_env, o_read);
+
+  return (0);
+} /* }}} jint cjni_api_register_read */
+
+static jint JNICALL cjni_api_register_write (JNIEnv *jvm_env, /* {{{ */
+    jobject this, jobject o_name, jobject o_write)
+{
+  user_data_t ud;
+  cjni_callback_info_t *cbi;
+
+  cbi = cjni_callback_info_create (jvm_env, o_name, o_write, CB_TYPE_WRITE);
+  if (cbi == NULL)
+    return (-1);
+
+  DEBUG ("java plugin: Registering new write callback: %s", cbi->name);
+
+  memset (&ud, 0, sizeof (ud));
+  ud.data = (void *) cbi;
+  ud.free_func = cjni_callback_info_destroy;
+
+  plugin_register_write (cbi->name, cjni_write, &ud);
+
+  (*jvm_env)->DeleteLocalRef (jvm_env, o_write);
+
+  return (0);
+} /* }}} jint cjni_api_register_write */
+
+static jint JNICALL cjni_api_register_flush (JNIEnv *jvm_env, /* {{{ */
+    jobject this, jobject o_name, jobject o_flush)
+{
+  user_data_t ud;
+  cjni_callback_info_t *cbi;
+
+  cbi = cjni_callback_info_create (jvm_env, o_name, o_flush, CB_TYPE_FLUSH);
+  if (cbi == NULL)
+    return (-1);
+
+  DEBUG ("java plugin: Registering new flush callback: %s", cbi->name);
+
+  memset (&ud, 0, sizeof (ud));
+  ud.data = (void *) cbi;
+  ud.free_func = cjni_callback_info_destroy;
+
+  plugin_register_flush (cbi->name, cjni_flush, &ud);
+
+  (*jvm_env)->DeleteLocalRef (jvm_env, o_flush);
+
+  return (0);
+} /* }}} jint cjni_api_register_flush */
+
+static jint JNICALL cjni_api_register_shutdown (JNIEnv *jvm_env, /* {{{ */
+    jobject this, jobject o_name, jobject o_shutdown)
+{
+  return (cjni_callback_register (jvm_env, o_name, o_shutdown,
+        CB_TYPE_SHUTDOWN));
+} /* }}} jint cjni_api_register_shutdown */
+
+static jint JNICALL cjni_api_register_log (JNIEnv *jvm_env, /* {{{ */
+    jobject this, jobject o_name, jobject o_log)
+{
+  user_data_t ud;
+  cjni_callback_info_t *cbi;
+
+  cbi = cjni_callback_info_create (jvm_env, o_name, o_log, CB_TYPE_LOG);
+  if (cbi == NULL)
+    return (-1);
+
+  DEBUG ("java plugin: Registering new log callback: %s", cbi->name);
+
+  memset (&ud, 0, sizeof (ud));
+  ud.data = (void *) cbi;
+  ud.free_func = cjni_callback_info_destroy;
+
+  plugin_register_log (cbi->name, cjni_log, &ud);
+
+  (*jvm_env)->DeleteLocalRef (jvm_env, o_log);
+
+  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 void JNICALL cjni_api_log (JNIEnv *jvm_env, /* {{{ */
+    jobject this, jint severity, jobject o_message)
+{
+  const char *c_str;
+
+  c_str = (*jvm_env)->GetStringUTFChars (jvm_env, o_message, 0);
+  if (c_str == NULL)
+  {
+    ERROR ("java plugin: cjni_api_log: GetStringUTFChars failed.");
+    return;
+  }
+
+  if (severity < LOG_ERR)
+    severity = LOG_ERR;
+  if (severity > LOG_DEBUG)
+    severity = LOG_DEBUG;
+
+  plugin_log (severity, "%s", c_str);
+
+  (*jvm_env)->ReleaseStringUTFChars (jvm_env, o_message, c_str);
+} /* }}} void cjni_api_log */
+
+/* List of ``native'' functions, i. e. C-functions that can be called from
+ * Java. */
+static JNINativeMethod jni_api_functions[] = /* {{{ */
 {
-  { "DispatchValues", "(Lorg/collectd/protocol/ValueList;)I", cjni_api_dispatch_values },
-  { "GetDS",          "(Ljava/lang/String;)Ljava/util/List;", cjni_api_get_ds }
+  { "dispatchValues",
+    "(Lorg/collectd/api/ValueList;)I",
+    cjni_api_dispatch_values },
+
+  { "getDS",
+    "(Ljava/lang/String;)Lorg/collectd/api/DataSet;",
+    cjni_api_get_ds },
+
+  { "registerConfig",
+    "(Ljava/lang/String;Lorg/collectd/api/CollectdConfigInterface;)I",
+    cjni_api_register_config },
+
+  { "registerInit",
+    "(Ljava/lang/String;Lorg/collectd/api/CollectdInitInterface;)I",
+    cjni_api_register_init },
+
+  { "registerRead",
+    "(Ljava/lang/String;Lorg/collectd/api/CollectdReadInterface;)I",
+    cjni_api_register_read },
+
+  { "registerWrite",
+    "(Ljava/lang/String;Lorg/collectd/api/CollectdWriteInterface;)I",
+    cjni_api_register_write },
+
+  { "registerFlush",
+    "(Ljava/lang/String;Lorg/collectd/api/CollectdFlushInterface;)I",
+    cjni_api_register_flush },
+
+  { "registerShutdown",
+    "(Ljava/lang/String;Lorg/collectd/api/CollectdShutdownInterface;)I",
+    cjni_api_register_shutdown },
+
+  { "registerLog",
+    "(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 },
+
+  { "log",
+    "(ILjava/lang/String;)V",
+    cjni_api_log },
 };
 static size_t jni_api_functions_num = sizeof (jni_api_functions)
   / sizeof (jni_api_functions[0]);
+/* }}} */
 
 /*
  * Functions
  */
+/* Allocate a `cjni_callback_info_t' given the type and objects necessary for
+ * all registration functions. */
+static cjni_callback_info_t *cjni_callback_info_create (JNIEnv *jvm_env, /* {{{ */
+    jobject o_name, jobject o_callback, int type)
+{
+  const char *c_name;
+  cjni_callback_info_t *cbi;
+  const char *method_name;
+  const char *method_signature;
+
+  switch (type)
+  {
+    case CB_TYPE_CONFIG:
+      method_name = "config";
+      method_signature = "(Lorg/collectd/api/OConfigItem;)I";
+      break;
+
+    case CB_TYPE_INIT:
+      method_name = "init";
+      method_signature = "()I";
+      break;
+
+    case CB_TYPE_READ:
+      method_name = "read";
+      method_signature = "()I";
+      break;
+
+    case CB_TYPE_WRITE:
+      method_name = "write";
+      method_signature = "(Lorg/collectd/api/ValueList;)I";
+      break;
+
+    case CB_TYPE_FLUSH:
+      method_name = "flush";
+      method_signature = "(ILjava/lang/String;)I";
+      break;
+
+    case CB_TYPE_SHUTDOWN:
+      method_name = "shutdown";
+      method_signature = "()I";
+      break;
+
+    case CB_TYPE_LOG:
+      method_name = "log";
+      method_signature = "(ILjava/lang/String;)V";
+      break;
+
+    case CB_TYPE_NOTIFICATION:
+      method_name = "notification";
+      method_signature = "(LLorg/collectd/api/Notification;)I";
+      break;
+
+    default:
+      ERROR ("java plugin: cjni_callback_info_create: Unknown type: %#x",
+          type);
+      return (NULL);
+  }
+
+  c_name = (*jvm_env)->GetStringUTFChars (jvm_env, o_name, 0);
+  if (c_name == NULL)
+  {
+    ERROR ("java plugin: cjni_callback_info_create: "
+        "GetStringUTFChars failed.");
+    return (NULL);
+  }
+
+  cbi = (cjni_callback_info_t *) malloc (sizeof (*cbi));
+  if (cbi == NULL)
+  {
+    ERROR ("java plugin: cjni_callback_info_create: malloc failed.");
+    (*jvm_env)->ReleaseStringUTFChars (jvm_env, o_name, c_name);
+    return (NULL);
+  }
+  memset (cbi, 0, sizeof (*cbi));
+  cbi->type = type;
+
+  cbi->name = strdup (c_name);
+  if (cbi->name == NULL)
+  {
+    pthread_mutex_unlock (&java_callbacks_lock);
+    ERROR ("java plugin: cjni_callback_info_create: strdup failed.");
+    (*jvm_env)->ReleaseStringUTFChars (jvm_env, o_name, c_name);
+    return (NULL);
+  }
+
+  (*jvm_env)->ReleaseStringUTFChars (jvm_env, o_name, c_name);
+
+  cbi->class  = (*jvm_env)->GetObjectClass (jvm_env, o_callback);
+  if (cbi->class == NULL)
+  {
+    ERROR ("java plugin: cjni_callback_info_create: GetObjectClass failed.");
+    free (cbi);
+    return (NULL);
+  }
+
+  cbi->object = o_callback;
+
+  cbi->method = (*jvm_env)->GetMethodID (jvm_env, cbi->class,
+      method_name, method_signature);
+  if (cbi->method == NULL)
+  {
+    ERROR ("java plugin: cjni_callback_info_create: "
+        "Cannot find the `%s' method with signature `%s'.",
+        method_name, method_signature);
+    free (cbi);
+    return (NULL);
+  }
+
+  (*jvm_env)->NewGlobalRef (jvm_env, o_callback);
+
+  return (cbi);
+} /* }}} cjni_callback_info_t cjni_callback_info_create */
+
+/* Allocate a `cjni_callback_info_t' via `cjni_callback_info_create' and add it
+ * to the global `java_callbacks' variable. This is used for `config', `init',
+ * and `shutdown' callbacks. */
+static int cjni_callback_register (JNIEnv *jvm_env, /* {{{ */
+    jobject o_name, jobject o_callback, int type)
+{
+  cjni_callback_info_t *cbi;
+  cjni_callback_info_t *tmp;
+#if COLLECT_DEBUG
+  const char *type_str;
+#endif
+
+  cbi = cjni_callback_info_create (jvm_env, o_name, o_callback, type);
+  if (cbi == NULL)
+    return (-1);
+
+#if COLLECT_DEBUG
+  switch (type)
+  {
+    case CB_TYPE_CONFIG:
+      type_str = "config";
+      break;
+
+    case CB_TYPE_INIT:
+      type_str = "init";
+      break;
+
+    case CB_TYPE_SHUTDOWN:
+      type_str = "shutdown";
+      break;
+
+    default:
+      type_str = "<unknown>";
+  }
+  DEBUG ("java plugin: Registering new %s callback: %s",
+      type_str, cbi->name);
+#endif
+
+  pthread_mutex_lock (&java_callbacks_lock);
+
+  tmp = (cjni_callback_info_t *) realloc (java_callbacks,
+      (java_callbacks_num + 1) * sizeof (*java_callbacks));
+  if (tmp == NULL)
+  {
+    pthread_mutex_unlock (&java_callbacks_lock);
+    ERROR ("java plugin: cjni_callback_register: realloc failed.");
+
+    (*jvm_env)->DeleteGlobalRef (jvm_env, cbi->object);
+    free (cbi);
+
+    return (-1);
+  }
+  java_callbacks = tmp;
+  java_callbacks[java_callbacks_num] = *cbi;
+  java_callbacks_num++;
+
+  pthread_mutex_unlock (&java_callbacks_lock);
+
+  free (cbi);
+  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) /* {{{ */
 {
   cjni_jvm_env_t *cjni_env;
@@ -1227,6 +1722,8 @@ static JNIEnv *cjni_thread_attach (void) /* {{{ */
   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;
@@ -1262,6 +1759,8 @@ static int cjni_thread_detach (void) /* {{{ */
   return (0);
 } /* }}} JNIEnv *cjni_thread_attach */
 
+/* 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;
@@ -1287,6 +1786,7 @@ static void cjni_jvm_env_destroy (void *args) /* {{{ */
   free (cjni_env);
 } /* }}} void cjni_jvm_env_destroy */
 
+/* Boring configuration functions.. {{{ */
 static int cjni_config_add_jvm_arg (oconfig_item_t *ci) /* {{{ */
 {
   char **tmp;
@@ -1318,7 +1818,7 @@ static int cjni_config_add_jvm_arg (oconfig_item_t *ci) /* {{{ */
 
 static int cjni_config_load_plugin (oconfig_item_t *ci) /* {{{ */
 {
-  java_plugin_t *jp;
+  java_plugin_class_t *tmp;
 
   if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
   {
@@ -1326,43 +1826,36 @@ static int cjni_config_load_plugin (oconfig_item_t *ci) /* {{{ */
     return (-1);
   }
 
-  jp = (java_plugin_t *) realloc (java_plugins,
-      sizeof (*java_plugins) * (java_plugins_num + 1));
-  if (jp == NULL)
+  tmp = (java_plugin_class_t *) realloc (java_classes_list,
+      (java_classes_list_len + 1) * sizeof (*java_classes_list));
+  if (tmp == NULL)
   {
     ERROR ("java plugin: realloc failed.");
     return (-1);
   }
-  java_plugins = jp;
-  jp = java_plugins + java_plugins_num;
+  java_classes_list = tmp;
+  tmp = java_classes_list + java_classes_list_len;
 
-  memset (jp, 0, sizeof (*jp));
-  jp->class_name = strdup (ci->values[0].value.string);
-  if (jp->class_name == NULL)
+  memset (tmp, 0, sizeof (*tmp));
+  tmp->name = strdup (ci->values[0].value.string);
+  if (tmp->name == NULL)
   {
     ERROR ("java plugin: strdup failed.");
     return (-1);
   }
+  tmp->class = NULL;
+  tmp->object = NULL;
 
-  jp->class_ptr  = NULL;
-  jp->object_ptr = NULL;
-  jp->ci         = NULL;
-  jp->flags      = 0;
-  jp->m_config   = NULL;
-  jp->m_init     = NULL;
-  jp->m_read     = NULL;
-  jp->m_write    = NULL;
-  jp->m_shutdown = NULL;
-
-  java_plugins_num++;
+  java_classes_list_len++;
 
   return (0);
 } /* }}} int cjni_config_load_plugin */
 
 static int cjni_config_plugin_block (oconfig_item_t *ci) /* {{{ */
 {
+  java_plugin_config_t *tmp;
+  char *name;
   size_t i;
-  const char *class_name;
 
   if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING))
   {
@@ -1371,42 +1864,53 @@ static int cjni_config_plugin_block (oconfig_item_t *ci) /* {{{ */
     return (-1);
   }
 
-  class_name = ci->values[0].value.string;
-  for (i = 0; i < java_plugins_num; i++)
-    if (strcmp (java_plugins[i].class_name, class_name) == 0)
-      break;
+  name = strdup (ci->values[0].value.string);
+  if (name == NULL)
+  {
+    ERROR ("java plugin: cjni_config_plugin_block: strdup faiiled.");
+    return (-1);
+  }
 
-  if (i >= java_plugins_num)
+  for (i = 0; i < java_plugin_configs_num; i++)
   {
-    WARNING ("java plugin: Configuration block for the `%s' plugin found, "
-        "but the plugin has not been loaded. Please note, that the class "
-        "name is case-sensitive!",
-        class_name);
-    return (0);
+    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);
+    }
   }
 
-  if (java_plugins[i].ci != NULL)
+  tmp = (java_plugin_config_t *) realloc (java_plugin_configs,
+      (java_plugin_configs_num + 1) * sizeof (*java_plugin_configs));
+  if (tmp == NULL)
   {
-    WARNING ("java plugin: There are more than one <Plugin> blocks for the "
-        "`%s' plugin. This is currently not supported - only the first block "
-        "will be used!",
-        class_name);
-    return (0);
+    ERROR ("java plugin: cjni_config_plugin_block: realloc failed.");
+    free (name);
+    return (-1);
   }
+  java_plugin_configs = tmp;
+  tmp = java_plugin_configs + java_plugin_configs_num;
 
-  java_plugins[i].ci = oconfig_clone (ci);
-  if (java_plugins[i].ci == NULL)
+  tmp->name = name;
+  tmp->ci = oconfig_clone (ci);
+  if (tmp->ci == NULL)
   {
     ERROR ("java plugin: cjni_config_plugin_block: "
         "oconfig_clone failed for `%s'.",
-        class_name);
+        name);
+    free (name);
     return (-1);
   }
 
   DEBUG ("java plugin: cjni_config_plugin_block: "
       "Successfully copied config for `%s'.",
-      class_name);
+      name);
 
+  java_plugin_configs_num++;
   return (0);
 } /* }}} int cjni_config_plugin_block */
 
@@ -1455,6 +1959,11 @@ static int cjni_config (oconfig_item_t *ci) /* {{{ */
     }
   }
 
+  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))
   {
     ERROR ("java plugin: All statements failed.");
@@ -1463,45 +1972,54 @@ static int cjni_config (oconfig_item_t *ci) /* {{{ */
 
   return (0);
 } /* }}} int cjni_config */
+/* }}} */
 
-static int cjni_read_one_plugin (JNIEnv *jvm_env, java_plugin_t *jp) /* {{{ */
+/* 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
+ * object. */
+static void cjni_callback_info_destroy (void *arg) /* {{{ */
 {
-  int status;
+  JNIEnv *jvm_env;
+  cjni_callback_info_t *cbi;
 
-  if ((jp == NULL)
-      || ((jp->flags & CJNI_FLAG_ENABLED) == 0)
-      || (jp->m_read == NULL))
-    return (0);
+  DEBUG ("java plugin: cjni_callback_info_destroy (arg = %p);", arg);
 
-  DEBUG ("java plugin: Calling: %s.Read()", jp->class_name);
+  cbi = (cjni_callback_info_t *) arg;
 
-  status = (*jvm_env)->CallIntMethod (jvm_env, jp->object_ptr,
-      jp->m_read);
-  if (status != 0)
+  /* This condition can occurr when shutting down. */
+  if (jvm == NULL)
   {
-    ERROR ("java plugin: cjni_read_one_plugin: "
-        "Calling `Read' on an `%s' object failed with status %i.",
-        jp->class_name, status);
-    return (-1);
+    sfree (cbi);
+    return;
   }
 
-  return (0);
-} /* }}} int cjni_read_one_plugin */
+  if (arg == NULL)
+    return;
 
-static int cjni_read_plugins (JNIEnv *jvm_env) /* {{{ */
-{
-  size_t j;
+  jvm_env = cjni_thread_attach ();
+  if (jvm_env == NULL)
+  {
+    ERROR ("java plugin: cjni_callback_info_destroy: cjni_thread_attach failed.");
+    return;
+  }
 
-  for (j = 0; j < java_plugins_num; j++)
-    cjni_read_one_plugin (jvm_env, &java_plugins[j]);
+  (*jvm_env)->DeleteGlobalRef (jvm_env, cbi->object);
 
-  return (0);
-} /* }}} int cjni_read_plugins */
+  cbi->method = NULL;
+  cbi->object = NULL;
+  cbi->class  = NULL;
+  free (cbi);
+
+  cjni_thread_detach ();
+} /* }}} void cjni_callback_info_destroy */
 
-static int cjni_read (void) /* {{{ */
+/* Call the CB_TYPE_READ callback pointed to by the `user_data_t' pointer. */
+static int cjni_read (user_data_t *ud) /* {{{ */
 {
   JNIEnv *jvm_env;
+  cjni_callback_info_t *cbi;
   int status;
+  int ret_status;
 
   if (jvm == NULL)
   {
@@ -1509,74 +2027,100 @@ static int cjni_read (void) /* {{{ */
     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);
 
-  cjni_read_plugins (jvm_env);
+  cbi = (cjni_callback_info_t *) ud->data;
+
+  ret_status = (*jvm_env)->CallIntMethod (jvm_env, cbi->object,
+      cbi->method);
 
   status = cjni_thread_detach ();
   if (status != 0)
+  {
+    ERROR ("java plugin: cjni_read: cjni_thread_detach failed.");
     return (-1);
+  }
 
-  return (0);
+  return (ret_status);
 } /* }}} int cjni_read */
 
-static int cjni_write_one_plugin (JNIEnv *jvm_env, /* {{{ */
-    java_plugin_t *jp, jobject vl_java)
+/* Call the CB_TYPE_WRITE callback pointed to by the `user_data_t' pointer. */
+static int cjni_write (const data_set_t *ds, const value_list_t *vl, /* {{{ */
+    user_data_t *ud)
 {
+  JNIEnv *jvm_env;
+  cjni_callback_info_t *cbi;
+  jobject vl_java;
   int status;
+  int ret_status;
 
-  if ((jp == NULL)
-      || ((jp->flags & CJNI_FLAG_ENABLED) == 0)
-      || (jp->m_write == NULL))
-    return (0);
-
-  DEBUG ("java plugin: Calling: %s.Write(ValueList)", jp->class_name);
-
-  status = (*jvm_env)->CallIntMethod (jvm_env, jp->object_ptr,
-      jp->m_write, vl_java);
-  if (status != 0)
+  if (jvm == NULL)
   {
-    ERROR ("java plugin: cjni_write_one_plugin: "
-        "Calling `Write' on an `%s' object failed with status %i.",
-        jp->class_name, status);
+    ERROR ("java plugin: cjni_write: jvm == NULL");
     return (-1);
   }
 
-  return (0);
-} /* }}} int cjni_write_one_plugin */
+  if ((ud == NULL) || (ud->data == NULL))
+  {
+    ERROR ("java plugin: cjni_write: Invalid user data.");
+    return (-1);
+  }
 
-static int cjni_write_plugins (JNIEnv *jvm_env, /* {{{ */
-    const data_set_t *ds, const value_list_t *vl)
-{
-  size_t j;
+  jvm_env = cjni_thread_attach ();
+  if (jvm_env == NULL)
+    return (-1);
 
-  jobject vl_java;
+  cbi = (cjni_callback_info_t *) ud->data;
 
   vl_java = ctoj_value_list (jvm_env, ds, vl);
   if (vl_java == NULL)
   {
-    ERROR ("java plugin: cjni_write_plugins: ctoj_value_list failed.");
+    ERROR ("java plugin: cjni_write: ctoj_value_list failed.");
     return (-1);
   }
 
-  for (j = 0; j < java_plugins_num; j++)
-    cjni_write_one_plugin (jvm_env, &java_plugins[j], vl_java);
+  ret_status = (*jvm_env)->CallIntMethod (jvm_env,
+      cbi->object, cbi->method, vl_java);
 
   (*jvm_env)->DeleteLocalRef (jvm_env, vl_java);
 
-  return (0);
-} /* }}} int cjni_write_plugins */
+  status = cjni_thread_detach ();
+  if (status != 0)
+  {
+    ERROR ("java plugin: cjni_write: cjni_thread_detach failed.");
+    return (-1);
+  }
 
-static int cjni_write (const data_set_t *ds, const value_list_t *vl) /* {{{ */
+  return (ret_status);
+} /* }}} int cjni_write */
+
+/* Call the CB_TYPE_FLUSH callback pointed to by the `user_data_t' pointer. */
+static int cjni_flush (int timeout, const char *identifier, /* {{{ */
+    user_data_t *ud)
 {
   JNIEnv *jvm_env;
+  cjni_callback_info_t *cbi;
+  jobject o_identifier;
   int status;
+  int ret_status;
 
   if (jvm == NULL)
   {
-    ERROR ("java plugin: cjni_write: jvm == NULL");
+    ERROR ("java plugin: cjni_flush: jvm == NULL");
+    return (-1);
+  }
+
+  if ((ud == NULL) || (ud->data == NULL))
+  {
+    ERROR ("java plugin: cjni_flush: Invalid user data.");
     return (-1);
   }
 
@@ -1584,254 +2128,356 @@ static int cjni_write (const data_set_t *ds, const value_list_t *vl) /* {{{ */
   if (jvm_env == NULL)
     return (-1);
 
-  cjni_write_plugins (jvm_env, ds, vl);
+  cbi = (cjni_callback_info_t *) ud->data;
 
-  status = cjni_thread_detach ();
-  if (status != 0)
-    return (-1);
-
-  return (0);
-} /* }}} int cjni_write */
+  o_identifier = NULL;
+  if (identifier != NULL)
+  {
+    o_identifier = (*jvm_env)->NewStringUTF (jvm_env, identifier);
+    if (o_identifier == NULL)
+    {
+      ERROR ("java plugin: cjni_flush: NewStringUTF failed.");
+      return (-1);
+    }
+  }
 
-static int cjni_shutdown_one_plugin (JNIEnv *jvm_env, /* {{{ */
-    java_plugin_t *jp)
-{
-  int status;
+  ret_status = (*jvm_env)->CallIntMethod (jvm_env,
+      cbi->object, cbi->method, (jint) timeout, o_identifier);
 
-  if ((jp == NULL)
-      || ((jp->flags & CJNI_FLAG_ENABLED) == 0)
-      || (jp->m_shutdown == NULL))
-    return (0);
+  (*jvm_env)->DeleteLocalRef (jvm_env, o_identifier);
 
-  status = (*jvm_env)->CallIntMethod (jvm_env, jp->object_ptr,
-      jp->m_shutdown);
+  status = cjni_thread_detach ();
   if (status != 0)
   {
-    ERROR ("cjni_shutdown_one_plugin: Destroying an `%s' object failed "
-        "with status %i.", jp->class_name, status);
+    ERROR ("java plugin: cjni_flush: cjni_thread_detach failed.");
     return (-1);
   }
-  jp->flags &= ~CJNI_FLAG_ENABLED;
 
-  return (0);
-} /* }}} int cjni_shutdown_one_plugin */
+  return (ret_status);
+} /* }}} int cjni_flush */
 
-static int cjni_shutdown_plugins (JNIEnv *jvm_env) /* {{{ */
+/* Call the CB_TYPE_LOG callback pointed to by the `user_data_t' pointer. */
+static void cjni_log (int severity, const char *message, /* {{{ */
+    user_data_t *ud)
 {
-  size_t j;
+  JNIEnv *jvm_env;
+  cjni_callback_info_t *cbi;
+  jobject o_message;
 
-  for (j = 0; j < java_plugins_num; j++)
-    cjni_shutdown_one_plugin (jvm_env, &java_plugins[j]);
+  if (jvm == NULL)
+    return;
 
-  return (0);
-} /* }}} int cjni_shutdown_plugins */
+  if ((ud == NULL) || (ud->data == NULL))
+    return;
 
-static int cjni_shutdown (void) /* {{{ */
+  jvm_env = cjni_thread_attach ();
+  if (jvm_env == NULL)
+    return;
+
+  cbi = (cjni_callback_info_t *) ud->data;
+
+  o_message = (*jvm_env)->NewStringUTF (jvm_env, message);
+  if (o_message == NULL)
+    return;
+
+  (*jvm_env)->CallVoidMethod (jvm_env,
+      cbi->object, cbi->method, (jint) severity, o_message);
+
+  (*jvm_env)->DeleteLocalRef (jvm_env, o_message);
+
+  cjni_thread_detach ();
+} /* }}} void cjni_log */
+
+/* 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;
-  JavaVMAttachArgs args;
+  cjni_callback_info_t *cbi;
+  jobject o_notification;
   int status;
-  size_t i;
+  int ret_status;
 
   if (jvm == NULL)
-    return (0);
-
-  jvm_env = NULL;
-  memset (&args, 0, sizeof (args));
-  args.version = JNI_VERSION_1_2;
-
-  status = (*jvm)->AttachCurrentThread (jvm, (void **) &jvm_env, &args);
-  if (status != 0)
   {
-    ERROR ("java plugin: cjni_read: AttachCurrentThread failed with status %i.",
-        status);
+    ERROR ("java plugin: cjni_read: jvm == NULL");
     return (-1);
   }
 
-  cjni_shutdown_plugins (jvm_env);
+  if ((ud == NULL) || (ud->data == NULL))
+  {
+    ERROR ("java plugin: cjni_read: Invalid user data.");
+    return (-1);
+  }
 
-  (*jvm)->DestroyJavaVM (jvm);
-  jvm = NULL;
-  jvm_env = NULL;
+  jvm_env = cjni_thread_attach ();
+  if (jvm_env == NULL)
+    return (-1);
 
-  pthread_key_delete (jvm_env_key);
+  cbi = (cjni_callback_info_t *) ud->data;
 
-  for (i = 0; i < jvm_argc; i++)
+  o_notification = ctoj_notification (jvm_env, n);
+  if (o_notification == NULL)
   {
-    sfree (jvm_argv[i]);
+    ERROR ("java plugin: cjni_notification: ctoj_notification failed.");
+    return (-1);
   }
-  sfree (jvm_argv);
-  jvm_argc = 0;
 
-  for (i = 0; i < java_plugins_num; i++)
+  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)
   {
-    sfree (java_plugins[i].class_name);
-    oconfig_free (java_plugins[i].ci);
+    ERROR ("java plugin: cjni_read: cjni_thread_detach failed.");
+    return (-1);
   }
-  sfree (java_plugins);
-  java_plugins_num = 0;
+
+  return (ret_status);
+} /* }}} int cjni_notification */
+
+/* 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) /* {{{ */
+{
+  size_t i;
+
+  for (i = 0; i < java_classes_list_len; i++)
+  {
+    java_plugin_class_t *class;
+    jmethodID constructor_id;
+
+    class = java_classes_list + i;
+
+    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_load_plugins: FindClass (%s) failed.",
+          class->name);
+      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);
+      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;
+    }
+
+    (*jvm_env)->NewGlobalRef (jvm_env, class->object);
+  } /* for (i = 0; i < java_classes_list_len; i++) */
 
   return (0);
-} /* }}} int cjni_shutdown */
+} /* }}} int cjni_load_plugins */
 
-static int cjni_init_one_plugin (JNIEnv *jvm_env, java_plugin_t *jp) /* {{{ */
+/* 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) /* {{{ */
 {
-  jmethodID constructor_id;
   int status;
+  size_t i;
+  size_t j;
 
-  jp->class_ptr = (*jvm_env)->FindClass (jvm_env, jp->class_name);
-  if (jp->class_ptr == NULL)
+  for (i = 0; i < java_plugin_configs_num; i++)
   {
-    ERROR ("cjni_init_one_plugin: FindClass (%s) failed.",
-        jp->class_name);
-    return (-1);
-  }
+    jobject o_ocitem;
 
-  constructor_id = (*jvm_env)->GetMethodID (jvm_env, jp->class_ptr,
-      "<init>", "()V");
-  if (constructor_id == NULL)
-  {
-    ERROR ("cjni_init_one_plugin: Could not find the constructor for `%s'.",
-        jp->class_name);
-    return (-1);
-  }
+    if (java_plugin_configs[i].ci == NULL)
+      continue;
 
-  jp->object_ptr = (*jvm_env)->NewObject (jvm_env, jp->class_ptr,
-      constructor_id);
-  if (jp->object_ptr == NULL)
-  {
-    ERROR ("cjni_init_one_plugin: Could create a new `%s' object.",
-        jp->class_name);
-    return (-1);
-  }
+    for (j = 0; j < java_callbacks_num; j++)
+    {
+      if (java_callbacks[j].type != CB_TYPE_CONFIG)
+        continue;
 
-  jp->m_config = (*jvm_env)->GetMethodID (jvm_env, jp->class_ptr,
-      "Config", "(Lorg/collectd/api/OConfigItem;)I");
-  DEBUG ("java plugin: cjni_init_one_plugin: "
-      "jp->class_name = %s; jp->m_config = %p;",
-      jp->class_name, (void *) jp->m_config);
+      if (strcmp (java_plugin_configs[i].name, java_callbacks[j].name) == 0)
+        break;
+    }
 
-  jp->m_init = (*jvm_env)->GetMethodID (jvm_env, jp->class_ptr,
-      "Init", "()I");
-  DEBUG ("java plugin: cjni_init_one_plugin: "
-      "jp->class_name = %s; jp->m_init = %p;",
-      jp->class_name, (void *) jp->m_init);
+    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;
+    }
 
-  jp->m_read = (*jvm_env)->GetMethodID (jvm_env, jp->class_ptr,
-      "Read", "()I");
-  DEBUG ("java plugin: cjni_init_one_plugin: "
-      "jp->class_name = %s; jp->m_read = %p;",
-      jp->class_name, (void *) jp->m_read);
+    DEBUG ("java plugin: Configuring %s", java_plugin_configs[i].name);
 
-  jp->m_write = (*jvm_env)->GetMethodID (jvm_env, jp->class_ptr,
-      "Write", "(Lorg/collectd/protocol/ValueList;)I");
-  DEBUG ("java plugin: cjni_init_one_plugin: "
-      "jp->class_name = %s; jp->m_write = %p;",
-      jp->class_name, (void *) jp->m_write);
+    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;
+    }
 
-  jp->m_shutdown = (*jvm_env)->GetMethodID (jvm_env, jp->class_ptr,
-      "Shutdown", "()I");
-  DEBUG ("java plugin: cjni_init_one_plugin: "
-      "jp->class_name = %s; jp->m_shutdown = %p;",
-      jp->class_name, (void *) jp->m_shutdown);
+    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++) */
 
-  if (jp->ci != NULL)
+  return (0);
+} /* }}} int cjni_config_plugins */
+
+/* Iterate over `java_callbacks' and call all CB_TYPE_INIT callbacks. */
+static int cjni_init_plugins (JNIEnv *jvm_env) /* {{{ */
+{
+  int status;
+  size_t i;
+
+  for (i = 0; i < java_callbacks_num; i++)
   {
-    if (jp->m_config == NULL)
+    if (java_callbacks[i].type != CB_TYPE_INIT)
+      continue;
+
+    DEBUG ("java plugin: Initializing %s", java_callbacks[i].name);
+
+    status = (*jvm_env)->CallIntMethod (jvm_env,
+        java_callbacks[i].object, java_callbacks[i].method);
+    if (status != 0)
     {
-      WARNING ("java plugin: Configuration for the `%s' plugin is present, "
-          "but plugin doesn't provide a configuration method.",
-          jp->class_name);
+      ERROR ("java plugin: Initializing `%s' failed with status %i. "
+          "Removing read function.",
+          java_callbacks[i].name, status);
+      plugin_unregister_read (java_callbacks[i].name);
     }
-    else /* if (jp->m_config != NULL) */
-    {
-      jobject o_ocitem;
-
-      o_ocitem = ctoj_oconfig_item (jvm_env, jp->ci);
-      if (o_ocitem == NULL)
-      {
-        ERROR ("java plugin: Creating an OConfigItem object failed. "
-            "Can't pass configuration information to the `%s' plugin!",
-            jp->class_name);
-      }
-      else /* if (o_ocitem != NULL) */
-      {
-        status = (*jvm_env)->CallIntMethod (jvm_env,
-            jp->object_ptr, jp->m_config, o_ocitem);
-        if (status != 0)
-        {
-          ERROR ("java plugin: cjni_init_one_plugin: "
-              "Configuring the `%s' object failed with status %i.",
-              jp->class_name, status);
-          (*jvm_env)->DeleteLocalRef (jvm_env, o_ocitem);
-          return (-1);
-        }
-        (*jvm_env)->DeleteLocalRef (jvm_env, o_ocitem);
-      } /* if (o_ocitem != NULL) */
-    } /* if (jp->m_config != NULL) */
-  } /* if (jp->ci != NULL) */
-
-  if (jp->m_init != NULL)
-  {
-    status = (*jvm_env)->CallIntMethod (jvm_env, jp->object_ptr,
-        jp->m_init);
+  }
+
+  return (0);
+} /* }}} int cjni_init_plugins */
+
+/* Iterate over `java_callbacks' and call all CB_TYPE_SHUTDOWN callbacks. */
+static int cjni_shutdown_plugins (JNIEnv *jvm_env) /* {{{ */
+{
+  int status;
+  size_t i;
+
+  for (i = 0; i < java_callbacks_num; i++)
+  {
+    if (java_callbacks[i].type != CB_TYPE_SHUTDOWN)
+      continue;
+
+    DEBUG ("java plugin: Shutting down %s", java_callbacks[i].name);
+
+    status = (*jvm_env)->CallIntMethod (jvm_env,
+        java_callbacks[i].object, java_callbacks[i].method);
     if (status != 0)
     {
-      ERROR ("java plugin: cjni_init_one_plugin: "
-        "Initializing `%s' object failed with status %i.",
-        jp->class_name, status);
-      return (-1);
+      ERROR ("java plugin: Shutting down `%s' failed with status %i. ",
+          java_callbacks[i].name, status);
     }
   }
-  jp->flags |= CJNI_FLAG_ENABLED;
 
   return (0);
-} /* }}} int cjni_init_one_plugin */
+} /* }}} int cjni_shutdown_plugins */
 
-static int cjni_init_plugins (JNIEnv *jvm_env) /* {{{ */
+
+static int cjni_shutdown (void) /* {{{ */
 {
-  size_t j;
+  JNIEnv *jvm_env;
+  JavaVMAttachArgs args;
+  int status;
+  size_t i;
+
+  if (jvm == NULL)
+    return (0);
+
+  jvm_env = NULL;
+  memset (&args, 0, sizeof (args));
+  args.version = JNI_VERSION_1_2;
 
-  int have_read;
-  int have_write;
-  int have_shutdown;
+  status = (*jvm)->AttachCurrentThread (jvm, (void **) &jvm_env, &args);
+  if (status != 0)
+  {
+    ERROR ("java plugin: cjni_shutdown: AttachCurrentThread failed with status %i.",
+        status);
+    return (-1);
+  }
 
-  have_read = 0;
-  have_write = 0;
-  have_shutdown = 0;
+  /* Execute all the shutdown functions registered by plugins. */
+  cjni_shutdown_plugins (jvm_env);
 
-  for (j = 0; j < java_plugins_num; j++)
+  /* Release all the global references to callback functions */
+  for (i = 0; i < java_callbacks_num; i++)
   {
-    cjni_init_one_plugin (jvm_env, &java_plugins[j]);
+    if (java_callbacks[i].object != NULL)
+    {
+      (*jvm_env)->DeleteGlobalRef (jvm_env, java_callbacks[i].object);
+      java_callbacks[i].object = NULL;
+    }
+    sfree (java_callbacks[i].name);
+  }
+  java_callbacks_num = 0;
+  sfree (java_callbacks);
 
-    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++;
+  /* Release all the global references to directly loaded classes. */
+  for (i = 0; i < java_classes_list_len; i++)
+  {
+    if (java_classes_list[i].object != NULL)
+    {
+      (*jvm_env)->DeleteGlobalRef (jvm_env, java_classes_list[i].object);
+      java_classes_list[i].object = NULL;
+    }
+    sfree (java_classes_list[i].name);
   }
+  java_classes_list_len = 0;
+  sfree (java_classes_list);
 
-  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);
+  /* Destroy the JVM */
+  DEBUG ("java plugin: Destroying the JVM.");
+  (*jvm)->DestroyJavaVM (jvm);
+  jvm = NULL;
+  jvm_env = NULL;
 
+  pthread_key_delete (jvm_env_key);
+
+  /* Free the JVM argument list */
+  for (i = 0; i < jvm_argc; i++)
+    sfree (jvm_argv[i]);
+  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_init_plugins */
+} /* }}} 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.CollectdAPI");
+  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.CollectdAPI'.");
+    ERROR ("cjni_init_native: Cannot find API class `org.collectd.api.Collectd'.");
     return (-1);
   }
 
@@ -1846,6 +2492,8 @@ static int cjni_init_native (JNIEnv *jvm_env) /* {{{ */
   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;
@@ -1901,6 +2549,8 @@ static int cjni_init (void) /* {{{ */
     return (-1);
   }
 
+  cjni_load_plugins (jvm_env);
+  cjni_config_plugins (jvm_env);
   cjni_init_plugins (jvm_env);
 
   return (0);
@@ -1910,6 +2560,7 @@ void module_register (void)
 {
   plugin_register_complex_config ("java", cjni_config);
   plugin_register_init ("java", cjni_init);
+  plugin_register_shutdown ("java", cjni_shutdown);
 } /* void module_register (void) */
 
 /* vim: set sw=2 sts=2 et fdm=marker : */