From 21ea0904317e88e05ec42e6a7f7f50c48b8b2975 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 22 Jan 2004 21:04:03 +0000 Subject: [PATCH] fixed missing code interfacing back to net io subsystem --- src/db/dbContext.cpp | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/src/db/dbContext.cpp b/src/db/dbContext.cpp index 0cd98fed8..7b73195ca 100644 --- a/src/db/dbContext.cpp +++ b/src/db/dbContext.cpp @@ -354,6 +354,7 @@ void dbContext::showAllIO ( const dbChannelIO & chan, unsigned level ) const void dbContext::show ( unsigned level ) const { epicsGuard < epicsMutex > guard ( this->mutex ); + this->show ( guard, level ); } void dbContext::show ( @@ -370,17 +371,30 @@ void dbContext::show ( if ( level > 1u ) { this->mutex.show ( level - 2u ); } + if ( this->pNetContext.get() ) { + this->pNetContext.get()->show ( guard, level ); + } } void dbContext::flush ( - epicsGuard < epicsMutex > & ) + epicsGuard < epicsMutex > & guard ) { + guard.assertIdenticalMutex ( this->mutex ); + if ( this->pNetContext.get() ) { + this->pNetContext.get()->flush ( guard ); + } } unsigned dbContext::circuitCount ( - epicsGuard < epicsMutex > & ) const + epicsGuard < epicsMutex > & guard ) const { - return 0u; + guard.assertIdenticalMutex ( this->mutex ); + if ( this->pNetContext.get() ) { + this->pNetContext.get()->circuitCount ( guard ); + } + else { + return 0u; + } } void dbContext::selfTest ( @@ -388,12 +402,22 @@ void dbContext::selfTest ( { guard.assertIdenticalMutex ( this->mutex ); this->ioTable.verify (); + + if ( this->pNetContext.get() ) { + this->pNetContext.get()->selfTest ( guard ); + } } unsigned dbContext::beaconAnomaliesSinceProgramStart ( - epicsGuard < epicsMutex > & ) const + epicsGuard < epicsMutex > & guard ) const { - return 0u; + guard.assertIdenticalMutex ( this->mutex ); + if ( this->pNetContext.get() ) { + this->pNetContext.get()->beaconAnomaliesSinceProgramStart ( guard ); + } + else { + return 0u; + } }