epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fix chan state set to invalid prior to use in ca_clear_chan() bug

Browse Source
This commit is contained in:
Jeff Hill
1992-04-14 18:02:34 +00:00
parent 233f4c4f60
commit 66e541f726
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ca/access.c
View File

@@ -59,6 +59,14 @@
/* 031892 joh initial broadcast retry delay is now a #define */
/* 032092 joh dont allow them to add an event which does not */
/* select anything (has a nill mask) */
/* 041492 joh Use channel state enum to determine if I need */
/* to send monitor clear message to the IOC */
/* instead of the IOC in use conn up flag */
/* (did the same thing to the tests in */
/* issue_get_callback() & request_event()) */
/* 041492 joh fixed bug introduced by 022692 when the chan */
/* state enum was used after it was set to */
/* cs_closed */
/* */
/*_begin */
/************************************************************************/
@@ -1198,8 +1206,9 @@ issue_get_callback(monix)
* dont send the message if the conn is down
* (it will be sent once connected)
*/
if(!iiu[chix->iocix].conn_up || chix->iocix == BROADCAST_IIU)
if(chix->state != cs_conn){
return;
}
/*
* set to the native count if they specify zero
@@ -1663,8 +1672,9 @@ ca_request_event(monix)
* dont send the message if the conn is down
* (it will be sent once connected)
*/
if(!iiu[chix->iocix].conn_up || chix->iocix == BROADCAST_IIU)
if(chix->state != cs_conn){
return;
}
/*
* clip to the native count and set to the native count if they
@@ -1910,10 +1920,7 @@ ca_clear_event
* check for conn down while locked to avoid a race
*/
LOCK;
if (!iiu[chix->iocix].conn_up || chix->iocix == BROADCAST_IIU){
lstDelete(&monix->chan->eventq, monix);
}else{
if(chix->state == cs_conn){
mptr = CAC_ALLOC_MSG(&iiu[chix->iocix], 0);
/* msg header */
@@ -1929,6 +1936,9 @@ ca_clear_event
*/
CAC_ADD_MSG(&iiu[chix->iocix]);
}
else{
lstDelete(&monix->chan->eventq, monix);
}
UNLOCK;
return ECA_NORMAL;
@@ -1957,14 +1967,16 @@ ca_clear_channel
register chid chix;
#endif
{
register evid monix;
struct ioc_in_use *piiu = &iiu[chix->iocix];
register struct extmsg *mptr;
register evid monix;
struct ioc_in_use *piiu = &iiu[chix->iocix];
register struct extmsg *mptr;
enum channel_state old_chan_state;
LOOSECHIXCHK(chix);
/* disable their further use of deallocated channel */
chix->type = TYPENOTINUSE;
old_chan_state = chix->state;
chix->state = cs_closed;
/* the while is only so I can break to the lock exit */
@@ -2013,7 +2025,7 @@ ca_clear_channel
*
* check for conn state while locked to avoid a race
*/
if(chix->state != cs_conn){
if(old_chan_state != cs_conn){
lstConcat(&free_event_list, &chix->eventq);
lstDelete(&piiu->chidlist, chix);
if (free((char *) chix) < 0)