#include "common.h"
#include "plugin.h"
#include "configfile.h"
+#include "utils_avltree.h"
#include "utils_llist.h"
#include "utils_cache.h"
#include "utils_threshold.h"
static llist_t *list_read;
static llist_t *list_write;
static llist_t *list_shutdown;
-static llist_t *list_data_set;
static llist_t *list_log;
static llist_t *list_notification;
+static c_avl_tree_t *data_sets;
+
static char *plugindir = NULL;
static int read_loop = 1;
static int register_callback (llist_t **list, const char *name, void *callback)
{
llentry_t *le;
+ char *key;
if ((*list == NULL)
&& ((*list = llist_create ()) == NULL))
le = llist_search (*list, name);
if (le == NULL)
{
- le = llentry_create (name, callback);
+ key = strdup (name);
+ if (key == NULL)
+ return (-1);
+
+ le = llentry_create (key, callback);
if (le == NULL)
+ {
+ free (key);
return (-1);
+ }
llist_append (*list, le);
}
return (-1);
llist_remove (list, e);
+ free (e->key);
llentry_destroy (e);
return (0);
pthread_mutex_unlock (&read_lock);
pthread_exit (NULL);
+ return ((void *) 0);
} /* void *plugin_read_thread */
static void start_threads (int num)
{
DIR *dh;
const char *dir;
- char filename[BUFSIZE];
+ char filename[BUFSIZE] = "";
char typename[BUFSIZE];
int typename_len;
int ret;
closedir (dh);
+ if (filename[0] == '\0')
+ fprintf (stderr, "Could not find plugin %s.\n", type);
+
return (ret);
}
data_set_t *ds_copy;
int i;
- if ((list_data_set != NULL)
- && (llist_search (list_data_set, ds->type) != NULL))
+ if ((data_sets != NULL)
+ && (c_avl_get (data_sets, ds->type, NULL) == 0))
{
NOTICE ("Replacing DS `%s' with another version.", ds->type);
plugin_unregister_data_set (ds->type);
}
+ else if (data_sets == NULL)
+ {
+ data_sets = c_avl_create ((int (*) (const void *, const void *)) strcmp);
+ if (data_sets == NULL)
+ return (-1);
+ }
ds_copy = (data_set_t *) malloc (sizeof (data_set_t));
if (ds_copy == NULL)
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));
+ return (c_avl_insert (data_sets, (void *) ds_copy->type, (void *) ds_copy));
} /* int plugin_register_data_set */
int plugin_register_log (char *name,
int plugin_register_notification (const char *name,
int (*callback) (const notification_t *notif))
{
- return (register_callback (&list_log, name, (void *) callback));
+ return (register_callback (&list_notification, name, (void *) callback));
} /* int plugin_register_log */
int plugin_unregister_config (const char *name)
llist_remove (list_read, e);
free (e->value);
+ free (e->key);
llentry_destroy (e);
return (0);
int plugin_unregister_data_set (const char *name)
{
- llentry_t *e;
data_set_t *ds;
- if (list_data_set == NULL)
+ if (data_sets == NULL)
return (-1);
- e = llist_search (list_data_set, name);
-
- if (e == NULL)
+ if (c_avl_remove (data_sets, name, NULL, (void *) &ds) != 0)
return (-1);
- llist_remove (list_data_set, e);
- ds = (data_set_t *) e->value;
- llentry_destroy (e);
-
sfree (ds->ds);
sfree (ds);
}
} /* void plugin_init_all */
-void plugin_read_all (const int *loop)
+void plugin_read_all (void)
{
llentry_t *le;
read_func_t *rf;
+ uc_check_timeout ();
+
if (list_read == NULL)
return;
data_set_t *ds;
llentry_t *le;
- if ((list_write == NULL) || (list_data_set == NULL))
+ if (list_write == NULL)
+ {
+ ERROR ("plugin_dispatch_values: No write callback has been "
+ "registered. Please load at least one plugin "
+ "that provides a write function.");
return (-1);
+ }
- le = llist_search (list_data_set, name);
- if (le == NULL)
+ if (data_sets == NULL)
{
- DEBUG ("No such dataset registered: %s", name);
+ ERROR ("plugin_dispatch_values: No data sets registered. "
+ "Could the types database be read? Check "
+ "your `TypesDB' setting!");
return (-1);
}
- ds = (data_set_t *) le->value;
+ if (c_avl_get (data_sets, name, (void *) &ds) != 0)
+ {
+ INFO ("plugin_dispatch_values: Dataset not found: %s", name);
+ return (-1);
+ }
- DEBUG ("plugin: plugin_dispatch_values: time = %u; interval = %i; "
+ DEBUG ("plugin_dispatch_values: time = %u; interval = %i; "
"host = %s; "
"plugin = %s; plugin_instance = %s; "
"type = %s; type_instance = %s;",
#else
if (ds->ds_num != vl->values_len)
{
- ERROR ("plugin: ds->type = %s: (ds->ds_num = %i) != "
+ ERROR ("plugin_dispatch_values: ds->type = %s: "
+ "(ds->ds_num = %i) != "
"(vl->values_len = %i)",
ds->type, ds->ds_num, vl->values_len);
return (-1);
llentry_t *le;
/* Possible TODO: Add flap detection here */
+ DEBUG ("plugin_dispatch_notification: severity = %i; message = %s; "
+ "time = %u; host = %s;",
+ notif->severity, notif->message,
+ (unsigned int) notif->time, notif->host);
+
/* Nobody cares for notifications */
if (list_notification == NULL)
return (-1);
}
} /* void plugin_log */
-void plugin_complain (int level, complain_t *c, const char *format, ...)
-{
- char message[512];
- va_list ap;
-
- if (c->delay > 0)
- {
- c->delay--;
- return;
- }
-
- if (c->interval < interval_g)
- c->interval = interval_g;
- else
- c->interval *= 2;
-
- if (c->interval > 86400)
- c->interval = 86400;
-
- c->delay = c->interval / interval_g;
-
- va_start (ap, format);
- vsnprintf (message, 512, format, ap);
- message[511] = '\0';
- va_end (ap);
-
- plugin_log (level, message);
-}
-
-void plugin_relief (int level, complain_t *c, const char *format, ...)
-{
- char message[512];
- va_list ap;
-
- if (c->interval == 0)
- return;
-
- c->interval = 0;
-
- va_start (ap, format);
- vsnprintf (message, 512, format, ap);
- message[511] = '\0';
- va_end (ap);
-
- plugin_log (level, message);
-}
-
const data_set_t *plugin_get_ds (const char *name)
{
data_set_t *ds;
- llentry_t *le;
- le = llist_search (list_data_set, name);
- if (le == NULL)
+ if (c_avl_get (data_sets, name, (void *) &ds) != 0)
{
DEBUG ("No such dataset registered: %s", name);
return (NULL);
}
- ds = (data_set_t *) le->value;
-
return (ds);
} /* data_set_t *plugin_get_ds */
projects / collectd.git / blobdiff