More fixes relating to removal of factory and registry and thread pool

gabime · Nov 23, 2024 · 8d96662 · 8d96662
1 parent 20cd446
commit 8d96662
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 299 deletions.
diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt
@@ -23,10 +23,6 @@ if(NOT benchmark_FOUND)
     FetchContent_MakeAvailable(googlebenchmark)
 endif()
 
-add_executable(bench bench.cpp)
-spdlog_enable_warnings(bench)
-target_link_libraries(bench PRIVATE spdlog::spdlog)
-
 add_executable(async_bench async_bench.cpp)
 target_link_libraries(async_bench PRIVATE spdlog::spdlog)
 

diff --git a/bench/async_bench.cpp b/bench/async_bench.cpp
@@ -7,7 +7,7 @@
 // bench.cpp : spdlog benchmarks
 //
 #include "spdlog/spdlog.h"
-#include "spdlog/async.h"
+#include "spdlog/async_logger.h"
 #include "spdlog/sinks/basic_file_sink.h"
 
 #if defined(SPDLOG_USE_STD_FORMAT)

diff --git a/bench/bench.cpp b/bench/bench.cpp
diff --git a/include/spdlog/async_logger.h b/include/spdlog/async_logger.h
@@ -15,22 +15,11 @@
 // destructing..
 
 #include <spdlog/logger.h>
-#include <spdlog/details/thread_pool.h>
+#include "spdlog/async_overflow_policy.h"
+#include "spdlog/details/thread_pool.h"
 
 namespace spdlog {
 
-// Async overflow policy - block by default.
-enum class async_overflow_policy {
-    block,           // Block until message can be enqueued
-    overrun_oldest,  // Discard oldest message in the queue if full when trying to
-                     // add new item.
-    discard_new      // Discard new message if the queue is full when trying to add new item.
-};
-
-namespace details {
-class thread_pool;
-}
-
 class SPDLOG_API async_logger final : public std::enable_shared_from_this<async_logger>,
                                       public logger {
     friend class details::thread_pool;

diff --git a/include/spdlog/async_overflow_policy.h b/include/spdlog/async_overflow_policy.h
@@ -0,0 +1,14 @@
+#pragma once
+
+namespace spdlog {
+// Async overflow policy - block by default.
+enum class async_overflow_policy {
+  block,           // Block until message can be enqueued
+  overrun_oldest,  // Discard oldest message in the queue if full when trying to
+                   // add new item.
+  discard_new      // Discard new message if the queue is full when trying to add new item.
+};
+
+}
+
+
diff --git a/include/spdlog/details/thread_pool-inl.h b/include/spdlog/details/thread_pool-inl.h
@@ -9,6 +9,7 @@
 
 #include <cassert>
 #include <spdlog/common.h>
+#include "spdlog/async_logger.h"
 
 namespace spdlog {
 namespace details {

diff --git a/include/spdlog/details/thread_pool.h b/include/spdlog/details/thread_pool.h
@@ -6,6 +6,7 @@
 #include <spdlog/details/log_msg_buffer.h>
 #include <spdlog/details/mpmc_blocking_q.h>
 #include <spdlog/details/os.h>
+#include <spdlog/async_overflow_policy.h>
 
 #include <functional>
 #include <memory>
@@ -15,7 +16,6 @@
 namespace spdlog {
 class async_logger;
 
-enum class async_overflow_policy;
 namespace details {
 
 using async_logger_ptr = std::shared_ptr<spdlog::async_logger>;

diff --git a/include/spdlog/sinks/stdout_color_sinks-inl.h b/include/spdlog/sinks/stdout_color_sinks-inl.h
@@ -11,28 +11,4 @@
 #include <spdlog/logger.h>
 
 namespace spdlog {
-
-template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name,
-                                                      color_mode mode) {
-    return Factory::template create<sinks::stdout_color_sink_mt>(logger_name, mode);
-}
-
-template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stdout_color_st(const std::string &logger_name,
-                                                      color_mode mode) {
-    return Factory::template create<sinks::stdout_color_sink_st>(logger_name, mode);
-}
-
-template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name,
-                                                      color_mode mode) {
-    return Factory::template create<sinks::stderr_color_sink_mt>(logger_name, mode);
-}
-
-template <typename Factory>
-SPDLOG_INLINE std::shared_ptr<logger> stderr_color_st(const std::string &logger_name,
-                                                      color_mode mode) {
-    return Factory::template create<sinks::stderr_color_sink_st>(logger_name, mode);
-}
 }  // namespace spdlog
diff --git a/include/spdlog/spdlog-inl.h b/include/spdlog/spdlog-inl.h
@@ -9,7 +9,7 @@
 
 #include <spdlog/common.h>
 #include <spdlog/pattern_formatter.h>
-#include <spdlog/sinks/stdout_color_sinks-inl.h>
+#include <spdlog/sinks/stdout_color_sinks.h>
 
 namespace spdlog {
 
@@ -19,7 +19,7 @@ using default_sink_t = sinks::stdout_color_sink_mt;
 using default_sink_t = sinks::null_sink_mt;
 #endif
 
-SPDLOG_INLINE static auto s_logger = std::make_shared<logger>("", std::make_shared<default_sink_t>());
+static auto s_logger = std::make_shared<logger>("", std::make_shared<default_sink_t>());
 
 SPDLOG_INLINE void set_formatter(std::unique_ptr<spdlog::formatter> formatter) {
     s_logger->set_formatter(std::move(formatter));

diff --git a/include/spdlog/spdlog.h b/include/spdlog/spdlog.h
@@ -12,9 +12,6 @@
 #include <spdlog/common.h>
 #include <spdlog/logger.h>
 #include <spdlog/version.h>
-
-#include <chrono>
-#include <functional>
 #include <memory>
 #include <string>