X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=graph_list.c;h=2d0f57500a111a50e67a1b80fe45c9ea4309b965;hb=477b8a38dc1b3d0ae5e726f765722c962b2fcb46;hp=0e4428de2c3308096a8042da4e0e7b985ae5c95b;hpb=052657ddb5a25bf53e3ad4a0a5ec3c3afd48ec8c;p=collection4.git diff --git a/graph_list.c b/graph_list.c index 0e4428d..2d0f575 100644 --- a/graph_list.c +++ b/graph_list.c @@ -1,15 +1,19 @@ #include #include +#include +#include #include #include #include #include -#include -#include - #include "graph_list.h" +#include "graph_ident.h" #include "common.h" +#include "utils_params.h" + +#include +#include /* * Defines @@ -19,35 +23,51 @@ #define ANY_TOKEN "/any/" #define ALL_TOKEN "/all/" +#define IS_ANY(str) (((str) != NULL) && (strcmp (ANY_TOKEN, (str)) == 0)) +#define IS_ALL(str) (((str) != NULL) && (strcmp (ALL_TOKEN, (str)) == 0)) + /* * Data types */ -struct graph_ident_s /* {{{ */ +struct gl_ident_stage_s /* {{{ */ { char *host; char *plugin; char *plugin_instance; char *type; char *type_instance; -}; /* }}} struct graph_ident_s */ +}; /* }}} */ +typedef struct gl_ident_stage_s gl_ident_stage_t; -struct graph_instance_s; -typedef struct graph_instance_s graph_instance_t; struct graph_instance_s /* {{{ */ { - graph_ident_t select; + graph_ident_t *select; - graph_ident_t *files; + graph_ident_t **files; size_t files_num; graph_instance_t *next; }; /* }}} struct graph_instance_s */ -struct graph_config_s; -typedef struct graph_config_s graph_config_t; +struct graph_def_s; +typedef struct graph_def_s graph_def_t; +struct graph_def_s /* {{{ */ +{ + graph_ident_t *select; + + char *name; + char *legend; + double scale; + _Bool nan_to_zero; + _Bool draw_area; + uint32_t color; + + graph_def_t *next; +}; /* }}} struct graph_def_s */ + struct graph_config_s /* {{{ */ { - graph_ident_t select; + graph_ident_t *select; char *title; char *vertical_label; @@ -62,25 +82,25 @@ struct graph_config_s /* {{{ */ */ static graph_config_t *graph_config_head = NULL; -static graph_ident_t *graph_list = NULL; -static size_t graph_list_length = 0; static time_t gl_last_update = 0; /* * 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) /* {{{ */ { size_t i; for (i = 0; i < inst->files_num; i++) { - graph_ident_t *file = inst->files + i; + graph_ident_t *ident = inst->files[i]; + char *file; - printf (" File \"%s/%s-%s/%s-%s\"\n", - file->host, - file->plugin, file->plugin_instance, - file->type, file->type_instance); + file = ident_to_file (ident); + printf (" File \"%s\"\n", file); + free (file); } return (0); @@ -92,10 +112,11 @@ static int print_instances (const graph_config_t *cfg) /* {{{ */ for (inst = cfg->instances; inst != NULL; inst = inst->next) { - printf (" Instance \"%s/%s-%s/%s-%s\"\n", - inst->select.host, - inst->select.plugin, inst->select.plugin_instance, - inst->select.type, inst->select.type_instance); + char *str; + + str = ident_to_string (inst->select); + printf (" Instance \"%s\"\n", str); + free (str); print_files (inst); } @@ -109,10 +130,11 @@ static int print_graphs (void) /* {{{ */ for (cfg = graph_config_head; cfg != NULL; cfg = cfg->next) { - printf ("Graph \"%s/%s-%s/%s-%s\"\n", - cfg->select.host, - cfg->select.plugin, cfg->select.plugin_instance, - cfg->select.type, cfg->select.type_instance); + char *str; + + str = ident_to_string (cfg->select); + printf ("Graph \"%s\"\n", str); + free (str); print_instances (cfg); } @@ -120,7 +142,7 @@ static int print_graphs (void) /* {{{ */ 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) /* {{{ */ { @@ -134,88 +156,53 @@ static int strcmp_s (const char *s1, const char *s2) /* {{{ */ return (strcmp (s1, s2)); } /* }}} int strcmp_s */ +#endif -static _Bool part_matches (const char *sel, const char *val) /* {{{ */ +static void instance_destroy (graph_instance_t *inst) /* {{{ */ { - if ((sel == NULL) && (val == NULL)) - return (1); + graph_instance_t *next; + size_t i; - if (sel == NULL) /* && (val != NULL) */ - return (0); + if (inst == NULL) + return; - if ((strcasecmp (ALL_TOKEN, sel) == 0) - || (strcasecmp (ANY_TOKEN, sel) == 0)) - return (1); + next = inst->next; - if (val == NULL) /* && (sel != NULL) */ - return (0); + ident_destroy (inst->select); - if (strcmp (sel, val) == 0) - return (1); + for (i = 0; i < inst->files_num; i++) + ident_destroy (inst->files[i]); + free (inst->files); - return (0); -} /* }}} _Bool part_matches */ + free (inst); -static _Bool file_matches (const graph_ident_t *sel, /* {{{ */ - const graph_ident_t *val) + instance_destroy (next); +} /* }}} void instance_destroy */ + +static void graph_destroy (graph_config_t *cfg) /* {{{ */ { - if ((sel == NULL) && (val == NULL)) - return (0); - else if (sel == NULL) - return (-1); - else if (val == NULL) - return (1); + graph_config_t *next; - if (!part_matches (sel->host, val->host)) - return (0); + if (cfg == NULL) + return; - if (!part_matches (sel->plugin, val->plugin)) - return (0); + next = cfg->next; - if (!part_matches (sel->plugin_instance, val->plugin_instance)) - return (0); + ident_destroy (cfg->select); - if (!part_matches (sel->type, val->type)) - return (0); + free (cfg->title); + free (cfg->vertical_label); - if (!part_matches (sel->type_instance, val->type_instance)) - return (0); + instance_destroy (cfg->instances); - return (1); -} /* }}} _Bool ident_compare */ + graph_destroy (next); +} /* }}} void graph_destroy */ /* * 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 char *identifier_copy_part (const char *template, const char *value) /* {{{ */ -{ - if (template == NULL) - { - return (NULL); - } - else if (strcasecmp (ANY_TOKEN, template) == 0) - { - /* ANY in the graph selection => concrete value in the instance. */ - if (value == NULL) - return (NULL); - else - return (strdup (value)); - } - else if (strcasecmp (ALL_TOKEN, template) == 0) - { - /* ALL in the graph selection => ALL in the instance. */ - return (strdup (ALL_TOKEN)); - } - else - { - assert (value != NULL); - assert (strcmp (template, value) == 0); - return (strdup (template)); - } -} /* }}} int identifier_copy_part */ - static graph_instance_t *instance_create (graph_config_t *cfg, /* {{{ */ const graph_ident_t *file) { @@ -229,13 +216,8 @@ static graph_instance_t *instance_create (graph_config_t *cfg, /* {{{ */ return (NULL); memset (i, 0, sizeof (*i)); - i->select.host = identifier_copy_part (cfg->select.host, file->host); - i->select.plugin = identifier_copy_part (cfg->select.plugin, file->plugin); - i->select.plugin_instance = identifier_copy_part (cfg->select.plugin_instance, - file->plugin_instance); - i->select.type = identifier_copy_part (cfg->select.type, file->type); - i->select.type_instance = identifier_copy_part (cfg->select.type_instance, - file->type_instance); + i->select = ident_copy_with_selector (cfg->select, file, + /* keep_all_selector = */ 1); i->files = NULL; i->files_num = 0; @@ -261,26 +243,16 @@ static graph_instance_t *instance_create (graph_config_t *cfg, /* {{{ */ static int instance_add_file (graph_instance_t *inst, /* {{{ */ const graph_ident_t *file) { - graph_ident_t *tmp; + graph_ident_t **tmp; tmp = realloc (inst->files, sizeof (*inst->files) * (inst->files_num + 1)); if (tmp == NULL) return (ENOMEM); inst->files = tmp; - tmp = inst->files + inst->files_num; - memset (tmp, 0, sizeof (*tmp)); - tmp->host = strdup (file->host); - tmp->plugin = strdup (file->plugin); - if (file->plugin_instance != NULL) - tmp->plugin_instance = strdup (file->plugin_instance); - else - tmp->plugin_instance = NULL; - tmp->type = strdup (file->type); - if (file->type_instance != NULL) - tmp->type_instance = strdup (file->type_instance); - else - tmp->type_instance = NULL; + inst->files[inst->files_num] = ident_clone (file); + if (inst->files[inst->files_num] == NULL) + return (ENOMEM); inst->files_num++; @@ -296,7 +268,7 @@ static graph_instance_t *graph_find_instance (graph_config_t *cfg, /* {{{ */ return (NULL); for (i = cfg->instances; i != NULL; i = i->next) - if (file_matches (&i->select, file)) + if (ident_matches (i->select, file)) return (i); return (NULL); @@ -348,11 +320,7 @@ static int graph_create_from_file (const graph_ident_t *file) /* {{{ */ return (ENOMEM); memset (cfg, 0, sizeof (*cfg)); - cfg->select.host = strdup (file->host); - cfg->select.plugin = strdup (file->plugin); - cfg->select.plugin_instance = strdup (file->plugin_instance); - cfg->select.type = strdup (file->type); - cfg->select.type_instance = strdup (file->type_instance); + cfg->select = ident_clone (file); cfg->title = NULL; cfg->vertical_label = NULL; @@ -373,7 +341,7 @@ static int register_file (const graph_ident_t *file) /* {{{ */ { int status; - if (!file_matches (&cfg->select, file)) + if (!ident_matches (cfg->select, file)) continue; status = graph_add_file (cfg, file); @@ -393,7 +361,10 @@ static int register_file (const graph_ident_t *file) /* {{{ */ return (0); } /* }}} int register_file */ -static int FIXME_graph_create_from_file (const graph_ident_t *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; @@ -402,13 +373,11 @@ static int FIXME_graph_create_from_file (const graph_ident_t *file) /* {{{ */ return (ENOMEM); memset (cfg, 0, sizeof (*cfg)); - cfg->select.host = strdup (file->host); - cfg->select.plugin = strdup (file->plugin); - cfg->select.plugin_instance = strdup (file->plugin_instance); - cfg->select.type = strdup (file->type); - cfg->select.type_instance = strdup (file->type_instance); + 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; @@ -418,166 +387,41 @@ static int FIXME_graph_create_from_file (const graph_ident_t *file) /* {{{ */ 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); - graph_ident_t ident; - - - ident.host = ANY_TOKEN; - ident.plugin = "cpu"; - ident.plugin_instance = ANY_TOKEN; - ident.type = "cpu"; - ident.type_instance = ALL_TOKEN; - FIXME_graph_create_from_file (&ident); - - ident.plugin = "memory"; - ident.plugin_instance = ""; - ident.type = "memory"; - FIXME_graph_create_from_file (&ident); - - ident.plugin = "swap"; - ident.plugin_instance = ""; - ident.type = "swap"; - FIXME_graph_create_from_file (&ident); - - ident.plugin = ANY_TOKEN; - ident.plugin_instance = ANY_TOKEN; - ident.type = "ps_state"; - FIXME_graph_create_from_file (&ident); - - ident.host = ALL_TOKEN; - ident.plugin = "cpu"; - ident.plugin_instance = ALL_TOKEN; - ident.type = "cpu"; - ident.type_instance = "idle"; - FIXME_graph_create_from_file (&ident); + 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 int gl_compare (const void *p0, const void *p1) /* {{{ */ -{ - const graph_ident_t *gl0 = p0; - const graph_ident_t *gl1 = p1; - int status; - - status = strcmp (gl0->host, gl1->host); - if (status != 0) - return (status); - - status = strcmp (gl0->plugin, gl1->plugin); - if (status != 0) - return (status); - - status = strcmp_s (gl0->plugin_instance, gl1->plugin_instance); - if (status != 0) - return (status); - - status = strcmp (gl0->type, gl1->type); - if (status != 0) - return (status); - - return (strcmp_s (gl0->type_instance, gl1->type_instance)); -} /* }}} int gl_compare */ - -static void gl_clear_entry (graph_ident_t *gl) /* {{{ */ -{ - if (gl == NULL) - return; - - free (gl->host); - free (gl->plugin); - free (gl->plugin_instance); - free (gl->type); - free (gl->type_instance); - - gl->host = NULL; - gl->plugin = NULL; - gl->plugin_instance = NULL; - gl->type = NULL; - gl->type_instance = NULL; -} /* }}} void gl_clear_entry */ - static void gl_clear (void) /* {{{ */ { - size_t i; + graph_config_t *cfg; - for (i = 0; i < graph_list_length; i++) - gl_clear_entry (graph_list + i); + cfg = graph_config_head; + graph_config_head = NULL; + graph_destroy (cfg); - free (graph_list); - graph_list = NULL; - graph_list_length = 0; gl_last_update = 0; } /* }}} void gl_clear */ -static int gl_add_copy (graph_ident_t *gl) /* {{{ */ -{ - graph_ident_t *ptr; - int status; - - if (gl == NULL) - return (EINVAL); - - ptr = realloc (graph_list, sizeof (*graph_list) * (graph_list_length + 1)); - if (ptr == 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) - - status = ENOMEM; - do - { - DUP_OR_BREAK(host); - DUP_OR_BREAK(plugin); - DUP_OR_BREAK(plugin_instance); - DUP_OR_BREAK(type); - DUP_OR_BREAK(type_instance); - - status = 0; - } while (0); - -#undef DUP_OR_BREAK - - if (status != 0) - { - free (ptr->host); - free (ptr->plugin); - free (ptr->plugin_instance); - free (ptr->type); - free (ptr->type_instance); - return (status); - } - - graph_list_length++; - return (0); -} /* }}} int gl_add_copy */ - static int callback_type (const char *type, void *user_data) /* {{{ */ { - graph_ident_t *gl; + gl_ident_stage_t *gl; + graph_ident_t *ident; int status; if ((type == NULL) || (user_data == NULL)) @@ -602,9 +446,18 @@ static int callback_type (const char *type, void *user_data) /* {{{ */ gl->type_instance = gl->type + strlen (gl->type); } - register_file (gl); - - 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; @@ -615,7 +468,7 @@ static int callback_type (const char *type, void *user_data) /* {{{ */ static int callback_plugin (const char *plugin, void *user_data) /* {{{ */ { - graph_ident_t *gl; + gl_ident_stage_t *gl; int status; if ((plugin == NULL) || (user_data == NULL)) @@ -651,7 +504,7 @@ static int callback_plugin (const char *plugin, void *user_data) /* {{{ */ static int callback_host (const char *host, void *user_data) /* {{{ */ { - graph_ident_t *gl; + gl_ident_stage_t *gl; int status; if ((host == NULL) || (user_data == NULL)) @@ -673,18 +526,350 @@ static int callback_host (const char *host, void *user_data) /* {{{ */ 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 */ + +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++) + { + int status; + + status = gl_ident_get_rrdargs (cfg, inst, 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_ident_t gl; + gl_ident_stage_t gl; int status; + /* printf ("Content-Type: text/plain\n\n"); - - read_graph_config (); + */ now = time (NULL); @@ -693,6 +878,8 @@ int gl_update (void) /* {{{ */ gl_clear (); + read_graph_config (); + memset (&gl, 0, sizeof (gl)); gl.host = NULL; gl.plugin = NULL; @@ -702,28 +889,9 @@ int gl_update (void) /* {{{ */ status = foreach_host (callback_host, &gl); - print_graphs (); - - if (graph_list_length > 1) - qsort (graph_list, graph_list_length, sizeof (*graph_list), gl_compare); + /* print_graphs (); */ 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; - - status = (*callback) ((void *) (graph_list + i), user_data); - if (status != 0) - return (status); - } - - return (0); -} /* }}} int gl_foreach */ - /* vim: set sw=2 sts=2 et fdm=marker : */