From: Wilfried Göesgens Date: Tue, 17 Nov 2009 21:14:44 +0000 (+0000) Subject: * arm the thread on shutdown killer. killing is better then waiting for a -9 from... X-Git-Tag: v7.86~610 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=98067ef980d9ce3992433b07bf1f2ba4304dfcba * arm the thread on shutdown killer. killing is better then waiting for a -9 from the admin. --- diff --git a/citadel/threads.c b/citadel/threads.c index e115306a2..40c4cca4c 100644 --- a/citadel/threads.c +++ b/citadel/threads.c @@ -694,13 +694,13 @@ void CtdlThreadGC (void) if (that_thread->stop_ticker + 5 == time(NULL)) { - CtdlLogPrintf(CTDL_DEBUG, "Thread System: The thread \"%s\" (0x%08lx) failed to self terminate within 5 ticks. It would be cancelled now.\n", that_thread->name, that_thread->tid); + CtdlLogPrintf(CTDL_DEBUG, "Thread System: The thread \"%s\" (0x%08lx) failed to self terminate within 5 ticks. Canceling now.\n", that_thread->name, that_thread->tid); if ((that_thread->flags & CTDLTHREAD_WORKER) == 0) CtdlLogPrintf(CTDL_INFO, "Thread System: A non worker thread would have been canceled this may cause message loss.\n"); -// that_thread->state = CTDL_THREAD_CANCELLED; + that_thread->state = CTDL_THREAD_CANCELLED; that_thread->stop_ticker++; -// citthread_cancel(that_thread->tid); -// continue; + citthread_cancel(that_thread->tid); + continue; } /* Do we need to clean up this thread? */