X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph_def.c;h=1f78dddf90e16c79f3f3785d8774d9a3f80c5e81;hb=1c73ff974cb2a94f83ae1869f8267def13742bd8;hp=b8e0ce4e5402e9f76cf67ca879b15ef568418230;hpb=0ab3085f89e64eecd67d3179ea87f0463e918a10;p=collection4.git diff --git a/src/graph_def.c b/src/graph_def.c index b8e0ce4..1f78ddd 100644 --- a/src/graph_def.c +++ b/src/graph_def.c @@ -1,3 +1,26 @@ +/** + * collection4 - graph_def.c + * Copyright (C) 2010 Florian octo Forster + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * Authors: + * Florian octo Forster + **/ + #include #include #include @@ -5,6 +28,7 @@ #include "graph_def.h" #include "graph.h" #include "graph_config.h" +#include "graph_ident.h" #include "common.h" #include "oconfig.h" @@ -219,9 +243,6 @@ int def_config (graph_config_t *cfg, const oconfig_item_t *ci) /* {{{ */ graph_config_get_bool (child, &def->area); else if (strcasecmp ("Format", child->key) == 0) graph_config_get_string (child, &def->format); - else - fprintf (stderr, "def_config: Ignoring unknown config option \"%s\"", - child->key); } return (graph_add_def (cfg, def)); @@ -289,10 +310,12 @@ int def_foreach (graph_def_t *def, def_callback_t callback, /* {{{ */ } /* }}} int def_foreach */ int def_get_rrdargs (graph_def_t *def, graph_ident_t *ident, /* {{{ */ - str_array_t *args) + rrd_args_t *args) { char *file; int index; + char draw_def[64]; + char legend[256]; if ((def == NULL) || (ident == NULL) || (args == NULL)) return (EINVAL); @@ -306,42 +329,81 @@ int def_get_rrdargs (graph_def_t *def, graph_ident_t *ident, /* {{{ */ DEBUG ("gl_ident_get_rrdargs: file = %s;\n", file); - index = array_argc (args); + if (def->legend != NULL) + { + strncpy (legend, def->legend, sizeof (legend)); + legend[sizeof (legend) - 1] = 0; + } + else + { + ident_describe (ident, def->select, + legend, sizeof (legend)); + + if ((legend[0] == 0) || (strcmp ("default", legend) == 0)) + { + strncpy (legend, def->ds_name, sizeof (legend)); + legend[sizeof (legend) - 1] = 0; + } + } + + index = args->index; + args->index++; /* CDEFs */ - array_append_format (args, "DEF:def_%04i_min=%s:%s:MIN", + array_append_format (args->data, "DEF:def_%04i_min=%s:%s:MIN", index, file, def->ds_name); - array_append_format (args, "DEF:def_%04i_avg=%s:%s:AVERAGE", + array_append_format (args->data, "DEF:def_%04i_avg=%s:%s:AVERAGE", index, file, def->ds_name); - array_append_format (args, "DEF:def_%04i_max=%s:%s:MAX", + array_append_format (args->data, "DEF:def_%04i_max=%s:%s:MAX", index, file, def->ds_name); /* VDEFs */ - array_append_format (args, "VDEF:vdef_%04i_min=def_%04i_min,MINIMUM", + array_append_format (args->data, "VDEF:vdef_%04i_min=def_%04i_min,MINIMUM", index, index); - array_append_format (args, "VDEF:vdef_%04i_avg=def_%04i_avg,AVERAGE", + array_append_format (args->data, "VDEF:vdef_%04i_avg=def_%04i_avg,AVERAGE", index, index); - array_append_format (args, "VDEF:vdef_%04i_max=def_%04i_max,MAXIMUM", + array_append_format (args->data, "VDEF:vdef_%04i_max=def_%04i_max,MAXIMUM", index, index); - array_append_format (args, "VDEF:vdef_%04i_lst=def_%04i_avg,LAST", + array_append_format (args->data, "VDEF:vdef_%04i_lst=def_%04i_avg,LAST", index, index); + if (def->stack) + { + if (args->last_stack_cdef[0] != 0) + { + array_append_format (args->calc, "CDEF:cdef_%04i_stack=%s,def_%04i_avg,+", + index, args->last_stack_cdef, index); + snprintf (draw_def, sizeof (draw_def), "cdef_%04i_stack", index); + } + else + { + snprintf (draw_def, sizeof (draw_def), "def_%04i_avg", index); + } + } + else + { + snprintf (draw_def, sizeof (draw_def), "def_%04i_avg", index); + } + + if (def->area) + array_prepend_format (args->areas, "AREA:%s#%06"PRIx32, + draw_def, fade_color (def->color)); + /* Graph part */ - array_append_format (args, "%s:def_%04i_avg#%06"PRIx32":%s%s", - def->area ? "AREA" : "LINE1", - index, def->color, - (def->legend != NULL) ? def->legend : def->ds_name, - def->stack ? ":STACK" : ""); - array_append_format (args, "GPRINT:vdef_%04i_min:%s min,", - index, (def->format != NULL) ? def->format : "%lg"); - array_append_format (args, "GPRINT:vdef_%04i_avg:%s avg,", - index, (def->format != NULL) ? def->format : "%lg"); - array_append_format (args, "GPRINT:vdef_%04i_max:%s max,", - index, (def->format != NULL) ? def->format : "%lg"); - array_append_format (args, "GPRINT:vdef_%04i_lst:%s last\\l", - index, (def->format != NULL) ? def->format : "%lg"); + array_prepend_format (args->lines, "GPRINT:vdef_%04i_lst:%s last\\l", + index, (def->format != NULL) ? def->format : "%6.2lf"); + array_prepend_format (args->lines, "GPRINT:vdef_%04i_max:%s max,", + index, (def->format != NULL) ? def->format : "%6.2lf"); + array_prepend_format (args->lines, "GPRINT:vdef_%04i_avg:%s avg,", + index, (def->format != NULL) ? def->format : "%6.2lf"); + array_prepend_format (args->lines, "GPRINT:vdef_%04i_min:%s min,", + index, (def->format != NULL) ? def->format : "%6.2lf"); + array_prepend_format (args->lines, "LINE1:%s#%06"PRIx32":%s", + draw_def, def->color, legend); free (file); + memcpy (args->last_stack_cdef, draw_def, sizeof (args->last_stack_cdef)); + return (0); } /* }}} int def_get_rrdargs */