X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_rpncalc.c;h=73bef2f5a8bd936d668ef718d2c0c9ad9e708b95;hp=7a7a1242f9ede657e63133643f9e00873319f00a;hb=bac209eb1d120c27acc1ede8fa7dfef81f3eaaf1;hpb=285da1fa16e80919db972b1d7021c0b4705bedb1

diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
index 7a7a124..73bef2f 100644
--- a/src/rrd_rpncalc.c
+++ b/src/rrd_rpncalc.c
@@ -1,11 +1,12 @@
 /****************************************************************************
- * RRDtool 1.0.28  Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.2rc3  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd_rpncalc.c  RPN calculator functions
  ****************************************************************************/
 
 #include "rrd_tool.h"
 #include "rrd_rpncalc.h"
+#include "rrd_graph.h"
 #include <limits.h>
 
 short addop2str(enum op_en op, enum op_en op_type, char *op_str, 
@@ -40,7 +41,8 @@ short rpn_compact(rpnp_t *rpnp, rpn_cdefds_t **rpnc, short *count)
                 return -1;
             }
             (*rpnc)[i].val = (short) temp;
-        } else if (rpnp[i].op == OP_VARIABLE) {
+	  } else if (rpnp[i].op == OP_VARIABLE ||
+				 rpnp[i].op == OP_PREV_OTHER) {
             (*rpnc)[i].val = (short) rpnp[i].ptr;
         }
     }
@@ -63,7 +65,8 @@ rpnp_t * rpn_expand(rpn_cdefds_t *rpnc)
         rpnp[i].op = (long) rpnc[i].op;
         if (rpnp[i].op == OP_NUMBER) {
             rpnp[i].val = (double) rpnc[i].val;
-        } else if (rpnp[i].op == OP_VARIABLE) {
+	  } else if (rpnp[i].op == OP_VARIABLE ||
+				 rpnp[i].op == OP_PREV_OTHER) {
             rpnp[i].ptr = (long) rpnc[i].val;
         }
     }
@@ -94,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);
@@ -106,6 +109,12 @@ void rpn_compact2str(rpn_cdefds_t *rpnc,ds_def_t *ds_def,char **str)
             char *ds_name = ds_def[rpnc[i].val].ds_nam;
             add_op(OP_VARIABLE, ds_name)
                 }
+
+	  if (rpnc[i].op == OP_PREV_OTHER) {
+		char *ds_name = ds_def[rpnc[i].val].ds_nam;
+		add_op(OP_VARIABLE, ds_name)
+	  }
+
 #undef add_op
         
 #define add_op(VV,VVV) \
@@ -137,12 +146,18 @@ void rpn_compact2str(rpn_cdefds_t *rpnc,ds_def_t *ds_def,char **str)
 	  add_op(OP_UNKN,UNKN)
 	  add_op(OP_UN,UN)
 	  add_op(OP_NEGINF,NEGINF)
+	  add_op(OP_NE,NE)
 	  add_op(OP_PREV,PREV)
 	  add_op(OP_INF,INF)
+	  add_op(OP_ISINF,ISINF)
 	  add_op(OP_NOW,NOW)
 	  add_op(OP_LTIME,LTIME)
 	  add_op(OP_TIME,TIME)
-
+	  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)
 #undef add_op
               }
     (*str)[offset] = '\0';
@@ -185,10 +200,10 @@ void parseCDEF_DS(char *def,rrd_t *rrd, int ds_idx)
      * occur too often. */
     for (i = 0; rpnp[i].op != OP_END; i++) {
         if (rpnp[i].op == OP_TIME || rpnp[i].op == OP_LTIME || 
-            rpnp[i].op == OP_PREV)
+            rpnp[i].op == OP_PREV || rpnp[i].op == OP_COUNT)
         {
             rrd_set_error(
-                "operators time, ltime and prev not supported with DS COMPUTE");
+                "operators time, ltime, prev and count not supported with DS COMPUTE");
             free(rpnp);
             return;
         }
