New average implementation

src/stats.c

@@ -124,9 +124,9 @@ size_t pyfcgi_stats_format()
 int pyfcgi_stats_avg(const int data[PYFCGI_STATS_SZ], int *idx_nxt, int *last,
 	double avgs[4])
 {
-	double r15, r10, r5, r1, rtmp;
+	double r15, r10, r5, r1, rtmp, dmax;
 	unsigned long stmp; // stores a 60s req sum
-	int i, cur, idx, first;
+	int i, cur, idx, first, idiv;
 	int uptime, max;
 
 	uptime = time(NULL) - PyFCGI_conf.context.uptime;
@@ -154,21 +154,22 @@ int pyfcgi_stats_avg(const int data[PYFCGI_STATS_SZ], int *idx_nxt, int *last,
 			i++;
 			continue;
 		}
-		rtmp = (long double)stmp / ((max < 60)?max:60);
-		if(i==60) { r1 = rtmp; }
-		if(i<5*60) { r5 += rtmp; }
-		if(i<10*60) { r10 += rtmp; }
-		if(i<15*60) { r15 += rtmp; }
+		rtmp = (long double)stmp / ((i%60)?i%60:60);
+		if(i<=60) { r1 = rtmp; }
+		else if(i%60) { rtmp = (double)rtmp / (60.0 / (i%60)); }
+		if(i<=5*60) { r5 += rtmp; }
+		if(i<=10*60) { r10 += rtmp; }
+		if(i<=15*60) { r15 += rtmp; }
 		stmp = cur;
 		i++;
 	}while(i<max);
 	//Restore interrupt/ALARM ??
 	*last = data[*idx_nxt-1];
-	rtmp = max?rtmp:((double)*last);
-	r1 = (uptime <= 60)?rtmp:r1;
-	r5 /= 5;
-	r10 /= 10;
-	r15 /= 15;
+
+	dmax = (max<=60)?1:(double)max/60;
+	r5 /= (max >= 300)?5:dmax;
+	r10 /= (max >= 600)?10:dmax;
+	r15 /= (max >= 900)?15:dmax;
 	avgs[0] = r1;
 	avgs[1] = r5;
 	avgs[2] = r10;