diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-27 18:26:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-27 18:26:09 +0200 |
| commit | dd76d96d676f305aa2d29131321fe5cac5a676c4 (patch) | |
| tree | f71b499444c137ea1c9dfccc0dda9c1461e9040d /runtime/wti.c | |
| parent | 4a5a3196fbe4e5a4e9f8dea49f916462adbf3098 (diff) | |
| download | rsyslog-dd76d96d676f305aa2d29131321fe5cac5a676c4.tar.gz rsyslog-dd76d96d676f305aa2d29131321fe5cac5a676c4.tar.xz rsyslog-dd76d96d676f305aa2d29131321fe5cac5a676c4.zip | |
adapted new atomic instruction emulation to v5 engine
code did not compile after merge from v4
Diffstat (limited to 'runtime/wti.c')
| -rw-r--r-- | runtime/wti.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/runtime/wti.c b/runtime/wti.c index 8994d84b..77927453 100644 --- a/runtime/wti.c +++ b/runtime/wti.c @@ -82,7 +82,7 @@ wtiGetDbgHdr(wti_t *pThis) sbool wtiGetState(wti_t *pThis) { - return ATOMIC_FETCH_32BIT(pThis->bIsRunning); + return ATOMIC_FETCH_32BIT(&pThis->bIsRunning, &pThis->mutIsRunning); } @@ -105,10 +105,11 @@ rsRetVal wtiSetState(wti_t *pThis, sbool bNewVal) { ISOBJ_TYPE_assert(pThis, wti); - if(bNewVal) - ATOMIC_STORE_1_TO_INT(pThis->bIsRunning); - else - ATOMIC_STORE_0_TO_INT(pThis->bIsRunning); + if(bNewVal) { + ATOMIC_STORE_1_TO_INT(&pThis->bIsRunning, &pThis->mutIsRunning); + } else { + ATOMIC_STORE_0_TO_INT(&pThis->bIsRunning, &pThis->mutIsRunning); + } return RS_RET_OK; } @@ -147,7 +148,7 @@ BEGINobjDestruct(wti) /* be sure to specify the object type also in END and CODE CODESTARTobjDestruct(wti) /* actual destruction */ free(pThis->batch.pElem); - DESTROY_ATOMIC_HELPER_MUT(pThis->mutCurrCmd); + DESTROY_ATOMIC_HELPER_MUT(pThis->mutIsRunning); free(pThis->pszDbgHdr); ENDobjDestruct(wti) @@ -156,7 +157,7 @@ ENDobjDestruct(wti) /* Standard-Constructor for the wti object */ BEGINobjConstruct(wti) /* be sure to specify the object type also in END macro! */ - INIT_ATOMIC_HELPER_MUT(pThis->mutCurrCmd); + INIT_ATOMIC_HELPER_MUT(pThis->mutIsRunning); ENDobjConstruct(wti) |