Added some trace messages to PacketManager and HistoryManager. Fixed bug causing PacketManager to refresh twice any time new waveform data showed up, wasting time

Author: azonenberg

src/ngscopeclient/HistoryManager.cpp

@@ -265,6 +265,8 @@ void HistoryManager::AddHistory(
 	if(HasHistory(tp))
 		return;
 
+	LogTrace("Adding history for %s\n", tp.PrettyPrint().c_str());
+
 	//All good. Generate a new history point and add it
 	auto pt = make_shared<HistoryPoint>();
 	m_history.push_back(pt);
@@ -309,10 +311,15 @@ void HistoryManager::AddHistory(
 				//With multiple trigger groups at different rates, we might have the most recent trigger for a scope
 				//roll to the start of the history queue. Don't delete that!!
 				if(point->IsInUse())
+				{
+					LogTrace("Not removing %s because it's in use\n", point->m_time.PrettyPrint().c_str());
 					continue;
+				}
 
+				LogTrace("Removing un-pinned waveform at t=%s (now have %zu points of %d allowed)\n",
+					point->m_time.PrettyPrint().c_str(), m_history.size(), m_maxDepth);
 				m_session.RemoveMarkers(point->m_time);
-				m_session.RemovePackets(point->m_time);
+				m_session.RemovePackets(point->m_time, false);
 				m_history.erase(it);
 				deletedSomething = true;
 				break;

src/ngscopeclient/PacketManager.cpp

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2024 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -179,13 +179,13 @@ void PacketManager::Update()
 	if(key == m_cachekey)
 		return;
 
-	LogTrace("Updating\n");
+	LogTrace("Updating packet manager with new data at %s\n", time.PrettyPrint().c_str());
 
 	//If we get here, waveform changed. Update cache key
 	m_cachekey = key;
 
 	//Remove any old history we might have had from this timestamp
-	RemoveHistoryFrom(time);
+	RemoveHistoryFrom(time, false);
 
 	//Copy the new packets and detach them so the filter doesn't delete them.
 	//Do the merging now
@@ -307,11 +307,17 @@ void PacketManager::FilterPackets()
 
 /**
 	@brief Removes all history from the specified timestamp
+
+	@param timestamp		Time to remove the history from
+	@param refreshAfter		True if we should refresh the list of displayed rows, false to not refresh
+							(should only be set false in Update())
  */
-void PacketManager::RemoveHistoryFrom(TimePoint timestamp)
+void PacketManager::RemoveHistoryFrom(TimePoint timestamp, bool refreshAfter)
 {
 	lock_guard<recursive_mutex> lock(m_mutex);
 
+	LogTrace("Removing history from %s\n", timestamp.PrettyPrint().c_str());
+
 	auto& packets = m_packets[timestamp];
 	for(auto p : packets)
 	{
@@ -323,7 +329,8 @@ void PacketManager::RemoveHistoryFrom(TimePoint timestamp)
 	m_filteredPackets.erase(timestamp);
 
 	//update the list of displayed rows so we don't have anything left pointing to stale packets
-	RefreshRows();
+	if(refreshAfter)
+		RefreshRows();
 }
 
 void PacketManager::RemoveChildHistoryFrom(Packet* pack)

src/ngscopeclient/PacketManager.h

@@ -156,7 +156,7 @@ class PacketManager
 	virtual ~PacketManager();
 
 	void Update();
-	void RemoveHistoryFrom(TimePoint timestamp);
+	void RemoveHistoryFrom(TimePoint timestamp, bool refreshAfter = true);
 
 	std::recursive_mutex& GetMutex()
 	{ return m_mutex; }

src/ngscopeclient/Session.cpp

@@ -3473,10 +3473,10 @@ shared_ptr<PacketManager> Session::AddPacketFilter(PacketDecoder* filter)
 /**
 	@brief Deletes packets from our packet managers for a waveform timestamp
  */
-void Session::RemovePackets(TimePoint t)
+void Session::RemovePackets(TimePoint t, bool immediateRefresh)
 {
 	for(auto it : m_packetmgrs)
-		it.second->RemoveHistoryFrom(t);
+		it.second->RemoveHistoryFrom(t, immediateRefresh);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/ngscopeclient/Session.h

@@ -2,7 +2,7 @@
 *                                                                                                                      *
 * ngscopeclient                                                                                                        *
 *                                                                                                                      *
-* Copyright (c) 2012-2024 Andrew D. Zonenberg and contributors                                                         *
+* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors                                                         *
 * All rights reserved.                                                                                                 *
 *                                                                                                                      *
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the     *
@@ -535,7 +535,7 @@ class Session
 	void RemoveMarkers(TimePoint t)
 	{ m_markers.erase(t); }
 
-	void RemovePackets(TimePoint t);
+	void RemovePackets(TimePoint t, bool immediateRefresh = true);
 
 	std::set<FlowGraphNode*> GetAllGraphNodes();