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

fixed put notify cleanup during shutdown

Browse Source
This commit is contained in:
Jeff Hill
2002-03-13 18:32:36 +00:00
parent 567b220ea7
commit e6850d62db
1 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/rsrv/caservertask.c
View File

@@ -227,11 +227,13 @@ int free_client(struct client *client)
*/
LOCAL int terminate_one_client(struct client *client)
{
int servertid;
int tmpsock;
int status;
struct event_ext *pevext;
struct channel_in_use *pciu;
int servertid;
int tmpsock;
int status;
struct event_ext *pevext;
struct channel_in_use *pciu;
ELLLIST tmpQueue;
RSRVPUTNOTIFY *ppnb;
if (client->proto != IPPROTO_TCP) {
logMsg("CAS: non TCP client delete ignored\n",
@@ -256,11 +258,48 @@ LOCAL int terminate_one_client(struct client *client)
NULL);
}
/*
* exit flow control so the event system will
* shutdown correctly
*/
db_event_flow_ctrl_mode_off(client->evuser);
/*
* cancel any put notify in progress
*/
ellInit ( &tmpQueue );
while ( TRUE ) {
FASTLOCK(&client->addrqLock);
pciu = (struct channel_in_use *) ellGet(&client->addrq);
FASTUNLOCK(&client->addrqLock);
if(!pciu){
break;
}
ellAdd ( &tmpQueue, &pciu->node );
if ( pciu->pPutNotify ) {
if ( pciu->pPutNotify->busy ) {
dbNotifyCancel ( &pciu->pPutNotify->dbPutNotify );
}
}
}
/*
* remove all put notify entries from the extra labor queue
*/
FASTLOCK ( &client->putNotifyLock );
do {
ppnb = ( RSRVPUTNOTIFY * ) ellGet ( &client->putNotifyQue );
}
while ( ppnb );
FASTUNLOCK ( &client->putNotifyLock );
/*
* exit flow control so the event system will
* shutdown correctly
*/
db_event_flow_ctrl_mode_off(client->evuser);
/*
* wait for any put notify in progress to comple
*/
status = db_flush_extra_labor_event(client->evuser);
assert(status==OK);
/*
* Server task deleted first since close() is not reentrant
@@ -282,22 +321,11 @@ LOCAL int terminate_one_client(struct client *client)
}
while(TRUE){
FASTLOCK(&client->addrqLock);
pciu = (struct channel_in_use *) ellGet(&client->addrq);
FASTUNLOCK(&client->addrqLock);
pciu = (struct channel_in_use *) ellGet ( &tmpQueue );
if(!pciu){
break;
}
/*
* put notify in progress needs to be deleted
*/
if(pciu->pPutNotify){
if(pciu->pPutNotify->busy){
dbNotifyCancel(&pciu->pPutNotify->dbPutNotify);
}
}
while (TRUE){
/*
* AS state change could be using this list
@@ -315,8 +343,6 @@ LOCAL int terminate_one_client(struct client *client)
}
freeListFree(rsrvEventFreeList, pevext);
}
status = db_flush_extra_labor_event(client->evuser);
assert(status==OK);
if(pciu->pPutNotify){
free(pciu->pPutNotify);
}