![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/configfile.c b/src/configfile.c
index 52978b39c2a43b57dd642f6b6713ae37aa9a4969..4c514d7509d4a6a34e2079b8a08fc066b5554c05 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
/**
* collectd - src/configfile.c
- * Copyright (C) 2005 Florian octo Forster
+ * Copyright (C) 2005,2006 Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Florian octo Forster <octo at verplant.org>
**/
-/* TODO
- * make internal-only functions `static' */
-
#include "collectd.h"
-#include "libconfig/libconfig.h"
+#include "liboconfig/oconfig.h"
#include "common.h"
#include "plugin.h"
#include "configfile.h"
-#include "network.h"
-#include "utils_debug.h"
-
-#define SHORTOPT_NONE 0
-#define ERR_NOT_NESTED "Sections cannot be nested.\n"
-#define ERR_SECTION_ONLY "`%s' can only be used as section.\n"
-#define ERR_NEEDS_ARG "Section `%s' needs an argument.\n"
-#define ERR_NEEDS_SECTION "`%s' can only be used within a section.\n"
-
-#ifdef HAVE_LIBRRD
-extern int operating_mode;
-#else
-static int operating_mode = MODE_CLIENT;
-#endif
+#define ESCAPE_NULL(str) ((str) == NULL ? "(null)" : (str))
+/*
+ * Private types
+ */
typedef struct cf_callback
{
- char *type;
- int (*callback) (char *, char *);
- char **keys;
+ const char *type;
+ int (*callback) (const char *, const char *);
+ const char **keys;
int keys_num;
struct cf_callback *next;
} cf_callback_t;
-static cf_callback_t *first_callback = NULL;
+typedef struct cf_complex_callback_s
+{
+ char *type;
+ int (*callback) (oconfig_item_t *);
+ struct cf_complex_callback_s *next;
+} cf_complex_callback_t;
-typedef struct cf_mode_item
+typedef struct cf_value_map_s
+{
+ char *key;
+ int (*func) (const oconfig_item_t *);
+} cf_value_map_t;
+
+typedef struct cf_global_option_s
{
char *key;
char *value;
- int mode;
-} cf_mode_item_t;
+ char *def;
+} cf_global_option_t;
-/* TODO
- * - LogFile
+/*
+ * Prototypes of callback functions
*/
-static cf_mode_item_t cf_mode_list[] =
+static int dispatch_value_plugindir (const oconfig_item_t *ci);
+static int dispatch_value_loadplugin (const oconfig_item_t *ci);
+
+/*
+ * Private variables
+ */
+static cf_callback_t *first_callback = NULL;
+static cf_complex_callback_t *complex_callback_head = NULL;
+
+static cf_value_map_t cf_value_map[] =
{
- {"MulticastTTL",NULL, MODE_CLIENT },
- {"PIDFile", NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL},
- {"DataDir", NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL},
- {"LogFile", NULL, MODE_CLIENT | MODE_SERVER | MODE_LOCAL}
+ {"PluginDir", dispatch_value_plugindir},
+ {"LoadPlugin", dispatch_value_loadplugin}
};
-static int cf_mode_num = 4;
-
-static int nesting_depth = 0;
-static char *current_module = NULL;
+static int cf_value_map_num = STATIC_ARRAY_LEN (cf_value_map);
-/* `cf_register' needs this prototype */
-int cf_callback_plugin_dispatch (const char *, const char *, const char *,
- const char *, lc_flags_t, void *);
+static cf_global_option_t cf_global_options[] =
+{
+ {"BaseDir", NULL, PKGLOCALSTATEDIR},
+ {"PIDFile", NULL, PIDFILE},
+ {"Hostname", NULL, NULL},
+ {"Interval", NULL, "10"},
+ {"ReadThreads", NULL, "5"},
+ {"TypesDB", NULL, PLUGINDIR"/types.db"} /* FIXME: Configure path */
+};
+static int cf_global_options_num = STATIC_ARRAY_LEN (cf_global_options);
/*
* Functions to handle register/unregister, search, and other plugin related
* stuff
*/
-cf_callback_t *cf_search (char *type)
+static cf_callback_t *cf_search (const char *type)
{
cf_callback_t *cf_cb;
return (cf_cb);
}
-int cf_dispatch (char *type, const char *orig_key, const char *orig_value)
+static int cf_dispatch (const char *type, const char *orig_key,
+ const char *orig_value)
{
cf_callback_t *cf_cb;
char *key;
int ret;
int i;
- DBG ("type = %s, key = %s, value = %s", type, orig_key, orig_value);
+ DEBUG ("type = %s, key = %s, value = %s",
+ ESCAPE_NULL(type),
+ ESCAPE_NULL(orig_key),
+ ESCAPE_NULL(orig_value));
if ((cf_cb = cf_search (type)) == NULL)
{
- syslog (LOG_WARNING, "Plugin `%s' did not register a callback.\n", type);
+ WARNING ("Found a configuration for the `%s' plugin, but "
+ "the plugin isn't loaded or didn't register "
+ "a configuration callback.", type);
return (-1);
}
}
if (i >= cf_cb->keys_num)
- syslog (LOG_WARNING, "Plugin `%s' did not register for value `%s'.\n", type, key);
+ WARNING ("Plugin `%s' did not register for value `%s'.", type, key);
free (key);
free (value);
+ DEBUG ("return (%i)", ret);
+
return (ret);
-}
+} /* int cf_dispatch */
-void cf_unregister (char *type)
+static int dispatch_global_option (const oconfig_item_t *ci)
{
- cf_callback_t *this, *prev;
+ if (ci->values_num != 1)
+ return (-1);
+ if (ci->values[0].type == OCONFIG_TYPE_STRING)
+ return (global_option_set (ci->key, ci->values[0].value.string));
+ else if (ci->values[0].type == OCONFIG_TYPE_NUMBER)
+ {
+ char tmp[128];
+ snprintf (tmp, sizeof (tmp), "%lf", ci->values[0].value.number);
+ tmp[127] = '\0';
+ return (global_option_set (ci->key, tmp));
+ }
- for (prev = NULL, this = first_callback;
- this != NULL;
- prev = this, this = this->next)
- if (strcasecmp (this->type, type) == 0)
- {
- if (prev == NULL)
- first_callback = this->next;
- else
- prev->next = this->next;
+ return (-1);
+} /* int dispatch_global_option */
- free (this);
- break;
- }
+static int dispatch_value_plugindir (const oconfig_item_t *ci)
+{
+ assert (strcasecmp (ci->key, "PluginDir") == 0);
+
+ if (ci->values_num != 1)
+ return (-1);
+ if (ci->values[0].type != OCONFIG_TYPE_STRING)
+ return (-1);
+
+ plugin_set_dir (ci->values[0].value.string);
+ return (0);
}
-void cf_register (char *type,
- int (*callback) (char *, char *),
- char **keys, int keys_num)
+static int dispatch_value_loadplugin (const oconfig_item_t *ci)
{
- cf_callback_t *cf_cb;
- char buf[64];
- int i;
+ assert (strcasecmp (ci->key, "LoadPlugin") == 0);
- /* Remove this module from the list, if it already exists */
- cf_unregister (type);
+ if (ci->values_num != 1)
+ return (-1);
+ if (ci->values[0].type != OCONFIG_TYPE_STRING)
+ return (-1);
- /* This pointer will be free'd in `cf_unregister' */
- if ((cf_cb = (cf_callback_t *) malloc (sizeof (cf_callback_t))) == NULL)
- return;
+ return (plugin_load (ci->values[0].value.string));
+} /* int dispatch_value_loadplugin */
- cf_cb->type = type;
- cf_cb->callback = callback;
- cf_cb->keys = keys;
- cf_cb->keys_num = keys_num;
+static int dispatch_value_plugin (const char *plugin, oconfig_item_t *ci)
+{
+ char buffer[4096];
+ char *buffer_ptr;
+ int buffer_free;
+ int i;
- cf_cb->next = first_callback;
- first_callback = cf_cb;
+ buffer_ptr = buffer;
+ buffer_free = sizeof (buffer);
- for (i = 0; i < keys_num; i++)
+ for (i = 0; i < ci->values_num; i++)
{
- if (snprintf (buf, 64, "Plugin.%s", keys[i]) < 64)
+ int status = -1;
+
+ if (ci->values[i].type == OCONFIG_TYPE_STRING)
+ status = snprintf (buffer_ptr, buffer_free, " %s",
+ ci->values[i].value.string);
+ else if (ci->values[i].type == OCONFIG_TYPE_NUMBER)
+ status = snprintf (buffer_ptr, buffer_free, " %lf",
+ ci->values[i].value.number);
+ else if (ci->values[i].type == OCONFIG_TYPE_BOOLEAN)
+ status = snprintf (buffer_ptr, buffer_free, " %s",
+ ci->values[i].value.boolean
+ ? "true" : "false");
+
+ if ((status < 0) || (status >= buffer_free))
+ return (-1);
+ buffer_free -= status;
+ buffer_ptr += status;
+ }
+ /* skip the initial space */
+ buffer_ptr = buffer + 1;
+
+ return (cf_dispatch (plugin, ci->key, buffer_ptr));
+} /* int plugin_conf_dispatch */
+
+static int dispatch_value (const oconfig_item_t *ci)
+{
+ int ret = -2;
+ int i;
+
+ for (i = 0; i < cf_value_map_num; i++)
+ if (strcasecmp (cf_value_map[i].key, ci->key) == 0)
{
- /* This may be called multiple times for the same
- * `key', but apparently `lc_register_*' can handle
- * it.. */
- lc_register_callback (buf, SHORTOPT_NONE,
- LC_VAR_STRING, cf_callback_plugin_dispatch,
- NULL);
+ ret = cf_value_map[i].func (ci);
+ break;
}
- else
+
+ for (i = 0; i < cf_global_options_num; i++)
+ if (strcasecmp (cf_global_options[i].key, ci->key) == 0)
{
- DBG ("Key was truncated: `%s'", keys[i]);
+ ret = dispatch_global_option (ci);
+ break;
}
- }
-}
-/*
- * Other query functions
- */
-char *cf_get_option (const char *key, char *def)
+ return (ret);
+} /* int dispatch_value */
+
+static int dispatch_block_plugin (oconfig_item_t *ci)
{
int i;
+ char *name;
- for (i = 0; i < cf_mode_num; i++)
- {
- if ((cf_mode_list[i].mode & operating_mode) == 0)
- continue;
+ cf_complex_callback_t *cb;
- if (strcasecmp (cf_mode_list[i].key, key) != 0)
- continue;
+ if (strcasecmp (ci->key, "Plugin") != 0)
+ return (-1);
+ if (ci->values_num < 1)
+ return (-1);
+ if (ci->values[0].type != OCONFIG_TYPE_STRING)
+ return (-1);
- if (cf_mode_list[i].value != NULL)
- return (cf_mode_list[i].value);
- return (def);
- }
+ name = ci->values[0].value.string;
- return (NULL);
-}
+ /* Check for a complex callback first */
+ for (cb = complex_callback_head; cb != NULL; cb = cb->next)
+ if (strcasecmp (name, cb->type) == 0)
+ return (cb->callback (ci));
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Functions for the actual parsing *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-/*
- * `cf_callback_mode'
- * Chose the `operating_mode'
- *
- * Mode `value'
- */
-int cf_callback_mode (const char *shortvar, const char *var,
- const char *arguments, const char *value, lc_flags_t flags,
- void *extra)
-{
- DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
- shortvar, var, arguments, value);
-
- if (strcasecmp (value, "Client") == 0)
- operating_mode = MODE_CLIENT;
- else if (strcasecmp (value, "Server") == 0)
- operating_mode = MODE_SERVER;
- else if (strcasecmp (value, "Local") == 0)
- operating_mode = MODE_LOCAL;
- else
+ /* Hm, no complex plugin found. Dispatch the values one by one */
+ for (i = 0; i < ci->children_num; i++)
{
- syslog (LOG_ERR, "Invalid value for config option `Mode': `%s'", value);
- return (LC_CBRET_ERROR);
+ if (ci->children[i].children == NULL)
+ dispatch_value_plugin (name, ci->children + i);
+ else
+ {DEBUG ("No nested config blocks allow for this plugin.");}
}
- return (LC_CBRET_OKAY);
+ return (0);
}
-/*
- * `cf_callback_mode_plugindir'
- * Change the plugin directory
- *
- * <Mode xxx>
- * PluginDir `value'
- * </Mode>
- */
-int cf_callback_mode_plugindir (const char *shortvar, const char *var,
- const char *arguments, const char *value, lc_flags_t flags,
- void *extra)
-{
- DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
- shortvar, var, arguments, value);
- plugin_set_dir (value);
+static int dispatch_block (oconfig_item_t *ci)
+{
+ if (strcasecmp (ci->key, "Plugin") == 0)
+ return (dispatch_block_plugin (ci));
- return (LC_CBRET_OKAY);
+ return (0);
}
-int cf_callback_mode_option (const char *shortvar, const char *var,
- const char *arguments, const char *value, lc_flags_t flags,
- void *extra)
-{
- cf_mode_item_t *item;
+#define CF_MAX_DEPTH 8
+static oconfig_item_t *cf_read_file (const char *file, int depth);
- DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
- shortvar, var, arguments, value);
+static int cf_include_all (oconfig_item_t *root, int depth)
+{
+ int i;
- if (extra == NULL)
+ for (i = 0; i < root->children_num; i++)
{
- fprintf (stderr, "No extra..?\n");
- return (LC_CBRET_ERROR);
- }
+ oconfig_item_t *new;
+ oconfig_item_t *old;
- item = (cf_mode_item_t *) extra;
+ /* Ignore all blocks, including `Include' blocks. */
+ if (root->children[i].children_num != 0)
+ continue;
- if (strcasecmp (item->key, shortvar))
- {
- fprintf (stderr, "Wrong extra..\n");
- return (LC_CBRET_ERROR);
- }
+ if (strcasecmp (root->children[i].key, "Include") != 0)
+ continue;
- if ((operating_mode & item->mode) == 0)
- {
- fprintf (stderr, "Option `%s' is not valid in this mode!\n", shortvar);
- return (LC_CBRET_ERROR);
- }
+ old = root->children + i;
- if (item->value != NULL)
- {
- free (item->value);
- item->value = NULL;
- }
+ if ((old->values_num != 1)
+ || (old->values[0].type != OCONFIG_TYPE_STRING))
+ {
+ ERROR ("configfile: `Include' needs exactly one string argument.");
+ continue;
+ }
- if ((item->value = strdup (value)) == NULL)
- {
- perror ("strdup");
- return (LC_CBRET_ERROR);
- }
+ new = cf_read_file (old->values[0].value.string, depth + 1);
+ if (new == NULL)
+ continue;
- return (LC_CBRET_OKAY);
-}
+ /* There are more children now. We need to expand
+ * root->children. */
+ if (new->children_num > 1)
+ {
+ oconfig_item_t *temp;
+
+ DEBUG ("configfile: Resizing root-children from %i to %i elements.",
+ root->children_num,
+ root->children_num + new->children_num - 1);
+
+ temp = (oconfig_item_t *) realloc (root->children,
+ sizeof (oconfig_item_t)
+ * (root->children_num + new->children_num - 1));
+ if (temp == NULL)
+ {
+ ERROR ("configfile: realloc failed.");
+ oconfig_free (new);
+ continue;
+ }
+ root->children = temp;
+ }
-/*
- * `cf_callback_mode_loadmodule':
- * Load a plugin.
- *
- * <Mode xxx>
- * LoadPlugin `value'
- * </Mode>
- */
-int cf_callback_mode_loadmodule (const char *shortvar, const char *var,
- const char *arguments, const char *value, lc_flags_t flags,
- void *extra)
-{
- DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
- shortvar, var, arguments, value);
+ /* Clean up the old include directive while we still have a
+ * valid pointer */
+ DEBUG ("configfile: Cleaning up `old'");
+ /* sfree (old->values[0].value.string); */
+ sfree (old->values);
+
+ /* If there are trailing children and the number of children
+ * changes, we need to move the trailing ones either one to the
+ * front or (new->num - 1) to the back */
+ if (((root->children_num - i) > 1)
+ && (new->children_num != 1))
+ {
+ DEBUG ("configfile: Moving trailing children.");
+ memmove (root->children + i + new->children_num,
+ root->children + i + 1,
+ sizeof (oconfig_item_t)
+ * (root->children_num - (i + 1)));
+ }
- if (plugin_load (value))
- syslog (LOG_ERR, "plugin_load (%s): failed to load plugin", value);
+ /* Now copy the new children to where the include statement was */
+ if (new->children_num > 0)
+ {
+ DEBUG ("configfile: Copying new children.");
+ memcpy (root->children + i,
+ new->children,
+ sizeof (oconfig_item_t)
+ * new->children_num);
+ }
- /* Return `okay' even if there was an error, because it's not a syntax
- * problem.. */
- return (LC_CBRET_OKAY);
-}
+ /* Adjust the number of children and the position in the list. */
+ root->children_num = root->children_num + new->children_num - 1;
+ i = i + new->children_num - 1;
-/*
- * `cf_callback_mode_switch'
- * Change the contents of the global variable `operating_mode'
- *
- * This should be command line options. One *can* do this in the config
- * files, but I will not document this. Don't whine abount it not working as
- * you expect if you do it anyways.
- */
-int cf_callback_mode_switch (const char *shortvar, const char *var,
- const char *arguments, const char *value, lc_flags_t flags,
- void *extra)
-{
- DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
- shortvar, var, arguments, value);
-
- if (strcasecmp (shortvar, "Client") == 0)
- operating_mode = MODE_CLIENT;
- else if (strcasecmp (shortvar, "Local") == 0)
- operating_mode = MODE_LOCAL;
- else if (strcasecmp (shortvar, "Server") == 0)
- operating_mode = MODE_SERVER;
- else
- {
- fprintf (stderr, "cf_callback_mode_switch: Wrong mode!\n");
- return (LC_CBRET_ERROR);
- }
+ /* Clean up the `new' struct. We set `new->children' to NULL so
+ * the stuff we've just copied pointers to isn't freed by
+ * `oconfig_free' */
+ DEBUG ("configfile: Cleaning up `new'");
+ sfree (new->values); /* should be NULL anyway */
+ sfree (new);
+ new = NULL;
+ } /* for (i = 0; i < root->children_num; i++) */
- return (LC_CBRET_OKAY);
-}
+ return (0);
+} /* int cf_include_all */
-int cf_callback_socket (const char *shortvar, const char *var,
- const char *arguments, const char *value, lc_flags_t flags,
- void *extra)
+static oconfig_item_t *cf_read_file (const char *file, int depth)
{
- char *buffer;
+ oconfig_item_t *root;
- char *fields[3];
- int numfields;
+ if (depth >= CF_MAX_DEPTH)
+ {
+ ERROR ("configfile: Not including `%s' because the maximum nesting depth has been reached.",
+ file);
+ return (NULL);
+ }
- char *node;
- char *service = NET_DEFAULT_PORT;
+ root = oconfig_parse_file (file);
+ if (root == NULL)
+ {
+ ERROR ("configfile: Cannot read file `%s'.", file);
+ return (NULL);
+ }
- DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
- shortvar, var, arguments, value);
+ cf_include_all (root, depth);
- buffer = strdup (value);
- if (buffer == NULL)
- return (LC_CBRET_ERROR);
+ return (root);
+} /* oconfig_item_t *cf_read_file */
- numfields = strsplit (buffer, fields, 3);
+/*
+ * Public functions
+ */
+int global_option_set (const char *option, const char *value)
+{
+ int i;
- if ((numfields != 1) && (numfields != 2))
- {
- syslog (LOG_ERR, "Invalid number of arguments to `%s'",
- shortvar);
- free (buffer);
- return (LC_CBRET_ERROR);
- }
+ DEBUG ("option = %s; value = %s;", option, value);
+
+ for (i = 0; i < cf_global_options_num; i++)
+ if (strcasecmp (cf_global_options[i].key, option) == 0)
+ break;
- node = fields[0];
- if (numfields == 2)
- service = fields[1];
+ if (i >= cf_global_options_num)
+ return (-1);
- /* Still return `LC_CBRET_OKAY' because this is not an syntax error */
- if (network_create_socket (node, service) < 1)
- syslog (LOG_ERR, "network_create_socket (%s, %s) failed",
- node, service);
+ sfree (cf_global_options[i].value);
- free (buffer);
+ if (value != NULL)
+ cf_global_options[i].value = strdup (value);
+ else
+ cf_global_options[i].value = NULL;
- return (LC_CBRET_OKAY);
+ return (0);
}
-/*
- * `cf_callback_plugin'
- * Start/end section `plugin'
- *
- * <Plugin `arguments'>
- * ...
- * </Plugin>
- */
-int cf_callback_plugin (const char *shortvar, const char *var,
- const char *arguments, const char *value, lc_flags_t flags,
- void *extra)
+const char *global_option_get (const char *option)
{
- DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
- shortvar, var, arguments, value);
-
- if (flags == LC_FLAGS_SECTIONSTART)
- {
- if (nesting_depth != 0)
- {
- fprintf (stderr, ERR_NOT_NESTED);
- return (LC_CBRET_ERROR);
- }
+ int i;
- if (arguments == NULL)
- {
- fprintf (stderr, ERR_NEEDS_ARG, shortvar);
- return (LC_CBRET_ERROR);
- }
+ for (i = 0; i < cf_global_options_num; i++)
+ if (strcasecmp (cf_global_options[i].key, option) == 0)
+ break;
- if ((current_module = strdup (arguments)) == NULL)
- {
- perror ("strdup");
- return (LC_CBRET_ERROR);
- }
+ if (i >= cf_global_options_num)
+ return (NULL);
+
+ return ((cf_global_options[i].value != NULL)
+ ? cf_global_options[i].value
+ : cf_global_options[i].def);
+} /* char *global_option_get */
- nesting_depth++;
+void cf_unregister (const char *type)
+{
+ cf_callback_t *this, *prev;
- if (cf_search (current_module) != NULL)
- return (LC_CBRET_OKAY);
- else
- return (LC_CBRET_IGNORESECTION);
- }
- else if (flags == LC_FLAGS_SECTIONEND)
- {
- if (current_module != NULL)
+ for (prev = NULL, this = first_callback;
+ this != NULL;
+ prev = this, this = this->next)
+ if (strcasecmp (this->type, type) == 0)
{
- free (current_module);
- current_module = NULL;
- }
-
- nesting_depth--;
+ if (prev == NULL)
+ first_callback = this->next;
+ else
+ prev->next = this->next;
- return (LC_CBRET_OKAY);
- }
- else
- {
- fprintf (stderr, ERR_SECTION_ONLY, shortvar);
- return (LC_CBRET_ERROR);
- }
-}
+ free (this);
+ break;
+ }
+} /* void cf_unregister */
-/*
- * `cf_callback_plugin_dispatch'
- * Send options within `plugin' sections to the plugin that requests it.
- *
- * <Plugin `current_module'>
- * `var' `value'
- * </Plugin>
- */
-int cf_callback_plugin_dispatch (const char *shortvar, const char *var,
- const char *arguments, const char *value, lc_flags_t flags,
- void *extra)
+void cf_unregister_complex (const char *type)
{
- DBG ("shortvar = %s, var = %s, arguments = %s, value = %s, ...",
- shortvar, var, arguments, value);
-
- if ((nesting_depth == 0) || (current_module == NULL))
- {
- fprintf (stderr, ERR_NEEDS_SECTION, shortvar);
- return (LC_CBRET_ERROR);
- }
+ cf_complex_callback_t *this, *prev;
- /* Send the data to the plugin */
- if (cf_dispatch (current_module, shortvar, value) < 0)
- return (LC_CBRET_ERROR);
+ for (prev = NULL, this = complex_callback_head;
+ this != NULL;
+ prev = this, this = this->next)
+ if (strcasecmp (this->type, type) == 0)
+ {
+ if (prev == NULL)
+ complex_callback_head = this->next;
+ else
+ prev->next = this->next;
- return (LC_CBRET_OKAY);
-}
+ sfree (this->type);
+ sfree (this);
+ break;
+ }
+} /* void cf_unregister */
-void cf_init (void)
+void cf_register (const char *type,
+ int (*callback) (const char *, const char *),
+ const char **keys, int keys_num)
{
- static int run_once = 0;
- int i;
+ cf_callback_t *cf_cb;
- if (run_once != 0)
+ /* Remove this module from the list, if it already exists */
+ cf_unregister (type);
+
+ /* This pointer will be free'd in `cf_unregister' */
+ if ((cf_cb = (cf_callback_t *) malloc (sizeof (cf_callback_t))) == NULL)
return;
- run_once = 1;
- lc_register_callback ("Mode", SHORTOPT_NONE, LC_VAR_STRING,
- cf_callback_mode, NULL);
- lc_register_callback ("Plugin", SHORTOPT_NONE, LC_VAR_SECTION,
- cf_callback_plugin, NULL);
+ cf_cb->type = type;
+ cf_cb->callback = callback;
+ cf_cb->keys = keys;
+ cf_cb->keys_num = keys_num;
- lc_register_callback ("PluginDir", SHORTOPT_NONE,
- LC_VAR_STRING, cf_callback_mode_plugindir, NULL);
- lc_register_callback ("LoadPlugin", SHORTOPT_NONE,
- LC_VAR_STRING, cf_callback_mode_loadmodule, NULL);
+ cf_cb->next = first_callback;
+ first_callback = cf_cb;
+} /* void cf_register */
+
+int cf_register_complex (const char *type, int (*callback) (oconfig_item_t *))
+{
+ cf_complex_callback_t *new;
- lc_register_callback ("Listen", SHORTOPT_NONE,
- LC_VAR_STRING, cf_callback_socket, NULL);
- lc_register_callback ("Server", SHORTOPT_NONE,
- LC_VAR_STRING, cf_callback_socket, NULL);
+ new = (cf_complex_callback_t *) malloc (sizeof (cf_complex_callback_t));
+ if (new == NULL)
+ return (-1);
- for (i = 0; i < cf_mode_num; i++)
+ new->type = strdup (type);
+ if (new->type == NULL)
{
- cf_mode_item_t *item;
+ sfree (new);
+ return (-1);
+ }
- item = &cf_mode_list[i];
+ new->callback = callback;
+ new->next = NULL;
- lc_register_callback (item->key, SHORTOPT_NONE, LC_VAR_STRING,
- cf_callback_mode_option, (void *) item);
+ if (complex_callback_head == NULL)
+ {
+ complex_callback_head = new;
+ }
+ else
+ {
+ cf_complex_callback_t *last = complex_callback_head;
+ while (last->next != NULL)
+ last = last->next;
+ last->next = new;
}
-}
+
+ return (0);
+} /* int cf_register_complex */
int cf_read (char *filename)
{
- cf_init ();
-
- if (filename == NULL)
- filename = CONFIGFILE;
-
- DBG ("Starting to parse file `%s'", filename);
+ oconfig_item_t *conf;
+ int i;
- /* int lc_process_file(const char *appname, const char *pathname, lc_conf_type_t type); */
- if (lc_process_file ("collectd", filename, LC_CONF_APACHE))
+ conf = cf_read_file (filename, 0 /* depth */);
+ if (conf == NULL)
{
- syslog (LOG_ERR, "lc_process_file (%s): %s", filename, lc_geterrstr ());
+ ERROR ("Unable to read config file %s.", filename);
return (-1);
}
- DBG ("Done parsing file `%s'", filename);
-
- /* free memory and stuff */
- lc_cleanup ();
+ for (i = 0; i < conf->children_num; i++)
+ {
+ if (conf->children[i].children == NULL)
+ dispatch_value (conf->children + i);
+ else
+ dispatch_block (conf->children + i);
+ }
return (0);
-}
+} /* int cf_read */