many structural improvements

src/ca/netiiu.cpp

@@ -19,110 +19,44 @@
 #include "cac.h"
 #include "netiiu.h"
 
-netiiu::netiiu ( cac *pClientCtxIn ) : pClientCtx ( pClientCtxIn )
-{
-}
-
 netiiu::~netiiu ()
 {
 }
 
-void netiiu::show ( unsigned level ) const
-{
-    ::printf ( "network IO base class\n" );
-    if ( level > 1 ) {
-        tsDLIterConstBD < nciu > pChan = this->channelList.firstIter ();
-	    while ( pChan.valid () ) {
-            pChan->show ( level - 1u );
-            pChan++;
-        }
-    }
-    if ( level > 2u ) {
-        ::printf ( "\tcac pointer %p\n", 
-            static_cast <void *> ( this->pClientCtx ) );
-    }
-}
-
-void netiiu::connectTimeoutNotify ()
-{
-    tsDLIterBD < nciu > chan = this->channelList.firstIter ();
-    while ( chan.valid () ) {
-        chan->connectTimeoutNotify ();
-        chan++;
-    }
-}
-
-void netiiu::resetChannelRetryCounts ()
-{
-    tsDLIterBD < nciu > chan = this->channelList.firstIter ();
-    while ( chan.valid () ) {
-        chan->resetRetryCount ();
-        chan++;
-    }
-}
-
-bool netiiu::searchMsg ( unsigned short retrySeqNumber, unsigned &retryNoForThisChannel )
-{
-    bool success;
-
-    if ( nciu *pChan = this->channelList.get () ) {
-        success = pChan->searchMsg ( retrySeqNumber, retryNoForThisChannel );
-        if ( success ) {
-            this->channelList.add ( *pChan );
-        }
-        else {
-            this->channelList.push ( *pChan );
-        }
-    }
-    else {
-        success = false;
-    }
-
-    return success;
-}
-
 bool netiiu::ca_v42_ok () const
 {
     return false;
 }
 
-bool netiiu::pushDatagramMsg ( const caHdr &, const void *, ca_uint16_t )
-{
-    return false;
-}
-
-void netiiu::lastChannelDetachNotify ( epicsGuard < class callbackMutex > & /* cbLocker */ )
-{
-}
-
-void netiiu::writeRequest ( nciu &, unsigned, unsigned, const void * )
+void netiiu::writeRequest ( epicsGuard < cacMutex > &, nciu &, 
+                           unsigned, unsigned, const void * )
 {
     throw cacChannel::notConnected();
 }
 
-void netiiu::writeNotifyRequest ( nciu &, netWriteNotifyIO &, unsigned, unsigned, const void * )
+void netiiu::writeNotifyRequest ( epicsGuard < cacMutex > &, 
+               nciu &, netWriteNotifyIO &, unsigned, unsigned, const void * )
 {
     throw cacChannel::notConnected();
 }
 
-void netiiu::readNotifyRequest ( nciu &, netReadNotifyIO &, unsigned, unsigned )
+void netiiu::readNotifyRequest ( epicsGuard < cacMutex > &, 
+                                nciu &, netReadNotifyIO &, unsigned, unsigned )
 {
     throw cacChannel::notConnected();
 }
 
-void netiiu::createChannelRequest ( nciu & )
+void netiiu::clearChannelRequest ( epicsGuard < cacMutex > &, ca_uint32_t, ca_uint32_t )
 {
 }
 
-void netiiu::clearChannelRequest ( ca_uint32_t, ca_uint32_t )
+void netiiu::subscriptionRequest ( epicsGuard < cacMutex > &, 
+                                  nciu &, netSubscription & )
 {
 }
 
-void netiiu::subscriptionRequest ( nciu &, netSubscription & )
-{
-}
-
-void netiiu::subscriptionCancelRequest (  nciu &, netSubscription & )
+void netiiu::subscriptionCancelRequest ( epicsGuard < cacMutex > &, 
+                                        nciu &, netSubscription & )
 {
 }
 
@@ -150,36 +84,32 @@ void netiiu::flushRequest ()
 {
 }
 
-bool netiiu::flushBlockThreshold () const
+bool netiiu::flushBlockThreshold ( epicsGuard < cacMutex > & ) const
 {
     return false;
 }
 
-void netiiu::flushRequestIfAboveEarlyThreshold ()
+void netiiu::flushRequestIfAboveEarlyThreshold ( epicsGuard < cacMutex > & )
 {
 }
 
 void netiiu::blockUntilSendBacklogIsReasonable 
-    ( epicsGuard < callbackMutex > *, epicsGuard < epicsMutex > & )
+    ( epicsGuard < callbackMutex > *, epicsGuard < cacMutex > & )
 {
 }
 
-int netiiu::printf ( const char *pformat, ... )
-{
-    va_list theArgs;
-    int status;
-
-    va_start ( theArgs, pformat );
-    
-    status = this->pClientCtx->vPrintf ( pformat, theArgs );
-    
-    va_end ( theArgs );
-    
-    return status;
-}
-
 void netiiu::requestRecvProcessPostponedFlush ()
 {
     return;
 }
 
+void netiiu::uninstallChannel ( epicsGuard < callbackMutex > &, 
+                               epicsGuard < cacMutex > &, nciu & )
+{
+    throw cacChannel::notConnected();
+}
+
+
+
+
+