Merge pull request #1927 from joto/refactor-thread-num-log

Various changes around threads and logging

Author: lonvia

src/logging.cpp

@@ -9,6 +9,8 @@
 
 #include "logging.hpp"
 
+#include <osmium/thread/util.hpp>
+
 thread_local unsigned int this_thread_num = 0;
 
 /// Global logger singleton
@@ -31,7 +33,7 @@ std::string logger::generate_common_prefix(fmt::text_style const &ts,
                        fmt::localtime(std::time(nullptr)));
 
     if (m_current_level == log_level::debug) {
-        str += fmt::format(ts, "[{}] ", this_thread_num);
+        str += fmt::format(ts, "[{:02d}] ", this_thread_num);
     }
 
     if (prefix) {
@@ -40,3 +42,15 @@ std::string logger::generate_common_prefix(fmt::text_style const &ts,
 
     return str;
 }
+
+void logger::init_thread(unsigned int num) const
+{
+    // Store thread number in thread local variable
+    this_thread_num = num;
+
+    // Set thread name in operating system.
+    // On Linux thread names have a maximum length of 16 characters.
+    std::string name{"_osm2pgsql_"};
+    name.append(std::to_string(num));
+    osmium::thread::set_thread_name(name.c_str());
+}

src/logging.hpp

@@ -20,8 +20,6 @@
 #include <cstdio>
 #include <utility>
 
-extern thread_local unsigned int this_thread_num;
-
 enum class log_level
 {
     debug = 1,
@@ -36,9 +34,6 @@ enum class log_level
  */
 class logger
 {
-    std::string generate_common_prefix(fmt::text_style const &ts,
-                                       char const *prefix);
-
 public:
     template <typename S, typename... TArgs>
     void log(log_level with_level, char const *prefix,
@@ -84,7 +79,12 @@ class logger
     void needs_leading_return() noexcept { m_needs_leading_return = true; }
     void no_leading_return() noexcept { m_needs_leading_return = false; }
 
+    void init_thread(unsigned int num) const;
+
 private:
+    std::string generate_common_prefix(fmt::text_style const &ts,
+                                       char const *prefix);
+
     log_level m_current_level = log_level::info;
     bool m_log_sql = false;
     bool m_log_sql_data = false;

src/thread-pool.cpp

@@ -9,8 +9,6 @@
 
 #include "thread-pool.hpp"
 
-#include <osmium/thread/util.hpp>
-
 #include <cassert>
 #include <string>
 
@@ -52,10 +50,7 @@ void thread_pool_t::shutdown_all_workers()
 
 void thread_pool_t::worker_thread(unsigned int thread_num)
 {
-    std::string name{"_osm2pgsql_worker_"};
-    name.append(std::to_string(thread_num));
-    osmium::thread::set_thread_name(name.c_str());
-    this_thread_num = thread_num + 1;
+    get_logger().init_thread(thread_num + 1);
 
     while (true) {
         osmium::thread::function_wrapper task;