Merge pull request #104 from ecmwf/feature/thread-safe-debug

Looks good to me. Thanks @simondsmart and @geier1993
ecmwf · Jun 13, 2024 · 3ee79af · 3ee79af
2 parents 149b9f7 + 1f072b3
commit 3ee79af
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/src/eckit/log/Log.cc b/src/eckit/log/Log.cc
@@ -173,9 +173,10 @@ struct CreateDebugChannel : public CreateLogChannel {
 };
 
 Channel& Log::debug() {
-    if (!Main::ready()) {
 
 
+    if (!Main::ready()) {
+
         const char* e = getenv("DEBUG");
 
         if (e && bool(Translator<std::string, bool>()(e))) {
@@ -187,8 +188,8 @@ Channel& Log::debug() {
     }
 
     if (!Main::instance().debug_) {
-        static Channel empty;
-        return empty;
+        static ThreadSingleton<Channel> empty;
+        return empty.instance();
     }
 
 

diff --git a/src/eckit/system/Library.cc b/src/eckit/system/Library.cc
@@ -30,14 +30,14 @@
 #include "eckit/system/SystemInfo.h"
 #include "eckit/thread/AutoLock.h"
 #include "eckit/thread/Mutex.h"
+#include "eckit/thread/ThreadSingleton.h"
 #include "eckit/utils/Translator.h"
 
 namespace eckit::system {
 
 //----------------------------------------------------------------------------------------------------------------------
 
-Library::Library(const std::string& name) :
-    name_(name), prefix_(name), debug_(false) {
+Library::Library(const std::string& name) : name_(name), prefix_(name), debug_(false) {
 
     LibraryManager::enregister(name, this);
 
@@ -109,25 +109,22 @@ std::string Library::libraryPath() const {
     return libraryPath_;
 }
 
-Channel& Library::debugChannel() const {
-    AutoLock<Mutex> lock(mutex_);
-
-    if (debugChannel_) {
-        return *debugChannel_;
-    }
 
-    std::string s = prefix_ + "_DEBUG";
+Channel& Library::debugChannel() const {
+    static ThreadSingleton<std::map<const Library*, std::unique_ptr<Channel>>> debugChannels;
 
-    if (debug_) {
-        debugChannel_.reset(new Channel(new PrefixTarget(s)));
-    }
-    else {
-        debugChannel_.reset(new Channel());
+    auto it = debugChannels.instance().find(this);
+    if (it != debugChannels.instance().end()) {
+        return *it->second;
     }
 
-    return *debugChannel_;
+    return *debugChannels.instance()
+                .emplace(this, debug_ ? std::make_unique<Channel>(new PrefixTarget(prefix_ + "_DEBUG"))  //
+                                      : std::make_unique<Channel>())                                     //
+                .first->second.get();
 }
 
+
 const Configuration& Library::configuration() const {
     AutoLock<Mutex> lock(mutex_);
 
@@ -142,7 +139,8 @@ const Configuration& Library::configuration() const {
 
     Log::debug() << "Parsing Lib " << name_ << " config file " << cfgpath << std::endl;
 
-    eckit::Configuration* cfg = cfgpath.exists() ? new eckit::YAMLConfiguration(cfgpath) : new eckit::YAMLConfiguration(std::string(""));
+    eckit::Configuration* cfg
+        = cfgpath.exists() ? new eckit::YAMLConfiguration(cfgpath) : new eckit::YAMLConfiguration(std::string(""));
 
     Log::debug() << "Lib " << name_ << " configuration: " << *cfg << std::endl;
 

diff --git a/src/eckit/system/Library.h b/src/eckit/system/Library.h
@@ -103,8 +103,6 @@ class Library : private eckit::NonCopyable {
     mutable std::string libraryPath_;
     mutable std::string prefixDirectory_;
 
-    mutable std::unique_ptr<eckit::Channel> debugChannel_;
-
     mutable std::unique_ptr<eckit::Configuration> configuration_;
 };