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

relaxed need for atomic builtins

Browse Source
This commit is contained in:
Rainer Gerhards 2010-03-05 09:36:45 +01:00
parent b54d56b9f8
commit 129eeca64b
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/omfile.c
View File

@ -89,12 +89,31 @@ static uint64 clockFileAccess = 0;
static unsigned clockFileAccess = 0;
#endif
/* and the "tick" function */
#ifdef HAVE_ATOMIC_BUILTINS
static inline uint64
getClockFileAccess(void)
{
return ATOMIC_INC_AND_FETCH(clockFileAccess);
}
#else
/* if we do not have atomics, we need to guard this via a mutex.
* the reason is that otherwise cache lookups may fail. That function
* requires the highest current value, and we can not provide that
* without using atomic instructions and mutexes.
* rgerhards, 2010-03-05
*/
static pthread_mutex_t mutClock;
static uint64
getClockFileAccess(void)
{
uint64 retVal;
d_pthread_mutex_lock(&mutClock);
retVal = ++clockFileAccess;
d_pthread_mutex_unlock(&mutClock);
return retVal;
}
#endif /* #ifdef HAVE_ATOMIC_BUILTINS */
/* The following structure is a dynafile name cache entry.
*/
@ -827,6 +846,9 @@ CODESTARTmodExit
objRelease(errmsg, CORE_COMPONENT);
objRelease(strm, CORE_COMPONENT);
free(pszFileDfltTplName);
# ifndef HAVE_ATOMIC_BUILTINS
pthread_mutex_destroy(&mutClock);
# endif
ENDmodExit
@ -844,6 +866,11 @@ CODESTARTmodInit
CODEmodInit_QueryRegCFSLineHdlr
CHKiRet(objUse(errmsg, CORE_COMPONENT));
CHKiRet(objUse(strm, CORE_COMPONENT));
# ifndef HAVE_ATOMIC_BUILTINS
pthread_mutex_init(&mutClock, NULL);
# endif
INITChkCoreFeature(bCoreSupportsBatching, CORE_FEATURE_BATCHING);
DBGPRINTF("omfile: %susing transactional output interface.\n", bCoreSupportsBatching ? "" : "not ");
CHKiRet(omsdRegCFSLineHdlr((uchar *)"dynafilecachesize", 0, eCmdHdlrInt, (void*) setDynaFileCacheSize, NULL, STD_LOADABLE_MODULE_ID));