From f2a3c033fc31332e78aa45d2d9deaf51359b584a Mon Sep 17 00:00:00 2001 From: Benoit Germain Date: Wed, 13 Nov 2024 10:47:24 +0100 Subject: Cleaning up guano Lane::tracking_next and LaneTracker::trackingFirst do not need to be volatile or anything else, all accesses are mutex-protected --- src/lane.hpp | 4 ++-- src/tracker.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lane.hpp b/src/lane.hpp index 4f87e2a..eb51aa3 100644 --- a/src/lane.hpp +++ b/src/lane.hpp @@ -135,8 +135,8 @@ class Lane // is still running // S: cleans up after itself if non-nullptr at lane exit - // For tracking only - Lane* volatile tracking_next{ nullptr }; + // access is protected by LaneTracker::trackingMutex + Lane* tracking_next{ nullptr }; ErrorTraceLevel const errorTraceLevel{ Basic }; diff --git a/src/tracker.hpp b/src/tracker.hpp index dcf3c6e..c1a38e2 100644 --- a/src/tracker.hpp +++ b/src/tracker.hpp @@ -11,7 +11,7 @@ class LaneTracker { private: mutable std::mutex trackingMutex; - Lane* volatile trackingFirst{ nullptr }; // will change to TRACKING_END if we want to activate tracking + Lane* trackingFirst{ nullptr }; // will change to TRACKING_END if we want to activate tracking public: void tracking_add(Lane* lane_); -- cgit v1.2.3-55-g6feb