X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_rpncalc.c;h=01c21f9cbb0a37e5e659c3d031735ab3359d61d0;hb=aa4d951ab71eb7fe57840c3baaddf36809806aef;hp=52d7a11897f2153262ee6fde4ca13b7375616d7a;hpb=2412c8211fbd8e6cb077a0785ab335416a7090fa;p=rrdtool.git diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c index 52d7a11..01c21f9 100644 --- a/src/rrd_rpncalc.c +++ b/src/rrd_rpncalc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.0.28 Copyright Tobias Oetiker, 1997 - 2002 + * RRDtool 1.2.10 Copyright by Tobi Oetiker, 1997-2005 **************************************************************************** * rrd_rpncalc.c RPN calculator functions ****************************************************************************/ @@ -97,7 +97,7 @@ void rpn_compact2str(rpn_cdefds_t *rpnc,ds_def_t *ds_def,char **str) if (rpnc[i].op == OP_NUMBER) { /* convert a short into a string */ -#ifdef WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) _itoa(rpnc[i].val,buffer,10); #else sprintf(buffer,"%d",rpnc[i].val); @@ -153,8 +153,14 @@ void rpn_compact2str(rpn_cdefds_t *rpnc,ds_def_t *ds_def,char **str) add_op(OP_NOW,NOW) add_op(OP_LTIME,LTIME) add_op(OP_TIME,TIME) + add_op(OP_ATAN2,ATAN2) add_op(OP_ATAN,ATAN) - + add_op(OP_SQRT,SQRT) + add_op(OP_SORT,SORT) + add_op(OP_REV,REV) + add_op(OP_TREND,TREND) + add_op(OP_RAD2DEG,RAD2DEG) + add_op(OP_DEG2RAD,DEG2RAD) #undef add_op } (*str)[offset] = '\0'; @@ -300,6 +306,7 @@ rpn_parse(void *key_hash,char *expr,long (*lookup)(void *,char*)){ match_op(OP_DUP,DUP) match_op(OP_EXC,EXC) match_op(OP_POP,POP) + match_op(OP_LTIME,LTIME) match_op(OP_LT,LT) match_op(OP_LE,LE) match_op(OP_GT,GT) @@ -315,15 +322,20 @@ rpn_parse(void *key_hash,char *expr,long (*lookup)(void *,char*)){ match_op(OP_NEGINF,NEGINF) match_op(OP_NE,NE) match_op(OP_COUNT,COUNT) - match_op_param(OP_PREV_OTHER,PREV) + match_op_param(OP_PREV_OTHER,PREV) match_op(OP_PREV,PREV) match_op(OP_INF,INF) match_op(OP_ISINF,ISINF) match_op(OP_NOW,NOW) - match_op(OP_LTIME,LTIME) match_op(OP_TIME,TIME) + match_op(OP_ATAN2,ATAN2) match_op(OP_ATAN,ATAN) - + match_op(OP_SQRT,SQRT) + match_op(OP_SORT,SORT) + match_op(OP_REV,REV) + match_op(OP_TREND,TREND) + match_op(OP_RAD2DEG,RAD2DEG) + match_op(OP_DEG2RAD,DEG2RAD) #undef match_op @@ -367,6 +379,14 @@ rpnstack_free(rpnstack_t *rpnstack) rpnstack -> dc_stacksize = 0; } +static int +rpn_compare_double(const void *x, const void *y) +{ + double diff = *((const double *)x) - *((const double *)y); + + return (diff < 0) ? -1 : (diff > 0) ? 1 : 0; +} + /* rpn_calc: run the RPN calculator; also performs variable substitution; * moved and modified from data_calc() originally included in rrd_graph.c * arguments: @@ -414,7 +434,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; @@ -425,7 +446,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; } @@ -440,15 +470,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: @@ -507,6 +530,21 @@ rpn_calc(rpnp_t *rpnp, rpnstack_t *rpnstack, long data_idx, stackunderflow(0); rpnstack -> s[stptr] = atan(rpnstack -> s[stptr]); break; + case OP_RAD2DEG: + stackunderflow(0); + rpnstack -> s[stptr] = 57.29577951 * rpnstack -> s[stptr]; + break; + case OP_DEG2RAD: + stackunderflow(0); + rpnstack -> s[stptr] = 0.0174532952 * rpnstack -> s[stptr]; + break; + case OP_ATAN2: + stackunderflow(1); + rpnstack -> s[stptr-1]= atan2( + rpnstack -> s[stptr-1], + rpnstack -> s[stptr]); + stptr--; + break; case OP_COS: stackunderflow(0); rpnstack -> s[stptr] = cos(rpnstack -> s[stptr]); @@ -660,6 +698,61 @@ rpn_calc(rpnp_t *rpnp, rpnstack_t *rpnstack, long data_idx, stackunderflow(0); rpnstack->s[stptr] = isinf(rpnstack->s[stptr]) ? 1.0 : 0.0; break; + case OP_SQRT: + stackunderflow(0); + rpnstack -> s[stptr] = sqrt(rpnstack -> s[stptr]); + break; + case OP_SORT: + stackunderflow(0); + { + int spn = (int)rpnstack -> s[stptr--]; + + stackunderflow(spn-1); + qsort(rpnstack -> s + stptr-spn+1, spn, sizeof(double), + rpn_compare_double); + } + break; + case OP_REV: + stackunderflow(0); + { + int spn = (int)rpnstack -> s[stptr--]; + double *p, *q; + + stackunderflow(spn-1); + + p = rpnstack -> s + stptr-spn+1; + q = rpnstack -> s + stptr; + while (p < q) { + double x = *q; + + *q-- = *p; + *p++ = x; + } + } + break; + case OP_TREND: + stackunderflow(1); + if ((rpi < 2) || (rpnp[rpi-2].op != OP_VARIABLE)) { + rrd_set_error("malformed trend arguments"); + return -1; + } else { + time_t dur = (time_t)rpnstack -> s[stptr]; + time_t step = (time_t)rpnp[rpi-2].step; + + if (output_idx > (int)ceil((float)dur / (float)step)) { + double accum = 0.0; + int i = 0; + + do { + accum += rpnp[rpi-2].data[rpnp[rpi-2].ds_cnt * i--]; + dur -= step; + } while (dur > 0); + + rpnstack -> s[--stptr] = (accum / -i); + } else + rpnstack -> s[--stptr] = DNAN; + } + break; case OP_END: break; }