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

use subroutine to compute the priority and dont restart

Browse Source 
the recv watchdog while holding the callback lock
This commit is contained in:
Jeff Hill
2001-10-03 17:23:31 +00:00
parent 67eb482234
commit 19f8326ae0
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/ca/tcpiiu.cpp
View File

@@ -226,19 +226,9 @@ extern "C" void cacRecvThreadTCP ( void *pParam )
}
if ( piiu->state == iiu_connected ) {
unsigned priorityOfSend;
epicsThreadBooleanStatus tbs = epicsThreadLowestPriorityLevelAbove (
piiu->pCAC()->getInitializingThreadsPriority (), &priorityOfSend );
if ( tbs != epicsThreadBooleanStatusSuccess ) {
priorityOfSend = piiu->pCAC ()->getInitializingThreadsPriority ();
}
else {
epicsThreadBooleanStatus tbsInside = epicsThreadLowestPriorityLevelAbove (
priorityOfSend, &priorityOfSend );
if ( tbsInside != epicsThreadBooleanStatusSuccess ) {
priorityOfSend = piiu->pCAC ()->getInitializingThreadsPriority ();
}
}
unsigned priorityOfSend = cac::lowestPriorityLevelAbove
( piiu->pCAC()->getInitializingThreadsPriority() );
priorityOfSend = cac::lowestPriorityLevelAbove ( priorityOfSend );
epicsThreadId tid = epicsThreadCreate ( "CAC-TCP-send", priorityOfSend,
epicsThreadGetStackSize ( epicsThreadStackMedium ), cacSendThreadTCP, piiu );
if ( ! tid ) {
@@ -284,7 +274,16 @@ extern "C" void cacRecvThreadTCP ( void *pParam )
break;
}
// reschedule connection activity watchdog
// but dont hold the lock for fear of deadlocking
// because cancel is blocking for the completion
// of the recvDog expire which takes the lock
// - it take also the callback lock
piiu->recvDog.messageArrivalNotify ();
// only one recv thread at a time may call callbacks
// - pendEvent() blocks until threads waiting for
// this lock get a chance to run
callbackAutoMutex autoMutex ( *piiu->pCAC() );
if ( ! piiu->pCAC()->preemptiveCallbackEnable() ) {
@@ -296,7 +295,9 @@ extern "C" void cacRecvThreadTCP ( void *pParam )
}
}
while ( true ) {
// force the receive watchdog to be reset every 50 frames
unsigned contiguousFrameCount = 0;
while ( contiguousFrameCount++ < 50 ) {
if ( nBytesIn == pComBuf->capacityBytes () ) {
if ( piiu->contigRecvMsgCount >=
@@ -316,12 +317,6 @@ extern "C" void cacRecvThreadTCP ( void *pParam )
piiu->recvQue.pushLastComBufReceived ( *pComBuf );
pComBuf = 0;
// reschedule connection activity watchdog
// but dont hold the lock for fear of deadlocking
// because cancel is blocking for the completion
// of the recvDog expire which takes the lock
piiu->recvDog.messageArrivalNotify ();
// execute receive labor
bool noProtocolViolation = piiu->processIncoming ();
if ( ! noProtocolViolation ) {
@@ -474,12 +469,8 @@ tcpiiu::tcpiiu ( cac & cac, double connectionTimeout,
memset ( (void *) &this->curMsg, '\0', sizeof ( this->curMsg ) );
unsigned priorityOfRecv;
epicsThreadBooleanStatus tbs = epicsThreadHighestPriorityLevelBelow (
this->pCAC()->getInitializingThreadsPriority (), &priorityOfRecv );
if ( tbs != epicsThreadBooleanStatusSuccess ) {
priorityOfRecv = this->pCAC ()->getInitializingThreadsPriority ();
}
unsigned priorityOfRecv = cac::highestPriorityLevelBelow
( this->pCAC()->getInitializingThreadsPriority() );
epicsThreadId tid = epicsThreadCreate ( "CAC-TCP-recv", priorityOfRecv,
epicsThreadGetStackSize ( epicsThreadStackBig ),