From 56096be8b6e3f67e3bdce25bee73d0fc0534b0d5 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 6 Apr 2016 16:28:40 -0700 Subject: Tweak new RX queue algorithm to "expire" old entries to prevent always needing to traverse the whole queue array. --- node/Switch.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'node/Switch.hpp') diff --git a/node/Switch.hpp b/node/Switch.hpp index 219bfb41..ce4f00a1 100644 --- a/node/Switch.hpp +++ b/node/Switch.hpp @@ -184,7 +184,7 @@ private: /* Returns the matching or oldest entry. Caller must check timestamp and * packet ID to determine which. */ - inline RXQueueEntry *_findRXQueueEntry(uint64_t packetId) + inline RXQueueEntry *_findRXQueueEntry(uint64_t now,uint64_t packetId) { RXQueueEntry *rq; RXQueueEntry *oldest = &(_rxQueue[ZT_RX_QUEUE_SIZE - 1]); @@ -193,6 +193,8 @@ private: rq = &(_rxQueue[--i]); if ((rq->packetId == packetId)&&(rq->timestamp)) return rq; + if ((now - rq->timestamp) >= ZT_RX_QUEUE_EXPIRE) + rq->timestamp = 0; if (rq->timestamp < oldest->timestamp) oldest = rq; } -- cgit v1.2.3