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

Changed order of the callback and semGive in the WdTask. There was a race condition

Browse Source
This commit is contained in:
John Winans
1994-05-02 11:10:50 +00:00
parent ab1be79d3f
commit faa429fb7e
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/drv/drvBitBus.c
View File

@@ -809,20 +809,22 @@ int link;
(plink->deviceStatus[pnode->txMsg.node])--; /* fix device status */
pnode->status = BB_TIMEOUT;
/* Release a completion lock if one was spec'd */
if (pnode->psyncSem != NULL)
semGive(*(pnode->psyncSem));
/* Do now in case we need it later */
resetNodeData = pnode->txMsg.node; /* mark the node number */
/* Make the callbackRequest if one was spec'd */
if(pnode->finishProc != NULL)
callbackRequest(pnode); /* schedule completion processing */
/* Release a completion lock if one was spec'd */
if (pnode->psyncSem != NULL)
semGive(*(pnode->psyncSem));
/* If we are not going to reboot the link... */
if (plink->nukeEm == 0)
{ /* Send out a RAC_NODE_OFFLINE to the controller */
semGive(plink->busyList.sem);
resetNodeData = pnode->txMsg.node; /* mark the node number */
printf("issuing a node offline for link %d node %d\n", link, resetNodeData);
semTake(plink->queue[BB_Q_HIGH].sem, WAIT_FOREVER);

20
src/drv/drvPEPBitBus.c
View File

@@ -823,14 +823,24 @@ int link;
(plink->deviceStatus[pnode->txMsg.node])--; /* fix device status */
pnode->status = BB_TIMEOUT;
/* Gotta do this now in case we need the info after the completion */
resetNode.txMsg.node = pnode->txMsg.node;
offlnNodeData = pnode->txMsg.node; /* mark the node number */
/* Make the callbackRequest if one was spec'd */
if(pnode->finishProc != NULL)
{
if (bbDebug>2)
{
printf("xvmeWdTask(%d): invoking the callbackRequest %8.8x %d\n", link, pnode->finishProc, pnode->priority);
}
callbackRequest(pnode); /* schedule completion processing */
}
/* Release a completion lock if one was spec'd */
if (pnode->psyncSem != NULL && plink->nukeEm == 0)
semGive(*(pnode->psyncSem));
/* Make the callbackRequest if one was spec'd */
if(pnode->finishProc != NULL)
callbackRequest(pnode); /* schedule completion processing */
/* If we are not going to reboot the link... */
if ( plink->nukeEm == 0 ) {
/* Send out a RAC_RESET/RAC_OFFLINE pair */
@@ -838,11 +848,9 @@ int link;
/* Configure message for a RAC_RESET */
resetNode.txMsg.cmd = 0x00;
resetNode.txMsg.node = pnode->txMsg.node;
/* Configure message for a RAC_OFFLINE */
offlnNode.txMsg.cmd = RAC_OFFLINE;
offlnNodeData = pnode->txMsg.node; /* mark the node number */
offlnNode.txMsg.node = 0xff;
/* Queue the messages (high priority, reset first) */