Use the new stats features in PyFCGI

The worker indicate each new request using semaphore

include/monitor.h

@@ -43,6 +43,7 @@ typedef union pyfcgi_monitor_addr_u pyfcgi_monitor_addr_t;
 
 #include "conf.h"
 #include "logger.h"
+#include "stats.h"
 
 union pyfcgi_monitor_addr_u
 {
@@ -56,8 +57,18 @@ struct pyfcgi_monitor_s
 	int sockserv;
 	int sockargs[3];
 	pyfcgi_monitor_addr_t addr;
+
 };
 
+/**@brief Attempt to init unitialized IPC component
+ *
+ * If an error occured it will be logged, and the init should be retry latter.
+ *
+ * @note the monitor process uses IPC_WREQS to count requests IPC_SEMST for
+ * SHM syn and IPC_SHMST for SHM initalization
+ */
+int pyfcgi_monitor_IPC_init();
+
 /**@brief Start the stats server monitoring server 
  * @return PID of the child process and -1 on error
  * @note When called the configuration has to be parsed */

src/main.c

@@ -146,22 +146,22 @@ int main(int argc, char **argv)
 
 	while(1)
 	{
-		if(PyFCGI_conf.mon_socket && !monitor_serv_pid)
+		if(!pool_handler_pid)
 		{
-			monitor_serv_pid = pyfcgi_spawn_monitor();
-			if(monitor_serv_pid < 0)
+			pool_handler_pid = spawn_pool_handler();
+			if(pool_handler_pid < 0)
 			{
 				fails = 1;
-				monitor_serv_pid = 0;
+				pool_handler_pid = 0;
 			}
 		}
-		if(!pool_handler_pid)
+		if(PyFCGI_conf.mon_socket && !monitor_serv_pid)
 		{
-			pool_handler_pid = spawn_pool_handler();
-			if(pool_handler_pid < 0)
+			monitor_serv_pid = pyfcgi_spawn_monitor();
+			if(monitor_serv_pid < 0)
 			{
 				fails = 1;
-				pool_handler_pid = 0;
+				monitor_serv_pid = 0;
 			}
 		}
 		if(fails)
@@ -229,8 +229,10 @@ int main(int argc, char **argv)
 				child_name, WEXITSTATUS(child_ret));
 			if(WIFSIGNALED(child_ret))
 			{
-				pyfcgi_log(LOG_ERR, "%s terminated by sig '%d'",
-					child_name, WTERMSIG(child_ret));
+				pyfcgi_log(LOG_ERR, "%s terminated by sig %s(%d)",
+					child_name,
+					strsignal(WTERMSIG(child_ret)),
+					WTERMSIG(child_ret));
 			}
 		}
 		else

src/monitor.c

@@ -61,6 +61,23 @@ pid_t pyfcgi_spawn_monitor()
 	return res;
 }
 
+int pyfcgi_monitor_IPC_init()
+{
+	int ret;
+	ret = 0;
+	if(!PyFCGI_SEM_OPEN(SEM_WREQS))
+	{
+		pyfcgi_IPC_init(IPC_WREQS);
+		ret = -1;
+	}
+	if(!PyFCGI_SEM_OPEN(SEM_STATS))
+	{
+		pyfcgi_IPC_init(IPC_SEMST);
+		ret = -1;
+	}
+	//pyfcgi_IPC_init(IPC_SHMST);
+	return ret;
+}
 
 void pyfcgi_monitor_loop()
 {
@@ -110,7 +127,11 @@ void pyfcgi_monitor_loop()
 		clean_exit(PYFCGI_ERR);
 	}
 	pyfcgi_log(LOG_INFO, "Listening on %s", PyFCGI_conf.mon_socket);
+
 	//bind successfull, sending to appropriate response loop
+	pyfcgi_monitor_IPC_init(); //check returned value !
+	pyfcgi_stats_init();
+
 	if(pyfcgi_mon.sockargs[1] == SOCK_DGRAM)
 	{
 		pyfcgi_monitor_dgram_loop();
@@ -125,7 +146,7 @@ void pyfcgi_monitor_stream_loop(pyfcgi_monitor_addr_t addr_serv)
 {
 	pyfcgi_monitor_addr_t cliaddr;
 	socklen_t addrlen;
-	int sockcli;
+	int sockcli, err;
 	char ipstr[64];
 	char name[] = "PYFCGI_"VERSION"\n";
 
@@ -136,10 +157,17 @@ void pyfcgi_monitor_stream_loop(pyfcgi_monitor_addr_t addr_serv)
 			strerror(errno));
 		clean_exit(PYFCGI_ERR);
 	}
-
-	while( (sockcli = accept(pyfcgi_mon.sockserv,
-		(struct sockaddr*)&cliaddr, &addrlen)) >= 0)
+	
+	while(1)
 	{
+		sockcli = accept(pyfcgi_mon.sockserv,
+			(struct sockaddr*)&cliaddr, &addrlen);
+		if(sockcli < 0)
+		{
+			err = errno;
+			if(err == EINTR) { continue; }
+			break;
+		}
 		pyfcgi_log(LOG_DEBUG, "New client");
 		if(!inet_ntop(pyfcgi_mon.sockargs[0], (void*)&cliaddr, ipstr, 64))
 		{

src/pyworker.c

@@ -80,6 +80,7 @@ int work333(int wrk_id)
 		FCGX_Accept(&in_stream, &out_stream, &err_stream, &envp) >= 0)
 	{
 		pyfcgi_wd_arm();
+		sem_post(PyFCGI_SEM(SEM_WREQS).sem); // increment request counter
 		gettimeofday(&start, NULL);
 		worker_set_busy();
 		count++;
@@ -254,6 +255,7 @@ int work(int wrk_id)
 	while ((!count || count != max_reqs) && FCGX_Accept(&in_stream, &out_stream, &err_stream, &envp) >= 0)
 	{
 		pyfcgi_wd_arm();
+		sem_post(PyFCGI_SEM(SEM_WREQS).sem); // increment request counter
 		gettimeofday(&start, NULL);
 		worker_set_busy();