Fix static initialization fiasco problem with the logger and code calling into it from other TUs (#358)

* Addresses static initialization fiasco problem with the logger and code calling into it from other translation units

* fix namespace

* make logger init multithreading safe

* actually we can use magic statics to simplify

* Fix #356

* gate GMH/GPA on Windows only

Author: asklar

AnnService/inc/Core/Common.h

@@ -123,9 +123,9 @@ extern std::shared_ptr<Helper::DiskIO>(*f_createIO)();
 #define IOBINARY(ptr, func, bytes, ...) if (ptr->func(bytes, __VA_ARGS__) != bytes) return ErrorCode::DiskIOFail
 #define IOSTRING(ptr, func, ...) if (ptr->func(__VA_ARGS__) == 0) return ErrorCode::DiskIOFail
 
-extern std::shared_ptr<Helper::Logger> g_pLogger;
+extern std::shared_ptr<Helper::Logger> GetLogger();
 
-#define LOG(l, ...) g_pLogger->Logging("SPTAG", l, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+#define LOG(l, ...) GetLogger()->Logging("SPTAG", l, __FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 
 class MyException : public std::exception 
 {

AnnService/inc/SSDServing/SSDIndex.h

@@ -174,7 +174,7 @@ namespace SPTAG {
 
                 if (!p_opts.m_logFile.empty())
                 {
-                    g_pLogger.reset(new Helper::FileLogger(Helper::LogLevel::LL_Info, p_opts.m_logFile.c_str()));
+                    GetLogger().reset(new Helper::FileLogger(Helper::LogLevel::LL_Info, p_opts.m_logFile.c_str()));
                 }
                 int numThreads = p_opts.m_iSSDNumberOfThreads;
                 int internalResultNum = p_opts.m_searchInternalResultNum;

AnnService/src/Core/VectorIndex.cpp

@@ -15,11 +15,23 @@ typedef typename SPTAG::Helper::Concurrent::ConcurrentMap<std::string, SPTAG::Si
 
 using namespace SPTAG;
 
+std::shared_ptr<Helper::Logger> SPTAG::GetLogger() {
 #ifdef DEBUG
-std::shared_ptr<Helper::Logger> SPTAG::g_pLogger(new Helper::SimpleLogger(Helper::LogLevel::LL_Debug));
+  auto logLevel = Helper::LogLevel::LL_Debug;
 #else
-std::shared_ptr<Helper::Logger> SPTAG::g_pLogger(new Helper::SimpleLogger(Helper::LogLevel::LL_Info));
+  auto logLevel = Helper::LogLevel::LL_Info;
 #endif
+#ifdef  _WINDOWS_
+  if (auto exeHandle = GetModuleHandleW(nullptr)) {
+    if (auto SPTAG_GetLoggerLevel = reinterpret_cast<SPTAG::Helper::LogLevel(*)()>(GetProcAddress(exeHandle, "SPTAG_GetLoggerLevel"))) {
+      logLevel = SPTAG_GetLoggerLevel();
+    }
+  }
+#endif //  _WINDOWS_
+
+  static std::shared_ptr<Helper::Logger> s_pLogger = std::make_shared<Helper::SimpleLogger>(logLevel);
+  return s_pLogger;
+}
 
 std::mt19937 SPTAG::rg;
 

AnnService/src/Quantizer/main.cpp

@@ -68,7 +68,7 @@ void QuantizeAndSave(std::shared_ptr<SPTAG::Helper::VectorSetReader>& vectorRead
 
 int main(int argc, char* argv[])
 {
-    std::shared_ptr<QuantizerOptions> options = std::make_shared<QuantizerOptions>(10000, true, 0.0, SPTAG::QuantizerType::None, std::string(), -1, std::string(), std::string());
+    std::shared_ptr<QuantizerOptions> options = std::make_shared<QuantizerOptions>(10000, true, 0.0f, SPTAG::QuantizerType::None, std::string(), -1, std::string(), std::string());
 
     if (!options->Parse(argc - 1, argv + 1))
     {

AnnService/src/Server/SearchService.cpp

@@ -84,7 +84,7 @@ SearchService::Initialize(int p_argNum, char* p_args[])
     }
 
     if (!cmdOptions.m_logFile.empty()) {
-        g_pLogger.reset(new Helper::FileLogger(Helper::LogLevel::LL_Debug, cmdOptions.m_logFile.c_str()));
+        GetLogger().reset(new Helper::FileLogger(Helper::LogLevel::LL_Debug, cmdOptions.m_logFile.c_str()));
     }
 
     m_serviceContext.reset(new ServiceContext(cmdOptions.m_configFile));