Removed useless argument to average calculation function

Defining a PYFCGI_STATS_SZ = 15 * 60s = 900

include/stats.h

@@ -28,7 +28,7 @@
 #include <signal.h>
 #include <string.h>
 
-#define PYFCGI_STATS_REQS_SAMPLES (900)
+#define PYFCGI_STATS_SZ (900)
 
 typedef struct pyfcgi_stats_s pyfcgi_stats_t;
 
@@ -38,7 +38,7 @@ typedef struct pyfcgi_stats_s pyfcgi_stats_t;
 struct pyfcgi_stats_s
 {
 	/**@brief Request per seconds on 15 minutes */
-	int reqs[PYFCGI_STATS_REQS_SAMPLES];
+	int reqs[PYFCGI_STATS_SZ];
 	/**@brief Current request index */
 	int cur_req;
 
@@ -83,7 +83,16 @@ void pyfcgi_stats_buffprintf(const char *fmt, ...);
  */
 int pyfcgi_stats_reqbuff(size_t);
 
-int pyfcgi_stats_avg(const int[], int*, int, int*, double[4]);
+/**@brief Returns statistics about a 900s ringbuffer
+ *
+ * @param const int[PYFCGI_STATS_SZ] data : a 900 ringbuffer stats samples
+ * @param int* idx_nxt next data index in ring buffer (allow interrupt
+ * detection : when *idx_nxt changes)
+ * @param int *last : last sample
+ * @param double[4] avgs : average samples on 1, 5, 10 and 15 minutes
+ * @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 Returns the formated buffer
  * @todo make @ref pyfcgi_stats_format() implement this functionnality

src/stats.c

@@ -65,7 +65,7 @@ void pyfcgi_stats_collector(int signum)
 	pyfcgi_log(LOG_DEBUG, "s#%d %d req/s", pyfcgi_stats.cur_req,
 		pyfcgi_stats.reqs[stats->cur_req]);
 	stats->cur_req++;
-	stats->cur_req %= PYFCGI_STATS_REQS_SAMPLES;
+	stats->cur_req %= PYFCGI_STATS_SZ;
 
 	return;
 }
@@ -114,16 +114,15 @@ size_t pyfcgi_stats_format()
 	do
 	{
 		ret = pyfcgi_stats_avg(pyfcgi_stats.reqs,
-			&(pyfcgi_stats.cur_req), PYFCGI_STATS_REQS_SAMPLES,
-			&last_rs, avgs);
+			&(pyfcgi_stats.cur_req), &last_rs, avgs);
 	} while(ret < 0 && errno == EINTR);
 	pyfcgi_stats_buffprintf("Requests stats :\n1s:%dr/s 1m:%.2fr/s 5m:%.2fr/s 10m:%.2fr/s 15m:%.2fr/s\n",
 		last_rs, avgs[0], avgs[1], avgs[2], avgs[3]);
 	return pyfcgi_stats.buff_ptr;
 }
 
-int pyfcgi_stats_avg(const int data[], int *idx_first, int len,
-	int *last, double avgs[4])
+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
@@ -131,23 +130,23 @@ int pyfcgi_stats_avg(const int data[], int *idx_first, int len,
 	int uptime, max;
 
 	uptime = time(NULL) - PyFCGI_conf.context.uptime;
-	max = (uptime > len) ? len:uptime;
+	max = (uptime > PYFCGI_STATS_SZ) ? PYFCGI_STATS_SZ:uptime;
 
-	r15 = r10 = r5 = r1 = stmp = 0;
-	first = *idx_first;
+	r15 = r10 = r5 = r1 = stmp = rtmp = 0;
+	first = *idx_nxt;
 
 	//Block interrupt/ALARM ??
 	i = 0;
 	do
 	{
-		if(first != *idx_first)
+		if(first != *idx_nxt)
 		{
 			errno = EINTR;
 			return -1;
 		}
-		idx = (*idx_first- i - 1);
-		idx = (idx<0)?len + idx:idx;
-		idx %= len;
+		idx = (*idx_nxt- i - 1);
+		idx = (idx<0)?PYFCGI_STATS_SZ + idx:idx;
+		idx %= PYFCGI_STATS_SZ;
 		cur = data[idx];
 		if((!i || i%60) && i < max-1)
 		{
@@ -164,7 +163,7 @@ int pyfcgi_stats_avg(const int data[], int *idx_first, int len,
 		i++;
 	}while(i<max);
 	//Restore interrupt/ALARM ??
-	*last = data[*idx_first-1];
+	*last = data[*idx_nxt-1];
 	rtmp = max?rtmp:((double)*last);
 	r1 = (uptime <= 60)?rtmp:r1;
 	r5 /= 5;