Track 32 latency values

ClarenceShalave · Feb 18, 2021 · eb3273f · eb3273f
1 parent 8c52d61
commit eb3273f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/XivAlexander/App_Network_IcmpPingTracker.cpp b/XivAlexander/App_Network_IcmpPingTracker.cpp
@@ -14,7 +14,7 @@ struct ConnectionPair {
 static std::unique_ptr<App::Network::IcmpPingTracker> s_instance;
 static std::mutex s_latestKnownLatencyLock;
 static std::map<ConnectionPair, std::vector<uint64_t>> s_latestKnownLatency;
-static const int LatencyTrackCount = 16;
+static const int LatencyTrackCount = 32;
 
 class App::Network::IcmpPingTracker::Implementation {
 public:
@@ -62,7 +62,7 @@ class App::Network::IcmpPingTracker::Implementation {
 			DWORD waitTime;
 			size_t successCount = 0;
 			do {
-				const auto interval = successCount > 16 ? 10000 : 1000;
+				const auto interval = successCount > LatencyTrackCount ? 10000 : 1000;
 				const auto startTime = Utils::GetHighPerformanceCounter();
 				const auto ok = IcmpSendEcho2Ex(hIcmp, nullptr, nullptr, nullptr, info.Pair.Source.S_un.S_addr, info.Pair.Destination.S_un.S_addr, SendBuf, sizeof SendBuf, nullptr, ReplyBuf, sizeof ReplyBuf, interval);
 				const auto endTime = Utils::GetHighPerformanceCounter();
@@ -75,7 +75,8 @@ class App::Network::IcmpPingTracker::Implementation {
 					const auto newPos = list.empty() ? 0 : std::upper_bound(list.begin(), list.end(), latency) - list.begin();
 					list.insert(list.begin() + newPos, latency);
 					if (list.size() > LatencyTrackCount) {
-						if (newPos >= LatencyTrackCount / 2)
+						// try to send new item to middle
+						if (newPos < LatencyTrackCount / 2)
 							list.pop_back();
 						else
 							list.erase(list.begin());

diff --git a/XivAlexander/App_Network_SocketHook.cpp b/XivAlexander/App_Network_SocketHook.cpp
@@ -168,7 +168,7 @@ class App::Network::SingleConnection::Internals {
 	std::map<size_t, std::vector<std::function<bool(Structures::FFXIVMessage*, std::vector<uint8_t>&)>>> m_incomingHandlers;
 	std::map<size_t, std::vector<std::function<bool(Structures::FFXIVMessage*, std::vector<uint8_t>&)>>> m_outgoingHandlers;
 
-	static const size_t LatencyTrackCount = 16;
+	static const size_t LatencyTrackCount = 32;
 	std::deque<uint64_t> KeepAliveRequestTimestamps;
 	std::vector<uint64_t> ObservedLatencyList;
 
@@ -232,7 +232,8 @@ class App::Network::SingleConnection::Internals {
 		const auto newPos = ObservedLatencyList.empty() ? 0 : std::upper_bound(ObservedLatencyList.begin(), ObservedLatencyList.end(), delay) - ObservedLatencyList.begin();
 		ObservedLatencyList.insert(ObservedLatencyList.begin() + newPos, delay);
 		if (ObservedLatencyList.size() > LatencyTrackCount) {
-			if (newPos >= LatencyTrackCount / 2)
+			// try to send new item to middle
+			if (newPos < LatencyTrackCount / 2)
 				ObservedLatencyList.pop_back();
 			else
 				ObservedLatencyList.erase(ObservedLatencyList.begin());