From 28c44e9a7bf4f99279af94a96bac42d0379b27d0 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 10 Jan 2008 14:27:26 +0000 Subject: - fixed a bug that caused a segfault on startup when no $WorkDir directive was specified in rsyslog.conf - fixed a bug that caused a segfault on queues with types other than "disk" - removed the now longer needed thread TermSyncTool --- threads.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'threads.h') diff --git a/threads.h b/threads.h index b0cc9221..dc937def 100644 --- a/threads.h +++ b/threads.h @@ -24,15 +24,8 @@ #define THREADS_H_INCLUDED -/* type of sync tools for terminating the thread */ -typedef enum eTermSyncType { - eTermSync_NONE = 0, /* no cleanup necessary, just cancel thread */ - eTermSync_SIGNAL /* termination via pthread_kill() */ -} eTermSyncType_t; - /* the thread object */ typedef struct thrdInfo { - eTermSyncType_t eTermTool; pthread_mutex_t *mutTermOK; /* Is it ok to terminate that thread now? */ int bIsActive; /* Is thread running? */ int bShallStop; /* set to 1 if the thread should be stopped ? */ @@ -46,7 +39,7 @@ rsRetVal thrdExit(void); rsRetVal thrdInit(void); rsRetVal thrdTerminate(thrdInfo_t *pThis); rsRetVal thrdTerminateAll(void); -rsRetVal thrdCreate(rsRetVal (*thrdMain)(thrdInfo_t*), eTermSyncType_t eTermSyncType, rsRetVal(*afterRun)(thrdInfo_t *)); +rsRetVal thrdCreate(rsRetVal (*thrdMain)(thrdInfo_t*), rsRetVal(*afterRun)(thrdInfo_t *)); rsRetVal thrdSleep(thrdInfo_t *pThis, int iSeconds, int iuSeconds); /* macros (replace inline functions) */ -- cgit