mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-09 23:01:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace spdlog (#185)

Browse Source 
* remove spdlog

* clang format and fix windows

* add format shared

* windows sucks
This commit is contained in:
water111
2021-01-06 12:16:39 -05:00
committed by GitHub
parent 69f7f46477
commit 3331e9cd00
43 changed files with 509 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/runtime.cpp
+17 -16
View File
@@ -16,6 +16,7 @@
#include <cstring>
#include <thread>
#include "common/log/log.h"
#include "runtime.h"
#include "system/SystemThread.h"
#include "sce/libcdvd_ee.h"
@@ -72,21 +73,21 @@ void deci2_runner(SystemThreadInterface& iface) {
iface.initialization_complete();
// in our own thread, wait for the EE to register the first protocol driver
spdlog::debug("[DECI2] Waiting for EE to register protos");
lg::debug("[DECI2] Waiting for EE to register protos");
server.wait_for_protos_ready();
// then allow the server to accept connections
if (!server.init()) {
assert(false);
}
spdlog::debug("[DECI2] Waiting for listener...");
// spdlog::debug("[DECI2] Waiting for listener..."); --> disabled temporarily, some weird race
lg::debug("[DECI2] Waiting for listener...");
// lg::debug("[DECI2] Waiting for listener..."); --> disabled temporarily, some weird race
// condition?
bool saw_listener = false;
while (!iface.get_want_exit()) {
if (server.check_for_listener()) {
if (!saw_listener) {
spdlog::debug("[DECI2] Connected!");
lg::debug("[DECI2] Connected!");
}
saw_listener = true;
// we have a listener, run!
@@ -116,19 +117,19 @@ void ee_runner(SystemThreadInterface& iface) {
}
if (g_ee_main_mem == (u8*)(-1)) {
spdlog::debug("Failed to initialize main memory! {}", strerror(errno));
lg::debug("Failed to initialize main memory! {}", strerror(errno));
iface.initialization_complete();
return;
}
spdlog::debug("Main memory mapped at 0x{:016x}", (u64)(g_ee_main_mem));
spdlog::debug("Main memory size 0x{:x} bytes ({:.3f} MB)", EE_MAIN_MEM_SIZE,
(double)EE_MAIN_MEM_SIZE / (1 << 20));
lg::debug("Main memory mapped at 0x{:016x}", (u64)(g_ee_main_mem));
lg::debug("Main memory size 0x{:x} bytes ({:.3f} MB)", EE_MAIN_MEM_SIZE,
(double)EE_MAIN_MEM_SIZE / (1 << 20));
spdlog::debug("[EE] Initialization complete!");
lg::debug("[EE] Initialization complete!");
iface.initialization_complete();
spdlog::debug("[EE] Run!");
lg::debug("[EE] Run!");
memset((void*)g_ee_main_mem, 0, EE_MAIN_MEM_SIZE);
// prevent access to the first 1 MB of memory.
@@ -153,7 +154,7 @@ void ee_runner(SystemThreadInterface& iface) {
xdbg::allow_debugging();
goal_main(g_argc, g_argv);
spdlog::debug("[EE] Done!");
lg::debug("[EE] Done!");
// // kill the IOP todo
iop::LIBRARY_kill();
@@ -169,7 +170,7 @@ void ee_runner(SystemThreadInterface& iface) {
*/
void iop_runner(SystemThreadInterface& iface) {
IOP iop;
spdlog::debug("[IOP] Restart!");
lg::debug("[IOP] Restart!");
iop.reset_allocator();
ee::LIBRARY_sceSif_register(&iop);
iop::LIBRARY_register(&iop);
@@ -192,12 +193,12 @@ void iop_runner(SystemThreadInterface& iface) {
iface.initialization_complete();
spdlog::debug("[IOP] Wait for OVERLORD to start...");
lg::debug("[IOP] Wait for OVERLORD to start...");
iop.wait_for_overlord_start_cmd();
if (iop.status == IOP_OVERLORD_INIT) {
spdlog::debug("[IOP] Run!");
lg::debug("[IOP] Run!");
} else {
spdlog::debug("[IOP] Shutdown!");
lg::debug("[IOP] Shutdown!");
return;
}
@@ -259,6 +260,6 @@ u32 exec_runtime(int argc, char** argv) {
// join and exit
tm.join();
spdlog::info("GOAL Runtime Shutdown (code {})", MasterExit);
lg::info("GOAL Runtime Shutdown (code {})", MasterExit);
return MasterExit;
}