summaryrefslogtreecommitdiffstats
path: root/threads.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-20 19:01:03 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-20 19:01:03 +0200
commita5e8684b91bf88c53f4afb548b797ac9ccb463e2 (patch)
tree172d8b821053baa818efb45f549c294269aa44f4 /threads.c
parentcf4e3a4d99c677c8aae60499f44046c5b388a144 (diff)
downloadrsyslog-a5e8684b91bf88c53f4afb548b797ac9ccb463e2.tar.gz
rsyslog-a5e8684b91bf88c53f4afb548b797ac9ccb463e2.tar.xz
rsyslog-a5e8684b91bf88c53f4afb548b797ac9ccb463e2.zip
disabling new input termination interface
a bug showed up during further testing. As this was a side-activity, I'll probably disable it for the time being and check what's going on somewhat later (I'll do it tomorrow if I can find it quickly)
Diffstat (limited to 'threads.c')
-rw-r--r--threads.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/threads.c b/threads.c
index 20ab9f66..05e6159f 100644
--- a/threads.c
+++ b/threads.c
@@ -92,13 +92,19 @@ 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;