The-Homebrew-Cloud/WUMSLoader
2
0
Fork 0
mirror of https://github.com/wiiu-env/WUMSLoader.git synced 2025-02-17 08:46:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only do logging when built with make DEBUG=1, deinit logging properly

Browse Source
This commit is contained in:
Maschell 2022-01-23 22:16:51 +01:00
parent 91ad24571c
commit f8fb941b07
4 changed files with 60 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -31,7 +31,7 @@ INCLUDES := source
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# options for code generation # options for code generation
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
CFLAGS := -g -Wall -O3 -ffunction-sections -fno-exceptions -fno-rtti\ CFLAGS := -Wall -O2 -ffunction-sections -fno-exceptions -fno-rtti\
$(MACHDEP) $(MACHDEP)
CFLAGS += $(INCLUDE) -D__WIIU__ -D__WUT__ CFLAGS += $(INCLUDE) -D__WIIU__ -D__WUT__
@ -41,6 +41,11 @@ CXXFLAGS := $(CFLAGS) -std=c++20
ASFLAGS := -g $(ARCH) ASFLAGS := -g $(ARCH)
LDFLAGS = -g $(ARCH) $(RPXSPECS) --entry=_start -Wl,-Map,$(notdir $*.map) LDFLAGS = -g $(ARCH) $(RPXSPECS) --entry=_start -Wl,-Map,$(notdir $*.map)
ifeq ($(DEBUG),1)
CXXFLAGS += -DDEBUG -g
CCFLAGS += -DDEBUG -g
endif
LIBS := -lwut -lz LIBS := -lwut -lz
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

12
source/main.cpp
View File

@ -3,9 +3,6 @@
#include <elfio/elfio.hpp> #include <elfio/elfio.hpp>
#include <sysapp/launch.h> #include <sysapp/launch.h>
#include <nn/act/client_cpp.h> #include <nn/act/client_cpp.h>
#include <whb/log_udp.h>
#include <whb/log_cafe.h>
#include <whb/log_module.h>
#include "fs/DirList.h" #include "fs/DirList.h"
#include "module/ModuleDataPersistence.h" #include "module/ModuleDataPersistence.h"
@ -18,10 +15,7 @@ extern "C" uint32_t textStart();
extern "C" void __fini(); extern "C" void __fini();
int main(int argc, char **argv) { int main(int argc, char **argv) {
if (!WHBLogModuleInit()) { initLogging();
WHBLogCafeInit();
WHBLogUdpInit();
}
// We subtract 0x100 to be safe. // We subtract 0x100 to be safe.
uint32_t textSectionStart = textStart() - 0x100; uint32_t textSectionStart = textStart() - 0x100;
@ -52,8 +46,6 @@ int main(int argc, char **argv) {
SetupRelocator(); SetupRelocator();
WHBLogUdpDeinit();
nn::act::Initialize(); nn::act::Initialize();
nn::act::SlotNo slot = nn::act::GetSlotNo(); nn::act::SlotNo slot = nn::act::GetSlotNo();
nn::act::SlotNo defaultSlot = nn::act::GetDefaultAccount(); nn::act::SlotNo defaultSlot = nn::act::GetDefaultAccount();
@ -65,6 +57,8 @@ int main(int argc, char **argv) {
_SYSLaunchMenuWithCheckingAccount(slot); _SYSLaunchMenuWithCheckingAccount(slot);
} }
deinitLogging();
__fini(); __fini();
return 0; return 0;
} }

37
source/utils/logger.c Normal file
View File

@ -0,0 +1,37 @@
#ifdef DEBUG
#include <stdint.h>
#include <whb/log_udp.h>
#include <whb/log_cafe.h>
#include <whb/log_module.h>
uint32_t moduleLogInit = false;
uint32_t cafeLogInit = false;
uint32_t udpLogInit = false;
#endif // DEBUG
void initLogging() {
#ifdef DEBUG
if (!(moduleLogInit = WHBLogModuleInit())) {
cafeLogInit = WHBLogCafeInit();
udpLogInit = WHBLogUdpInit();
}
#endif // DEBUG
}
void deinitLogging() {
#ifdef DEBUG
if (moduleLogInit) {
WHBLogMffoduleDeinit();
moduleLogInit = false;
}
if (cafeLogInit) {
WHBLogCafeDeinit();
cafeLogInit = false;
}
if (udpLogInit) {
WHBLogUdpDeinit();
udpLogInit = false;
}
#endif // DEBUG
}

14
source/utils/logger.h
View File

@ -7,6 +7,8 @@
extern "C" { extern "C" {
#endif #endif
#ifdef DEBUG
#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__) #define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__) #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
@ -18,6 +20,18 @@ extern "C" {
WHBLogWritef("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \ WHBLogWritef("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
} while (0) } while (0)
#else
#define DEBUG_FUNCTION_LINE(FMT, ARGS...) while (0)
#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...) while (0)
#endif
void initLogging();
void deinitLogging();
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif