From d1175e8fa1eb873e6accbb2f220686077cad38dc Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 13 Dec 2019 15:24:56 -0500
Subject: DRTVWR-476: Log calls to LLParamSingleton::initParamSingleton().

---
 indra/llcommon/llsingleton.cpp | 12 ++++++------
 indra/llcommon/llsingleton.h   |  8 +++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llsingleton.cpp b/indra/llcommon/llsingleton.cpp
index 9846031512..d3d25201b2 100644
--- a/indra/llcommon/llsingleton.cpp
+++ b/indra/llcommon/llsingleton.cpp
@@ -42,8 +42,6 @@ namespace {
 void log(LLError::ELevel level,
          const char* p1, const char* p2, const char* p3, const char* p4);
 
-void logdebugs(const char* p1="", const char* p2="", const char* p3="", const char* p4="");
-
 bool oktolog();
 } // anonymous namespace
 
@@ -486,10 +484,6 @@ void log(LLError::ELevel level,
     }
 }
 
-void logdebugs(const char* p1, const char* p2, const char* p3, const char* p4)
-{
-    log(LLError::LEVEL_DEBUG, p1, p2, p3, p4);
-}
 } // anonymous namespace        
 
 //static
@@ -504,6 +498,12 @@ void LLSingletonBase::loginfos(const char* p1, const char* p2, const char* p3, c
     log(LLError::LEVEL_INFO, p1, p2, p3, p4);
 }
 
+//static
+void LLSingletonBase::logdebugs(const char* p1, const char* p2, const char* p3, const char* p4)
+{
+    log(LLError::LEVEL_DEBUG, p1, p2, p3, p4);
+}
+
 //static
 void LLSingletonBase::logerrs(const char* p1, const char* p2, const char* p3, const char* p4)
 {
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index 65dd332afb..27c2ceb3b6 100644
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -110,15 +110,15 @@ protected:
     // A::initSingleton(), record that A directly depends on B.
     void capture_dependency();
 
-    // delegate LL_ERRS() logging to llsingleton.cpp
+    // delegate logging calls to llsingleton.cpp
     static void logerrs(const char* p1, const char* p2="",
                         const char* p3="", const char* p4="");
-    // delegate LL_WARNS() logging to llsingleton.cpp
     static void logwarns(const char* p1, const char* p2="",
                          const char* p3="", const char* p4="");
-    // delegate LL_INFOS() logging to llsingleton.cpp
     static void loginfos(const char* p1, const char* p2="",
                          const char* p3="", const char* p4="");
+    static void logdebugs(const char* p1, const char* p2="",
+                          const char* p3="", const char* p4="");
     static std::string demangle(const char* mangled);
     template <typename T>
     static std::string classname()       { return demangle(typeid(T).name()); }
@@ -647,6 +647,8 @@ private:
         else if (on_main_thread())
         {
             // on the main thread, simply construct instance while holding lock
+            super::logdebugs(super::template classname<DERIVED_TYPE>().c_str(),
+                             "::initParamSingleton()");
             super::constructSingleton(lk, std::forward<Args>(args)...);
             return lk->mInstance;
         }
-- 
cgit v1.2.3