@@ -211,7 +226,7 @@ void parseCDEF_DS(char *def,rrd_t *rrd, int ds_idx)
  */
 long lookup_DS(void *rrd_vptr,char *ds_name)
 {
-    int i;
+    unsigned int i;
     rrd_t *rrd; 
     
     rrd = (rrd_t *) rrd_vptr;
@@ -259,6 +274,21 @@ rpn_parse(void *key_hash,char *expr,long (*lookup)(void *,char*)){
 	    expr+=strlen(#VVV); \
 	}
 
+
+#define match_op_param(VV,VVV) \
+        else if (sscanf(expr, #VVV "(" DEF_NAM_FMT ")",vname) == 1) { \
+          int length = 0; \
+          if ((length = strlen(#VVV)+strlen(vname)+2, \
+              expr[length] == ',' || expr[length] == '\0') ) { \
+             rpnp[steps].op = VV; \
+             rpnp[steps].ptr = (*lookup)(key_hash,vname); \
+             if (rpnp[steps].ptr < 0) { \
+			   free(rpnp); \
+			   return NULL; \
+			 } else expr+=length; \
+          } \
+        }
+
 	match_op(OP_ADD,+)
 	match_op(OP_SUB,-)
 	match_op(OP_MUL,*)
@@ -273,6 +303,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)
@@ -286,16 +317,23 @@ rpn_parse(void *key_hash,char *expr,long (*lookup)(void *,char*)){
 	match_op(OP_UNKN,UNKN)
 	match_op(OP_UN,UN)
 	match_op(OP_NEGINF,NEGINF)
+	match_op(OP_NE,NE)
+	match_op(OP_COUNT,COUNT)
+	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_ATAN,ATAN)
+	match_op(OP_SQRT,SQRT)
+	match_op(OP_SORT,SORT)
+	match_op(OP_REV,REV)
+	match_op(OP_TREND,TREND)
 #undef match_op
 
 
-            else if ((sscanf(expr,"%29[_A-Za-z0-9]%n",
+            else if ((sscanf(expr, DEF_NAM_FMT "%n",
                              vname,&pos) == 1) 
                      && ((rpnp[steps].ptr = (*lookup)(key_hash,vname)) != -1)){
                 rpnp[steps].op = OP_VARIABLE;
@@ -335,6 +373,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:
@@ -370,6 +416,13 @@ rpn_calc(rpnp_t *rpnp, rpnstack_t *rpnstack, long data_idx,
 		return -1;
 	    }
 	}
+
+#define stackunderflow(MINSIZE)				\
+	if(stptr<MINSIZE){				\
+	    rrd_set_error("RPN stack underflow");	\
+	    return -1;					\
+	}
+
 	switch (rpnp[rpi].op){
 	    case OP_NUMBER:
 		rpnstack -> s[++stptr] = rpnp[rpi].val;
@@ -386,276 +439,300 @@ 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 (data_idx % rpnp[rpi].step == 0){
 			rpnp[rpi].data += rpnp[rpi].ds_cnt;
 		    }
-		    rpnstack -> s[++stptr] =  *(rpnp[rpi].data);
 		}
 		break;
+	    case OP_COUNT:
+	    	rpnstack -> s[++stptr] = (output_idx+1); /* Note: Counter starts at 1 */
+	    	break;
 	    case OP_PREV:
-		if ((output_idx-1) <= 0) {
+		if ((output_idx) <= 0) {
 		    rpnstack -> s[++stptr] = DNAN;
 		} else {
 		    rpnstack -> s[++stptr] = output[output_idx-1];
 		}
 		break;
-       case OP_UNKN:
-           rpnstack -> s[++stptr] = DNAN; 
-           break;
-       case OP_INF:
-           rpnstack -> s[++stptr] = DINF; 
-           break;
-       case OP_NEGINF:
-           rpnstack -> s[++stptr] = -DINF; 
-           break;
-       case OP_NOW:
-           rpnstack -> s[++stptr] = (double)time(NULL);
-           break;
-       case OP_TIME:
-           /* HACK: this relies on the data_idx being the time,
-            * which the within-function scope is unaware of */
-           rpnstack -> s[++stptr] = (double) data_idx;
-           break;
-       case OP_LTIME:
-           rpnstack -> s[++stptr] = (double) tzoffset(data_idx) + (double)data_idx;
-           break;
-       case OP_ADD:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] 
-               + rpnstack -> s[stptr];
-           stptr--;
-           break;
-       case OP_SUB:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] - rpnstack -> s[stptr];
-           stptr--;
-           break;
-       case OP_MUL:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr-1] = (rpnstack -> s[stptr-1]) * (rpnstack -> s[stptr]);
-           stptr--;
-           break;
-       case OP_DIV:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] / rpnstack -> s[stptr];
-           stptr--;
-           break;
-       case OP_MOD:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr-1] = fmod(rpnstack -> s[stptr-1],rpnstack -> s[stptr]);
-           stptr--;
-           break;
-       case OP_SIN:
-           if(stptr<0){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr] = sin(rpnstack -> s[stptr]);
-           break;
-       case OP_COS:
-           if(stptr<0){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr] = cos(rpnstack -> s[stptr]);
-           break;
-       case OP_CEIL:
-           if(stptr<0){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr] = ceil(rpnstack -> s[stptr]);
-           break;
-       case OP_FLOOR:
-           if(stptr<0){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr] = floor(rpnstack -> s[stptr]);
-           break;
-       case OP_LOG:
-           if(stptr<0){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr] = log(rpnstack -> s[stptr]);
-           break;
-       case OP_DUP:
-           if(stptr<0){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr+1] = rpnstack -> s[stptr];
-           stptr++;
-           break;
-       case OP_POP:
-           if(stptr<0){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           stptr--;
-           break;
-       case OP_EXC:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           } else {
-               double dummy;
-               dummy = rpnstack -> s[stptr] ;
-               rpnstack -> s[stptr] = rpnstack -> s[stptr-1];
-               rpnstack -> s[stptr-1] = dummy;
-           }
-           break;
-       case OP_EXP:
-           if(stptr<0){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack -> s[stptr] = exp(rpnstack -> s[stptr]);
-           break;
-       case OP_LT:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           if (isnan(rpnstack -> s[stptr-1])) 
-               ;
-           else if (isnan(rpnstack -> s[stptr]))
-               rpnstack -> s[stptr-1] = rpnstack -> s[stptr];
-           else
-               rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] < rpnstack -> s[stptr] ? 1.0 : 0.0;
-           stptr--;
-           break;
-       case OP_LE:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           if (isnan(rpnstack -> s[stptr-1])) 
-               ;
-           else if (isnan(rpnstack -> s[stptr]))
-               rpnstack -> s[stptr-1] = rpnstack -> s[stptr];
-           else
-               rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] <= rpnstack -> s[stptr] ? 1.0 : 0.0;
-           stptr--;
-           break;
-       case OP_GT:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           if (isnan(rpnstack -> s[stptr-1])) 
-               ;
-           else if (isnan(rpnstack -> s[stptr]))
-               rpnstack -> s[stptr-1] = rpnstack -> s[stptr];
-           else
-               rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] > rpnstack -> s[stptr] ? 1.0 : 0.0;
-           stptr--;
-           break;
-       case OP_GE:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           if (isnan(rpnstack -> s[stptr-1])) 
-               ;
-           else if (isnan(rpnstack -> s[stptr]))
-               rpnstack -> s[stptr-1] = rpnstack -> s[stptr];
-           else
-               rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] >= rpnstack -> s[stptr] ? 1.0 : 0.0;
-           stptr--;
-           break;
-       case OP_EQ:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           if (isnan(rpnstack -> s[stptr-1])) 
-               ;
-           else if (isnan(rpnstack -> s[stptr]))
-               rpnstack -> s[stptr-1] = rpnstack -> s[stptr];
-           else
-               rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] == rpnstack -> s[stptr] ? 1.0 : 0.0;
-           stptr--;
-           break;
-       case OP_IF:
-           if(stptr<2){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack->s[stptr-2] = rpnstack->s[stptr-2] != 0.0 ? rpnstack->s[stptr-1] : rpnstack->s[stptr];
-           stptr--;
-           stptr--;
-           break;
-       case OP_MIN:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           if (isnan(rpnstack->s[stptr-1])) 
-               ;
-           else if (isnan(rpnstack->s[stptr]))
-               rpnstack->s[stptr-1] = rpnstack->s[stptr];
-           else if (rpnstack->s[stptr-1] > rpnstack->s[stptr])
-               rpnstack->s[stptr-1] = rpnstack->s[stptr];
-           stptr--;
-           break;
-       case OP_MAX:
-           if(stptr<1){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           if (isnan(rpnstack->s[stptr-1])) 
-               ;
-           else if (isnan(rpnstack->s[stptr]))
-               rpnstack->s[stptr-1] = rpnstack->s[stptr];
-           else if (rpnstack->s[stptr-1] < rpnstack->s[stptr])
-               rpnstack->s[stptr-1] = rpnstack->s[stptr];
-           stptr--;
-           break;
-       case OP_LIMIT:
-           if(stptr<2){
-               rrd_set_error("RPN stack underflow");
-               free(rpnstack->s);
-               return -1;
-           }
-           if (isnan(rpnstack->s[stptr-2])) 
+	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:
+		rpnstack -> s[++stptr] = DNAN; 
+		break;
+	    case OP_INF:
+		rpnstack -> s[++stptr] = DINF; 
+		break;
+	    case OP_NEGINF:
+		rpnstack -> s[++stptr] = -DINF; 
+		break;
+	    case OP_NOW:
+		rpnstack -> s[++stptr] = (double)time(NULL);
+		break;
+	    case OP_TIME:
+		/* HACK: this relies on the data_idx being the time,
+		** which the within-function scope is unaware of */
+		rpnstack -> s[++stptr] = (double) data_idx;
+		break;
+	    case OP_LTIME:
+		rpnstack -> s[++stptr] =
+			(double) tzoffset(data_idx) + (double)data_idx;
+		break;
+	    case OP_ADD:
+		stackunderflow(1);
+		rpnstack -> s[stptr-1]	= rpnstack -> s[stptr-1] 
+					+ rpnstack -> s[stptr];
+		stptr--;
+		break;
+	    case OP_SUB:
+		stackunderflow(1);
+		rpnstack -> s[stptr-1]	= rpnstack -> s[stptr-1]
+					- rpnstack -> s[stptr];
+		stptr--;
+		break;
+	    case OP_MUL:
+		stackunderflow(1);
+		rpnstack -> s[stptr-1]	= (rpnstack -> s[stptr-1])
+					* (rpnstack -> s[stptr]);
+		stptr--;
+		break;
+	    case OP_DIV:
+		stackunderflow(1);
+		rpnstack -> s[stptr-1]	= rpnstack -> s[stptr-1]
+					/ rpnstack -> s[stptr];
+		stptr--;
+		break;
+	    case OP_MOD:
+		stackunderflow(1);
+		rpnstack -> s[stptr-1]= fmod(	rpnstack -> s[stptr-1]
+						,rpnstack -> s[stptr]);
+		stptr--;
+		break;
+	    case OP_SIN:
+		stackunderflow(0);
+		rpnstack -> s[stptr] = sin(rpnstack -> s[stptr]);
+		break;
+	    case OP_ATAN:
+		stackunderflow(0);
+		rpnstack -> s[stptr] = atan(rpnstack -> s[stptr]);
+		break;
+	    case OP_COS:
+		stackunderflow(0);
+		rpnstack -> s[stptr] = cos(rpnstack -> s[stptr]);
+		break;
+	    case OP_CEIL:
+		stackunderflow(0);
+		rpnstack -> s[stptr] = ceil(rpnstack -> s[stptr]);
+		break;
+	    case OP_FLOOR:
+		stackunderflow(0);
+		rpnstack -> s[stptr] = floor(rpnstack -> s[stptr]);
+		break;
+	    case OP_LOG:
+		stackunderflow(0);
+		rpnstack -> s[stptr] = log(rpnstack -> s[stptr]);
+		break;
+	    case OP_DUP:
+		stackunderflow(0);
+		rpnstack -> s[stptr+1] = rpnstack -> s[stptr];
+		stptr++;
+		break;
+	    case OP_POP:
+		stackunderflow(0);
+		stptr--;
+		break;
+	    case OP_EXC:
+		stackunderflow(1);
+		{
+		    double dummy;
+		    dummy = rpnstack -> s[stptr] ;
+		    rpnstack -> s[stptr] = rpnstack -> s[stptr-1];
+		    rpnstack -> s[stptr-1] = dummy;
+		}
+		break;
+	    case OP_EXP:
+		stackunderflow(0);
+		rpnstack -> s[stptr] = exp(rpnstack -> s[stptr]);
+		break;
+	    case OP_LT:
+		stackunderflow(1);
+		if (isnan(rpnstack -> s[stptr-1])) 
+		    ;
+		else if (isnan(rpnstack -> s[stptr]))
+		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr];
+		else
+		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] <
+					rpnstack -> s[stptr] ? 1.0 : 0.0;
+		stptr--;
+		break;
+	    case OP_LE:
+		stackunderflow(1);
+		if (isnan(rpnstack -> s[stptr-1])) 
+		    ;
+		else if (isnan(rpnstack -> s[stptr]))
+		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr];
+		else
+		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] <=
+					rpnstack -> s[stptr] ? 1.0 : 0.0;
+		stptr--;
+		break;
+	    case OP_GT:
+		stackunderflow(1);
+		if (isnan(rpnstack -> s[stptr-1])) 
+		    ;
+		else if (isnan(rpnstack -> s[stptr]))
+		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr];
+		else
+		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] >
+					rpnstack -> s[stptr] ? 1.0 : 0.0;
+		stptr--;
+		break;
+	    case OP_GE:
+		stackunderflow(1);
+		if (isnan(rpnstack -> s[stptr-1])) 
+		    ;
+		else if (isnan(rpnstack -> s[stptr]))
+       		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr];
+		else
+		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] >=
+					rpnstack -> s[stptr] ? 1.0 : 0.0;
+		stptr--;
+		break;
+	    case OP_NE:
+		stackunderflow(1);
+		if (isnan(rpnstack -> s[stptr-1]))
+		    ;
+		else if (isnan(rpnstack -> s[stptr]))
+		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr];
+		else
+		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] ==
+					rpnstack -> s[stptr] ? 0.0 : 1.0;
+		stptr--;
+		break;
+	    case OP_EQ:
+		stackunderflow(1);
+		if (isnan(rpnstack -> s[stptr-1])) 
+		    ;
+		else if (isnan(rpnstack -> s[stptr]))
+		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr];
+		else
+		    rpnstack -> s[stptr-1] = rpnstack -> s[stptr-1] ==
+					rpnstack -> s[stptr] ? 1.0 : 0.0;
+		stptr--;
+		break;
+	    case OP_IF:
+		stackunderflow(2);
+		rpnstack->s[stptr-2] = rpnstack->s[stptr-2] != 0.0 ?
+				rpnstack->s[stptr-1] : rpnstack->s[stptr];
+		stptr--;
+		stptr--;
+		break;
+	    case OP_MIN:
+		stackunderflow(1);
+		if (isnan(rpnstack->s[stptr-1])) 
+		    ;
+		else if (isnan(rpnstack->s[stptr]))
+		    rpnstack->s[stptr-1] = rpnstack->s[stptr];
+		else if (rpnstack->s[stptr-1] > rpnstack->s[stptr])
+		    rpnstack->s[stptr-1] = rpnstack->s[stptr];
+		stptr--;
+		break;
+	    case OP_MAX:
+		stackunderflow(1);
+		if (isnan(rpnstack->s[stptr-1])) 
                ;
