re-enabled input thread termination handling that does avoid thread cancellation

...where possible. This provides a more reliable mode of
rsyslogd termination (canceling threads my result in not properly
freed resouces and potential later hangs, even though we perform
proper cancel handling in our code). This is part of an effort to
reduce thread cnacellation as much as possible in rsyslog.

NOTE: some comments indicated that there were problems with some code
that has been re-activated. Testing did not show any issues. My current
assumption is that these issues were related to some other code that
has been removed/changed during the previous restructuring events.
In any case, if there is a shutdown issue, one should carefully look
at this change here!

1 files changed, 0 insertions, 5 deletions

diff --git a/threads.c b/threads.c
index 05e6159f..a6cbc2ff 100644
--- a/threads.c
+++ b/threads.c
@@ -92,19 +92,14 @@ rsRetVal thrdTerminate(thrdInfo_t *pThis)
 	DEFiRet;
 	assert(pThis != NULL);
 	
-#if 0 // TODO: somehow does not really work yet!
 	if(pThis->bNeedsCancel) {
-#endif
 		DBGPRINTF("request term via canceling for input thread 0x%x\n", (unsigned) pThis->thrdID);
 		pthread_cancel(pThis->thrdID);
-#if 0 // TODO: somehow does not really work yet!
-	if(pThis->bNeedsCancel) {
 	} else {
 
 		DBGPRINTF("request term via SIGTTIN for input thread 0x%x\n", (unsigned) pThis->thrdID);
 		pthread_kill(pThis->thrdID, SIGTTIN);
 	}
-#endif
 	pthread_join(pThis->thrdID, NULL); /* wait for input thread to complete */
 	pThis->bIsActive = 0;