From 70f80ce13330a9e64cb7f0ca6829610e11c05469 Mon Sep 17 00:00:00 2001
From: YexuanXiao <bizwen@nykz.org>
Date: Thu, 19 Mar 2026 15:58:41 +0800
Subject: [PATCH] Fix race condition in multi_threaded_observable_map test

---
 test/test/multi_threaded_common.h | 15 +++++++++++++--
 test/test/multi_threaded_map.cpp  |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/test/test/multi_threaded_common.h b/test/test/multi_threaded_common.h
index 026cb3264..3ed687743 100644
--- a/test/test/multi_threaded_common.h
+++ b/test/test/multi_threaded_common.h
@@ -45,7 +45,7 @@ namespace concurrent_collections
     // for the first time on the background thread.
     enum class collection_action
     {
-        none, push_back, insert, erase, at, lookup
+        none, push_back, insert, erase, at, lookup, advance
     };
 
     // All of our concurrency tests consists of starting an
@@ -165,16 +165,23 @@ namespace concurrent_collections
             return owner->dereference_iterator(inner());
         }
 
-        // inherited: pointer operator->() const;
+        pointer operator->() const
+        {
+            auto guard = owner->lock_const();
+            owner->call_hook(collection_action::at);
+            return iterator::operator->();
+        }
 
         concurrency_checked_random_access_iterator& operator++()
         {
+            owner->call_hook(collection_action::advance);
             ++inner();
             return *this;
         }
 
         concurrency_checked_random_access_iterator& operator++(int)
         {
+            owner->call_hook(collection_action::advance);
             auto prev = *this;
             ++inner();
             return prev;
@@ -182,12 +189,14 @@ namespace concurrent_collections
 
         concurrency_checked_random_access_iterator& operator--()
         {
+            owner->call_hook(collection_action::advance);
             --inner();
             return *this;
         }
 
         concurrency_checked_random_access_iterator& operator--(int)
         {
+            owner->call_hook(collection_action::advance);
             auto prev = *this;
             --inner();
             return prev;
@@ -195,6 +204,7 @@ namespace concurrent_collections
 
         concurrency_checked_random_access_iterator& operator+=(difference_type offset)
         {
+            owner->call_hook(collection_action::advance);
             inner() += offset;
             return *this;
         }
@@ -206,6 +216,7 @@ namespace concurrent_collections
 
         concurrency_checked_random_access_iterator& operator-=(difference_type offset)
         {
+            owner->call_hook(collection_action::advance);
             inner() -= offset;
             return *this;
         }
diff --git a/test/test/multi_threaded_map.cpp b/test/test/multi_threaded_map.cpp
index d0f68c1e2..ffa9988ba 100644
--- a/test/test/multi_threaded_map.cpp
+++ b/test/test/multi_threaded_map.cpp
@@ -237,7 +237,7 @@ namespace
         {
             // MoveNext vs Remove
             bool moved = false;
-            race(collection_action::at, [&]
+            race(collection_action::advance, [&]
             {
                 try
                 {
@@ -273,7 +273,7 @@ namespace
         {
             // MoveNext vs Insert
             bool moved = false;
-            race(collection_action::at, [&]
+            race(collection_action::advance, [&]
             {
                 try
                 {