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

improved the maint of the asych io count in off normal situations

Browse Source
This commit is contained in:
Jeff Hill
2009-08-14 00:24:09 +00:00
parent 50ddd62502
commit 547c5d06ea
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/makeBaseApp/top/caServerApp/exAsyncPV.cc
View File

@@ -26,14 +26,12 @@ caStatus exAsyncPV::read (const casCtx &ctx, gdd &valueIn)
return S_casApp_postponeAsyncIO;
}
this->simultAsychIOCount++;
pIO = new exAsyncReadIO ( this->cas, ctx,
*this, valueIn, this->asyncDelay );
if (!pIO) {
if ( ! pIO ) {
return S_casApp_noMemory;
}
this->simultAsychIOCount++;
return S_casApp_asyncCompletion;
}
@@ -46,15 +44,13 @@ caStatus exAsyncPV::writeNotify ( const casCtx &ctx, const gdd &valueIn )
return S_casApp_postponeAsyncIO;
}
this->simultAsychIOCount++;
exAsyncWriteIO * pIO = new
exAsyncWriteIO ( this->cas, ctx, *this,
valueIn, this->asyncDelay );
if ( ! pIO ) {
this->simultAsychIOCount--;
return S_casApp_noMemory;
}
this->simultAsychIOCount++;
return S_casApp_asyncCompletion;
}
@@ -63,7 +59,7 @@ caStatus exAsyncPV::writeNotify ( const casCtx &ctx, const gdd &valueIn )
//
caStatus exAsyncPV::write ( const casCtx &ctx, const gdd &valueIn )
{
// implement the dicard intermediate values, but last value
// implement the discard intermediate values, but last value
// sent always applied behavior that IOCs provide excepting
// that we will alow N requests to pend instead of a limit
// of only one imposed in the IOC
@@ -72,15 +68,13 @@ caStatus exAsyncPV::write ( const casCtx &ctx, const gdd &valueIn )
return S_casApp_success;
}
this->simultAsychIOCount++;
exAsyncWriteIO * pIO = new
exAsyncWriteIO ( this->cas, ctx, *this,
valueIn, this->asyncDelay );
if ( ! pIO ) {
this->simultAsychIOCount--;
return S_casApp_noMemory;
}
this->simultAsychIOCount++;
return S_casApp_asyncCompletion;
}
@@ -130,7 +124,8 @@ exAsyncWriteIO::~exAsyncWriteIO()
// exAsyncWriteIO::expire()
// (a virtual function that runs when the base timer expires)
//
epicsTimerNotify::expireStatus exAsyncWriteIO::expire ( const epicsTime & /* currentTime */ )
epicsTimerNotify::expireStatus exAsyncWriteIO::
expire ( const epicsTime & /* currentTime */ )
{
caStatus status = this->pv.update ( *this->pValue );
this->pValue.set ( 0 );
@@ -166,13 +161,11 @@ exAsyncReadIO::~exAsyncReadIO()
//
epicsTimerNotify::expireStatus exAsyncReadIO::expire ( const epicsTime & /* currentTime */ )
{
caStatus status;
//
// map between the prototype in and the
// current value
//
status = this->pv.exPV::readNoCtx ( this->pProto );
caStatus status = this->pv.exPV::readNoCtx ( this->pProto );
//
// post IO completion

8
src/makeBaseApp/top/caServerApp/exServer.cc
View File

@@ -199,12 +199,13 @@ pvExistReturn exServer::pvExistTest // X aCC 361
this->simultAsychIOCount++;
exAsyncExistIO *pIO;
pIO = new exAsyncExistIO ( pvi, ctxIn, *this );
if (pIO) {
exAsyncExistIO * pIO =
new exAsyncExistIO ( pvi, ctxIn, *this );
if ( pIO ) {
return pverAsyncCompletion;
}
else {
this->simultAsychIOCount--;
return pverDoesNotExistHere;
}
}
@@ -259,6 +260,7 @@ pvAttachReturn exServer::pvAttach // X aCC 361
return S_casApp_asyncCompletion;
}
else {
this->simultAsychIOCount--;
return S_casApp_noMemory;
}
}