From 6a44cbfd5498d9e489bca574feeafb968a5dc8a6 Mon Sep 17 00:00:00 2001 From: oetiker Date: Sat, 7 May 2005 10:34:48 +0000 Subject: [PATCH] fix handling of PREV(x) command git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@497 a5681a0c-68f1-0310-ab6d-d61299d08faa --- src/rrd_graph.c | 42 +++++++++++++++++++++++------------------- src/rrd_rpncalc.c | 25 ++++++++++++++----------- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/src/rrd_graph.c b/src/rrd_graph.c index cbf947d..b01bd3a 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -886,26 +886,29 @@ data_calc( image_desc_t *im){ * and the resulting number is the step size for the * resulting data source. */ - for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){ - if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE || - im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){ - long ptr = im->gdes[gdi].rpnp[rpi].ptr; - if (im->gdes[ptr].ds_cnt == 0) { + for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){ + if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE || + im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){ + long ptr = im->gdes[gdi].rpnp[rpi].ptr; + if (im->gdes[ptr].ds_cnt == 0) { /* this is a VDEF data source */ #if 0 - printf("DEBUG: inside CDEF '%s' processing VDEF '%s'\n", - im->gdes[gdi].vname, - im->gdes[ptr].vname); - printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val); + printf("DEBUG: inside CDEF '%s' processing VDEF '%s'\n", + im->gdes[gdi].vname, + im->gdes[ptr].vname); + printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val); #endif im->gdes[gdi].rpnp[rpi].val = im->gdes[ptr].vf.val; im->gdes[gdi].rpnp[rpi].op = OP_NUMBER; - } else { - if ((steparray = + } else { /* normal variables and PREF(variables) */ + + /* add one entry to the array that keeps track of the step sizes of the + * data sources going into the CDEF. */ + if ((steparray = rrd_realloc(steparray, (++stepcnt+1)*sizeof(*steparray)))==NULL){ - rrd_set_error("realloc steparray"); - rpnstack_free(&rpnstack); - return -1; + rrd_set_error("realloc steparray"); + rpnstack_free(&rpnstack); + return -1; }; steparray[stepcnt-1] = im->gdes[ptr].step; @@ -915,6 +918,7 @@ data_calc( image_desc_t *im){ * to the earliest endpoint of any of the * rras involved (ptr) */ + if(im->gdes[gdi].start < im->gdes[ptr].start) im->gdes[gdi].start = im->gdes[ptr].start; @@ -927,8 +931,8 @@ data_calc( image_desc_t *im){ * further save step size and data source * count of this rra */ - im->gdes[gdi].rpnp[rpi].data = im->gdes[ptr].data + im->gdes[ptr].ds; - im->gdes[gdi].rpnp[rpi].step = im->gdes[ptr].step; + im->gdes[gdi].rpnp[rpi].data = im->gdes[ptr].data + im->gdes[ptr].ds; + im->gdes[gdi].rpnp[rpi].step = im->gdes[ptr].step; im->gdes[gdi].rpnp[rpi].ds_cnt = im->gdes[ptr].ds_cnt; /* backoff the *.data ptr; this is done so @@ -941,9 +945,9 @@ data_calc( image_desc_t *im){ /* move the data pointers to the correct period */ for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){ - if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE || - im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){ - long ptr = im->gdes[gdi].rpnp[rpi].ptr; + if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE || + im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){ + long ptr = im->gdes[gdi].rpnp[rpi].ptr; long diff = im->gdes[gdi].start - im->gdes[ptr].start; if(diff > 0) diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c index 8639d39..e3784da 100644 --- a/src/rrd_rpncalc.c +++ b/src/rrd_rpncalc.c @@ -428,7 +428,8 @@ rpn_calc(rpnp_t *rpnp, rpnstack_t *rpnstack, long data_idx, rpnstack -> s[++stptr] = rpnp[rpi].val; break; case OP_VARIABLE: - /* Sanity check: VDEFs shouldn't make it here */ + case OP_PREV_OTHER: + /* Sanity check: VDEFs shouldn't make it here */ if (rpnp[rpi].ds_cnt == 0) { rrd_set_error("VDEF made it into rpn_calc... aborting"); return -1; @@ -439,7 +440,16 @@ rpn_calc(rpnp_t *rpnp, rpnstack_t *rpnstack, long data_idx, * row in the rra (skip over non-relevant * data sources) */ - rpnstack -> s[++stptr] = *(rpnp[rpi].data); + if (rpnp[rpi].op == OP_VARIABLE) { + rpnstack -> s[++stptr] = *(rpnp[rpi].data); + } else { + if ((output_idx) <= 0) { + rpnstack -> s[++stptr] = DNAN; + } else { + rpnstack -> s[++stptr] = *(rpnp[rpi].data-rpnp[rpi].ds_cnt); + } + + } if (data_idx % rpnp[rpi].step == 0){ rpnp[rpi].data += rpnp[rpi].ds_cnt; } @@ -454,15 +464,8 @@ rpn_calc(rpnp_t *rpnp, rpnstack_t *rpnstack, long data_idx, } else { rpnstack -> s[++stptr] = output[output_idx-1]; } - break; - case OP_PREV_OTHER: - if ((output_idx) <= 0) { - rpnstack -> s[++stptr] = DNAN; - } else { - rpnstack -> s[++stptr] = rpnp[rpnp[rpi].ptr].data[output_idx-1]; - } - break; - case OP_UNKN: + break; + case OP_UNKN: rpnstack -> s[++stptr] = DNAN; break; case OP_INF: -- 2.30.2