summaryrefslogtreecommitdiffstats
path: root/threads.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-01-10 14:27:26 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-01-10 14:27:26 +0000
commit28c44e9a7bf4f99279af94a96bac42d0379b27d0 (patch)
tree7f66af0893f092d3212e3e34218d41973a3fe2cc /threads.h
parent4c24b427954166689b58562d68fefcfda7439ace (diff)
downloadrsyslog-28c44e9a7bf4f99279af94a96bac42d0379b27d0.tar.gz
rsyslog-28c44e9a7bf4f99279af94a96bac42d0379b27d0.tar.xz
rsyslog-28c44e9a7bf4f99279af94a96bac42d0379b27d0.zip
- fixed a bug that caused a segfault on startup when no $WorkDir directivev3-10-1a
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
Diffstat (limited to 'threads.h')
-rw-r--r--threads.h9
1 files changed, 1 insertions, 8 deletions
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) */