Skip to content

Deterministic multithreading usage of itkMersenneTwisterRandomVariate… #5287

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

Closed
michalmeszaroswork wants to merge 1 commit into from
Closed

Deterministic multithreading usage of itkMersenneTwisterRandomVariate… #5287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Modules/Core/Common/src/itkMersenneTwisterRandomVariateGenerator.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ struct MersenneTwisterGlobals
MersenneTwisterGlobals() = default;
~MersenneTwisterGlobals() = default;

MersenneTwisterRandomVariateGenerator::Pointer m_StaticInstance{};
std::mutex m_StaticInstanceMutex{};
std::atomic<MersenneTwisterRandomVariateGenerator::IntegerType> m_StaticDiffer{};
};
Expand Down Expand Up @@ -74,13 +73,14 @@ MersenneTwisterRandomVariateGenerator::GetInstance()
itkInitGlobalsMacro(PimplGlobals);
const std::lock_guard<std::mutex> lockGuard(m_PimplGlobals->m_StaticInstanceMutex);

if (!m_PimplGlobals->m_StaticInstance)
thread_local MersenneTwisterRandomVariateGenerator::Pointer threadSafeInstance{};
if (!threadSafeInstance)
{
m_PimplGlobals->m_StaticInstance = MersenneTwisterRandomVariateGenerator::CreateInstance();
m_PimplGlobals->m_StaticInstance->SetSeed();
threadSafeInstance = MersenneTwisterRandomVariateGenerator::CreateInstance();
threadSafeInstance->SetSeed();
}

return m_PimplGlobals->m_StaticInstance;
return threadSafeInstance;
Comment on lines -77 to +83
Copy link
Contributor

@N-Dekker N-Dekker Mar 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: I would name it threadLocalInstance, rather than threadSafeInstance. The original instance m_StaticInstance was thread-safe already, but your essential change is to make it thread local.

Then I would suggest to have it initialized during its declaration, so that it can be const:

  const thread_local MersenneTwisterRandomVariateGenerator::Pointer threadLocalInstance = [] {
    MersenneTwisterRandomVariateGenerator::Pointer instance = MersenneTwisterRandomVariateGenerator::CreateInstance();
    instance->SetSeed();
    return instance;
  }();

  return threadLocalInstance;

}


Expand Down