X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=c6805450e68d0733b45d232a978dd37daeab1750;hb=096bb3f53482c95c3d2dd09e8c7b2329f6c1c2ff;hp=24b58d08bf48b9b8264789aa340aeb382a1c8bc9;hpb=f99f5a6e7ff6ba37adb08eb0c3c5af9371d3bc56;p=rrdtool.git diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 24b58d0..c680545 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.4.2 Copyright by Tobi Oetiker, 1997-2009 + * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010 **************************************************************************** * rrd__graph.c produce graphs from data in rrdfiles ****************************************************************************/ @@ -29,6 +29,10 @@ #include +#ifdef HAVE_LANGINFO_H +#include +#endif + #include "rrd_graph.h" #include "rrd_client.h" @@ -230,6 +234,7 @@ enum gf_en gf_conv( conv_if(VRULE, GF_VRULE); conv_if(LINE, GF_LINE); conv_if(AREA, GF_AREA); + conv_if(GRAD, GF_GRAD); conv_if(STACK, GF_STACK); conv_if(TICK, GF_TICK); conv_if(TEXTALIGN, GF_TEXTALIGN); @@ -841,46 +846,48 @@ 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); - } + 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; } - } /* 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; } im->gdes[i].data_first = 1; @@ -1212,8 +1219,11 @@ int data_proc( /* memory for the processed data */ for (i = 0; i < im->gdes_c; i++) { - if ((im->gdes[i].gf == GF_LINE) || - (im->gdes[i].gf == GF_AREA) || (im->gdes[i].gf == GF_TICK)) { + if ((im->gdes[i].gf == GF_LINE) + || (im->gdes[i].gf == GF_AREA) + || (im->gdes[i].gf == GF_TICK) + || (im->gdes[i].gf == GF_GRAD) + ) { if ((im->gdes[i].p_data = (rrd_value_t*)malloc((im->xsize + 1) * sizeof(rrd_value_t))) == NULL) { rrd_set_error("malloc data_proc"); @@ -1234,6 +1244,7 @@ int data_proc( switch (im->gdes[ii].gf) { case GF_LINE: case GF_AREA: + case GF_GRAD: case GF_TICK: if (!im->gdes[ii].stack) paintval = 0.0; @@ -1355,7 +1366,21 @@ int data_proc( return 0; } - +static int find_first_weekday(void){ + static int first_weekday = -1; + if (first_weekday == -1){ +#ifdef HAVE__NL_TIME_WEEK_1STDAY + /* according to http://sourceware.org/ml/libc-locales/2009-q1/msg00011.html */ + long week_1stday_l = (long) nl_langinfo (_NL_TIME_WEEK_1STDAY); + if (week_1stday_l == 19971130) first_weekday = 0; /* Sun */ + else if (week_1stday_l == 19971201) first_weekday = 1; /* Mon */ + else first_weekday = 1; /* we go for a monday default */ +#else + first_weekday = 1; +#endif + } + return first_weekday; +} /* identify the point where the first gridline, label ... gets placed */ @@ -1397,10 +1422,10 @@ time_t find_first_time( tm. tm_sec = 0; tm. tm_min = 0; tm. tm_hour = 0; - tm. tm_mday -= tm.tm_wday - 1; /* -1 because we want the monday */ + tm. tm_mday -= tm.tm_wday - find_first_weekday(); - if (tm.tm_wday == 0) - tm. tm_mday -= 7; /* we want the *previous* monday */ + if (tm.tm_wday == 0 && find_first_weekday() > 0) + tm. tm_mday -= 7; /* we want the *previous* week */ break; case TMT_MONTH: @@ -1613,6 +1638,7 @@ int print_calc( break; case GF_LINE: case GF_AREA: + case GF_GRAD: case GF_TICK: graphelement = 1; break; @@ -1730,6 +1756,7 @@ int leg_place( prt_fctn != 'r' && prt_fctn != 'j' && prt_fctn != 'c' && + prt_fctn != 'u' && prt_fctn != 's' && prt_fctn != '\0' && prt_fctn != 'g') { free(legspace); rrd_set_error @@ -1839,6 +1866,8 @@ int leg_place( leg_y += im->text_prop[TEXT_PROP_LEGEND].size * 1.8; if (prt_fctn == 's') leg_y -= im->text_prop[TEXT_PROP_LEGEND].size; + if (prt_fctn == 'u') + leg_y -= im->text_prop[TEXT_PROP_LEGEND].size *1.8; if(calc_width && (fill > legendwidth)){ legendwidth = fill; @@ -3403,6 +3432,7 @@ int graph_paint( break; case GF_LINE: case GF_AREA: + case GF_GRAD: /* fix data points at oo and -oo */ for (ii = 0; ii < im->xsize; ii++) { if (isinf(im->gdes[i].p_data[ii])) { @@ -3501,6 +3531,8 @@ int graph_paint( cairo_stroke(im->cr); cairo_restore(im->cr); } else { + double lastx=0; + double lasty=0; int idxI = -1; double *foreY = (double *) malloc(sizeof(double) * im->xsize * 2); @@ -3531,12 +3563,17 @@ int graph_paint( [cntI + 1], 4)) { cntI++; } - gfx_new_area(im, - backX[0], backY[0], - foreX[0], foreY[0], - foreX[cntI], - foreY[cntI], im->gdes[i].col); - while (cntI < idxI) { + if (im->gdes[i].gf != GF_GRAD) { + gfx_new_area(im, + backX[0], backY[0], + foreX[0], foreY[0], + foreX[cntI], + foreY[cntI], im->gdes[i].col); + } else { + lastx = foreX[cntI]; + lasty = foreY[cntI]; + } + while (cntI < idxI) { lastI = cntI; cntI++; while (cntI < idxI @@ -3552,9 +3589,32 @@ int graph_paint( + 1], 4)) { cntI++; } - gfx_add_point(im, foreX[cntI], foreY[cntI]); + if (im->gdes[i].gf != GF_GRAD) { + gfx_add_point(im, foreX[cntI], foreY[cntI]); + } else { + gfx_add_rect_fadey(im, + lastx, foreY[0], + foreX[cntI], foreY[cntI], lasty, + im->gdes[i].col, + im->gdes[i].col2, + im->gdes[i].gradheight + ); + lastx = foreX[cntI]; + lasty = foreY[cntI]; + } } - gfx_add_point(im, backX[idxI], backY[idxI]); + if (im->gdes[i].gf != GF_GRAD) { + gfx_add_point(im, backX[idxI], backY[idxI]); + } else { + gfx_add_rect_fadey(im, + lastx, foreY[0], + backX[idxI], backY[idxI], lasty, + im->gdes[i].col, + im->gdes[i].col2, + im->gdes[i].gradheight); + lastx = backX[idxI]; + lasty = backY[idxI]; + } while (idxI > 1) { lastI = idxI; idxI--; @@ -3571,11 +3631,23 @@ int graph_paint( - 1], 4)) { idxI--; } - gfx_add_point(im, backX[idxI], backY[idxI]); + if (im->gdes[i].gf != GF_GRAD) { + gfx_add_point(im, backX[idxI], backY[idxI]); + } else { + gfx_add_rect_fadey(im, + lastx, foreY[0], + backX[idxI], backY[idxI], lasty, + im->gdes[i].col, + im->gdes[i].col2, + im->gdes[i].gradheight); + lastx = backX[idxI]; + lasty = backY[idxI]; + } } idxI = -1; drawem = 0; - gfx_close_path(im); + if (im->gdes[i].gf != GF_GRAD) + gfx_close_path(im); } if (drawem != 0) { drawem = 0; @@ -3769,6 +3841,11 @@ int gdes_alloc( im->gdes[im->gdes_c - 1].col.green = 0.0; im->gdes[im->gdes_c - 1].col.blue = 0.0; im->gdes[im->gdes_c - 1].col.alpha = 0.0; + im->gdes[im->gdes_c - 1].col2.red = 0.0; + im->gdes[im->gdes_c - 1].col2.green = 0.0; + im->gdes[im->gdes_c - 1].col2.blue = 0.0; + im->gdes[im->gdes_c - 1].col2.alpha = 0.0; + im->gdes[im->gdes_c - 1].gradheight = 50.0; im->gdes[im->gdes_c - 1].legend[0] = '\0'; im->gdes[im->gdes_c - 1].format[0] = '\0'; im->gdes[im->gdes_c - 1].strftm = 0; @@ -3778,6 +3855,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; } @@ -4194,7 +4272,7 @@ void rrd_graph_options( int col_start, col_end; opt = getopt_long(argc, argv, - "Aa:B:b:c:Dd:Ee:Ff:G:gh:IiJjL:l:Nn:Bb:oPR:rS:s:T:t:u:v:W:w:X:x:Yy:z", + "Aa:B:b:c:Dd:Ee:Ff:G:gh:IiJjL:l:Mm:Nn:oPR:rS:s:T:t:u:v:W:w:X:x:Yy:z", long_options, &option_index); if (opt == EOF) break; @@ -4615,11 +4693,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);