diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-03 12:05:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-03 12:05:50 +0200 |
| commit | 22328c72aef2df73741afefe0e8b53d3ad83f15d (patch) | |
| tree | 4a0b311508ebb28a0dc72e12993f704c2709d46a /runtime/wti.h | |
| parent | da933a7e105acf814d5e7955d39d29eab3a96613 (diff) | |
| parent | 7c0ca7553738161c681c0d0600de99e9fabee81d (diff) | |
| download | rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.gz rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.tar.bz2 rsyslog-22328c72aef2df73741afefe0e8b53d3ad83f15d.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
runtime/datetime.c
Diffstat (limited to 'runtime/wti.h')
| -rw-r--r-- | runtime/wti.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/runtime/wti.h b/runtime/wti.h index 72653b15..2acd3cf6 100644 --- a/runtime/wti.h +++ b/runtime/wti.h @@ -1,6 +1,6 @@ /* Definition of the worker thread instance (wti) class. * - * Copyright 2008 Rainer Gerhards and Adiscon GmbH. + * Copyright 2008, 2009 by Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * @@ -27,19 +27,21 @@ #include <pthread.h> #include "wtp.h" #include "obj.h" +#include "batch.h" + /* the worker thread instance class */ -typedef struct wti_s { +struct wti_s { BEGINobjInstance; pthread_t thrdID; /* thread ID */ qWrkCmd_t tCurrCmd; /* current command to be carried out by worker */ - obj_t *pUsrp; /* pointer to an object meaningful for current user pointer (e.g. queue pUsr data elemt) */ wtp_t *pWtp; /* my worker thread pool (important if only the work thread instance is passed! */ pthread_cond_t condExitDone; /* signaled when the thread exit is done (once per thread existance) */ pthread_mutex_t mut; + batch_t batch; /* pointer to an object array meaningful for current user pointer (e.g. queue pUsr data elemt) */ bool bShutdownRqtd; /* shutdown for this thread requested? 0 - no , 1 - yes */ uchar *pszDbgHdr; /* header string for debug messages */ -} wti_t; +}; /* some symbolic constants for easier reference */ |