From 98900cfd0f414012ed937af047c07415d3d3972c Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 5 Nov 2013 13:03:01 +0100 Subject: consistently use msg generation time in mark msg processing --- action.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/action.c b/action.c index f6d7ae42..8349120c 100644 --- a/action.c +++ b/action.c @@ -1329,21 +1329,17 @@ activateActions(void) static rsRetVal doSubmitToActionQNotAllMarkBatch(action_t *pAction, wti_t *pWti, msg_t *pMsg) { - time_t now = 0; int doProcess = 1; time_t lastAct; DEFiRet; - if(now == 0) { // TODO: do in caller! - now = datetime.GetTime(NULL); /* good time call - the only one done */ - } /* CAS loop, we write back a bit early, but that's OK... */ /* we use reception time, not dequeue time - this is considered more appropriate and * also faster ;) -- rgerhards, 2008-09-17 */ do { lastAct = pAction->f_time; if(pMsg->msgFlags & MARK) { - if((now - lastAct) < MarkInterval / 2) { + if((pMsg->ttGenTime - lastAct) < MarkInterval / 2) { doProcess = 0; DBGPRINTF("action was recently called, ignoring mark message\n"); break; /* do not update timestamp for non-written mark messages */ -- cgit v1.2.3