X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_graph.c;h=b8ef6b7411aa19149ea1ddda3ad637cf58d585d6;hp=5dd332861bfe5074f394f22481ea10ee0c6765b0;hb=355e29120ccb981bab8779dab297d0302b7524ec;hpb=49593a6456b8dd4e82f82d8c76aaf21ce876ea92 diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 5dd3328..b8ef6b7 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -59,6 +59,8 @@ text_prop_t text_prop[] = { {5.5, RRD_DEFAULT_FONT,NULL} /* watermark */ }; +char week_fmt[128] = "Week %V"; + xlab_t xlab[] = { {0, 0, TMT_SECOND, 30, TMT_MINUTE, 5, TMT_MINUTE, 5, 0, "%H:%M"} , @@ -87,10 +89,9 @@ xlab_t xlab[] = { , {2400, 0, TMT_HOUR, 12, TMT_DAY, 1, TMT_DAY, 2, 24 * 3600, "%a"} , - {3600, 0, TMT_DAY, 1, TMT_WEEK, 1, TMT_WEEK, 1, 7 * 24 * 3600, "Week %V"} + {3600, 0, TMT_DAY, 1, TMT_WEEK, 1, TMT_WEEK, 1, 7 * 24 * 3600, week_fmt} , - {3 * 3600, 0, TMT_WEEK, 1, TMT_MONTH, 1, TMT_WEEK, 2, 7 * 24 * 3600, - "Week %V"} + {3 * 3600, 0, TMT_WEEK, 1, TMT_MONTH, 1, TMT_WEEK, 2, 7 * 24 * 3600, week_fmt} , {6 * 3600, 0, TMT_MONTH, 1, TMT_MONTH, 1, TMT_MONTH, 1, 30 * 24 * 3600, "%b"} @@ -255,10 +256,25 @@ enum gfx_if_en if_conv( conv_if(SVG, IF_SVG); conv_if(EPS, IF_EPS); conv_if(PDF, IF_PDF); + conv_if(XML, IF_XML); + conv_if(XMLENUM, IF_XMLENUM); + conv_if(CSV, IF_CSV); + conv_if(TSV, IF_TSV); + conv_if(SSV, IF_SSV); + conv_if(JSON, IF_JSON); + conv_if(JSONTIME, IF_JSONTIME); return (enum gfx_if_en)(-1); } +enum gfx_type_en type_conv( + char *string) +{ + conv_if(TIME , GTYPE_TIME); + conv_if(XY, GTYPE_XY); + return (enum gfx_type_en)(-1); +} + enum tmt_en tmt_conv( char *string) { @@ -337,6 +353,12 @@ int im_free( free(im->gdes[i].rpnp); } free(im->gdes); + + for (i = 0; i < DIM(text_prop);i++){ + pango_font_description_free(im->text_prop[i].font_desc); + im->text_prop[i].font_desc = NULL; + } + if (im->font_options) cairo_font_options_destroy(im->font_options); @@ -344,6 +366,8 @@ int im_free( status = cairo_status(im->cr); cairo_destroy(im->cr); } + + if (im->rendered_image) { free(im->rendered_image); } @@ -403,8 +427,11 @@ void auto_scale( } } +/* power prefixes */ static char si_symbol[] = { + 'y', /* 10e-24 Yocto */ + 'z', /* 10e-21 Zepto */ 'a', /* 10e-18 Atto */ 'f', /* 10e-15 Femto */ 'p', /* 10e-12 Pico */ @@ -418,8 +445,10 @@ static char si_symbol[] = { 'T', /* 10e12 Tera */ 'P', /* 10e15 Peta */ 'E', /* 10e18 Exa */ + 'Z', /* 10e21 Zeta */ + 'Y' /* 10e24 Yotta */ }; -static const int si_symbcenter = 6; +static const int si_symbcenter = 8; /* find SI magnitude symbol for the numbers on the y-axis*/ void si_unit( @@ -846,49 +875,55 @@ int data_fetch( } if (!skip) { unsigned long ft_step = im->gdes[i].step; /* ft_step will record what we got from fetch */ + const char *rrd_daemon; + int status; - /* Flush the file if - * - a connection to the daemon has been established - * - this is the first occurrence of that RRD file - */ - if (rrdc_is_connected(im->daemon_addr)) + if (im->gdes[i].daemon[0] != 0) + rrd_daemon = im->gdes[i].daemon; + else + rrd_daemon = im->daemon_addr; + + /* "daemon" may be NULL. ENV_RRDCACHED_ADDRESS is evaluated in that + * case. If "daemon" holds the same value as in the previous + * iteration, no actual new connection is established - the + * existing connection is re-used. */ + rrdc_connect (rrd_daemon); + + /* If connecting was successfull, use the daemon to query the data. + * If there is no connection, for example because no daemon address + * was specified, (try to) use the local file directly. */ + if (rrdc_is_connected (rrd_daemon)) { - int status; - - status = 0; - for (ii = 0; ii < i; ii++) - { - if (strcmp (im->gdes[i].rrd, im->gdes[ii].rrd) == 0) - { - status = 1; - break; - } - } - - if (status == 0) - { - status = rrdc_flush (im->gdes[i].rrd); - if (status != 0) - { - rrd_set_error ("rrdc_flush (%s) failed with status %i.", - im->gdes[i].rrd, status); - return (-1); - } - } - } /* if (rrdc_is_connected()) */ - - if ((rrd_fetch_fn(im->gdes[i].rrd, - im->gdes[i].cf, - &im->gdes[i].start, - &im->gdes[i].end, - &ft_step, - &im->gdes[i].ds_cnt, - &im->gdes[i].ds_namv, - &im->gdes[i].data)) == -1) { - return -1; + status = rrdc_fetch (im->gdes[i].rrd, + cf_to_string (im->gdes[i].cf), + &im->gdes[i].start, + &im->gdes[i].end, + &ft_step, + &im->gdes[i].ds_cnt, + &im->gdes[i].ds_namv, + &im->gdes[i].data); + if (status != 0) + return (status); + } + else + { + if ((rrd_fetch_fn(im->gdes[i].rrd, + im->gdes[i].cf, + &im->gdes[i].start, + &im->gdes[i].end, + &ft_step, + &im->gdes[i].ds_cnt, + &im->gdes[i].ds_namv, + &im->gdes[i].data)) == -1) { + return -1; + } } im->gdes[i].data_first = 1; + /* must reduce to at least im->step + otherwhise we end up with more data than we can handle in the + chart and visibility of data will be random */ + im->gdes[i].step = max(im->gdes[i].step,im->step); if (ft_step < im->gdes[i].step) { reduce_data(im->gdes[i].cf_reduce, ft_step, @@ -1460,6 +1495,13 @@ time_t find_next_time( localtime_r(¤t, &tm); + int limit = 2; + switch (baseint) { + case TMT_SECOND: limit = 7200; break; + case TMT_MINUTE: limit = 120; break; + case TMT_HOUR: limit = 2; break; + default: limit = 2; break; + } do { switch (baseint) { case TMT_SECOND: @@ -1490,7 +1532,7 @@ time_t find_next_time( tm. tm_year += basestep; } madetime = mktime(&tm); - } while (madetime == -1); /* this is necessary to skip impssible times + } while (madetime == -1 && limit-- >= 0); /* this is necessary to skip impossible times like the daylight saving time skips */ return madetime; @@ -1572,7 +1614,7 @@ int print_calc( } } /* prepare printval */ - if ((percent_s = strstr(im->gdes[i].format, "%S")) != NULL) { + if (!im->gdes[i].strftm && (percent_s = strstr(im->gdes[i].format, "%S")) != NULL) { /* Magfact is set to -1 upon entry to print_calc. If it * is still less than 0, then we need to run auto_scale. * Otherwise, put the value into the correct units. If @@ -1586,7 +1628,7 @@ int print_calc( printval /= magfact; } *(++percent_s) = 's'; - } else if (strstr(im->gdes[i].format, "%s") != NULL) { + } else if (!im->gdes[i].strftm && strstr(im->gdes[i].format, "%s") != NULL) { auto_scale(im, &printval, &si_symb, &magfact); } @@ -1595,8 +1637,12 @@ int print_calc( if (im->gdes[i].strftm) { prline.u_str = (char*)malloc((FMT_LEG_LEN + 2) * sizeof(char)); - strftime(prline.u_str, - FMT_LEG_LEN, im->gdes[i].format, &tmvdef); + if (im->gdes[vidx].vf.never == 1) { + time_clean(prline.u_str, im->gdes[i].format); + } else { + strftime(prline.u_str, + FMT_LEG_LEN, im->gdes[i].format, &tmvdef); + } } else if (bad_format(im->gdes[i].format)) { rrd_set_error ("bad format for PRINT in '%s'", im->gdes[i].format); @@ -1613,8 +1659,12 @@ int print_calc( /* GF_GPRINT */ if (im->gdes[i].strftm) { - strftime(im->gdes[i].legend, - FMT_LEG_LEN, im->gdes[i].format, &tmvdef); + if (im->gdes[vidx].vf.never == 1) { + time_clean(im->gdes[i].legend, im->gdes[i].format); + } else { + strftime(im->gdes[i].legend, + FMT_LEG_LEN, im->gdes[i].format, &tmvdef); + } } else { if (bad_format(im->gdes[i].format)) { rrd_set_error @@ -1755,6 +1805,7 @@ int leg_place( prt_fctn != 'j' && prt_fctn != 'c' && prt_fctn != 'u' && + prt_fctn != '.' && prt_fctn != 's' && prt_fctn != '\0' && prt_fctn != 'g') { free(legspace); rrd_set_error @@ -1766,6 +1817,10 @@ int leg_place( if (prt_fctn == 'n') { prt_fctn = 'l'; } + /* \. is a null operation to allow strings ending in \x */ + if (prt_fctn == '.') { + prt_fctn = '\0'; + } /* remove exess space from the end of the legend for \g */ while (prt_fctn == 'g' && @@ -1841,7 +1896,7 @@ int leg_place( glue = 0; } if (prt_fctn == 'c') - leg_x = (double)(legendwidth - fill) / 2.0; + leg_x = border + (double)(legendwidth - fill) / 2.0; if (prt_fctn == 'r') leg_x = legendwidth - fill + border; for (ii = mark; ii <= i; ii++) { @@ -2283,7 +2338,7 @@ int horizontal_log_grid( } } else { - sprintf(graph_label_right,im->second_axis_format,sval); + sprintf(graph_label_right,im->second_axis_format,sval,""); } gfx_text ( im, @@ -2488,19 +2543,20 @@ void vertical_grid( mgridtm, im->xlab_user. mgridst); - ti < im->end; + ti < im->end && ti != -1; ti = find_next_time(ti, im->xlab_user.gridtm, im->xlab_user.gridst) ) { /* are we inside the graph ? */ if (ti < im->start || ti > im->end) continue; - while (timajor < ti) { + while (timajor < ti && timajor != -1) { timajor = find_next_time(timajor, im-> xlab_user. mgridtm, im->xlab_user.mgridst); } + if (timajor == -1) break; /* fail in case of problems with time increments */ if (ti == timajor) continue; /* skip as falls on major grid line */ X0 = xtr(im, ti); @@ -2524,7 +2580,7 @@ void vertical_grid( im-> xlab_user. mgridst); - ti < im->end; + ti < im->end && ti != -1; ti = find_next_time(ti, im->xlab_user.mgridtm, im->xlab_user.mgridst) ) { /* are we inside the graph ? */ @@ -2550,9 +2606,9 @@ void vertical_grid( labtm, im->xlab_user. labst); - ti <= + (ti <= im->end - - im->xlab_user.precis / 2; + im->xlab_user.precis / 2) && ti != -1; ti = find_next_time(ti, im->xlab_user.labtm, im->xlab_user.labst) ) { tilab = ti + im->xlab_user.precis / 2; /* correct time for the label */ @@ -2911,6 +2967,7 @@ int graph_size_location( im->ximg = im->xsize; im->yimg = im->ysize; im->yorigin = im->ysize; + xtr(im, 0); ytr(im, DNAN); return 0; } @@ -2942,7 +2999,7 @@ int graph_size_location( } else{ // we have no title; get a little clearing from the top - Ytitle = 1.5 * Yspacing; + Ytitle = Yspacing; } if (elements) { @@ -3036,7 +3093,7 @@ int graph_size_location( /* reserve space for padding below the graph */ if (im->extra_flags & NOLEGEND) { - Ymain -= Yspacing; + Ymain -= 0.5*Yspacing; } if (im->watermark[0] != '\0') { @@ -3096,7 +3153,7 @@ int graph_size_location( } /* reserve space for padding below the graph */ if (im->extra_flags & NOLEGEND) { - im->yimg += Yspacing; + im->yimg += 0.5*Yspacing; } if (im->watermark[0] != '\0') { @@ -3125,7 +3182,7 @@ int graph_size_location( */ switch(im->legendposition){ case NORTH: - im->xOriginTitle = Xvertical + Xylabel + (im->xsize / 2); + im->xOriginTitle = (im->ximg / 2); im->yOriginTitle = 0; im->xOriginLegend = 0; @@ -3146,7 +3203,7 @@ int graph_size_location( break; case WEST: - im->xOriginTitle = im->legendwidth + Xvertical + Xylabel + im->xsize / 2; + im->xOriginTitle = im->legendwidth + im->xsize / 2; im->yOriginTitle = 0; im->xOriginLegend = 0; @@ -3167,7 +3224,7 @@ int graph_size_location( break; case SOUTH: - im->xOriginTitle = Xvertical + Xylabel + im->xsize / 2; + im->xOriginTitle = im->ximg / 2; im->yOriginTitle = 0; im->xOriginLegend = 0; @@ -3188,7 +3245,7 @@ int graph_size_location( break; case EAST: - im->xOriginTitle = Xvertical + Xylabel + im->xsize / 2; + im->xOriginTitle = im->xsize / 2; im->yOriginTitle = 0; im->xOriginLegend = Xvertical + Xylabel + Xmain + Xvertical2; @@ -3245,13 +3302,15 @@ static cairo_status_t cairo_output( int graph_paint( image_desc_t *im) { - int i, ii; int lazy = lazy_check(im); - double areazero = 0.0; - graph_desc_t *lastgdes = NULL; - rrd_infoval_t info; + int cnt; -// PangoFontMap *font_map = pango_cairo_font_map_get_default(); + /* imgformat XML or higher dispatch to xport + * output format there is selected via graph_type + */ + if (im->imgformat >= IF_XML) { + return rrd_graph_xport(im); + } /* pull the data from the rrd files ... */ if (data_fetch(im) == -1) @@ -3264,19 +3323,41 @@ int graph_paint( * if there are no graph elements (i==0) we stop here ... * if we are lazy, try to quit ... */ - i = print_calc(im); - if (i < 0) + cnt = print_calc(im); + if (cnt < 0) return -1; /* if we want and can be lazy ... quit now */ - if (i == 0) + if (cnt == 0) return 0; + /* otherwise call graph_paint_timestring */ + switch (im->graph_type) { + case GTYPE_TIME: + return graph_paint_timestring(im,lazy,cnt); + break; + case GTYPE_XY: + return graph_paint_xy(im,lazy,cnt); + break; + } + /* final return with error*/ + rrd_set_error("Graph type %i is not implemented",im->graph_type); + return -1; +} + +int graph_paint_timestring( + image_desc_t *im, int lazy, int cnt) +{ + int i,ii; + double areazero = 0.0; + graph_desc_t *lastgdes = NULL; + rrd_infoval_t info; + /************************************************************** *** Calculating sizes and locations became a bit confusing *** *** so I moved this into a separate function. *** **************************************************************/ - if (graph_size_location(im, i) == -1) + if (graph_size_location(im, cnt) == -1) return -1; info.u_cnt = im->xorigin; @@ -3324,67 +3405,11 @@ int graph_paint( ytr(im, DNAN); /* if (im->gridfit) apply_gridfit(im); */ - /* the actual graph is created by going through the individual - graph elements and then drawing them */ - cairo_surface_destroy(im->surface); - switch (im->imgformat) { - case IF_PNG: - im->surface = - cairo_image_surface_create(CAIRO_FORMAT_ARGB32, - im->ximg * im->zoom, - im->yimg * im->zoom); - break; - case IF_PDF: - im->gridfit = 0; - im->surface = strlen(im->graphfile) - ? cairo_pdf_surface_create(im->graphfile, im->ximg * im->zoom, - im->yimg * im->zoom) - : cairo_pdf_surface_create_for_stream - (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); - break; - case IF_EPS: - im->gridfit = 0; - im->surface = strlen(im->graphfile) - ? - cairo_ps_surface_create(im->graphfile, im->ximg * im->zoom, - im->yimg * im->zoom) - : cairo_ps_surface_create_for_stream - (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); - break; - case IF_SVG: - im->gridfit = 0; - im->surface = strlen(im->graphfile) - ? - cairo_svg_surface_create(im-> - graphfile, - im->ximg * im->zoom, im->yimg * im->zoom) - : cairo_svg_surface_create_for_stream - (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); - cairo_svg_surface_restrict_to_version - (im->surface, CAIRO_SVG_VERSION_1_1); - break; - }; - cairo_destroy(im->cr); - im->cr = cairo_create(im->surface); - cairo_set_antialias(im->cr, im->graph_antialias); - cairo_scale(im->cr, im->zoom, im->zoom); -// pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(font_map), 100); - gfx_new_area(im, 0, 0, 0, im->yimg, - im->ximg, im->yimg, im->graph_col[GRC_BACK]); - gfx_add_point(im, im->ximg, 0); - gfx_close_path(im); - gfx_new_area(im, im->xorigin, - im->yorigin, - im->xorigin + - im->xsize, im->yorigin, - im->xorigin + - im->xsize, - im->yorigin - im->ysize, im->graph_col[GRC_CANVAS]); - gfx_add_point(im, im->xorigin, im->yorigin - im->ysize); - gfx_close_path(im); - cairo_rectangle(im->cr, im->xorigin, im->yorigin - im->ysize - 1.0, - im->xsize, im->ysize + 2.0); - cairo_clip(im->cr); + + /* set up cairo */ + if (graph_cairo_setup(im)) { return -1; } + + /* other stuff */ if (im->minval > 0.0) areazero = im->minval; if (im->maxval < 0.0) @@ -3430,17 +3455,27 @@ int graph_paint( break; case GF_LINE: case GF_AREA: - case GF_GRAD: - /* fix data points at oo and -oo */ + case GF_GRAD: { + rrd_value_t diffval = im->maxval - im->minval; + rrd_value_t maxlimit = im->maxval + 9 * diffval; + rrd_value_t minlimit = im->minval - 9 * diffval; for (ii = 0; ii < im->xsize; ii++) { + /* fix data points at oo and -oo */ if (isinf(im->gdes[i].p_data[ii])) { if (im->gdes[i].p_data[ii] > 0) { im->gdes[i].p_data[ii] = im->maxval; } else { im->gdes[i].p_data[ii] = im->minval; } - } + /* some versions of cairo go unstable when trying + to draw way out of the canvas ... lets not even try */ + if (im->gdes[i].p_data[ii] > maxlimit) { + im->gdes[i].p_data[ii] = maxlimit; + } + if (im->gdes[i].p_data[ii] < minlimit) { + im->gdes[i].p_data[ii] = minlimit; + } } /* for */ /* ******************************************************* @@ -3708,6 +3743,7 @@ int graph_paint( } lastgdes = &(im->gdes[i]); break; + } /* GF_AREA, GF_LINE, GF_GRAD */ case GF_STACK: rrd_set_error ("STACK should already be turned into LINE or AREA here"); @@ -3767,7 +3803,86 @@ int graph_paint( break; } } + /* close the graph via cairo*/ + return graph_cairo_finish(im); +} + +int graph_cairo_setup (image_desc_t *im) +{ + /* the actual graph is created by going through the individual + graph elements and then drawing them */ + cairo_surface_destroy(im->surface); + switch (im->imgformat) { + case IF_PNG: + im->surface = + cairo_image_surface_create(CAIRO_FORMAT_ARGB32, + im->ximg * im->zoom, + im->yimg * im->zoom); + break; + case IF_PDF: + im->gridfit = 0; + im->surface = strlen(im->graphfile) + ? cairo_pdf_surface_create(im->graphfile, im->ximg * im->zoom, + im->yimg * im->zoom) + : cairo_pdf_surface_create_for_stream + (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); + break; + case IF_EPS: + im->gridfit = 0; + im->surface = strlen(im->graphfile) + ? + cairo_ps_surface_create(im->graphfile, im->ximg * im->zoom, + im->yimg * im->zoom) + : cairo_ps_surface_create_for_stream + (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); + break; + case IF_SVG: + im->gridfit = 0; + im->surface = strlen(im->graphfile) + ? + cairo_svg_surface_create(im-> + graphfile, + im->ximg * im->zoom, im->yimg * im->zoom) + : cairo_svg_surface_create_for_stream + (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom); + cairo_svg_surface_restrict_to_version + (im->surface, CAIRO_SVG_VERSION_1_1); + break; + case IF_XML: + case IF_XMLENUM: + case IF_CSV: + case IF_TSV: + case IF_SSV: + case IF_JSON: + case IF_JSONTIME: + break; + }; + cairo_destroy(im->cr); + im->cr = cairo_create(im->surface); + cairo_set_antialias(im->cr, im->graph_antialias); + cairo_scale(im->cr, im->zoom, im->zoom); +// pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(font_map), 100); + gfx_new_area(im, 0, 0, 0, im->yimg, + im->ximg, im->yimg, im->graph_col[GRC_BACK]); + gfx_add_point(im, im->ximg, 0); + gfx_close_path(im); + gfx_new_area(im, im->xorigin, + im->yorigin, + im->xorigin + + im->xsize, im->yorigin, + im->xorigin + + im->xsize, + im->yorigin - im->ysize, im->graph_col[GRC_CANVAS]); + gfx_add_point(im, im->xorigin, im->yorigin - im->ysize); + gfx_close_path(im); + cairo_rectangle(im->cr, im->xorigin, im->yorigin - im->ysize - 1.0, + im->xsize, im->ysize + 2.0); + cairo_clip(im->cr); + return 0; +} +int graph_cairo_finish (image_desc_t *im) +{ switch (im->imgformat) { case IF_PNG: @@ -3785,6 +3900,14 @@ int graph_paint( } break; } + case IF_XML: + case IF_XMLENUM: + case IF_CSV: + case IF_TSV: + case IF_SSV: + case IF_JSON: + case IF_JSONTIME: + break; default: if (strlen(im->graphfile)) { cairo_show_page(im->cr); @@ -3797,6 +3920,14 @@ int graph_paint( return 0; } +int graph_paint_xy( + image_desc_t *im, int lazy, int cnt) +{ + /* to stop compiler warnings for now */ + lazy=cnt=(int)im->gdes_c; + rrd_set_error("XY diagramm not implemented"); + return -1; +} /***************************************************** * graph stuff @@ -3853,6 +3984,7 @@ int gdes_alloc( im->gdes[im->gdes_c - 1].cf = CF_AVERAGE; im->gdes[im->gdes_c - 1].yrule = DNAN; im->gdes[im->gdes_c - 1].xrule = 0; + im->gdes[im->gdes_c - 1].daemon[0] = 0; return 0; } @@ -3963,6 +4095,7 @@ int rrd_graph( ** - options parsing now in rrd_graph_options() ** - script parsing now in rrd_graph_script() */ + rrd_info_t *rrd_graph_v( int argc, char **argv) @@ -3972,15 +4105,18 @@ rrd_info_t *rrd_graph_v( char *old_locale; rrd_graph_init(&im); /* a dummy surface so that we can measure text sizes for placements */ - old_locale = setlocale(LC_NUMERIC, "C"); + old_locale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "C"); rrd_graph_options(argc, argv, &im); if (rrd_test_error()) { + setlocale(LC_NUMERIC, old_locale); /* reenable locale */ rrd_info_free(im.grinfo); im_free(&im); return NULL; } if (optind >= argc) { + setlocale(LC_NUMERIC, old_locale); /* reenable locale */ rrd_info_free(im.grinfo); im_free(&im); rrd_set_error("missing filename"); @@ -3988,6 +4124,7 @@ rrd_info_t *rrd_graph_v( } if (strlen(argv[optind]) >= MAXPATH) { + setlocale(LC_NUMERIC, old_locale); /* reenable locale */ rrd_set_error("filename (including path) too long"); rrd_info_free(im.grinfo); im_free(&im); @@ -4009,16 +4146,14 @@ rrd_info_t *rrd_graph_v( im_free(&im); return NULL; } - + /* Everything is now read and the actual work can start */ - if (graph_paint(&im) == -1) { - rrd_info_free(im.grinfo); - im_free(&im); - return NULL; + rrd_info_free(im.grinfo); + im_free(&im); + return NULL; } - /* The image is generated and needs to be output. ** Also, if needed, print a line with information about the image. */ @@ -4057,6 +4192,8 @@ rrd_set_font_desc ( if (font){ strncpy(im->text_prop[prop].font, font, sizeof(text_prop[prop].font) - 1); im->text_prop[prop].font[sizeof(text_prop[prop].font) - 1] = '\0'; + /* if we already got one, drop it first */ + pango_font_description_free(im->text_prop[prop].font_desc); im->text_prop[prop].font_desc = pango_font_description_from_string( font ); }; if (size > 0){ @@ -4076,10 +4213,13 @@ void rrd_graph_init( static PangoFontMap *fontmap = NULL; PangoContext *context; + /* zero the whole structure first */ + memset(im,0,sizeof(image_desc_t)); + #ifdef HAVE_TZSET tzset(); #endif - + im->graph_type = GTYPE_TIME; im->base = 1000; im->daemon_addr = NULL; im->draw_x_grid = 1; @@ -4108,6 +4248,7 @@ void rrd_graph_init( im->maxval = DNAN; im->minval = 0; im->minval = DNAN; + im->magfact = 1; im->prt_c = 0; im->rigid = 0; im->rendered_image_size = 0; @@ -4150,6 +4291,7 @@ void rrd_graph_init( for (i = 0; i < DIM(text_prop); i++) { im->text_prop[i].size = -1; + im->text_prop[i].font_desc = NULL; rrd_set_font_desc(im,i, deffont ? deffont : text_prop[i].font,text_prop[i].size); } @@ -4164,6 +4306,7 @@ void rrd_graph_init( pango_cairo_update_context(im->cr,context); im->layout = pango_layout_new(context); + g_object_unref (context); // im->layout = pango_cairo_create_layout(im->cr); @@ -4255,6 +4398,8 @@ void rrd_graph_options( { "border", required_argument, 0, 1007}, { "grid-dash", required_argument, 0, 1008}, { "dynamic-labels", no_argument, 0, 1009}, + { "week-fmt", required_argument, 0, 1010}, + { "graph-type", required_argument, 0, 1011}, { 0, 0, 0, 0} }; /* *INDENT-ON* */ @@ -4440,6 +4585,10 @@ void rrd_graph_options( case 1009: /* enable dynamic labels */ im->dynamic_labels = 1; break; + case 1010: + strncpy(week_fmt,optarg,sizeof week_fmt); + week_fmt[(sizeof week_fmt)-1]='\0'; + break; case 1002: /* right y axis */ if(sscanf(optarg, @@ -4520,6 +4669,13 @@ void rrd_graph_options( return; } break; + case 1011: + if ((int) + (im->graph_type = type_conv(optarg)) == -1) { + rrd_set_error("unsupported graphics type '%s'", optarg); + return; + } + break; case 'z': im->lazy = 1; break; @@ -4690,11 +4846,6 @@ void rrd_graph_options( } } /* while (1) */ - { /* try to connect to rrdcached */ - int status = rrdc_connect(im->daemon_addr); - if (status != 0) return; - } - pango_cairo_context_set_font_options(pango_layout_get_context(im->layout), im->font_options); pango_layout_context_changed(im->layout); @@ -4897,6 +5048,7 @@ int vdef_parse( gdes->vf.param = param; gdes->vf.val = DNAN; /* undefined */ gdes->vf.when = 0; /* undefined */ + gdes->vf.never = 1; } else { rrd_set_error ("Parameter '%f' out of range in VDEF '%s'\n", @@ -4918,6 +5070,7 @@ int vdef_parse( gdes->vf.param = DNAN; gdes->vf.val = DNAN; gdes->vf.when = 0; + gdes->vf.never = 1; } else { rrd_set_error ("Function '%s' needs no parameter in VDEF '%s'\n", @@ -4963,6 +5116,7 @@ int vdef_calc( field = round((dst->vf.param * (double)(steps - 1)) / 100.0); dst->vf.val = array[field]; dst->vf.when = 0; /* no time component */ + dst->vf.never = 1; free(array); #if 0 for (step = 0; step < steps; step++) @@ -4996,6 +5150,7 @@ int vdef_calc( field = round( dst->vf.param * (double)(nancount - 1) / 100.0); dst->vf.val = array[field]; dst->vf.when = 0; /* no time component */ + dst->vf.never = 1; free(array); } break; @@ -5006,15 +5161,18 @@ int vdef_calc( if (step == steps) { dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } else { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + (step + 1) * src->step; + dst->vf.never = 0; } while (step != steps) { if (finite(data[step * src->ds_cnt])) { if (data[step * src->ds_cnt] > dst->vf.val) { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + (step + 1) * src->step; + dst->vf.never = 0; } } step++; @@ -5037,9 +5195,11 @@ int vdef_calc( if (dst->vf.op == VDEF_TOTAL) { dst->vf.val = sum * src->step; dst->vf.when = 0; /* no time component */ + dst->vf.never = 1; } else if (dst->vf.op == VDEF_AVERAGE) { dst->vf.val = sum / cnt; dst->vf.when = 0; /* no time component */ + dst->vf.never = 1; } else { average = sum / cnt; sum = 0.0; @@ -5050,10 +5210,12 @@ int vdef_calc( } dst->vf.val = pow(sum / cnt, 0.5); dst->vf.when = 0; /* no time component */ + dst->vf.never = 1; }; } else { dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } } break; @@ -5064,15 +5226,18 @@ int vdef_calc( if (step == steps) { dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } else { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + (step + 1) * src->step; + dst->vf.never = 0; } while (step != steps) { if (finite(data[step * src->ds_cnt])) { if (data[step * src->ds_cnt] < dst->vf.val) { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + (step + 1) * src->step; + dst->vf.never = 0; } } step++; @@ -5089,9 +5254,11 @@ int vdef_calc( if (step == steps) { /* all entries were NaN */ dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } else { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + step * src->step; + dst->vf.never = 0; } break; case VDEF_LAST: @@ -5105,9 +5272,11 @@ int vdef_calc( if (step < 0) { /* all entries were NaN */ dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } else { dst->vf.val = data[step * src->ds_cnt]; dst->vf.when = src->start + (step + 1) * src->step; + dst->vf.never = 0; } break; case VDEF_LSLSLOPE: @@ -5145,16 +5314,20 @@ int vdef_calc( if (dst->vf.op == VDEF_LSLSLOPE) { dst->vf.val = slope; dst->vf.when = 0; + dst->vf.never = 1; } else if (dst->vf.op == VDEF_LSLINT) { dst->vf.val = y_intercept; dst->vf.when = 0; + dst->vf.never = 1; } else if (dst->vf.op == VDEF_LSLCORREL) { dst->vf.val = correl; dst->vf.when = 0; + dst->vf.never = 1; }; } else { dst->vf.val = DNAN; dst->vf.when = 0; + dst->vf.never = 1; } } break; @@ -5203,3 +5376,156 @@ void grinfo_push( im->grinfo = im->grinfo_current; } } + + +void time_clean( + char *result, + char *format) +{ + int j, jj; + +/* Handling based on + - ANSI C99 Specifications http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1124.pdf + - Single UNIX Specification version 2 http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html + - POSIX:2001/Single UNIX Specification version 3 http://www.opengroup.org/onlinepubs/009695399/functions/strftime.html + - POSIX:2008 Specifications http://www.opengroup.org/onlinepubs/9699919799/functions/strftime.html + Specifications tells + "If a conversion specifier is not one of the above, the behavior is undefined." + + C99 tells + "A conversion specifier consists of a % character, possibly followed by an E or O modifier character (described below), followed by a character that determines the behavior of the conversion specifier. + + POSIX:2001 tells + "A conversion specification consists of a '%' character, possibly followed by an E or O modifier, and a terminating conversion specifier character that determines the conversion specification's behavior." + + POSIX:2008 introduce more complexe behavior that are not handled here. + + According to this, this code will replace: + - % followed by @ by a %@ + - % followed by by a %SPACE + - % followed by . by a %. + - % followed by % by a % + - % followed by t by a TAB + - % followed by E then anything by '-' + - % followed by O then anything by '-' + - % followed by anything else by at least one '-'. More characters may be added to better fit expected output length +*/ + + jj = 0; + for(j = 0; (j < FMT_LEG_LEN - 1) && (jj < FMT_LEG_LEN); j++) { /* we don't need to parse the last char */ + if (format[j] == '%') { + if ((format[j+1] == 'E') || (format[j+1] == 'O')) { + result[jj++] = '-'; + j+=2; /* We skip next 2 following char */ + } else if ((format[j+1] == 'C') || (format[j+1] == 'd') || + (format[j+1] == 'g') || (format[j+1] == 'H') || + (format[j+1] == 'I') || (format[j+1] == 'm') || + (format[j+1] == 'M') || (format[j+1] == 'S') || + (format[j+1] == 'U') || (format[j+1] == 'V') || + (format[j+1] == 'W') || (format[j+1] == 'y')) { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN) { + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'j') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if ((format[j+1] == 'G') || (format[j+1] == 'Y')) { + /* Assuming Year on 4 digit */ + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 2) { + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'R') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 3) { + result[jj++] = '-'; + result[jj++] = ':'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'T') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 6) { + result[jj++] = '-'; + result[jj++] = ':'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = ':'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'F') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 8) { + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'D') { + result[jj++] = '-'; + if (jj < FMT_LEG_LEN - 6) { + result[jj++] = '-'; + result[jj++] = '/'; + result[jj++] = '-'; + result[jj++] = '-'; + result[jj++] = '/'; + result[jj++] = '-'; + result[jj++] = '-'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == 'n') { + result[jj++] = '\r'; + result[jj++] = '\n'; + j++; /* We skip the following char */ + } else if (format[j+1] == 't') { + result[jj++] = '\t'; + j++; /* We skip the following char */ + } else if (format[j+1] == '%') { + result[jj++] = '%'; + j++; /* We skip the following char */ + } else if (format[j+1] == ' ') { + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '%'; + result[jj++] = ' '; + } + j++; /* We skip the following char */ + } else if (format[j+1] == '.') { + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '%'; + result[jj++] = '.'; + } + j++; /* We skip the following char */ + } else if (format[j+1] == '@') { + if (jj < FMT_LEG_LEN - 1) { + result[jj++] = '%'; + result[jj++] = '@'; + } + j++; /* We skip the following char */ + } else { + result[jj++] = '-'; + j++; /* We skip the following char */ + } + } else { + result[jj++] = format[j]; + } + } + result[jj] = '\0'; /* We must force the end of the string */ +}