Average function enhancement

src/stats.c

@@ -128,10 +128,17 @@ int pyfcgi_stats_avg(const int data[], int *idx_first, int len,
 	double r15, r10, r5, r1, rtmp;
 	unsigned long stmp; // stores a 60s req sum
 	int i, cur, idx, first;
+	int uptime, max;
+
+	uptime = time(NULL) - PyFCGI_conf.context.uptime;
+	max = (uptime > len) ? len:uptime;
+
 	r15 = r10 = r5 = r1 = stmp = 0;
 	first = *idx_first;
+
 	//Block interrupt/ALARM ??
-	for(i=0; i<len; i++)
+	i = 0;
+	do
 	{
 		if(first != *idx_first)
 		{
@@ -142,23 +149,27 @@ int pyfcgi_stats_avg(const int data[], int *idx_first, int len,
 		idx = (idx<0)?len + idx:idx;
 		idx %= len;
 		cur = data[idx];
-		if(!i || i%60)
+		if((!i || i%60) && i < max-1)
 		{
 			stmp += cur;
+			i++;
 			continue;
 		}
-		rtmp = (long double)stmp / 60;
+		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; }
 		stmp = cur;
-	}
+		i++;
+	}while(i<max);
 	//Restore interrupt/ALARM ??
+	*last = data[*idx_first-1];
+	rtmp = max?rtmp:((double)*last);
+	r1 = (uptime <= 60)?rtmp:r1;
 	r5 /= 5;
 	r10 /= 10;
 	r15 /= 15;
-	*last = data[*idx_first];
 	avgs[0] = r1;
 	avgs[1] = r5;
 	avgs[2] = r10;