-           else if (isnan(rpnstack->s[stptr-1]))
-               rpnstack->s[stptr-2] = rpnstack->s[stptr-1];
-           else if (isnan(rpnstack->s[stptr]))
-               rpnstack->s[stptr-2] = rpnstack->s[stptr];
-           else if (rpnstack->s[stptr-2] < rpnstack->s[stptr-1])
-               rpnstack->s[stptr-2] = DNAN;
-           else if (rpnstack->s[stptr-2] > rpnstack->s[stptr])
-               rpnstack->s[stptr-2] = DNAN;
-           stptr-=2;
-           break;
-       case OP_UN:
-           if(stptr<0){
-               rrd_set_error("RPN stack underflow");
-               return -1;
-           }
-           rpnstack->s[stptr] = isnan(rpnstack->s[stptr]) ? 1.0 : 0.0;
-           break;
-       case OP_END:
-           break;
+		else if (isnan(rpnstack->s[stptr]))
+		    rpnstack->s[stptr-1] = rpnstack->s[stptr];
+		else if (rpnstack->s[stptr-1] < rpnstack->s[stptr])
+		    rpnstack->s[stptr-1] = rpnstack->s[stptr];
+		stptr--;
+		break;
+	    case OP_LIMIT:
+		stackunderflow(2);
+		if (isnan(rpnstack->s[stptr-2])) 
+		    ;
+		else if (isnan(rpnstack->s[stptr-1]))
+		    rpnstack->s[stptr-2] = rpnstack->s[stptr-1];
+		else if (isnan(rpnstack->s[stptr]))
+		    rpnstack->s[stptr-2] = rpnstack->s[stptr];
+		else if (rpnstack->s[stptr-2] < rpnstack->s[stptr-1])
+		    rpnstack->s[stptr-2] = DNAN;
+		else if (rpnstack->s[stptr-2] > rpnstack->s[stptr])
+		    rpnstack->s[stptr-2] = DNAN;
+		stptr-=2;
+       		break;
+	    case OP_UN:
+		stackunderflow(0);
+		rpnstack->s[stptr] = isnan(rpnstack->s[stptr]) ? 1.0 : 0.0;
+		break;
+	    case OP_ISINF:
+		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;
        }
