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

db flush extra labor now returns void

Browse Source
This commit is contained in:
Jeff Hill
2006-11-28 18:51:16 +00:00
parent b50c8f5882
commit 91e3c129df
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rsrv/camessage.c
+1 -8
View File
@@ -1927,14 +1927,7 @@ LOCAL int clear_channel_reply ( caHdrLargeArray *mp,
freeListFree(rsrvEventFreeList, pevext);
}
status = db_flush_extra_labor_event(client->evuser);
if (status) {
SEND_LOCK(client);
send_err(mp, ECA_INTERNAL, client,
"extra labor event didnt flush");
SEND_UNLOCK(client);
return RSRV_ERROR;
}
db_flush_extra_labor_event ( client->evuser );
/*
* send delete confirmed message
src/rsrv/caservertask.c
+5 -12
View File
@@ -643,22 +643,15 @@ void destroy_tcp_client ( struct client *client )
if ( client->evuser ) {
/*
* turn off extra labor callbacks from the event thread
*/
* turn off extra labor callbacks from the event thread
*/
status = db_add_extra_labor_event ( client->evuser, NULL, NULL );
assert ( ! status );
/*
* wait for extra labor in progress to comple
*/
status = db_flush_extra_labor_event ( client->evuser );
assert ( ! status );
/*
* wait for any put notify in progress to comple
*/
status = db_flush_extra_labor_event(client->evuser);
assert ( ! status );
* wait for extra labor in progress to comple
*/
db_flush_extra_labor_event ( client->evuser );
}
destroyAllChannels ( client, & client->chanList );