1) replaced elimateExcessiveSendBacklog with
requestMessageBytesPending and flush 2) Removed callback control guards from this interface
This commit is contained in:
@@ -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 ¬ify, ioid * );
|
||||
virtual void ioCancel (
|
||||
epicsGuard < epicsMutex > & callbackControlGuard,
|
||||
epicsGuard < epicsMutex > & mutualExclusionGuard,
|
||||
const ioid & );
|
||||
void ioShow (
|
||||
|
||||
@@ -129,8 +129,13 @@ void netiiu::flushRequest (
|
||||
{
|
||||
}
|
||||
|
||||
void netiiu::eliminateExcessiveSendBacklog (
|
||||
epicsGuard < epicsMutex > *,
|
||||
unsigned netiiu::requestMessageBytesPending (
|
||||
epicsGuard < epicsMutex > & )
|
||||
{
|
||||
return 0u;
|
||||
}
|
||||
|
||||
void netiiu::flush (
|
||||
epicsGuard < epicsMutex > & )
|
||||
{
|
||||
}
|
||||
|
||||
@@ -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 &,
|
||||
|
||||
@@ -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 (
|
||||
|
||||
@@ -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 &,
|
||||
|
||||
Reference in New Issue
Block a user