#ifdef'd out multipath/QoS statistics buffers allocations for ZT_PROTOCOL_VERSION<10

This commit is contained in:
Joseph Henry 2019-03-01 13:28:00 -08:00
parent 59a0a25f35
commit 270debb3fc
3 changed files with 8 additions and 2 deletions

View file

@ -161,6 +161,7 @@ public:
~Path()
{
#if ZT_PROTO_VERSION >= 10
delete _throughputSamples;
delete _latencySamples;
delete _packetValiditySamples;
@ -169,6 +170,7 @@ public:
_latencySamples = NULL;
_packetValiditySamples = NULL;
_throughputDisturbanceSamples = NULL;
#endif
}
/**
@ -651,12 +653,14 @@ public:
* Initialize statistical buffers
*/
inline void prepareBuffers() {
#if ZT_PROTO_VERSION >= 10
_throughputSamples = new RingBuffer<uint64_t>(ZT_PATH_QUALITY_METRIC_WIN_SZ);
_latencySamples = new RingBuffer<uint32_t>(ZT_PATH_QUALITY_METRIC_WIN_SZ);
_packetValiditySamples = new RingBuffer<bool>(ZT_PATH_QUALITY_METRIC_WIN_SZ);
_throughputDisturbanceSamples = new RingBuffer<float>(ZT_PATH_QUALITY_METRIC_WIN_SZ);
memset(_ifname, 0, 16);
memset(_addrString, 0, sizeof(_addrString));
#endif
}
private:
@ -702,8 +706,6 @@ private:
float _lastComputedThroughputDistCoeff;
unsigned char _lastAllocation;
// cached human-readable strings for tracing purposes
char _ifname[16];
char _addrString[256];