Decrease poll timer & move piper control pipe

src/pyworker.c

@@ -28,6 +28,7 @@ int work(char* py_entrypoint, int wrk_id, int semid, int max_reqs)
 	int count, pipe_out[2], pipe_err[2], pipe_ctl[2], err, piper_status;
 	struct sembuf sop;
 	struct sigaction act;
+	struct timeval start, stop;
 	sigset_t emptyset;
 	char buf[PIPE_BUF];
 
@@ -85,9 +86,19 @@ int work(char* py_entrypoint, int wrk_id, int semid, int max_reqs)
 		       wrk_id, strerror(err));
 	}
 
+	if(pipe(pipe_ctl) == -1)
+	{
+		err = errno;
+		syslog(LOG_ALERT,
+		       "Worker[%d] Pipe fails for piper ctl : %s",
+		       wrk_id, strerror(err));
+		exit(err);
+	}
+
 	count = 0;
 	while ((!count || count != max_reqs) && FCGI_Accept() >= 0)
 	{
+		gettimeofday(&start, NULL);
 		sop.sem_op = -1; // decrementing sem to show worker busy
 		if(semop(semid, &sop, 1) < 0)
 		{
@@ -103,7 +114,6 @@ int work(char* py_entrypoint, int wrk_id, int semid, int max_reqs)
 			"Worker[%d] request %d", wrk_id, count);
 		*/
 		worker_piper_sigrcv = 0;
-		pipe(pipe_ctl); //TODO : check for pipe error
 		pid_t pid = fork();
 		if(pid < 0)
 		{
@@ -122,8 +132,7 @@ int work(char* py_entrypoint, int wrk_id, int semid, int max_reqs)
 					strerror(err));
 				exit(err);
 			}
-			close(pipe_ctl[0]);
-			close(pipe_ctl[1]);
+			write(pipe_ctl[1], " ", 1);
 	
 			worker_piper(wrk_id, count, pipe_out[0], pipe_err[0],
 			             pipe_ctl[1]);
@@ -131,8 +140,7 @@ int work(char* py_entrypoint, int wrk_id, int semid, int max_reqs)
 			exit(1);
 		}
 		update_pyenv(py_osmod);
-		//TODO : check if pipe_ctl lock is really needed anymore
-		close(pipe_ctl[1]);
+		//close(pipe_ctl[1]);
 		PyObject_CallObject(entry_fun, NULL);
 		if(PyErr_Occurred())
 		{
@@ -148,14 +156,31 @@ int work(char* py_entrypoint, int wrk_id, int semid, int max_reqs)
 		PyObject_CallObject(pystdout_flush, NULL);
 		PyObject_CallObject(pystderr_flush, NULL);
 		read(pipe_ctl[0], &buf, 1); // unblock when child ready
+		//close(pipe_ctl[0]);
 
 		kill(pid, WPIPER_SIG); //indicate child python call ended
+/*
+gettimeofday(&stop, NULL);
+syslog(LOG_DEBUG, "W%dR%dtimer KIL %ld.%06ld us", wrk_id, count, stop.tv_sec - start.tv_sec, stop.tv_usec - start.tv_usec);
+*/
 		waitpid(pid, &piper_status, 0);
-		if(piper_status)
+/*
+gettimeofday(&stop, NULL);
+syslog(LOG_DEBUG, "W%dR%dtimer W8  %ld.%06ld us", wrk_id, count, stop.tv_sec - start.tv_sec, stop.tv_usec - start.tv_usec);
+*/
+		if(WIFSIGNALED(piper_status))
+		{
+			syslog(LOG_ERR,
+			       "Woker[%d] req #%d piper terminated by sig %d",
+			       wrk_id, count, WTERMSIG(piper_status));
+			exit(40);
+		}
+		else if(WEXITSTATUS(piper_status))
 		{
-			syslog(LOG_WARNING,
+			syslog(LOG_ERR,
 			       "Woker[%d] req #%d piper exited with error status %d",
-			       wrk_id, count, piper_status);
+			       wrk_id, count, WEXITSTATUS(piper_status));
+			exit(41);
 		}
 
 		FCGI_Finish();
@@ -168,9 +193,16 @@ int work(char* py_entrypoint, int wrk_id, int semid, int max_reqs)
 			       "Worker[%d] error incrementing the semaphore : %s",
 			       wrk_id, strerror(err));
 		}
-		
-		syslog(LOG_DEBUG, "Worker[%d] request %d END [OK]",
-			wrk_id, count);
+		gettimeofday(&stop, NULL);
+		stop.tv_sec = stop.tv_sec - start.tv_sec;
+		stop.tv_usec = stop.tv_usec - start.tv_usec;
+		if(stop.tv_usec < 0)
+		{
+			stop.tv_usec += 1000000;
+			stop.tv_sec -= 1;
+		}
+		syslog(LOG_DEBUG, "Worker[%d] request %d END [OK] in %ld.%06lds",
+			wrk_id, count, stop.tv_sec, stop.tv_usec);
 	}
 	Py_Exit(count == max_reqs ?0:EXIT_PYERR);
 }
@@ -179,7 +211,7 @@ void worker_piper(int wrk_id, int req_id, int pystdout, int pystderr,
 	int ctl_pipe)
 {
 	struct pollfd fds[2];
-	int err, poll_ret, ret, cont;
+	int err, ret, cont, poll_ret;
 	short revents;
 	char buf[PIPE_BUF];
 
@@ -191,10 +223,10 @@ void worker_piper(int wrk_id, int req_id, int pystdout, int pystderr,
 	fds[0].revents = fds[1].revents = 0;
 
 
-	cont = 3;
+	cont = 2;
 	while(cont)
 	{
-		poll_ret = poll(fds, 2, 10);
+		poll_ret = poll(fds, 2, 0);
 //syslog(LOG_DEBUG, "Worker[%d] req #%d poll_ret = %d", wrk_id, req_id, poll_ret);
 		if(poll_ret < 0)
 		{