X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_rpncalc.c;h=3cd582b66824cc8fd4dc17e353ab1fb2941d15d1;hp=75c24cfa49799873f7f08dc5198ef061d488e95e;hb=fcbf2878a231442f4b62ee95fca39e28f04fc8d2;hpb=0209ff81818995fcd2e2b7080c0ca504fa14d949

diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
index 75c24cf..3cd582b 100644
--- a/src/rrd_rpncalc.c
+++ b/src/rrd_rpncalc.c
@@ -157,7 +157,7 @@ void rpn_compact2str(rpn_cdefds_t *rpnc,ds_def_t *ds_def,char **str)
 	  add_op(OP_SQRT,SQRT)
 	  add_op(OP_SORT,SORT)
 	  add_op(OP_REV,REV)
-
+	  add_op(OP_TREND,TREND)
 #undef add_op
               }
     (*str)[offset] = '\0';
@@ -319,7 +319,7 @@ 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)
@@ -329,6 +329,7 @@ rpn_parse(void *key_hash,char *expr,long (*lookup)(void *,char*)){
 	match_op(OP_SQRT,SQRT)
 	match_op(OP_SORT,SORT)
 	match_op(OP_REV,REV)
+	match_op(OP_TREND,TREND)
 #undef match_op
 
 
@@ -705,6 +706,29 @@ rpn_calc(rpnp_t *rpnp, rpnstack_t *rpnstack, long data_idx,
 		    }
 		}
 		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;
        }