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

Merge pull request #4800 from Cropi/dynamic-config-iActionNbr

Browse Source 
Make action counter part of the config
This commit is contained in:
Rainer Gerhards 2022-02-14 17:18:44 +01:00 committed by GitHub
commit d6d8e4aa53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
action.c
View File

@ -184,13 +184,6 @@ typedef struct configSettings_s {
static configSettings_t cs; /* our current config settings */
/* the counter below counts actions created. It is used to obtain unique IDs for the action. They
* should not be relied on for any long-term activity (e.g. disk queue names!), but they are nice
* to have during one instance of an rsyslogd run. For example, I use them to name actions when there
* is no better name available.
*/
int iActionNbr = 0;
/* tables for interfacing with the v6 config system */
static struct cnfparamdescr cnfparamdescr[] = {
{ "name", eCmdHdlrGetWord, 0 }, /* legacy: actionname */
@ -412,14 +405,14 @@ rsRetVal actionConstruct(action_t **ppThis)
pThis->bReportSuspensionCont = -1; /* indicate "not yet set" */
pThis->bCopyMsg = 0;
pThis->tLastOccur = datetime.GetTime(NULL); /* done once per action on startup only */
pThis->iActionNbr = iActionNbr;
pThis->iActionNbr = loadConf->actions.iActionNbr;
pthread_mutex_init(&pThis->mutErrFile, NULL);
pthread_mutex_init(&pThis->mutAction, NULL);
pthread_mutex_init(&pThis->mutWrkrDataTable, NULL);
INIT_ATOMIC_HELPER_MUT(pThis->mutCAS);
/* indicate we have a new action */
++iActionNbr;
loadConf->actions.iActionNbr++;
finalize_it:
*ppThis = pThis;
@ -1618,7 +1611,7 @@ actionCommitAllDirect(wti_t *__restrict__ const pWti)
int i;
action_t *pAction;
for(i = 0 ; i < iActionNbr ; ++i) {
for(i = 0 ; i < runConf->actions.iActionNbr ; ++i) {
pAction = pWti->actWrkrInfo[i].pAction;
if(pAction == NULL)
continue;

3
action.h
View File

@ -111,7 +111,4 @@ void actionCommitAllDirect(wti_t *pWti);
void actionRemoveWorker(action_t *const pAction, void *const actWrkrData);
void releaseDoActionParams(action_t * const pAction, wti_t * const pWti, int action_destruct);
/* external data */
extern int iActionNbr;
#endif /* #ifndef ACTION_H_INCLUDED */

3
runtime/rsconf.c
View File

@ -165,6 +165,7 @@ static void cnfSetDefaults(rsconf_t *pThis)
pThis->templates.last = NULL;
pThis->templates.lastStatic = NULL;
pThis->actions.nbrActions = 0;
pThis->actions.iActionNbr = 0;
pThis->globals.pszWorkDir = NULL;
pThis->globals.bDropMalPTRMsgs = 0;
pThis->globals.operatingStateFile = NULL;
@ -1447,7 +1448,7 @@ load(rsconf_t **cnf, uchar *confFile)
ABORT_FINALIZE(RS_RET_NO_ACTIONS);
}
tellLexEndParsing();
DBGPRINTF("Number of actions in this configuration: %d\n", iActionNbr);
DBGPRINTF("Number of actions in this configuration: %d\n", loadConf->actions.iActionNbr);
CHKiRet(tellCoreConfigLoadDone());
tellModulesConfigLoadDone();

9
runtime/rsconf.h
View File

@ -206,7 +206,14 @@ struct templates_s {
struct actions_s {
unsigned nbrActions; /* number of actions */
/* number of active actions */
unsigned nbrActions;
/* number of actions created. It is used to obtain unique IDs for the action. They
* should not be relied on for any long-term activity (e.g. disk queue names!), but they are nice
* to have during one instance of an rsyslogd run. For example, I use them to name actions when there
* is no better name available.
*/
int iActionNbr;
};

11
runtime/wti.c
View File

@ -47,6 +47,7 @@
#include "glbl.h"
#include "action.h"
#include "atomic.h"
#include "rsconf.h"
/* static data */
DEFobjStaticHelpers
@ -275,13 +276,13 @@ wtiConstructFinalize(wti_t *pThis)
ISOBJ_TYPE_assert(pThis, wti);
DBGPRINTF("%s: finalizing construction of worker instance data (for %d actions)\n",
wtiGetDbgHdr(pThis), iActionNbr);
wtiGetDbgHdr(pThis), runConf->actions.iActionNbr);
/* initialize our thread instance descriptor (no concurrency here) */
pThis->bIsRunning = WRKTHRD_STOPPED;
/* must use calloc as we need zero-init */
CHKmalloc(pThis->actWrkrInfo = calloc(iActionNbr, sizeof(actWrkrInfo_t)));
CHKmalloc(pThis->actWrkrInfo = calloc(runConf->actions.iActionNbr, sizeof(actWrkrInfo_t)));
if(pThis->pWtp == NULL) {
dbgprintf("wtiConstructFinalize: pWtp not set, this may be intentional\n");
@ -316,7 +317,7 @@ wtiWorkerCancelCleanup(void *arg)
DBGPRINTF("%s: cancelation cleanup handler called.\n", wtiGetDbgHdr(pThis));
pWtp->pfObjProcessed(pWtp->pUsr, pThis);
DBGPRINTF("%s: done cancelation cleanup handler.\n", wtiGetDbgHdr(pThis));
}
@ -445,7 +446,7 @@ wtiWorker(wti_t *__restrict__ const pThis)
d_pthread_mutex_unlock(pWtp->pmutUsr);
DBGPRINTF("DDDD: wti %p: worker cleanup action instances\n", pThis);
for(i = 0 ; i < iActionNbr ; ++i) {
for(i = 0 ; i < runConf->actions.iActionNbr ; ++i) {
wrkrInfo = &(pThis->actWrkrInfo[i]);
dbgprintf("wti %p, action %d, ptr %p\n", pThis, i, wrkrInfo->actWrkrData);
if(wrkrInfo->actWrkrData != NULL) {
@ -496,7 +497,7 @@ wtiSetDbgHdr(wti_t *pThis, uchar *pszMsg, const size_t lenMsg)
ISOBJ_TYPE_assert(pThis, wti);
assert(pszMsg != NULL);
if(lenMsg < 1)
ABORT_FINALIZE(RS_RET_PARAM_ERROR);