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

made some improvements for SMP systems which are a good conservative design

Browse Source 
but may not have been necessary
This commit is contained in:
Jeff Hill
2003-08-09 00:02:11 +00:00
parent cc06a46407
commit 4fb36b3104
1 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/libCom/misc/ipAddrToAsciiAsynchronous.cpp
View File

@@ -42,7 +42,10 @@ ipAddrToAsciiEngine::~ipAddrToAsciiEngine ()
{
ipAddrToAsciiAsynchronous * pItem;
this->exitFlag = true;
{
epicsGuard < epicsMutex > locker ( ipAddrToAsciiEngine::mutex );
this->exitFlag = true;
}
this->laborEvent.signal ();
this->threadExit.wait ();
@@ -69,13 +72,12 @@ ipAddrToAsciiEngine::~ipAddrToAsciiEngine ()
void ipAddrToAsciiEngine::run ()
{
osiSockAddr addr;
while ( ! this->exitFlag ) {
while ( true ) {
{
epicsGuard < epicsMutex > locker ( ipAddrToAsciiEngine::mutex );
{
epicsGuard < epicsMutex > guard ( ipAddrToAsciiEngine::mutex );
while ( ! this->exitFlag ) {
while ( true ) {
ipAddrToAsciiAsynchronous * pItem = this->labor.get ();
osiSockAddr addr;
if ( pItem ) {
addr = pItem->addr;
this->pCurrent = pItem;
@@ -83,13 +85,19 @@ void ipAddrToAsciiEngine::run ()
else {
break;
}
}
if ( this->exitFlag )
{
sockAddrToDottedIP ( & addr.sa, this->nameTmp,
sizeof ( this->nameTmp ) );
}
else {
epicsGuardRelease < epicsMutex > unguard ( guard );
// depending on DNS configuration, this could take a very long time
// so we release the lock
sockAddrToA ( &addr.sa, this->nameTmp, sizeof ( this->nameTmp ) );
}
// depending on DNS configuration, this could take a very long time
sockAddrToA ( &addr.sa, this->nameTmp, sizeof ( this->nameTmp ) );
{
epicsGuard < epicsMutex > locker ( ipAddrToAsciiEngine::mutex );
if ( this->pCurrent ) {
this->pCurrent->pEngine = 0;
this->callbackInProgress = true;
@@ -97,21 +105,24 @@ void ipAddrToAsciiEngine::run ()
else {
continue;
}
}
// dont call callback with lock applied
this->pCurrent->ioCompletionNotify ( this->nameTmp );
{
epicsGuardRelease < epicsMutex > unguard ( guard );
// dont call callback with lock applied
this->pCurrent->ioCompletionNotify ( this->nameTmp );
}
{
epicsGuard < epicsMutex > locker ( ipAddrToAsciiEngine::mutex );
this->pCurrent = 0;
this->callbackInProgress = false;
if ( this->cancelPending ) {
this->destructorBlockEvent.signal ();
}
}
if ( this->cancelPending ) {
this->destructorBlockEvent.signal ();
{
epicsGuardRelease < epicsMutex > unguard ( guard );
this->laborEvent.wait ();
}
}
this->laborEvent.wait ();
}
this->threadExit.signal ();
}