epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

dbEvent: correct eventsRemaining

Browse Source 
Only pass eventsRemaining when no queued events have been canceled.
Also possible race bt accessing ev_que with locking.
This commit is contained in:
Michael Davidsaver
2023-01-22 13:02:00 -08:00
parent 90ae51e8f2
commit e1c1bb8b1b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/database/src/ioc/db/dbEvent.c
View File

@@ -955,6 +955,7 @@ static int event_read ( struct event_que *ev_que )
while ( ev_que->evque[ev_que->getix] != EVENTQEMPTY ) {
struct evSubscrip *pevent = ev_que->evque[ev_que->getix];
int eventsRemaining;
pfl = ev_que->valque[ev_que->getix];
if ( pevent == &canceledEvent ) {
@@ -977,6 +978,7 @@ static int event_read ( struct event_que *ev_que )
event_remove ( ev_que, ev_que->getix, EVENTQEMPTY );
ev_que->getix = RNGINC ( ev_que->getix );
eventsRemaining = ev_que->evque[ev_que->getix] != EVENTQEMPTY && !ev_que->nCanceled;
/*
* create a local copy of the call back parameters while
@@ -1009,7 +1011,7 @@ static int event_read ( struct event_que *ev_que )
if (pfl) {
/* Issue user callback */
( *user_sub ) ( pevent->user_arg, pevent->chan,
ev_que->evque[ev_que->getix] != EVENTQEMPTY, pfl );
eventsRemaining, pfl );
}
LOCKEVQUE (ev_que);