changed to call new idAssignAdd func
This commit is contained in:
@@ -689,7 +689,7 @@ void ca_client_context::installCASG (
|
||||
epicsGuard < epicsMutex > & guard, CASG & sg )
|
||||
{
|
||||
guard.assertIdenticalMutex ( this->mutex );
|
||||
this->sgTable.add ( sg );
|
||||
this->sgTable.idAssignAdd ( sg );
|
||||
}
|
||||
|
||||
void ca_client_context::uninstallCASG (
|
||||
|
||||
@@ -460,7 +460,7 @@ cacChannel & cac::createChannel (
|
||||
|
||||
nciu * pNetChan = new ( this->channelFreeList )
|
||||
nciu ( *this, *this->pudpiiu, chan, pName, pri );
|
||||
this->chanTable.add ( *pNetChan );
|
||||
this->chanTable.idAssignAdd ( *pNetChan );
|
||||
return *pNetChan;
|
||||
}
|
||||
|
||||
@@ -627,7 +627,7 @@ netWriteNotifyIO & cac::writeNotifyRequest (
|
||||
autoPtrRecycle < netWriteNotifyIO > pIO (
|
||||
guard, this->ioTable, *this,
|
||||
netWriteNotifyIO::factory ( this->freeListWriteNotifyIO, icni, notifyIn ) );
|
||||
this->ioTable.add ( *pIO );
|
||||
this->ioTable.idAssignAdd ( *pIO );
|
||||
chan.getPIIU(guard)->writeNotifyRequest (
|
||||
guard, chan, *pIO, type, nElem, pValue );
|
||||
return *pIO.release();
|
||||
@@ -641,7 +641,7 @@ netReadNotifyIO & cac::readNotifyRequest (
|
||||
autoPtrRecycle < netReadNotifyIO > pIO (
|
||||
guard, this->ioTable, *this,
|
||||
netReadNotifyIO::factory ( this->freeListReadNotifyIO, icni, notifyIn ) );
|
||||
this->ioTable.add ( *pIO );
|
||||
this->ioTable.idAssignAdd ( *pIO );
|
||||
chan.getPIIU(guard)->readNotifyRequest ( guard, chan, *pIO, type, nElem );
|
||||
return *pIO.release();
|
||||
}
|
||||
@@ -735,7 +735,7 @@ netSubscription & cac::subscriptionRequest (
|
||||
guard, this->ioTable, *this,
|
||||
netSubscription::factory ( this->freeListSubscription,
|
||||
privChan, type, nElem, mask, notifyIn ) );
|
||||
this->ioTable.add ( *pIO );
|
||||
this->ioTable.idAssignAdd ( *pIO );
|
||||
if ( chanIsInstalled ) {
|
||||
pIO->subscribeIfRequired ( guard, chan );
|
||||
}
|
||||
@@ -817,6 +817,7 @@ bool cac::readNotifyRespAction ( callbackManager &, tcpiiu & iiu,
|
||||
// then we need to reinstall the IO into the table
|
||||
netSubscription * pSubscr = pmiu->isSubscription ();
|
||||
if ( pSubscr ) {
|
||||
// this does *not* assign a new resource id
|
||||
this->ioTable.add ( *pmiu );
|
||||
}
|
||||
if ( caStatus == ECA_NORMAL ) {
|
||||
|
||||
@@ -1340,7 +1340,7 @@ caStatus casStrmClient::createChanResponse (
|
||||
// while an asynchronous IO fetching the enum
|
||||
// string table is outstanding
|
||||
//
|
||||
this->chanTable.add ( *pChan->pChanI );
|
||||
this->chanTable.idAssignAdd ( *pChan->pChanI );
|
||||
this->chanList.add ( *pChan->pChanI );
|
||||
pChan->pChanI->installIntoPV ();
|
||||
|
||||
|
||||
@@ -137,7 +137,7 @@ timerForOldFdmgr::timerForOldFdmgr ( oldFdmgr &fdmgrIn,
|
||||
if ( pFuncIn == NULL ) {
|
||||
throwWithLocation ( noFunctionSpecified () );
|
||||
}
|
||||
this->fdmgr.resTbl.add (*this);
|
||||
this->fdmgr.resTbl.idAssignAdd (*this);
|
||||
this->timer.start ( *this, delayIn );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user