summaryrefslogtreecommitdiff
path: root/node/Path.hpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2019-03-14 13:49:49 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2019-03-14 13:49:49 -0700
commit9d7b7c72b2dd769853bea3423321539ab198829e (patch)
treedb1a038d5cda0a023b63b449a2b0c53ce9b96428 /node/Path.hpp
parentd7a6357393f25748e4256d6ccf1321d7532d02b9 (diff)
parent95bfc29c92f1c689f181142d226ad642f86cee10 (diff)
downloadinfinitytier-9d7b7c72b2dd769853bea3423321539ab198829e.tar.gz
infinitytier-9d7b7c72b2dd769853bea3423321539ab198829e.zip
Merge branch 'dev' into edge
Diffstat (limited to 'node/Path.hpp')
-rw-r--r--node/Path.hpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/node/Path.hpp b/node/Path.hpp
index 6acba172..a9e7d84d 100644
--- a/node/Path.hpp
+++ b/node/Path.hpp
@@ -161,7 +161,6 @@ public:
~Path()
{
-#if ZT_PROTO_VERSION >= 10
delete _throughputSamples;
delete _latencySamples;
delete _packetValiditySamples;
@@ -170,7 +169,6 @@ public:
_latencySamples = NULL;
_packetValiditySamples = NULL;
_throughputDisturbanceSamples = NULL;
-#endif
}
/**
@@ -653,14 +651,12 @@ 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:
@@ -706,6 +702,8 @@ private:
float _lastComputedThroughputDistCoeff;
unsigned char _lastAllocation;
+
+
// cached human-readable strings for tracing purposes
char _ifname[16];
char _addrString[256];