Skip to content

Fix race condition in multi_threaded_observable_map test #1550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DefaultRyan wants to merge 2 commits into
base: master
Choose a base branch
from
+15 −4
Open

Fix race condition in multi_threaded_observable_map test #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20caba7
Fix race condition in multi_threaded_observable_map test
DefaultRyan Mar 19, 2026
c1857bd
Hook the other iterator movement methods.
DefaultRyan Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions test/test/multi_threaded_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -165,36 +165,46 @@ 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;
}

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;
}

concurrency_checked_random_access_iterator& operator+=(difference_type offset)
{
owner->call_hook(collection_action::advance);
inner() += offset;
return *this;
}
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions test/test/multi_threaded_map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ namespace
{
// MoveNext vs Remove
bool moved = false;
race(collection_action::at, [&]
race(collection_action::advance, [&]
{
try
{
Expand Down Expand Up @@ -273,7 +273,7 @@ namespace
{
// MoveNext vs Insert
bool moved = false;
race(collection_action::at, [&]
race(collection_action::advance, [&]
{
try
{
Expand Down