Bugfix in watchdog killer timer delay calculation

include/conf.h

@@ -182,6 +182,8 @@ struct pyfcgi_context_s {
 	timer_t wd_timerkill;
 	/**@brief Watchdog delay */
 	struct timespec wd_delay;
+	/**@brief SIGKILL watchdog delay */
+	struct timespec wd_killdelay;
 	/**@brief Watchdog sig restorer */
 	struct sigaction wd_oldsig;
 	/**@brief watchdog flag */

src/conf.c

@@ -230,13 +230,33 @@ int pyfcgi_wd_init(void (*wd_sig_cleaner)(int), const struct timespec *delay)
 	struct sigaction act;
 	struct sigevent sev;
 	pyfcgi_context_t *context;
+	struct timespec timeout;
+	double part, tmp;
 	int err;
 
 	context = &(PyFCGI_conf.context);
 
-	PyFCGI_conf.context.wd_delay.tv_sec = delay->tv_sec;
-	PyFCGI_conf.context.wd_delay.tv_nsec = delay->tv_nsec;
-	pyfcgi_log(LOG_DEBUG, "Set watchdog with %ds timeout", PyFCGI_conf.context.wd_delay.tv_sec);
+	timeout = PyFCGI_conf.context.wd_delay = *delay;
+
+	//kill delay timeout
+	timeout.tv_nsec *= 1.5;
+	part = modf(((double)timeout.tv_sec/2.0), &tmp);
+	timeout.tv_nsec += part * 1000000000;
+	timeout.tv_sec = (time_t)(timeout.tv_sec * 1.5);
+	timeout.tv_sec += timeout.tv_nsec / 1000000000;
+	if(part != 0.0)
+	{
+		timeout.tv_nsec /= (long)(part * 1000000000);
+	}
+
+	PyFCGI_conf.context.wd_killdelay = timeout;
+
+	pyfcgi_log(LOG_DEBUG,
+		"Set watchdog with %d.%09ds timeout (%d.%09ds for SIGKILL)",
+		PyFCGI_conf.context.wd_delay.tv_sec,
+		PyFCGI_conf.context.wd_delay.tv_nsec,
+		PyFCGI_conf.context.wd_killdelay.tv_sec,
+		PyFCGI_conf.context.wd_killdelay.tv_nsec);
 
 	// Creating new timer with default sigevent (SIGEV_SIGNAL with SIGALRM)
 	if(timer_create(CLOCK_REALTIME, NULL, &(context->wd_timer)) < 0)
@@ -300,9 +320,8 @@ int pyfcgi_wd_arm()
 			strerror(err));
 		res = -1;
 	}
-
-	timeout.it_value.tv_sec = (time_t)(timeout.it_value.tv_sec * 1.5);
-	timeout.it_value.tv_nsec = 500000000;
+	
+	timeout.it_value = context->wd_killdelay;
 	timeout.it_interval = timeout.it_value;
 
 	if(timer_settime(context->wd_timerkill, 0, &timeout, NULL) < 0)