Rollback average function

include/stats.h

@@ -93,6 +93,11 @@ int pyfcgi_stats_reqbuff(size_t);
  * @return 0 if no error else -1 and set errno to EINTR
  */
 int pyfcgi_stats_avg(const int[PYFCGI_STATS_SZ], int*, int*, double[4]);
+/**@brief Same than @ref pyfcgi_stats_avg but normalize average when
+ * uptime is bellow 900
+ * @see pyfcgi_stats_avg
+ */
+int pyfcgi_stats_avg_const(const int[PYFCGI_STATS_SZ], int*, int*, double[4]);
 
 /**@brief Returns the formated buffer
  * @todo make @ref pyfcgi_stats_format() implement this functionnality

src/stats.c

@@ -123,10 +123,57 @@ 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;
+	unsigned long stmp; // stores a 60s req sum
+	int i, cur, idx, first;
+
+	r15 = r10 = r5 = r1 = stmp = 0;
+	first = *idx_nxt;
+
+	//Block interrupt/ALARM ??
+	for(i=0; i<PYFCGI_STATS_SZ; i++)
+	{
+		if(first != *idx_nxt)
+		{
+			errno = EINTR;
+			return -1;
+		}
+		idx = (*idx_nxt- i - 1);
+		idx = (idx<0)?PYFCGI_STATS_SZ + idx:idx;
+		idx %= PYFCGI_STATS_SZ;
+		cur = data[idx];
+		if(!i || i%60)
+		{
+			stmp += cur;
+			continue;
+		}
+		rtmp = (long double)stmp / 60;
+		if(i==60) { r1 = rtmp; }
+		if(i<5*60) { r5 += rtmp; }
+		if(i<10*60) { r10 += rtmp; }
+		if(i<15*60) { r15 += rtmp; }
+		stmp = cur;
+	}
+	//Restore interrupt/ALARM ??
+	r5 /= 5;
+	r10 /= 10;
+	r15 /= 15;
+	*last = data[*idx_nxt-1];
+	avgs[0] = r1;
+	avgs[1] = r5;
+	avgs[2] = r10;
+	avgs[3] = r15;
+
+	return 0;
+}
+
+int pyfcgi_stats_avg_const(const int data[PYFCGI_STATS_SZ], int *idx_nxt, int *last,
+	double avgs[4])
 {
 	double r15, r10, r5, r1, rtmp, dmax;
 	unsigned long stmp; // stores a 60s req sum
-	int i, cur, idx, first, idiv;
+	int i, cur, idx, first;
 	int uptime, max;
 
 	uptime = time(NULL) - PyFCGI_conf.context.uptime;