+#undef stackunderflow
    }
    if(stptr!=0){
        rrd_set_error("RPN final stack size != 1");
@@ -672,20 +749,20 @@ int
 tzoffset( time_t now ){
     int gm_sec, gm_min, gm_hour, gm_yday, gm_year,
         l_sec, l_min, l_hour, l_yday, l_year;
-    struct tm *t;
+    struct tm t;
     int off;
-    t = gmtime(&now);
-    gm_sec = t->tm_sec;
-    gm_min = t->tm_min;
-    gm_hour = t->tm_hour;
-    gm_yday = t->tm_yday;
-    gm_year = t->tm_year;
-    t = localtime(&now);
-    l_sec = t->tm_sec;
-    l_min = t->tm_min;
-    l_hour = t->tm_hour;
-    l_yday = t->tm_yday;
-    l_year = t->tm_year;
+    gmtime_r(&now, &t);
+    gm_sec = t.tm_sec;
+    gm_min = t.tm_min;
+    gm_hour = t.tm_hour;
+    gm_yday = t.tm_yday;
+    gm_year = t.tm_year;
+    localtime_r(&now, &t);
+    l_sec = t.tm_sec;
+    l_min = t.tm_min;
+    l_hour = t.tm_hour;
+    l_yday = t.tm_yday;
+    l_year = t.tm_year;
     off = (l_sec-gm_sec)+(l_min-gm_min)*60+(l_hour-gm_hour)*3600; 
     if ( l_yday > gm_yday || l_year > gm_year){
         off += 24*3600;