fix log bug

lichuan · Jan 19, 2019 · b3a31a5 · b3a31a5
1 parent e8a81f6
commit b3a31a5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/src/fly/base/logger.cpp b/src/fly/base/logger.cpp
@@ -90,11 +90,6 @@ void Logger::_log(uint32 year, uint32 month, uint32 day, const char *format, ...
     if(year != m_year.load(std::memory_order_relaxed) || month != m_month.load(std::memory_order_relaxed)
        || day != m_day.load(std::memory_order_relaxed))
     {
-        while(m_enter_num.load(std::memory_order_relaxed) > 1)
-        {
-            std::this_thread::yield();
-        };
-
         std::lock_guard<std::mutex> guard(m_mutex);
         uint32 y = m_year.load(std::memory_order_relaxed);
         uint32 m = m_month.load(std::memory_order_relaxed);
@@ -126,20 +121,13 @@ void Logger::_log(uint32 year, uint32 month, uint32 day, const char *format, ...
         vfprintf(m_file, format, args);
         va_end(args);
     }
-
-    m_enter_num.fetch_sub(1, std::memory_order_relaxed);
 }
 
 void Logger::_console_log(uint32 year, uint32 month, uint32 day, const char *format, ...)
 {    
     if(year != m_year.load(std::memory_order_relaxed) || month != m_month.load(std::memory_order_relaxed)
        || day != m_day.load(std::memory_order_relaxed))
     {
-        while(m_enter_num.load(std::memory_order_relaxed) > 1)
-        {
-            std::this_thread::yield();
-        };
-
         std::lock_guard<std::mutex> guard(m_mutex);
         uint32 y = m_year.load(std::memory_order_relaxed);
         uint32 m = m_month.load(std::memory_order_relaxed);
@@ -171,8 +159,7 @@ void Logger::_console_log(uint32 year, uint32 month, uint32 day, const char *for
         vfprintf(m_file, format, args);
         va_end(args);
     }
-
-    m_enter_num.fetch_sub(1, std::memory_order_relaxed);
+
     va_list args;
     va_start(args, format);
     vfprintf(stdout, format, args);

diff --git a/src/fly/base/logger.hpp b/src/fly/base/logger.hpp
@@ -56,8 +56,6 @@ class Logger : public Singleton<Logger>
         {
             return false;
         }
-
-        m_enter_num.fetch_add(1, std::memory_order_relaxed);
 
         return true;
     }
@@ -70,7 +68,6 @@ class Logger : public Singleton<Logger>
     std::atomic<uint32> m_year;
     std::atomic<uint32> m_month;
     std::atomic<uint32> m_day;
-    std::atomic<uint32> m_enter_num {0};
     std::mutex m_mutex;
 };