From 992d77d3a64bba807daf89eb5bd0429a0521915f Mon Sep 17 00:00:00 2001
From: "ben.franksen" <ben.franksen@online.de>
Date: Thu, 31 Mar 2011 18:31:27 +0000
Subject: [PATCH] seq: in pvGetQ, set event flag for anonymous PVs, too
---
src/seq/seq_if.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/seq/seq_if.c b/src/seq/seq_if.c
index c18687d8..4ac4a8f7 100644
--- a/src/seq/seq_if.c
+++ b/src/seq/seq_if.c
@@ -864,20 +864,15 @@ epicsShareFunc boolean epicsShareAPI seq_pvGetQ(SS_ID ss, VAR_ID varId)
if (isSet)
{
struct getq_cp_arg arg = {ch, var, meta};
- QUEUE queue = ch->queue;
- boolean empty;
+ boolean was_empty;
- empty = seqQueueGetF(queue, getq_cp, &arg);
- if (empty)
- {
+ was_empty = seqQueueGetF(ch->queue, getq_cp, &arg);
+ if (was_empty)
errlogSevPrintf(errlogMajor,
"pvGetQ: event flag set but queue is empty\n");
- }
- else if (dbch)
- {
+ else if (seqQueueIsEmpty(ch->queue))
/* If queue is now empty, clear the event flag */
- if (seqQueueIsEmpty(queue)) bitClear(sp->evFlags, ev_flag);
- }
+ bitClear(sp->evFlags, ev_flag);
}
epicsMutexUnlock(sp->programLock);
--
GitLab