rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 16:20:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

add freeWrkrInstance to output module interface

Browse Source
This commit is contained in:
Rainer Gerhards 2013-10-29 16:17:46 +01:00
parent 1960b94b8a
commit 64a4358384
10 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/mmanon/mmanon.c
View File

@ -138,6 +138,11 @@ CODESTARTfreeInstance
ENDfreeInstance
BEGINfreeWrkrInstance
CODESTARTfreeWrkrInstance
ENDfreeWrkrInstance
static inline void
setInstParamDefaults(instanceData *pData)
{

4
runtime/module-template.h
View File

@ -204,7 +204,7 @@ static rsRetVal freeWrkrInstance(void* pd)\
wrkrInstanceData_t *pWrkrData;
#define CODESTARTfreeWrkrInstance \
pWrkrData = (wrkrInstanceData_t*) pModData;
pWrkrData = (wrkrInstanceData_t*) pd;
#define ENDfreeWrkrInstance \
if(pWrkrData != NULL)\
@ -511,6 +511,8 @@ static rsRetVal queryEtryPt(uchar *name, rsRetVal (**pEtryPoint)())\
#define CODEqueryEtryPt_STD_OMOD8_QUERIES \
else if(!strcmp((char*) name, "createWrkrInstance")) {\
*pEtryPoint = createWrkrInstance;\
} else if(!strcmp((char*) name, "freeWrkrInstance")) {\
*pEtryPoint = freeWrkrInstance;\
}
/* the following definition is queryEtryPt block that must be added

1
runtime/modules.c
View File

@ -653,6 +653,7 @@ doModInit(rsRetVal (*modInit)(int, int*, rsRetVal(**)(), rsRetVal(*)(), modInfo_
CHKiRet((*pNew->modQueryEtryPt)((uchar*)"parseSelectorAct", &pNew->mod.om.parseSelectorAct));
CHKiRet((*pNew->modQueryEtryPt)((uchar*)"tryResume", &pNew->tryResume));
CHKiRet((*pNew->modQueryEtryPt)((uchar*)"createWrkrInstance", &pNew->mod.om.createWrkrInstance));
CHKiRet((*pNew->modQueryEtryPt)((uchar*)"freeWrkrInstance", &pNew->mod.om.freeWrkrInstance));
/* try load optional interfaces */
localRet = (*pNew->modQueryEtryPt)((uchar*)"doHUP", &pNew->doHUP);

3
runtime/modules.h
View File

@ -139,7 +139,8 @@ struct modInfo_s {
rsRetVal (*parseSelectorAct)(uchar**, void**,omodStringRequest_t**);
rsRetVal (*newActInst)(uchar *modName, struct nvlst *lst, void **, omodStringRequest_t **);
rsRetVal (*SetShutdownImmdtPtr)(void *pData, void *pPtr);
rsRetVal (*createWrkrInstance)(void*pWrkrData, void*pData);
rsRetVal (*createWrkrInstance)(void*ppWrkrData, void*pData);
rsRetVal (*freeWrkrInstance)(void*pWrkrData);
} om;
struct { /* data for library modules */
char dummy;

5
tools/omdiscard.c
View File

@ -96,6 +96,11 @@ CODESTARTfreeInstance
ENDfreeInstance
BEGINfreeWrkrInstance
CODESTARTfreeWrkrInstance
ENDfreeWrkrInstance
BEGINparseSelectorAct
CODESTARTparseSelectorAct
CODE_STD_STRING_REQUESTparseSelectorAct(0)

5
tools/omfile.c
View File

@ -941,6 +941,11 @@ CODESTARTfreeInstance
ENDfreeInstance
BEGINfreeWrkrInstance
CODESTARTfreeWrkrInstance
ENDfreeWrkrInstance
BEGINtryResume
CODESTARTtryResume
ENDtryResume

5
tools/omfwd.c
View File

@ -369,6 +369,11 @@ CODESTARTfreeInstance
ENDfreeInstance
BEGINfreeWrkrInstance
CODESTARTfreeWrkrInstance
ENDfreeWrkrInstance
BEGINdbgPrintInstInfo
CODESTARTdbgPrintInstInfo
dbgprintf("%s", pData->target);

5
tools/ompipe.c
View File

@ -296,6 +296,11 @@ CODESTARTfreeInstance
ENDfreeInstance
BEGINfreeWrkrInstance
CODESTARTfreeWrkrInstance
ENDfreeWrkrInstance
BEGINtryResume
CODESTARTtryResume
ENDtryResume

5
tools/omshell.c
View File

@ -89,6 +89,11 @@ CODESTARTfreeInstance
ENDfreeInstance
BEGINfreeWrkrInstance
CODESTARTfreeWrkrInstance
ENDfreeWrkrInstance
BEGINdbgPrintInstInfo
CODESTARTdbgPrintInstInfo
printf("%s", pData->progName);

5
tools/omusrmsg.c
View File

@ -137,6 +137,11 @@ CODESTARTfreeInstance
ENDfreeInstance
BEGINfreeWrkrInstance
CODESTARTfreeWrkrInstance
ENDfreeWrkrInstance
BEGINdbgPrintInstInfo
register int i;
CODESTARTdbgPrintInstInfo