workaround for Solaris compiler bug

This commit is contained in:
Jeff Hill
2000-04-28 02:16:03 +00:00
parent d3dfd93151
commit d9bd2a3bdf
5 changed files with 17 additions and 5 deletions

View File

@@ -469,7 +469,7 @@ void cac::beaconNotify ( const inetAddrID &addr )
tcpiiu *piiu = pBHE->getIIU ();
if ( piiu ) {
if ( ! piiu->beaconAnomaly ) {
piiu->tcpRecvWatchdog::reschedule (); // reset connection activity watchdog
piiu->rescheduleRecvTimer (); // reset connection activity watchdog
}
}
}

View File

@@ -498,6 +498,7 @@ class tcpRecvWatchdog : public osiTimer {
public:
tcpRecvWatchdog (double periodIn, osiTimerQueue & queueIn, bool echoProtocolAcceptedIn);
void echoResponseNotify ();
void rescheduleRecvTimer ();
private:
void expire ();
void destroy ();
@@ -516,6 +517,7 @@ private:
class tcpSendWatchdog : public osiTimer {
public:
tcpSendWatchdog (double periodIn, osiTimerQueue & queueIn);
void rescheduleSendTimer ();
private:
void expire ();
void destroy ();

View File

@@ -70,3 +70,8 @@ const char *tcpRecvWatchdog::name () const
{
return "TCP Receive Watchdog";
}
void tcpRecvWatchdog::rescheduleRecvTimer ()
{
this->reschedule ();
}

View File

@@ -44,3 +44,8 @@ const char *tcpSendWatchdog::name () const
{
return "TCP Send Watchdog";
}
void tcpSendWatchdog::rescheduleSendTimer ()
{
this->reschedule ();
}

View File

@@ -151,7 +151,7 @@ LOCAL void cac_connect_tcp (tcpiiu *piiu)
*/
piiu->state = iiu_connected;
piiu->tcpRecvWatchdog::reschedule (); // reset connection activity watchdog
piiu->rescheduleRecvTimer (); // reset connection activity watchdog
return;
}
@@ -301,7 +301,7 @@ void tcpiiu::recvMsg ()
cacRingBufferWriteCommit (&this->recv, totalBytes);
cacRingBufferWriteFlush (&this->recv);
this->tcpRecvWatchdog::reschedule (); // reschedule connection activity watchdog
this->rescheduleRecvTimer (); // reschedule connection activity watchdog
return;
}
@@ -609,7 +609,7 @@ bool tcpiiu::compareIfTCP ( nciu &chan, const sockaddr_in &addr ) const
void tcpiiu::flush ()
{
if ( cacRingBufferWriteFlush ( &this->send ) ) {
this->tcpSendWatchdog::reschedule ();
this->rescheduleSendTimer ();
}
}
@@ -1375,7 +1375,7 @@ int tcpiiu::pushStreamMsg (const caHdr *pmsg,
if ( ! cacRingBufferWriteLockNoBlock ( &this->send, msgsize ) ) {
if ( BlockingOk ) {
this->tcpSendWatchdog::reschedule ();
this->rescheduleSendTimer ();
cacRingBufferWriteLock ( &this->send );
}
else {