* object, but it will bitch about a shared object not having a
* ``module_register'' symbol..
*/
-static int plugin_load_file (char *file, modreg_e load)
+static int plugin_load_file (char *file)
{
lt_dlhandle dlh;
- void (*reg_handle) (modreg_e mr);
+ void (*reg_handle) (void);
DEBUG ("file = %s", file);
const char *error = lt_dlerror ();
ERROR ("lt_dlopen failed: %s", error);
- DEBUG ("lt_dlopen failed: %s", error);
return (1);
}
- if ((reg_handle = (void (*) (modreg_e)) lt_dlsym (dlh, "module_register")) == NULL)
+ if ((reg_handle = (void (*) (void)) lt_dlsym (dlh, "module_register")) == NULL)
{
WARNING ("Couldn't find symbol ``module_register'' in ``%s'': %s\n",
file, lt_dlerror ());
return (-1);
}
- (*reg_handle) (load);
+ (*reg_handle) ();
return (0);
}
if (status != 0)
{
+ if (rf->wait_time < interval_g)
+ rf->wait_time = interval_g;
rf->wait_left = rf->wait_time;
rf->wait_time = rf->wait_time * 2;
if (rf->wait_time > 86400)
rf->wait_time = 86400;
NOTICE ("read-function of plugin `%s' "
- "failed. Will syspend it for %i "
+ "failed. Will suspend it for %i "
"seconds.", le->key, rf->wait_left);
}
else
}
#define BUFSIZE 512
-int plugin_load (const char *type, modreg_e mr)
+int plugin_load (const char *type)
{
DIR *dh;
const char *dir;
continue;
}
- if (plugin_load_file (filename, mr) == 0)
+ if (plugin_load_file (filename) == 0)
{
/* success */
ret = 0;
return (0);
} /* int plugin_register_config */
+int plugin_register_complex_config (const char *type,
+ int (*callback) (oconfig_item_t *))
+{
+ return (cf_register_complex (type, callback));
+} /* int plugin_register_complex_config */
+
int plugin_register_init (const char *name,
int (*callback) (void))
{
int plugin_register_data_set (const data_set_t *ds)
{
- return (register_callback (&list_data_set, ds->type, (void *) ds));
+ data_set_t *ds_copy;
+ int i;
+
+ if ((list_data_set != NULL)
+ && (llist_search (list_data_set, ds->type) != NULL))
+ {
+ NOTICE ("Replacing DS `%s' with another version.", ds->type);
+ plugin_unregister_data_set (ds->type);
+ }
+
+ ds_copy = (data_set_t *) malloc (sizeof (data_set_t));
+ if (ds_copy == NULL)
+ return (-1);
+ memcpy(ds_copy, ds, sizeof (data_set_t));
+
+ ds_copy->ds = (data_source_t *) malloc (sizeof (data_source_t)
+ * ds->ds_num);
+ if (ds_copy->ds == NULL)
+ {
+ free (ds_copy);
+ return (-1);
+ }
+
+ for (i = 0; i < ds->ds_num; i++)
+ memcpy (ds_copy->ds + i, ds->ds + i, sizeof (data_source_t));
+
+ return (register_callback (&list_data_set, ds->type, (void *) ds_copy));
} /* int plugin_register_data_set */
int plugin_register_log (char *name,
return (0);
} /* int plugin_unregister_config */
+int plugin_unregister_complex_config (const char *name)
+{
+ cf_unregister_complex (name);
+ return (0);
+} /* int plugin_unregister_complex_config */
+
int plugin_unregister_init (const char *name)
{
return (plugin_unregister (list_init, name));
int plugin_unregister_read (const char *name)
{
- return (plugin_unregister (list_read, name));
llentry_t *e;
e = llist_search (list_read, name);
int plugin_unregister_data_set (const char *name)
{
- return (plugin_unregister (list_data_set, name));
-}
+ llentry_t *e;
+ data_set_t *ds;
+
+ if (list_data_set == NULL)
+ return (-1);
+
+ e = llist_search (list_data_set, name);
+
+ if (e == NULL)
+ return (-1);
+
+ llist_remove (list_data_set, e);
+ ds = (data_set_t *) e->value;
+ llentry_destroy (e);
+
+ sfree (ds->ds);
+ sfree (ds);
+
+ return (0);
+} /* int plugin_unregister_data_set */
int plugin_unregister_log (const char *name)
{
le = llist_head (list_init);
while (le != NULL)
{
- callback = le->value;
+ callback = (int (*) (void)) le->value;
status = (*callback) ();
if (status != 0)
{
ERROR ("Initialization of plugin `%s' "
"failed with status %i. "
- "Plugin will be unloaded. TODO!",
+ "Plugin will be unloaded.",
le->key, status);
+ /* FIXME: Unload _all_ functions */
plugin_unregister_read (le->key);
}
le = llist_head (list_shutdown);
while (le != NULL)
{
- callback = le->value;
- (*callback) ();
+ callback = (int (*) (void)) le->value;
+ /* Advance the pointer before calling the callback allows
+ * shutdown functions to unregister themselves. If done the
+ * other way around the memory `le' points to will be freed
+ * after callback returns. */
le = le->next;
+
+ (*callback) ();
}
} /* void plugin_shutdown_all */
-int plugin_dispatch_values (const char *name, const value_list_t *vl)
+int plugin_dispatch_values (const char *name, value_list_t *vl)
{
int (*callback) (const data_set_t *, const value_list_t *);
data_set_t *ds;
llentry_t *le;
- if (list_write == NULL)
+ if ((list_write == NULL) || (list_data_set == NULL))
return (-1);
le = llist_search (list_data_set, name);
vl->plugin, vl->plugin_instance,
ds->type, vl->type_instance);
+#if COLLECT_DEBUG
+ assert (ds->ds_num == vl->values_len);
+#else
+ if (ds->ds_num != vl->values_len)
+ {
+ ERROR ("plugin: ds->type = %s: (ds->ds_num = %i) != "
+ "(vl->values_len = %i)",
+ ds->type, ds->ds_num, vl->values_len);
+ return (-1);
+ }
+#endif
+
+ escape_slashes (vl->host, sizeof (vl->host));
+ escape_slashes (vl->plugin, sizeof (vl->plugin));
+ escape_slashes (vl->plugin_instance, sizeof (vl->plugin_instance));
+ escape_slashes (vl->type_instance, sizeof (vl->type_instance));
+
le = llist_head (list_write);
while (le != NULL)
{
- callback = le->value;
+ callback = (int (*) (const data_set_t *, const value_list_t *)) le->value;
(*callback) (ds, vl);
le = le->next;
}
return (0);
-}
+} /* int plugin_dispatch_values */
void plugin_log (int level, const char *format, ...)
{
le = llist_head (list_log);
while (le != NULL)
{
- callback = le->value;
+ callback = (void (*) (int, const char *)) le->value;
(*callback) (level, msg);
le = le->next;
projects / collectd.git / blobdiff