From 287743f1401c763265f111cef14273ff5bdb0815 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 11 Jan 2007 21:33:31 +0000 Subject: [PATCH] 1) replaced elimateExcessiveSendBacklog with requestMessageBytesPending and flush 2) Removed callback control guards from this interface --- src/ca/cacIO.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ca/cacIO.h b/src/ca/cacIO.h index 5b7ce7161..4b8daf0f5 100644 --- a/src/ca/cacIO.h +++ b/src/ca/cacIO.h @@ -137,7 +137,6 @@ public: virtual void connectNotify ( epicsGuard < epicsMutex > & ) = 0; virtual void disconnectNotify ( epicsGuard < epicsMutex > & ) = 0; virtual void serviceShutdownNotify ( - epicsGuard < epicsMutex > & callbackControlGuard, epicsGuard < epicsMutex > & mutualExclusionGuard ) = 0; virtual void accessRightsNotify ( epicsGuard < epicsMutex > &, const caAccessRights & ) = 0; @@ -175,7 +174,6 @@ public: cacChannel ( cacChannelNotify & ); virtual void destroy ( - epicsGuard < epicsMutex > & callbackControlGuard, epicsGuard < epicsMutex > & mutualExclusionGuard ) = 0; cacChannelNotify & notify () const; // required ????? virtual unsigned getName ( @@ -189,8 +187,9 @@ public: unsigned level ) const = 0; virtual void initiateConnect ( epicsGuard < epicsMutex > & ) = 0; - virtual void eliminateExcessiveSendBacklog ( - epicsGuard < epicsMutex > * pCallbackGuard, + virtual unsigned requestMessageBytesPending ( + epicsGuard < epicsMutex > & mutualExclusionGuard ) = 0; + virtual void flush ( epicsGuard < epicsMutex > & mutualExclusionGuard ) = 0; virtual ioStatus read ( epicsGuard < epicsMutex > &, @@ -209,7 +208,6 @@ public: arrayElementCount count, unsigned mask, cacStateNotify &, ioid * = 0 ) = 0; virtual void ioCancel ( - epicsGuard < epicsMutex > & callbackControlGuard, epicsGuard < epicsMutex > & mutualExclusionGuard, const ioid & ) = 0; virtual void ioShow (