#include <stdlib.h>
#include <stdio.h>
+#include <stdint.h>
+#include <inttypes.h>
#include <string.h>
#include <time.h>
#include <errno.h>
+#include <assert.h>
#include "graph_list.h"
+#include "graph_ident.h"
+#include "graph_def.h"
#include "common.h"
+#include "utils_params.h"
+#include <fcgiapp.h>
+#include <fcgi_stdio.h>
+
+/*
+ * Defines
+ */
#define UPDATE_INTERVAL 10
-static graph_list_t *graph_list = NULL;
-static size_t graph_list_length = 0;
+#define ANY_TOKEN "/any/"
+#define ALL_TOKEN "/all/"
+
+/*
+ * Data types
+ */
+struct gl_ident_stage_s /* {{{ */
+{
+ char *host;
+ char *plugin;
+ char *plugin_instance;
+ char *type;
+ char *type_instance;
+}; /* }}} */
+typedef struct gl_ident_stage_s gl_ident_stage_t;
+
+struct graph_instance_s /* {{{ */
+{
+ graph_ident_t *select;
+
+ graph_ident_t **files;
+ size_t files_num;
+
+ graph_instance_t *next;
+}; /* }}} struct graph_instance_s */
+
+struct graph_config_s /* {{{ */
+{
+ graph_ident_t *select;
+
+ char *title;
+ char *vertical_label;
+
+ graph_def_t *defs;
+
+ graph_instance_t *instances;
+
+ graph_config_t *next;
+}; /* }}} struct graph_config_s */
+
+/*
+ * Global variables
+ */
+static graph_config_t *graph_config_head = NULL;
+
static time_t gl_last_update = 0;
-static void gl_clear_entry (graph_list_t *gl) /* {{{ */
+/*
+ * Private functions
+ */
+/* FIXME: These "print_*" functions are used for debugging. They should be
+ * removed at some point. */
+static int print_files (const graph_instance_t *inst) /* {{{ */
{
- if (gl == NULL)
- return;
+ size_t i;
- free (gl->host);
- free (gl->plugin);
- free (gl->plugin_instance);
- free (gl->type);
- free (gl->type_instance);
+ for (i = 0; i < inst->files_num; i++)
+ {
+ graph_ident_t *ident = inst->files[i];
+ char *file;
- gl->host = NULL;
- gl->plugin = NULL;
- gl->plugin_instance = NULL;
- gl->type = NULL;
- gl->type_instance = NULL;
-} /* }}} void gl_clear_entry */
+ file = ident_to_file (ident);
+ printf (" File \"%s\"\n", file);
+ free (file);
+ }
-static void gl_clear (void)
+ return (0);
+} /* }}} int print_instances */
+
+static int print_instances (const graph_config_t *cfg) /* {{{ */
{
+ graph_instance_t *inst;
+
+ for (inst = cfg->instances; inst != NULL; inst = inst->next)
+ {
+ char *str;
+
+ str = ident_to_string (inst->select);
+ printf (" Instance \"%s\"\n", str);
+ free (str);
+
+ print_files (inst);
+ }
+
+ return (0);
+} /* }}} int print_instances */
+
+static int print_graphs (void) /* {{{ */
+{
+ graph_config_t *cfg;
+
+ for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+ {
+ char *str;
+
+ str = ident_to_string (cfg->select);
+ printf ("Graph \"%s\"\n", str);
+ free (str);
+
+ print_instances (cfg);
+ }
+
+ return (0);
+} /* }}} int print_graphs */
+
+#if 0
+/* "Safe" version of strcmp(3): Either or both pointers may be NULL. */
+static int strcmp_s (const char *s1, const char *s2) /* {{{ */
+{
+ if ((s1 == NULL) && (s2 == NULL))
+ return (0);
+ else if (s1 == NULL)
+ return (1);
+ else if (s2 == NULL)
+ return (-1);
+ assert ((s1 != NULL) && (s2 != NULL));
+
+ return (strcmp (s1, s2));
+} /* }}} int strcmp_s */
+#endif
+
+static void instance_destroy (graph_instance_t *inst) /* {{{ */
+{
+ graph_instance_t *next;
size_t i;
- for (i = 0; i < graph_list_length; i++)
- gl_clear_entry (graph_list + i);
+ if (inst == NULL)
+ return;
- free (graph_list);
- graph_list = NULL;
- graph_list_length = 0;
- gl_last_update = 0;
-} /* }}} void gl_clear */
+ next = inst->next;
+
+ ident_destroy (inst->select);
+
+ for (i = 0; i < inst->files_num; i++)
+ ident_destroy (inst->files[i]);
+ free (inst->files);
+
+ free (inst);
+
+ instance_destroy (next);
+} /* }}} void instance_destroy */
-static int gl_add_copy (graph_list_t *gl) /* {{{ */
+/*
+ * Copy part of an identifier. If the "template" value is ANY_TOKEN, "value" is
+ * copied and returned. This function is used when creating graph_instance_t
+ * from graph_config_t.
+ */
+static graph_instance_t *instance_create (graph_config_t *cfg, /* {{{ */
+ const graph_ident_t *file)
{
- graph_list_t *ptr;
- int status;
+ graph_instance_t *i;
- if (gl == NULL)
- return (EINVAL);
+ if ((cfg == NULL) || (file == NULL))
+ return (NULL);
+
+ i = malloc (sizeof (*i));
+ if (i == NULL)
+ return (NULL);
+ memset (i, 0, sizeof (*i));
+
+ i->select = ident_copy_with_selector (cfg->select, file,
+ IDENT_FLAG_REPLACE_ANY);
+ if (i->select == NULL)
+ {
+ DEBUG ("instance_create: ident_copy_with_selector returned NULL.\n");
+ free (i);
+ return (NULL);
+ }
+
+ i->files = NULL;
+ i->files_num = 0;
+
+ i->next = NULL;
+
+ if (cfg->instances == NULL)
+ cfg->instances = i;
+ else
+ {
+ graph_instance_t *last;
+
+ last = cfg->instances;
+ while (last->next != NULL)
+ last = last->next;
+
+ last->next = i;
+ }
+
+ return (i);
+} /* }}} graph_instance_t *instance_create */
- ptr = realloc (graph_list, sizeof (*graph_list) * (graph_list_length + 1));
- if (ptr == NULL)
+static int instance_add_file (graph_instance_t *inst, /* {{{ */
+ const graph_ident_t *file)
+{
+ graph_ident_t **tmp;
+
+ tmp = realloc (inst->files, sizeof (*inst->files) * (inst->files_num + 1));
+ if (tmp == NULL)
return (ENOMEM);
- graph_list = ptr;
-
- ptr = graph_list + graph_list_length;
- memset (ptr, 0, sizeof (*ptr));
- ptr->host = NULL;
- ptr->plugin = NULL;
- ptr->plugin_instance = NULL;
- ptr->type = NULL;
- ptr->type_instance = NULL;
-
-#define DUP_OR_BREAK(member) do { \
- ptr->member = NULL; \
- if (gl->member != NULL) \
- { \
- ptr->member = strdup (gl->member); \
- if (ptr->member == NULL) \
- break; \
- } \
-} while (0)
+ inst->files = tmp;
- status = ENOMEM;
- do
+ inst->files[inst->files_num] = ident_clone (file);
+ if (inst->files[inst->files_num] == NULL)
+ return (ENOMEM);
+
+ inst->files_num++;
+
+ return (0);
+} /* }}} int instance_add_file */
+
+static graph_instance_t *graph_find_instance (graph_config_t *cfg, /* {{{ */
+ const graph_ident_t *file)
+{
+ graph_instance_t *i;
+
+ if ((cfg == NULL) || (file == NULL))
+ return (NULL);
+
+ for (i = cfg->instances; i != NULL; i = i->next)
+ if (ident_matches (i->select, file))
+ return (i);
+
+ return (NULL);
+} /* }}} graph_instance_t *graph_find_instance */
+
+static int graph_add_file (graph_config_t *cfg, const graph_ident_t *file) /* {{{ */
+{
+ graph_instance_t *inst;
+
+ inst = graph_find_instance (cfg, file);
+ if (inst == NULL)
{
- DUP_OR_BREAK(host);
- DUP_OR_BREAK(plugin);
- DUP_OR_BREAK(plugin_instance);
- DUP_OR_BREAK(type);
- DUP_OR_BREAK(type_instance);
+ inst = instance_create (cfg, file);
+ if (inst == NULL)
+ return (ENOMEM);
+ }
- status = 0;
- } while (0);
+ return (instance_add_file (inst, file));
+} /* }}} int graph_add_file */
-#undef DUP_OR_BREAK
+static int graph_append (graph_config_t *cfg) /* {{{ */
+{
+ graph_config_t *last;
- if (status != 0)
+ if (cfg == NULL)
+ return (EINVAL);
+
+ if (graph_config_head == NULL)
{
- free (ptr->host);
- free (ptr->plugin);
- free (ptr->plugin_instance);
- free (ptr->type);
- free (ptr->type_instance);
- return (status);
+ graph_config_head = cfg;
+ return (0);
+ }
+
+ last = graph_config_head;
+ while (last->next != NULL)
+ last = last->next;
+
+ last->next = cfg;
+
+ return (0);
+} /* }}} int graph_append */
+
+static graph_config_t *graph_create (const graph_ident_t *selector) /* {{{ */
+{
+ graph_config_t *cfg;
+
+ cfg = malloc (sizeof (*cfg));
+ if (cfg == NULL)
+ return (NULL);
+ memset (cfg, 0, sizeof (*cfg));
+
+ cfg->select = ident_clone (selector);
+
+ cfg->title = NULL;
+ cfg->vertical_label = NULL;
+ cfg->defs = NULL;
+ cfg->instances = NULL;
+ cfg->next = NULL;
+
+ return (cfg);
+} /* }}} int graph_create */
+
+static void graph_destroy (graph_config_t *cfg) /* {{{ */
+{
+ graph_config_t *next;
+
+ if (cfg == NULL)
+ return;
+
+ next = cfg->next;
+
+ ident_destroy (cfg->select);
+
+ free (cfg->title);
+ free (cfg->vertical_label);
+
+ def_destroy (cfg->defs);
+ instance_destroy (cfg->instances);
+
+ graph_destroy (next);
+} /* }}} void graph_destroy */
+
+static int register_file (const graph_ident_t *file) /* {{{ */
+{
+ graph_config_t *cfg;
+ int num_graphs = 0;
+
+ for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+ {
+ int status;
+
+ if (!ident_matches (cfg->select, file))
+ continue;
+
+ status = graph_add_file (cfg, file);
+ if (status != 0)
+ {
+ /* report error */;
+ }
+ else
+ {
+ num_graphs++;
+ }
+ }
+
+ if (num_graphs == 0)
+ {
+ cfg = graph_create (file);
+ graph_append (cfg);
+ graph_add_file (cfg, file);
}
- graph_list_length++;
return (0);
-} /* }}} int gl_add_copy */
+} /* }}} int register_file */
+
+static int FIXME_graph_create_from_file (const char *host, /* {{{ */
+ const char *plugin, const char *plugin_instance,
+ const char *type, const char *type_instance,
+ const char *title)
+{
+ graph_config_t *cfg;
+
+ cfg = malloc (sizeof (*cfg));
+ if (cfg == NULL)
+ return (ENOMEM);
+ memset (cfg, 0, sizeof (*cfg));
+
+ cfg->select = ident_create (host, plugin, plugin_instance, type, type_instance);
+
+ cfg->title = NULL;
+ if (title != NULL)
+ cfg->title = strdup (title);
+ cfg->vertical_label = NULL;
+ cfg->instances = NULL;
+ cfg->next = NULL;
+
+ graph_append (cfg);
+
+ return (0);
+} /* }}} int FIXME_graph_create_from_file */
+
+/* FIXME: Actually read the config file here. */
+static int read_graph_config (void) /* {{{ */
+{
+ if (graph_config_head != NULL)
+ return (0);
+
+ FIXME_graph_create_from_file (ANY_TOKEN, "cpu", ANY_TOKEN, "cpu", ALL_TOKEN,
+ "CPU {instance} usage");
+ FIXME_graph_create_from_file (ANY_TOKEN, "memory", "", "memory", ALL_TOKEN,
+ "Memory usage");
+ FIXME_graph_create_from_file (ANY_TOKEN, "swap", "", "swap", ALL_TOKEN,
+ "Swap");
+ FIXME_graph_create_from_file (ANY_TOKEN, ANY_TOKEN, ANY_TOKEN, "ps_state", ALL_TOKEN,
+ "Processes");
+ FIXME_graph_create_from_file (ANY_TOKEN, "cpu", ALL_TOKEN, "cpu", "idle",
+ "CPU idle overview");
+
+ return (0);
+} /* }}} int read_graph_config */
+
+static void gl_clear (void) /* {{{ */
+{
+ graph_config_t *cfg;
+
+ cfg = graph_config_head;
+ graph_config_head = NULL;
+ graph_destroy (cfg);
+
+ gl_last_update = 0;
+} /* }}} void gl_clear */
static int callback_type (const char *type, void *user_data) /* {{{ */
{
- graph_list_t *gl;
+ gl_ident_stage_t *gl;
+ graph_ident_t *ident;
int status;
if ((type == NULL) || (user_data == NULL))
*gl->type_instance = 0;
gl->type_instance++;
}
+ else
+ {
+ gl->type_instance = gl->type + strlen (gl->type);
+ }
- status = gl_add_copy (gl);
+ ident = ident_create (gl->host,
+ gl->plugin, gl->plugin_instance,
+ gl->type, gl->type_instance);
+ if (ident == 0)
+ {
+ status = -1;
+ }
+ else
+ {
+ status = register_file (ident);
+ ident_destroy (ident);
+ }
free (gl->type);
gl->type = NULL;
static int callback_plugin (const char *plugin, void *user_data) /* {{{ */
{
- graph_list_t *gl;
+ gl_ident_stage_t *gl;
int status;
if ((plugin == NULL) || (user_data == NULL))
*gl->plugin_instance = 0;
gl->plugin_instance++;
}
+ else
+ {
+ gl->plugin_instance = gl->plugin + strlen (gl->plugin);
+ }
status = foreach_type (gl->host, plugin, callback_type, gl);
static int callback_host (const char *host, void *user_data) /* {{{ */
{
- graph_list_t *gl;
+ gl_ident_stage_t *gl;
int status;
if ((host == NULL) || (user_data == NULL))
return (status);
} /* }}} int callback_host */
+static const char *get_part_from_param (const char *prim_key, /* {{{ */
+ const char *sec_key)
+{
+ const char *val;
+
+ val = param (prim_key);
+ if (val != NULL)
+ return (val);
+
+ return (param (sec_key));
+} /* }}} const char *get_part_from_param */
+
+int gl_ident_get_rrdargs (graph_config_t *cfg, /* {{{ */
+ graph_instance_t *inst,
+ graph_ident_t *ident,
+ str_array_t *args)
+{
+ char *file;
+ char **dses = NULL;
+ size_t dses_num = 0;
+ int status;
+ size_t i;
+
+ if ((cfg == NULL) || (inst == NULL) || (ident == NULL) || (args == NULL))
+ return (EINVAL);
+
+ file = ident_to_file (ident);
+ if (file == NULL)
+ {
+ DEBUG ("gl_ident_get_rrdargs: ident_to_file returned NULL.\n");
+ return (-1);
+ }
+
+ DEBUG ("gl_ident_get_rrdargs: file = %s;\n", file);
+
+ status = ds_list_from_rrd_file (file, &dses_num, &dses);
+ if (status != 0)
+ {
+ free (file);
+ return (status);
+ }
+
+ for (i = 0; i < dses_num; i++)
+ {
+ int index;
+
+ DEBUG ("gl_ident_get_rrdargs: ds[%lu] = %s;\n", (unsigned long) i, dses[i]);
+
+ index = array_argc (args);
+
+ /* CDEFs */
+ array_append_format (args, "DEF:def_%04i_min=%s:%s:MIN",
+ index, file, dses[i]);
+ array_append_format (args, "DEF:def_%04i_avg=%s:%s:AVERAGE",
+ index, file, dses[i]);
+ array_append_format (args, "DEF:def_%04i_max=%s:%s:MAX",
+ index, file, dses[i]);
+ /* VDEFs */
+ array_append_format (args, "VDEF:vdef_%04i_min=def_%04i_min,MINIMUM",
+ index, index);
+ array_append_format (args, "VDEF:vdef_%04i_avg=def_%04i_avg,AVERAGE",
+ index, index);
+ array_append_format (args, "VDEF:vdef_%04i_max=def_%04i_max,MAXIMUM",
+ index, index);
+ array_append_format (args, "VDEF:vdef_%04i_lst=def_%04i_avg,LAST",
+ index, index);
+
+ /* Graph part */
+ array_append_format (args, "LINE1:def_%04i_avg#%06"PRIx32":%s",
+ index, get_random_color (), dses[i]);
+ array_append_format (args, "GPRINT:vdef_%04i_min:%%lg min,", index);
+ array_append_format (args, "GPRINT:vdef_%04i_avg:%%lg avg,", index);
+ array_append_format (args, "GPRINT:vdef_%04i_max:%%lg max,", index);
+ array_append_format (args, "GPRINT:vdef_%04i_lst:%%lg last\\l", index);
+
+ free (dses[i]);
+ }
+ free (dses);
+
+ free (file);
+
+ return (0);
+} /* }}} int gl_ident_get_rrdargs */
+
+/*
+ * Global functions
+ */
+int gl_instance_get_params (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
+ char *buffer, size_t buffer_size)
+{
+ if ((inst == NULL) || (buffer == NULL) || (buffer_size < 1))
+ return (EINVAL);
+
+ buffer[0] = 0;
+
+#define COPY_FIELD(field) do { \
+ const char *cfg_f = ident_get_##field (cfg->select); \
+ const char *inst_f = ident_get_##field (inst->select); \
+ if (strcmp (cfg_f, inst_f) == 0) \
+ { \
+ strlcat (buffer, #field, buffer_size); \
+ strlcat (buffer, "=", buffer_size); \
+ strlcat (buffer, cfg_f, buffer_size); \
+ } \
+ else \
+ { \
+ strlcat (buffer, "graph_", buffer_size); \
+ strlcat (buffer, #field, buffer_size); \
+ strlcat (buffer, "=", buffer_size); \
+ strlcat (buffer, cfg_f, buffer_size); \
+ strlcat (buffer, ";", buffer_size); \
+ strlcat (buffer, "inst_", buffer_size); \
+ strlcat (buffer, #field, buffer_size); \
+ strlcat (buffer, "=", buffer_size); \
+ strlcat (buffer, inst_f, buffer_size); \
+ } \
+} while (0)
+
+ COPY_FIELD(host);
+ strlcat (buffer, ";", buffer_size);
+ COPY_FIELD(plugin);
+ strlcat (buffer, ";", buffer_size);
+ COPY_FIELD(plugin_instance);
+ strlcat (buffer, ";", buffer_size);
+ COPY_FIELD(type);
+ strlcat (buffer, ";", buffer_size);
+ COPY_FIELD(type_instance);
+
+#undef COPY_FIELD
+
+ return (0);
+} /* }}} int gl_instance_get_params */
+
+graph_instance_t *inst_get_selected (graph_config_t *cfg) /* {{{ */
+{
+ const char *host = get_part_from_param ("inst_host", "host");
+ const char *plugin = get_part_from_param ("inst_plugin", "plugin");
+ const char *plugin_instance = get_part_from_param ("inst_plugin_instance", "plugin_instance");
+ const char *type = get_part_from_param ("inst_type", "type");
+ const char *type_instance = get_part_from_param ("inst_type_instance", "type_instance");
+ graph_ident_t *ident;
+ graph_instance_t *inst;
+
+ if (cfg == NULL)
+ cfg = graph_get_selected ();
+
+ if (cfg == NULL)
+ {
+ DEBUG ("inst_get_selected: cfg == NULL;\n");
+ return (NULL);
+ }
+
+ if ((host == NULL)
+ || (plugin == NULL) || (plugin_instance == NULL)
+ || (type == NULL) || (type_instance == NULL))
+ {
+ DEBUG ("inst_get_selected: A parameter is NULL.\n");
+ return (NULL);
+ }
+
+ ident = ident_create (host, plugin, plugin_instance, type, type_instance);
+
+ for (inst = cfg->instances; inst != NULL; inst = inst->next)
+ {
+ if (ident_compare (ident, inst->select) != 0)
+ continue;
+
+ ident_destroy (ident);
+ return (inst);
+ }
+
+ DEBUG ("inst_get_selected: No match found.\n");
+ ident_destroy (ident);
+ return (NULL);
+} /* }}} graph_instance_t *inst_get_selected */
+
+int gl_graph_get_all (gl_cfg_callback callback, /* {{{ */
+ void *user_data)
+{
+ graph_config_t *cfg;
+
+ if (callback == NULL)
+ return (EINVAL);
+
+ gl_update ();
+
+ for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+ {
+ int status;
+
+ status = (*callback) (cfg, user_data);
+ if (status != 0)
+ return (status);
+ }
+
+ return (0);
+} /* }}} int gl_graph_get_all */
+
+graph_config_t *graph_get_selected (void) /* {{{ */
+{
+ const char *host = get_part_from_param ("graph_host", "host");
+ const char *plugin = get_part_from_param ("graph_plugin", "plugin");
+ const char *plugin_instance = get_part_from_param ("graph_plugin_instance", "plugin_instance");
+ const char *type = get_part_from_param ("graph_type", "type");
+ const char *type_instance = get_part_from_param ("graph_type_instance", "type_instance");
+ graph_ident_t *ident;
+ graph_config_t *cfg;
+
+ if ((host == NULL)
+ || (plugin == NULL) || (plugin_instance == NULL)
+ || (type == NULL) || (type_instance == NULL))
+ return (NULL);
+
+ ident = ident_create (host, plugin, plugin_instance, type, type_instance);
+
+ gl_update ();
+
+ for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+ {
+ if (ident_compare (ident, cfg->select) != 0)
+ continue;
+
+ ident_destroy (ident);
+ return (cfg);
+ }
+
+ ident_destroy (ident);
+ return (NULL);
+} /* }}} graph_config_t *graph_get_selected */
+
+int gl_graph_instance_get_all (graph_config_t *cfg, /* {{{ */
+ gl_inst_callback callback, void *user_data)
+{
+ graph_instance_t *inst;
+
+ if ((cfg == NULL) || (callback == NULL))
+ return (EINVAL);
+
+ for (inst = cfg->instances; inst != NULL; inst = inst->next)
+ {
+ int status;
+
+ status = (*callback) (cfg, inst, user_data);
+ if (status != 0)
+ return (status);
+ }
+
+ return (0);
+} /* }}} int gl_graph_instance_get_all */
+
+int gl_graph_get_title (graph_config_t *cfg, /* {{{ */
+ char *buffer, size_t buffer_size)
+{
+ char *str;
+
+ if ((cfg == NULL) || (buffer == NULL) || (buffer_size < 1))
+ return (EINVAL);
+
+ if (cfg->title != NULL)
+ str = cfg->title;
+ else
+ str = ident_to_string (cfg->select);
+
+ if (str == NULL)
+ return (ENOMEM);
+
+ strncpy (buffer, str, buffer_size);
+ buffer[buffer_size - 1] = 0;
+
+ free (str);
+
+ return (0);
+} /* }}} int gl_graph_get_title */
+
+graph_ident_t *gl_graph_get_selector (graph_config_t *cfg) /* {{{ */
+{
+ if (cfg == NULL)
+ return (NULL);
+
+ return (ident_clone (cfg->select));
+} /* }}} graph_ident_t *gl_graph_get_selector */
+
+int gl_instance_get_all (gl_inst_callback callback, /* {{{ */
+ void *user_data)
+{
+ graph_config_t *cfg;
+
+ gl_update ();
+
+ for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next)
+ {
+ graph_instance_t *inst;
+
+ for (inst = cfg->instances; inst != NULL; inst = inst->next)
+ {
+ int status;
+
+ status = (*callback) (cfg, inst, user_data);
+ if (status != 0)
+ return (status);
+ }
+ }
+
+ return (0);
+} /* }}} int gl_instance_get_all */
+
+int gl_instance_get_rrdargs (graph_config_t *cfg, /* {{{ */
+ graph_instance_t *inst,
+ str_array_t *args)
+{
+ size_t i;
+
+ if ((cfg == NULL) || (inst == NULL) || (args == NULL))
+ return (EINVAL);
+
+ if (cfg->title != NULL)
+ {
+ array_append (args, "-t");
+ array_append (args, cfg->title);
+ }
+
+ for (i = 0; i < inst->files_num; i++)
+ {
+ graph_def_t *def;
+ int status;
+
+ def = def_search (cfg->defs, inst->files[i]);
+ if (def == NULL)
+ {
+ def = def_create (cfg, inst->files[i]);
+ if (def == NULL)
+ return (-1);
+
+ if (cfg->defs == NULL)
+ cfg->defs = def;
+ else
+ def_append (cfg->defs, def);
+ }
+
+ status = def_get_rrdargs (def, inst->files[i], args);
+ if (status != 0)
+ return (status);
+ }
+
+ return (0);
+} /* }}} int gl_instance_get_rrdargs */
+
+graph_ident_t *gl_instance_get_selector (graph_instance_t *inst) /* {{{ */
+{
+ if (inst == NULL)
+ return (NULL);
+
+ return (ident_clone (inst->select));
+} /* }}} graph_ident_t *gl_instance_get_selector */
+
+/* DELETEME */
+
int gl_update (void) /* {{{ */
{
time_t now;
- graph_list_t gl;
+ gl_ident_stage_t gl;
int status;
+ /*
+ printf ("Content-Type: text/plain\n\n");
+ */
+
now = time (NULL);
if ((gl_last_update + UPDATE_INTERVAL) >= now)
gl_clear ();
+ read_graph_config ();
+
memset (&gl, 0, sizeof (gl));
gl.host = NULL;
gl.plugin = NULL;
gl.type = NULL;
gl.type_instance = NULL;
- /* TODO: Free old list */
-
status = foreach_host (callback_host, &gl);
- return (status);
-} /* }}} int gl_update */
-
-int gl_foreach (gl_callback callback, void *user_data) /* {{{ */
-{
- size_t i;
- for (i = 0; i < graph_list_length; i++)
- {
- int status;
+ /* print_graphs (); */
- status = (*callback) (graph_list + i, user_data);
- if (status != 0)
- return (status);
- }
-
- return (0);
-} /* }}} int gl_foreach */
+ return (status);
+} /* }}} int gl_update */
/* vim: set sw=2 sts=2 et fdm=marker : */