changed tsDLIterBD to tsDLIter

This commit is contained in:
Jeff Hill
2002-07-25 21:02:29 +00:00
parent 27d9ae81c6
commit e45a480dca
25 changed files with 131 additions and 143 deletions
+2 -2
View File
@@ -159,13 +159,13 @@ void CASG::show ( unsigned level ) const
if ( level ) {
epicsGuard < casgMutex > locker ( this->mutex );
::printf ( "\tPending" );
tsDLIterConstBD < syncGroupNotify > notifyPending = this->ioPendingList.firstIter ();
tsDLIterConst < syncGroupNotify > notifyPending = this->ioPendingList.firstIter ();
while ( notifyPending.valid () ) {
notifyPending->show ( level - 1u );
notifyPending++;
}
::printf ( "\tCompleted" );
tsDLIterConstBD < syncGroupNotify > notifyCompleted = this->ioCompletedList.firstIter ();
tsDLIterConst < syncGroupNotify > notifyCompleted = this->ioCompletedList.firstIter ();
while ( notifyCompleted.valid () ) {
notifyCompleted->show ( level - 1u );
notifyCompleted++;
+2 -2
View File
@@ -75,7 +75,7 @@ bhe::~bhe ()
void bhe::beaconAnomalyNotify ()
{
tsDLIterBD < tcpiiu > iter = this->iiuList.firstIter ();
tsDLIter < tcpiiu > iter = this->iiuList.firstIter ();
while ( iter.valid() ) {
iter->beaconAnomalyNotify ();
iter++;
@@ -195,7 +195,7 @@ bool bhe::updatePeriod ( const epicsTime & programBeginTime,
* update state of health for active virtual circuits
* if the beacon looks ok
*/
tsDLIterBD < tcpiiu > iter = this->iiuList.firstIter ();
tsDLIter < tcpiiu > iter = this->iiuList.firstIter ();
while ( iter.valid() ) {
iter->beaconArrivalNotify ();
iter++;
+4 -4
View File
@@ -991,10 +991,10 @@ void cac::ioExceptionNotifyAndDestroy ( unsigned id, int status,
// (always called from a udp thread)
void cac::connectAllIO ( epicsGuard < cacMutex > & guard, nciu & chan )
{
tsDLIterBD < baseNMIU > pNetIO =
tsDLIter < baseNMIU > pNetIO =
chan.cacPrivateListOfIO::eventq.firstIter ();
while ( pNetIO.valid () ) {
tsDLIterBD < baseNMIU > next = pNetIO;
tsDLIter < baseNMIU > next = pNetIO;
next++;
class netSubscription *pSubscr = pNetIO->isSubscription ();
// disconnected channels should have only subscription IO attached
@@ -1014,9 +1014,9 @@ void cac::connectAllIO ( epicsGuard < cacMutex > & guard, nciu & chan )
// -- callback lock and cac lock must be applied here
void cac::disconnectAllIO ( epicsGuard < cacMutex > &locker, nciu & chan, bool enableCallbacks )
{
tsDLIterBD<baseNMIU> pNetIO = chan.cacPrivateListOfIO::eventq.firstIter();
tsDLIter<baseNMIU> pNetIO = chan.cacPrivateListOfIO::eventq.firstIter();
while ( pNetIO.valid() ) {
tsDLIterBD<baseNMIU> pNext = pNetIO;
tsDLIter<baseNMIU> pNext = pNetIO;
pNext++;
if ( ! pNetIO->isSubscription() ) {
// no use after disconnected - so uninstall it
+2 -2
View File
@@ -48,7 +48,7 @@ cacChannel * cacServiceList::createChannel (
cacChannel *pChanIO = 0;
epicsGuard < epicsMutex > locker ( this->mutex );
tsDLIterBD < cacService > iter = this->services.firstIter ();
tsDLIter < cacService > iter = this->services.firstIter ();
while ( iter.valid () ) {
pChanIO = iter->createChannel ( pName, chan, pri );
if ( pChanIO ) {
@@ -63,7 +63,7 @@ cacChannel * cacServiceList::createChannel (
void cacServiceList::show ( unsigned level ) const
{
epicsGuard < epicsMutex > locker ( this->mutex );
tsDLIterConstBD < cacService > iter = this->services.firstIter ();
tsDLIterConst < cacService > iter = this->services.firstIter ();
while ( iter.valid () ) {
iter->show ( level );
iter++;
+2 -2
View File
@@ -98,14 +98,14 @@ void comQueSend::clear ()
this->nBytesPending -= pBuf->occupiedBytes ();
pBuf->destroy ();
}
this->pFirstUncommited = tsDLIterBD < comBuf > ();
this->pFirstUncommited = tsDLIter < comBuf > ();
assert ( this->nBytesPending == 0 );
}
void comQueSend::clearUncommitted ()
{
while ( this->pFirstUncommited.valid() ) {
tsDLIterBD < comBuf > next = this->pFirstUncommited;
tsDLIter < comBuf > next = this->pFirstUncommited;
next++;
this->pFirstUncommited->clearUncommittedIncomming ();
if ( this->pFirstUncommited->occupiedBytes() == 0u ) {
+1 -1
View File
@@ -65,7 +65,7 @@ public:
comBuf * popNextComBufToSend ();
private:
tsDLList < comBuf > bufs;
tsDLIterBD < comBuf > pFirstUncommited;
tsDLIter < comBuf > pFirstUncommited;
wireSendAdapter & wire;
unsigned nBytesPending;
void copy_dbr_string ( const void *pValue, unsigned nElem );
+1 -1
View File
@@ -415,7 +415,7 @@ static void register_new_client ( osiSockAddr &from )
}
}
tsDLIterBD < repeaterClient > pclient = client_list.firstIter ();
tsDLIter < repeaterClient > pclient = client_list.firstIter ();
while ( pclient.valid () ) {
if ( pclient->identicalPort ( from ) ) {
break;
+1 -1
View File
@@ -701,7 +701,7 @@ void tcpiiu::show ( unsigned level ) const
this->recvThread.show ( level-2u );
::printf ("\techo pending bool = %u\n", this->echoRequestPending );
::printf ( "IO identifier hash table:\n" );
tsDLIterConstBD < nciu > pChan = this->channelList.firstIter ();
tsDLIterConst < nciu > pChan = this->channelList.firstIter ();
while ( pChan.valid () ) {
pChan->show ( level - 2u );
pChan++;
+2 -2
View File
@@ -951,7 +951,7 @@ void udpiiu::show ( unsigned level ) const
this->pSearchTmr->show ( level - 2u );
::printf ( "repeater subscribee timer:\n" );
this->pRepeaterSubscribeTmr->show ( level - 2u );
tsDLIterConstBD < nciu > pChan = this->channelList.firstIter ();
tsDLIterConst < nciu > pChan = this->channelList.firstIter ();
while ( pChan.valid () ) {
pChan->show ( level - 2u );
pChan++;
@@ -1003,7 +1003,7 @@ void udpiiu::beaconAnomalyNotify ()
{
epicsGuard <udpMutex> guard ( this->mutex );
tsDLIterBD < nciu > chan = this->channelList.firstIter ();
tsDLIter < nciu > chan = this->channelList.firstIter ();
while ( chan.valid () ) {
chan->beaconAnomalyNotify ();
chan++;