Browse Source

Finally remove NETWORK_RESYNCH_LATENCY, raise NETWORK_MAX_LATENCY.

tags/v1.9.10
Stephane Letz 12 years ago
parent
commit
2c116851ad
2 changed files with 1 additions and 5 deletions
  1. +0
    -3
      common/JackNetInterface.cpp
  2. +1
    -2
      common/JackNetInterface.h

+ 0
- 3
common/JackNetInterface.cpp View File

@@ -499,9 +499,6 @@ namespace Jack
if (fCurrentCycleOffset == fMaxCycleOffset) { if (fCurrentCycleOffset == fMaxCycleOffset) {
// when the sync offset is reached // when the sync offset is reached
fSynched = true; fSynched = true;
} else if (abs(fCurrentCycleOffset - fMaxCycleOffset) >= NETWORK_RESYNCH_LATENCY) {
jack_info("Resync connection...");
fSynched = false;
} }
rx_bytes = Recv(rx_head->fPacketSize, 0); rx_bytes = Recv(rx_head->fPacketSize, 0);
fRxHeader.fIsLastPckt = rx_head->fIsLastPckt; fRxHeader.fIsLastPckt = rx_head->fIsLastPckt;


+ 1
- 2
common/JackNetInterface.h View File

@@ -37,8 +37,7 @@ namespace Jack
#define SLAVE_INIT_TIMEOUT 1000000 * 10 // in usec #define SLAVE_INIT_TIMEOUT 1000000 * 10 // in usec
#define PACKET_TIMEOUT 500000 // in usec #define PACKET_TIMEOUT 500000 // in usec


#define NETWORK_MAX_LATENCY 20 // maximun possile latency in network master/slave loop
#define NETWORK_RESYNCH_LATENCY 3 // number of cycles offset before a resync is done....
#define NETWORK_MAX_LATENCY 30 // maximum possible latency in network master/slave loop


/** /**
\Brief This class describes the basic Net Interface, used by both master and slave. \Brief This class describes the basic Net Interface, used by both master and slave.


Loading…
Cancel
Save