diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-12 15:27:40 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-12 15:27:40 +0200 |
| commit | bb79e96dc300fa5a2182e7c047afb3b15c5dc870 (patch) | |
| tree | 85680d43b503648da48fafe1178b1cb1ce62cc86 /tools/syslogd.c | |
| parent | 21b7f7e603639fa8f354c954b0e467abb72b6c12 (diff) | |
| download | rsyslog-bb79e96dc300fa5a2182e7c047afb3b15c5dc870.tar.gz rsyslog-bb79e96dc300fa5a2182e7c047afb3b15c5dc870.tar.bz2 rsyslog-bb79e96dc300fa5a2182e7c047afb3b15c5dc870.zip | |
moving to a cleaner implementation of batches
... now that we know what we need from a theoretical POV.
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 866c0173..7ee5dbd7 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -138,6 +138,7 @@ #include "datetime.h" #include "parser.h" #include "sysvar.h" +#include "batch.h" /* definitions for objects we access */ DEFobjCurrIf(obj) @@ -1211,16 +1212,16 @@ processMsg(msg_t *pMsg) * for the main queue. */ static rsRetVal -msgConsumer(void __attribute__((unused)) *notNeeded, aUsrp_t *paUsrp) +msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch) { int i; msg_t *pMsg; DEFiRet; - assert(paUsrp != NULL); + assert(pBatch != NULL); - for(i = 0 ; i < paUsrp->nElem ; i++) { - pMsg = (msg_t*) paUsrp->pUsrp[i]; + for(i = 0 ; i < pBatch->nElem ; i++) { + pMsg = (msg_t*) pBatch->pElem[i].pUsrp; dbgprintf("msgConsumer..MULTIQUEUE: i: %d, pMsg: %p\n", i, pMsg); if((pMsg->msgFlags & NEEDS_PARSING) != 0) { parseMsg(pMsg); |