# HG changeset patch # User Alain Mazy # Date 1781712052 -7200 # Node ID 2b7c43addced02f9539eccb58564a9f98a530349 # Parent 9e6a841aecc111b0ca099e1c11c9052d1afbc14d fix reused thread names diff -r 9e6a841aecc1 -r 2b7c43addced OrthancFramework/Sources/Logging.cpp --- a/OrthancFramework/Sources/Logging.cpp Wed Jun 17 17:34:51 2026 +0200 +++ b/OrthancFramework/Sources/Logging.cpp Wed Jun 17 18:00:52 2026 +0200 @@ -732,6 +732,7 @@ throw OrthancException(ErrorCode_InternalError, std::string("Thread name can not exceed 16 characters: ") + name); } + // std::cout << "+++++ SetCurrentThreadNameInternal " << id << " " << name << std::endl; #if !defined(NDEBUG) if (threadNames_.find(id) != threadNames_.end()) { @@ -783,6 +784,8 @@ boost::thread::id threadId = boost::this_thread::get_id(); boost::recursive_mutex::scoped_lock lock(threadNamesMutex_); + + // std::cout << "+++++ ClearCurrentThreadName " << threadId << std::endl; threadNames_.erase(threadId); } else if (hasClearThreadName_) // only recent runtimes support it (from 1.12.12) diff -r 9e6a841aecc1 -r 2b7c43addced OrthancFramework/UnitTestsSources/MemoryCacheTests.cpp --- a/OrthancFramework/UnitTestsSources/MemoryCacheTests.cpp Wed Jun 17 17:34:51 2026 +0200 +++ b/OrthancFramework/UnitTestsSources/MemoryCacheTests.cpp Wed Jun 17 18:00:52 2026 +0200 @@ -403,6 +403,8 @@ void ThreadingScenarioHappyThread1() { + Orthanc::Logging::ScopedThreadNameSetter setter("MEM-TEST-1"); + // the first thread to call Fetch (will be in charge of adding) Orthanc::MemoryStringCache::Accessor a(ThreadingScenarioHappyCache); std::string v; @@ -430,6 +432,8 @@ void ThreadingScenarioHappyThread2() { + Orthanc::Logging::ScopedThreadNameSetter setter("MEM-TEST-2"); + Orthanc::MemoryStringCache::Accessor a(ThreadingScenarioHappyCache); std::string v; @@ -472,6 +476,8 @@ void ThreadingScenarioFailureThread1() { + Orthanc::Logging::ScopedThreadNameSetter setter("MEM-TEST-1"); + // the first thread to call Fetch (will be in charge of adding) Orthanc::MemoryStringCache::Accessor a(ThreadingScenarioFailureCache); std::string v; @@ -495,6 +501,8 @@ void ThreadingScenarioFailureThread2() { + Orthanc::Logging::ScopedThreadNameSetter setter("MEM-TEST-2"); + Orthanc::MemoryStringCache::Accessor a(ThreadingScenarioFailureCache); std::string v; @@ -531,6 +539,8 @@ void ThreadingScenarioInvalidateThread1() { + Orthanc::Logging::ScopedThreadNameSetter setter("MEM-TEST-1"); + // the first thread to call Fetch (will be in charge of adding) Orthanc::MemoryStringCache::Accessor a(ThreadingScenarioInvalidateCache); std::string v; @@ -555,6 +565,8 @@ void ThreadingScenarioInvalidateThread2() { + Orthanc::Logging::ScopedThreadNameSetter setter("MEM-TEST-2"); + Orthanc::MemoryStringCache::Accessor a(ThreadingScenarioInvalidateCache); std::string v;