+ this->timeAtLastSend = currentTime;
+
// boost search period for channels not recently
// searched for if there was some success
if ( this->searchResponses && this->boostPossible ) {
@@ -273,8 +276,6 @@
this->dgSeqNoAtTimerExpireEnd = this->iiu.datagramSeqNumber ( guard ) - 1u;
It looks like these changes should resolve this issue
cvs diff -u -wb -i -- searchTimer.cpp udpiiu.cpp udpiiu.h (in directory D:\users\ hill\R3. 14.dll_ hell_fix\ epics\base\ src\ca\ ) ======= ======= ======= ======= ======= ======= ======= ======= ==== epicsmgr/ cvsroot/ epics/base/ src/ca/ searchTimer. cpp,v :getCurrent () ),
Index: searchTimer.cpp
=======
RCS file: /net/phoebus/
retrieving revision 1.33.2.14
diff -c -u -w -b -i -r1.33.2.14 searchTimer.cpp
cvs diff: conflicting specifications of output style
--- searchTimer.cpp 6 Jun 2006 22:53:04 -0000 1.33.2.14
+++ searchTimer.cpp 6 Jun 2006 23:12:42 -0000
@@ -44,6 +44,7 @@
const unsigned indexIn,
epicsMutex & mutexIn,
bool boostPossibleIn ) :
+ timeAtLastSend ( epicsTime:
timer ( queueIn.createTimer () ),
iiu ( iiuIn ),
mutex ( mutexIn ),
@@ -133,6 +134,8 @@
guard, *pChan, this->index );
}
+ this->timeAtLas tSend = currentTime; ponses && this->boostPossible ) { >dgSeqNoAtTimer ExpireEnd =
this- >iiu.datagramSe qNumber ( guard ) - 1u;
+
// boost search period for channels not recently
// searched for if there was some success
if ( this->searchRes
@@ -273,8 +276,6 @@
this-
- this->timeAtLas tSend = currentTime; empts ) { ======= ======= ======= ======= ======= ======= ======= ======= ==== epicsmgr/ cvsroot/ epics/base/ src/ca/ udpiiu. cpp,v
-
# ifdef DEBUG
if ( this->searchAtt
char buf[64];
Index: udpiiu.cpp
=======
RCS file: /net/phoebus/
retrieving revision 1.103.2.28
diff -c -u -w -b -i -r1.103.2.28 udpiiu.cpp
cvs diff: conflicting specifications of output style
--- udpiiu.cpp 22 Nov 2005 00:11:16 -0000 1.103.2.28
+++ udpiiu.cpp 6 Jun 2006 19:35:49 -0000
@@ -1115,13 +1115,19 @@
void udpiiu::updateRTTE ( double measured ) imate ) { imate; imate ) { imate;
{
+ if ( measured > maxRoundTripEst
+ measured = maxRoundTripEst
+ }
+ if ( measured < minRoundTripEst
+ measured = minRoundTripEst
+ }
double error = measured - this->rtteMean;
this->rtteMean += 0.25 * error;
}
double udpiiu::getRTTE () const imate );
{
- return epicsMax ( this->rtteMean, minRoundTripEst
+ return this->rtteMean;
}
unsigned udpiiu::getHostName ( ======= ======= ======= ======= ======= ======= ======= ======= ==== epicsmgr/ cvsroot/ epics/base/ src/ca/ udpiiu. h,v
Index: udpiiu.h
=======
RCS file: /net/phoebus/
retrieving revision 1.24.2.15
diff -c -u -w -b -i -r1.24.2.15 udpiiu.h
cvs diff: conflicting specifications of output style
--- udpiiu.h 22 Nov 2005 00:11:16 -0000 1.24.2.15
+++ udpiiu.h 6 Jun 2006 19:35:51 -0000
@@ -80,6 +80,7 @@
};
static const double minRoundTripEst imate = 32e-3; // seconds imate = 10; // seconds Default = 5.0 * 60.0; // seconds LowerLimit = 60.0; // seconds archPeriod = 5.0; // seconds
+static const double maxRoundTripEst
static const double maxSearchPeriod
static const double maxSearchPeriod
static const double beaconAnomalySe
***** CVS exited normally with code 1 *****