From 6ed4f091b2f6a96fb6206db8803dad8397b797cf Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 11 Jan 2007 21:43:40 +0000
Subject: [PATCH] 1) replaced elimateExcessiveSendBacklog with
 requestMessageBytesPending and flush 2) Removed callback control guards from
 this interface

---
 src/ca/nciu.h      |  7 +++----
 src/ca/netiiu.cpp  |  9 +++++++--
 src/ca/netiiu.h    |  5 +++--
 src/ca/noopiiu.cpp | 11 ++++++++---
 src/ca/noopiiu.h   |  5 +++--
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/ca/nciu.h b/src/ca/nciu.h
index 56be56964..877226c71 100644
--- a/src/ca/nciu.h
+++ b/src/ca/nciu.h
@@ -217,12 +217,12 @@ private:
     ca_uint16_t typeCode;
     ca_uint8_t priority; 
     virtual void destroy (
-        epicsGuard < epicsMutex > & callbackControlGuard, 
         epicsGuard < epicsMutex > & mutualExclusionGuard );
     void initiateConnect (
         epicsGuard < epicsMutex > & );
-    void eliminateExcessiveSendBacklog ( 
-        epicsGuard < epicsMutex > * pCallbackGuard,
+    unsigned requestMessageBytesPending ( 
+        epicsGuard < epicsMutex > & mutualExclusionGuard );
+    void flush ( 
         epicsGuard < epicsMutex > & mutualExclusionGuard );
     ioStatus read ( 
         epicsGuard < epicsMutex > &,
@@ -241,7 +241,6 @@ private:
         unsigned type, arrayElementCount nElem, 
         unsigned mask, cacStateNotify &notify, ioid * );
     virtual void ioCancel ( 
-        epicsGuard < epicsMutex > & callbackControlGuard, 
         epicsGuard < epicsMutex > & mutualExclusionGuard,
         const ioid & );
     void ioShow ( 
diff --git a/src/ca/netiiu.cpp b/src/ca/netiiu.cpp
index f8f14932e..a81b15533 100644
--- a/src/ca/netiiu.cpp
+++ b/src/ca/netiiu.cpp
@@ -129,8 +129,13 @@ void netiiu::flushRequest (
 {
 }
 
-void netiiu::eliminateExcessiveSendBacklog ( 
-    epicsGuard < epicsMutex > *,
+unsigned netiiu::requestMessageBytesPending ( 
+    epicsGuard < epicsMutex > & )
+{
+    return 0u;
+}
+
+void netiiu::flush ( 
     epicsGuard < epicsMutex > & )
 {
 }
diff --git a/src/ca/netiiu.h b/src/ca/netiiu.h
index 9152b73a2..99ea128f1 100644
--- a/src/ca/netiiu.h
+++ b/src/ca/netiiu.h
@@ -47,8 +47,9 @@ public:
         epicsGuard < epicsMutex > & ) const = 0;
     virtual bool ca_v42_ok (
         epicsGuard < epicsMutex > & ) const = 0;
-    virtual void eliminateExcessiveSendBacklog ( 
-        epicsGuard < epicsMutex > * pCallbackGuard,
+    virtual unsigned requestMessageBytesPending ( 
+        epicsGuard < epicsMutex > & mutualExclusionGuard ) = 0;
+    virtual void flush ( 
         epicsGuard < epicsMutex > & mutualExclusionGuard ) = 0;
     virtual void writeRequest ( 
         epicsGuard < epicsMutex > &, nciu &, 
diff --git a/src/ca/noopiiu.cpp b/src/ca/noopiiu.cpp
index 9c98447d9..a3d20b59b 100644
--- a/src/ca/noopiiu.cpp
+++ b/src/ca/noopiiu.cpp
@@ -116,11 +116,16 @@ void noopiiu::flushRequest (
     netiiu::flushRequest ( guard );
 }
 
-void noopiiu::eliminateExcessiveSendBacklog ( 
-    epicsGuard < epicsMutex > * pCBGuard,
+unsigned noopiiu::requestMessageBytesPending ( 
     epicsGuard < epicsMutex > & guard )
 {
-    netiiu::eliminateExcessiveSendBacklog ( pCBGuard, guard );
+    return netiiu::requestMessageBytesPending ( guard );
+}
+
+void noopiiu::flush ( 
+    epicsGuard < epicsMutex > & guard )
+{
+    netiiu::flush ( guard );
 }
 
 void noopiiu::requestRecvProcessPostponedFlush (
diff --git a/src/ca/noopiiu.h b/src/ca/noopiiu.h
index 7a5b6f11c..f373edec8 100644
--- a/src/ca/noopiiu.h
+++ b/src/ca/noopiiu.h
@@ -39,8 +39,9 @@ public:
         epicsGuard < epicsMutex > & ) const;
     bool ca_v42_ok (
         epicsGuard < epicsMutex > & ) const;
-    void eliminateExcessiveSendBacklog ( 
-        epicsGuard < epicsMutex > * pCallbackGuard,
+    unsigned requestMessageBytesPending ( 
+        epicsGuard < epicsMutex > & mutualExclusionGuard );
+    void flush ( 
         epicsGuard < epicsMutex > & mutualExclusionGuard );
     void writeRequest ( 
         epicsGuard < epicsMutex > &, nciu &,