Modification of workers making them always exist busy

Adds a global flag for worker indicating their status (add checks for
each semaphore change)
The pool handler will no longer have to decrease the semaphore value when
a child exit.

src/pyworker.c

@@ -20,6 +20,8 @@
 #include "pyworker.h"
 
 
+/**@brief 1 if worker idle else 0 */
+static short _worker_idle;
 /**@brief Indicate that a worker is idle */
 static inline void worker_set_idle();
 /**@brief Indicate that a worker is busy */
@@ -61,17 +63,16 @@ int work333(int wrk_id)
 	pyfcgi_log(LOG_INFO, "Waiting request with %s.%s()",
 		PyFCGI_conf.py_entrymod, PyFCGI_conf.py_entryfun);
 
-	worker_set_idle(); //before failing on import
-
 	if(!entry_fun) //but exit if import failed
 	{
 		pyfcgi_log(LOG_ALERT, "Unable to import entrypoint");
 		exit(PYFCGI_FATAL);
-
 	}
 
 	start_response = get_start_response();
 
+	_worker_idle = 0;
+	worker_set_idle();
 	// requests accepting loop
 	count = 0;
 	while ((!count || count != max_reqs) &&
@@ -121,7 +122,7 @@ int work333(int wrk_id)
 		FCGX_FClose(in_stream);
 		FCGX_FClose(err_stream);
 		FCGI_Finish();
-		worker_set_idle();
+
 		gettimeofday(&stop, NULL);
 		stop.tv_sec = stop.tv_sec - start.tv_sec;
 		stop.tv_usec = stop.tv_usec - start.tv_usec;
@@ -133,7 +134,10 @@ int work333(int wrk_id)
 		pyfcgi_wd_pause();
 		pyfcgi_log(LOG_DEBUG, "Worker[%d] request %d END [OK] %lu bytes in %ld.%06lds",
 			wrk_id, count, libpyfcgi.rep_sz, stop.tv_sec, stop.tv_usec);
+
+		worker_set_idle();
 	}
+	worker_set_busy();
 	return 0;
 }
 
@@ -207,7 +211,6 @@ int work(int wrk_id)
 		PyFCGI_conf.py_entrymod, PyFCGI_conf.py_entryfun);
 
 
-	worker_set_idle(); //before failing on import
 
 	if(!entry_fun) //but exit if import failed
 	{
@@ -226,6 +229,9 @@ int work(int wrk_id)
 	}
 	piper_args.ctl_pipe = pipe_ctl[1];
 
+	_worker_idle = 0;
+	worker_set_idle();
+
 	count = 0;
 	while ((!count || count != max_reqs) && FCGX_Accept(&in_stream, &out_stream, &err_stream, &envp) >= 0)
 	{
@@ -310,6 +316,7 @@ int work(int wrk_id)
 		pyfcgi_log(LOG_DEBUG, "Worker[%d] request %d END [OK] %lu bytes in %ld.%06lds",
 			wrk_id, count, rep_sz, stop.tv_sec, stop.tv_usec);
 	}
+	worker_set_busy();
 	free(piper_stack);
 	Py_Exit(count == max_reqs ?0:EXIT_PYERR);
 }
@@ -572,6 +579,8 @@ static void worker_set_idle()
 	int err;
 	struct sembuf sop;
 
+	if(_worker_idle) { return; }
+
 	sop.sem_num = 0;
 	sop.sem_flg = 0;
 	sop.sem_op = 1;
@@ -581,7 +590,9 @@ static void worker_set_idle()
 		err = errno;
 		pyfcgi_log(LOG_ERR, "error incrementing the semaphore : %s",
 			strerror(err));
+		return;
 	}
+	_worker_idle = 1;
 }
 
 static void worker_set_busy()
@@ -589,6 +600,8 @@ static void worker_set_busy()
 	int err;
 	struct sembuf sop;
 
+	if(!_worker_idle) { return; }
+	
 	sop.sem_num = 0;
 	sop.sem_flg = 0;
 	sop.sem_op = -1;
@@ -598,17 +611,21 @@ static void worker_set_busy()
 		err = errno;
 		pyfcgi_log(LOG_ERR, "error incrementing the semaphore : %s",
 			strerror(err));
+		return;
 	}
+	_worker_idle = 0;
 }
 
 void worker_sighandler(int signum)
 {
 	pyfcgi_log(LOG_INFO, "%s signal received, exiting...", strsignal(signum));
+	worker_set_busy();
 	exit(0);
 }
 
 void worker_sigalrmhandler(int signum)
 {
-	pyfcgi_log(LOG_WARNING, "Timeout, exiting...");
+	//pyfcgi_log(LOG_WARNING, "Timeout, exiting...");
+	worker_set_busy();
 	exit(PYFCGI_TIMEOUT);
 }