summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-08-25 03:31:27 +0200
committerGitHub <noreply@github.com>2021-08-25 03:31:27 +0200
commit4654fb96b0e2eb1b57857ae7f0438341fb2f9292 (patch)
tree4b257caf10eb6e7dfd2113671a7ebdcd845dcf3b
parentMerge pull request #6878 from BreadFish64/optimize-GetHostThreadID (diff)
parentlogging: Fix log filter during initialization (diff)
downloadyuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar
yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar.gz
yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar.bz2
yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar.lz
yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar.xz
yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.tar.zst
yuzu-4654fb96b0e2eb1b57857ae7f0438341fb2f9292.zip
-rw-r--r--src/common/logging/backend.cpp9
-rw-r--r--src/core/core.cpp10
-rw-r--r--src/core/core.h7
-rw-r--r--src/yuzu/main.cpp2
4 files changed, 16 insertions, 12 deletions
diff --git a/src/common/logging/backend.cpp b/src/common/logging/backend.cpp
index 13edda9c9..949384fd3 100644
--- a/src/common/logging/backend.cpp
+++ b/src/common/logging/backend.cpp
@@ -5,6 +5,7 @@
#include <atomic>
#include <chrono>
#include <climits>
+#include <exception>
#include <thread>
#include <vector>
@@ -152,7 +153,7 @@ public:
void EnableForStacktrace() override {}
};
-bool initialization_in_progress_suppress_logging = false;
+bool initialization_in_progress_suppress_logging = true;
/**
* Static state as a singleton.
@@ -161,17 +162,17 @@ class Impl {
public:
static Impl& Instance() {
if (!instance) {
- abort();
+ throw std::runtime_error("Using Logging instance before its initialization");
}
return *instance;
}
static void Initialize() {
if (instance) {
- abort();
+ LOG_WARNING(Log, "Reinitializing logging backend");
+ return;
}
using namespace Common::FS;
- initialization_in_progress_suppress_logging = true;
const auto& log_dir = GetYuzuPath(YuzuPath::LogDir);
void(CreateDir(log_dir));
Filter filter;
diff --git a/src/core/core.cpp b/src/core/core.cpp
index b0dc594d4..5893a86bf 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -4,6 +4,7 @@
#include <array>
#include <atomic>
+#include <exception>
#include <memory>
#include <utility>
@@ -423,9 +424,16 @@ struct System::Impl {
System::System() : impl{std::make_unique<Impl>(*this)} {}
System::~System() = default;
+System& System::GetInstance() {
+ if (!s_instance) {
+ throw std::runtime_error("Using System instance before its initialization");
+ }
+ return *s_instance;
+}
+
void System::InitializeGlobalInstance() {
if (s_instance) {
- abort();
+ throw std::runtime_error("Reinitializing Global System instance.");
}
s_instance = std::unique_ptr<System>(new System);
}
diff --git a/src/core/core.h b/src/core/core.h
index 65b447a1c..f9116ebb6 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -120,12 +120,7 @@ public:
* Gets the instance of the System singleton class.
* @returns Reference to the instance of the System singleton class.
*/
- [[deprecated("Use of the global system instance is deprecated")]] static System& GetInstance() {
- if (!s_instance) {
- abort();
- }
- return *s_instance;
- }
+ [[deprecated("Use of the global system instance is deprecated")]] static System& GetInstance();
static void InitializeGlobalInstance();
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 1bae1489f..e36774cc6 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -192,6 +192,7 @@ GMainWindow::GMainWindow()
: input_subsystem{std::make_shared<InputCommon::InputSubsystem>()},
config{std::make_unique<Config>()}, vfs{std::make_shared<FileSys::RealVfsFilesystem>()},
provider{std::make_unique<FileSys::ManualContentProvider>()} {
+ Common::Log::Initialize();
LoadTranslation();
setAcceptDrops(true);
@@ -3381,7 +3382,6 @@ void GMainWindow::SetDiscordEnabled([[maybe_unused]] bool state) {
#endif
int main(int argc, char* argv[]) {
- Common::Log::Initialize();
Common::DetachedTasks detached_tasks;
MicroProfileOnThreadCreate("Frontend");
SCOPE_EXIT({ MicroProfileShutdown(); });