refactor: only alloc console when needed and no longer freopen

Author: std-microblock

src/shell/config.cc

@@ -5,6 +5,7 @@
 #include <mutex>
 #include <thread>
 
+#include "entry.h"
 #include "logger.h"
 #include "rfl.hpp"
 #include "rfl/DefaultIfMissing.hpp"
@@ -96,9 +97,9 @@ void config::read_config() {
 #endif
 
     if (config::current->debug_console) {
-        ShowWindow(GetConsoleWindow(), SW_SHOW);
+        init_console(true);
     } else {
-        ShowWindow(GetConsoleWindow(), SW_HIDE);
+        init_console(false);
     }
 }
 

src/shell/entry.cc

@@ -54,18 +54,36 @@
 
 namespace mb_shell {
 window_proc_hook entry::main_window_loop_hook{};
+
+static bool console_allocated = false;
+
+void init_console(bool show) {
+    if (show && !console_allocated) {
+        AllocConsole();
+        console_allocated = true;
+        add_console_sink();
+        ShowWindow(GetConsoleWindow(), SW_SHOW);
+    } else if (show && console_allocated) {
+        ShowWindow(GetConsoleWindow(), SW_SHOW);
+        SetForegroundWindow(GetConsoleWindow());
+    } else if (!show && console_allocated) {
+        remove_console_sink();
+        FreeConsole();
+        console_allocated = false;
+    }
+}
+
 void main() {
     set_thread_locale_utf8();
-    AllocConsole();
-    freopen("CONOUT$", "w", stdout);
-    freopen("CONOUT$", "w", stderr);
-    freopen("CONIN$", "r", stdin);
-    ShowWindow(GetConsoleWindow(), SW_HIDE);
 
     init_logger();
     install_error_handlers();
     config::run_config_loader();
 
+    if (config::current->debug_console) {
+        init_console(true);
+    }
+
     static script_context script_ctx;
     std::thread([]() {
         auto data_dir = config::data_directory();
@@ -82,15 +100,15 @@ void main() {
     std::set_terminate([]() {
         auto eptr = std::current_exception();
         if (eptr) {
+            init_console(true);
             try {
                 std::rethrow_exception(eptr);
             } catch (const std::exception &e) {
-                std::cerr << "Uncaught exception: " << e.what() << std::endl;
+                spdlog::critical("Uncaught exception: {}", e.what());
             } catch (...) {
-                std::cerr << "Uncaught exception of unknown type" << std::endl;
+                spdlog::critical("Uncaught exception of unknown type");
             }
 
-            ShowWindow(GetConsoleWindow(), SW_SHOW);
             std::getchar();
         }
         std::abort();
@@ -169,8 +187,7 @@ void main() {
                     taskbar.rt.start_loop();
                 }
                 catch(const std::exception &e) {
-                    std::cerr << "Error in taskbar thread: " << e.what()
-                              << std::endl;
+                    spdlog::error("Error in taskbar thread: {}", e.what());
                 }
             }).detach();
         }
@@ -179,7 +196,7 @@ void main() {
     if (filename == "asan_test.exe") {
         // ASAN environment
         init_render_global();
-        ShowWindow(GetConsoleWindow(), SW_SHOW);
+        init_console(true);
         std::thread([]() {
             script_ctx.is_js_ready.wait(false);
             spdlog::info( "Is js ready: %d", script_ctx.is_js_ready.load());

src/shell/entry.h

@@ -6,4 +6,6 @@ namespace mb_shell {
 struct entry {
     static window_proc_hook main_window_loop_hook;
 };
+
+void init_console(bool show);
 } // namespace mb_shell

src/shell/logger.cc

@@ -6,18 +6,22 @@
 #include <spdlog/sinks/basic_file_sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
 #include <spdlog/sinks/msvc_sink.h>
+#include <memory>
+#include <mutex>
 
 namespace mb_shell {
+static std::shared_ptr<spdlog::sinks::stdout_color_sink_mt> console_sink;
+static std::mutex logger_mutex;
+
 void init_logger() {
     try {
-        auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
         auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(
             (config::data_directory() / "debug.log").string(), true);
         auto msvc_sink = std::make_shared<spdlog::sinks::msvc_sink_mt>();
 
-        std::vector<spdlog::sink_ptr> sinks{console_sink, file_sink, msvc_sink};
+        std::vector<spdlog::sink_ptr> sinks{file_sink, msvc_sink};
 
-        auto logger = std::make_shared<spdlog::logger>("multi_sink", sinks.begin(), sinks.end());
+        auto logger = std::make_shared<spdlog::logger>("breeze", sinks.begin(), sinks.end());
         spdlog::set_default_logger(logger);
         spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%^%l%$] %v");
         spdlog::set_level(spdlog::level::debug);
@@ -27,4 +31,27 @@ void init_logger() {
         printf("Log initialization failed: %s\n", ex.what());
     }
 }
+
+void add_console_sink() {
+    std::lock_guard<std::mutex> lock(logger_mutex);
+    if (!console_sink) {
+        console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+        auto logger = spdlog::default_logger();
+        if (logger) {
+            logger->sinks().push_back(console_sink);
+        }
+    }
+}
+
+void remove_console_sink() {
+    std::lock_guard<std::mutex> lock(logger_mutex);
+    if (console_sink) {
+        auto logger = spdlog::default_logger();
+        if (logger) {
+            auto &sinks = logger->sinks();
+            sinks.erase(std::remove(sinks.begin(), sinks.end(), console_sink), sinks.end());
+        }
+        console_sink.reset();
+    }
+}
 } // namespace mb_shell

src/shell/logger.h

@@ -4,4 +4,6 @@
 
 namespace mb_shell {
 void init_logger();
+void add_console_sink();
+void remove_console_sink();
 }