Tweak some timings, and remove some dead code.

This commit is contained in:
Adam Ierymenko 2015-10-29 09:39:36 -07:00
parent e3d811b04b
commit 883c84bdb9
2 changed files with 1 additions and 32 deletions

View file

@ -57,7 +57,7 @@
/** /**
* Desired period between doPeriodicTasks() in milliseconds * Desired period between doPeriodicTasks() in milliseconds
*/ */
#define ZT_CLUSTER_PERIODIC_TASK_PERIOD 250 #define ZT_CLUSTER_PERIODIC_TASK_PERIOD 100
namespace ZeroTier { namespace ZeroTier {

View file

@ -205,32 +205,6 @@ public:
return pp; return pp;
} }
/**
* @return Time of last direct packet receive for any path
*/
inline uint64_t lastDirectReceive() const
throw()
{
Mutex::Lock _l(_lock);
uint64_t x = 0;
for(unsigned int p=0,np=_numPaths;p<np;++p)
x = std::max(x,_paths[p].lastReceived());
return x;
}
/**
* @return Time of last direct packet send for any path
*/
inline uint64_t lastDirectSend() const
throw()
{
Mutex::Lock _l(_lock);
uint64_t x = 0;
for(unsigned int p=0,np=_numPaths;p<np;++p)
x = std::max(x,_paths[p].lastSend());
return x;
}
/** /**
* @return Time of last receive of anything, whether direct or relayed * @return Time of last receive of anything, whether direct or relayed
*/ */
@ -285,11 +259,6 @@ public:
else _latency = std::min(l,(unsigned int)65535); else _latency = std::min(l,(unsigned int)65535);
} }
/**
* @return True if this peer has at least one direct IP address path
*/
inline bool hasDirectPath() const throw() { return (_numPaths != 0); }
/** /**
* @param now Current time * @param now Current time
* @return True if this peer has at least one active direct path * @return True if this peer has at least one active direct path