From 38092e01bae08202547f23d4e1208ee19f3b2c0d Mon Sep 17 00:00:00 2001
From: Al-Azif <alazif@miskatonic.io>
Date: Tue, 14 Dec 2021 21:12:26 -0800
Subject: [PATCH] Static log library, readd logging to all sources

---
 Makefile                             |   5 +-
 external/{libLog_stub.h => libLog.h} |  78 ---------------------------
 libs/libLog.a                        | Bin 0 -> 12952 bytes
 sce_module/libLog.prx                | Bin 61952 -> 0 bytes
 src/controller.cpp                   |   6 ++-
 src/graphics.cpp                     |  23 ++++----
 src/main.cpp                         |  33 +++---------
 7 files changed, 28 insertions(+), 117 deletions(-)
 rename external/{libLog_stub.h => libLog.h} (54%)
 create mode 100644 libs/libLog.a
 delete mode 100644 sce_module/libLog.prx

diff --git a/Makefile b/Makefile
index 7fa3f27..2dc51ca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 # Package metadata
 TITLE         := PS4 Vibe
-VERSION       := 1.00
+VERSION       := 1.02
 TITLE_ID      := AZIF00001
 CONTENT_ID    := IV0000-AZIF00001_00-PS4VIBE000000000
 
 # Libraries linked into the ELF
 LIBS          := -lc -lkernel -lc++ -lSceSystemService -lSceSysmodule -lSceVideoOut -lSceUserService -lScePad -lSceFreeType
+LIBS					+= -Llibs -lLog
 
 # Directorys to include
 INCLUDES      := -Iinclude -Iexternal
@@ -89,4 +90,4 @@ $(ODIR):
 
 .PHONY: clean
 clean:
-	rm -rf $(CONTENT_ID).pkg pkg.gp4 sce_sys/param.sfo eboot.bin $(ODIR)
+	rm -rf *.pkg pkg.gp4 sce_sys/param.sfo eboot.bin $(ODIR)
diff --git a/external/libLog_stub.h b/external/libLog.h
similarity index 54%
rename from external/libLog_stub.h
rename to external/libLog.h
index fa22a98..1cabb28 100644
--- a/external/libLog_stub.h
+++ b/external/libLog.h
@@ -7,8 +7,6 @@
 #define LIBLOG_H
 
 #ifdef __cplusplus
-// TODO: C++ stream bindings includes here
-
 extern "C" {
 #endif
 
@@ -18,9 +16,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdio.h>
 
-#ifndef __LIBLOG_PC__
 #include <orbis/libkernel.h>
-#endif
 
 enum LogLevels {
   LL_None,
@@ -40,75 +36,6 @@ enum PrintTypes {
   PT_File,
 };
 
-#ifndef __LIBLOG_PC__
-void (*_logPrint)(enum LogLevels p_LogLevel, enum PrintTypes p_PrintType, bool p_Meta, const char *p_File, int p_Line, const char *p_Format, ...) = NULL;
-void (*_logPrintHex)(enum LogLevels p_LogLevel, enum PrintTypes p_PrintType, bool p_Meta, const char *p_File, int p_Line, const void *p_Pointer, int p_Length) = NULL;
-void (*_logPrintBin)(enum LogLevels p_LogLevel, enum PrintTypes p_PrintType, const char *p_Input, uint16_t p_Port, const void *p_Pointer, int p_Length) = NULL;
-
-bool (*logSocketOpen)(const char *p_IpAddress, uint16_t p_Port) = NULL;
-bool (*logSocketClose)() = NULL;
-bool (*logSocketIsOpen)() = NULL;
-
-const char *(*logSocketGetIpAddress)() = NULL;
-uint16_t (*logSocketGetPort)() = NULL;
-
-bool (*logFileOpen)(const char *p_Path) = NULL;
-bool (*logFileClose)() = NULL;
-const char *(*logFileGetFilename)() = NULL;
-
-void (*logSetLogLevel)(enum LogLevels p_LogLevel) = NULL;
-enum LogLevels (*logGetLogLevel)() = NULL;
-
-void (*logPrintSetLogLevel)(enum LogLevels p_LogLevel) = NULL;
-enum LogLevels (*logPrintGetLogLevel)() = NULL;
-
-void (*logKernelSetLogLevel)(enum LogLevels p_LogLevel) = NULL;
-enum LogLevels (*logKernelGetLogLevel)() = NULL;
-
-void (*logFileSetLogLevel)(enum LogLevels p_LogLevel) = NULL;
-enum LogLevels (*logFileGetLogLevel)() = NULL;
-
-void (*logSocketSetLogLevel)(enum LogLevels p_LogLevel) = NULL;
-enum LogLevels (*logSocketGetLogLevel)() = NULL;
-
-int32_t logInitalize(int handle) {
-  if (sceKernelDlsym(handle, "_logPrint", (void **)&_logPrint) != 0 ||
-      sceKernelDlsym(handle, "_logPrintHex", (void **)&_logPrintHex) != 0 ||
-      sceKernelDlsym(handle, "_logPrintBin", (void **)&_logPrintBin) != 0 ||
-
-      sceKernelDlsym(handle, "logSocketOpen", (void **)&logSocketOpen) != 0 ||
-      sceKernelDlsym(handle, "logSocketClose", (void **)&logSocketClose) != 0 ||
-      sceKernelDlsym(handle, "logSocketIsOpen", (void **)&logSocketIsOpen) != 0 ||
-
-      sceKernelDlsym(handle, "logSocketGetIpAddress", (void **)&logSocketGetIpAddress) != 0 ||
-      sceKernelDlsym(handle, "logSocketGetPort", (void **)&logSocketGetPort) != 0 ||
-
-      sceKernelDlsym(handle, "logFileOpen", (void **)&logFileOpen) != 0 ||
-      sceKernelDlsym(handle, "logFileClose", (void **)&logFileClose) != 0 ||
-      sceKernelDlsym(handle, "logFileGetFilename", (void **)&logFileGetFilename) != 0 ||
-
-      sceKernelDlsym(handle, "logSetLogLevel", (void **)&logSetLogLevel) != 0 ||
-      sceKernelDlsym(handle, "logGetLogLevel", (void **)&logGetLogLevel) != 0 ||
-
-      sceKernelDlsym(handle, "logPrintSetLogLevel", (void **)&logPrintSetLogLevel) != 0 ||
-      sceKernelDlsym(handle, "logPrintGetLogLevel", (void **)&logPrintGetLogLevel) != 0 ||
-
-      sceKernelDlsym(handle, "logKernelSetLogLevel", (void **)&logKernelSetLogLevel) != 0 ||
-      sceKernelDlsym(handle, "logKernelGetLogLevel", (void **)&logKernelGetLogLevel) != 0 ||
-
-      sceKernelDlsym(handle, "logFileSetLogLevel", (void **)&logFileSetLogLevel) != 0 ||
-      sceKernelDlsym(handle, "logFileGetLogLevel", (void **)&logFileGetLogLevel) != 0 ||
-
-      sceKernelDlsym(handle, "logSocketSetLogLevel", (void **)&logSocketSetLogLevel) != 0 ||
-      sceKernelDlsym(handle, "logSocketGetLogLevel", (void **)&logSocketGetLogLevel) != 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
-#else
-
 void _logPrint(enum LogLevels p_LogLevel, enum PrintTypes p_PrintType, bool p_Meta, const char *p_File, int p_Line, const char *p_Format, ...);
 void _logPrintHex(enum LogLevels p_LogLevel, enum PrintTypes p_PrintType, bool p_Meta, const char *p_File, int p_Line, const void *p_Pointer, int p_Length);
 void _logPrintBin(enum LogLevels p_LogLevel, enum PrintTypes p_PrintType, const char *p_Input, uint16_t p_Port, const void *p_Pointer, int p_Length);
@@ -139,8 +66,6 @@ enum LogLevels logFileGetLogLevel();
 void logSocketSetLogLevel(enum LogLevels p_LogLevel);
 enum LogLevels logSocketGetLogLevel();
 
-#endif
-
 #define logPrint(p_LogLevel, ...) _logPrint(p_LogLevel, PT_Print, true, __FILE__, __LINE__, __VA_ARGS__)
 #define logPrintUnformatted(p_LogLevel, ...) _logPrint(p_LogLevel, PT_Print, false, __FILE__, __LINE__, __VA_ARGS__)
 #define logPrintHexdump(p_LogLevel, p_Pointer, p_Length) _logPrintHex(p_LogLevel, PT_Print, true, __FILE__, __LINE__, p_Pointer, p_Length)
@@ -166,9 +91,6 @@ enum LogLevels logSocketGetLogLevel();
 
 #ifdef __cplusplus
 }
-
-// TODO: C++ stream bindings here
-
 #endif
 
 #endif
diff --git a/libs/libLog.a b/libs/libLog.a
new file mode 100644
index 0000000000000000000000000000000000000000..ee54c25f2871a1dd298a9b0bcad629d4b6cbaba2
GIT binary patch
literal 12952
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
b3*RNwRG4D~;<p#4v2CGtjycw&kL~{h96LC|

literal 0
HcmV?d00001

diff --git a/sce_module/libLog.prx b/sce_module/libLog.prx
deleted file mode 100644
index 9b097414a8e63e4cfb7f528cd0cd85ec97683bc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 61952
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

diff --git a/src/controller.cpp b/src/controller.cpp
index 6498cae..01ef18f 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -2,6 +2,8 @@
 
 #include "controller.h"
 
+#include "libLog.h"
+
 Controller::Controller() {
 }
 
@@ -11,7 +13,7 @@ Controller::~Controller() {
 bool Controller::Init(int controllerUserID) {
   // Initialize the Pad library
   if (scePadInit() != 0) {
-    // DEBUGLOG << "[DEBUG] [ERROR] Failed to initialize pad library!";
+    logKernel(LL_Error, "%s", "Failed to initialize pad library!");
     return false;
   }
 
@@ -29,7 +31,7 @@ bool Controller::Init(int controllerUserID) {
   this->pad = scePadOpen(this->userID, 0, 0, NULL);
 
   if (this->pad < 0) {
-    // DEBUGLOG << "[DEBUG] [ERROR] Failed to open pad!";
+    logKernel(LL_Error, "%s", "Failed to open pad!");
     return false;
   }
 
diff --git a/src/graphics.cpp b/src/graphics.cpp
index bf7e00a..cd4c823 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -1,14 +1,16 @@
 // OpenOrbis Toolchain, https://github.com/OpenOrbis/OpenOrbis-PS4-Toolchain
 
+#include "graphics.h"
+
+#include "libLog.h"
+
+#include <string>
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <string>
-
-#include "graphics.h"
-
 Scene2D::Scene2D(int w, int h, int pixelDepth) {
   this->width = w;
   this->height = h;
@@ -24,7 +26,7 @@ bool Scene2D::Init(size_t memSize, int numFrameBuffers) {
   this->videoMem = NULL;
 
   if (this->video < 0) {
-    // DEBUGLOG << "Failed to open a video out handle: " << std::string(strerror(errno));
+    logKernel(LL_Error, "Failed to open a video out handle: %s", std::string(strerror(errno)).c_str());
     return false;
   }
 
@@ -33,7 +35,8 @@ bool Scene2D::Init(size_t memSize, int numFrameBuffers) {
   rc = sceSysmoduleLoadModule(0x009A);
 
   if (rc < 0) {
-    // DEBUGLOG << "Failed to load freetype: " << std::string(strerror(errno));
+    logKernel(LL_Error, "Failed to load freetype: %s", std::string(strerror(errno)).c_str());
+
     return false;
   }
 
@@ -41,23 +44,23 @@ bool Scene2D::Init(size_t memSize, int numFrameBuffers) {
   rc = FT_Init_FreeType(&this->ftLib);
 
   if (rc != 0) {
-    // DEBUGLOG << "Failed to initialize freetype: " << std::string(strerror(errno));
+    logKernel(LL_Error, "Failed to initialize freetype: %s", std::string(strerror(errno)).c_str());
     return false;
   }
 #endif
 
   if (!initFlipQueue()) {
-    // DEBUGLOG << "Failed to initialize flip queue: " << std::string(strerror(errno));
+    logKernel(LL_Error, "Failed to initialize flip queue: %s", std::string(strerror(errno)).c_str());
     return false;
   }
 
   if (!allocateVideoMem(memSize, 0x200000)) {
-    // DEBUGLOG << "Failed to allocate video memory: " << std::string(strerror(errno));
+    logKernel(LL_Error, "Failed to allocate video memory: %s", std::string(strerror(errno)).c_str());
     return false;
   }
 
   if (!allocateFrameBuffers(numFrameBuffers)) {
-    // DEBUGLOG << "Failed to allocate frame buffers: " << std::string(strerror(errno));
+    logKernel(LL_Error, "Failed to allocate frame buffers: %s", std::string(strerror(errno)).c_str());
     return false;
   }
 
diff --git a/src/main.cpp b/src/main.cpp
index 03b519b..0abb0b4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,21 +3,19 @@
 
 // License: GPL-3.0
 
-#include <cstddef>
-#include <cstdlib>
+#include "controller.h"
+#include "graphics.h"
+
+#include "libLog.h"
+#include "notifi.h"
 
 #include <orbis/Pad.h>
 #include <orbis/SystemService.h>
 #include <orbis/UserService.h>
 #include <orbis/libkernel.h>
 
-#include "controller.h"
-#include "graphics.h"
-#include "libLog_stub.h"
-#include "notifi.h"
-
-// Handle for libLog
-int g_LibLogHandle = -1;
+#include <cstddef>
+#include <cstdlib>
 
 // Dimensions for the 2D scene
 #define FRAME_WIDTH 1920
@@ -49,15 +47,11 @@ void terminate() {
   g_Controller->SetVibration(&g_Vibra);
 
   g_Controller->ResetLightBar();
-
-  if (g_LibLogHandle >= 0) {
-    sceKernelStopUnloadModule(g_LibLogHandle, 0, 0, 0, NULL, NULL);
-  }
 }
 
 // This function will display p_Message, then "cleanly" close the application
 void fail(const char *p_Message) {
-  printf("%s", p_Message); // Flawfinder: ignore
+  logKernel(LL_Fatal, "%s", p_Message);
   notifi(NULL, "%s", p_Message);
   terminate();
   sceSystemServiceLoadExec("exit", NULL);
@@ -65,17 +59,6 @@ void fail(const char *p_Message) {
 
 // Initalize
 void initialize() {
-  if ((g_LibLogHandle = sceKernelLoadStartModule("/app0/sce_module/libLog.prx", 0, 0, 0, NULL, NULL)) < 0) {
-    fail("Failed to start the libLog library");
-  }
-
-  if (logInitalize(g_LibLogHandle) != 0) {
-    fail("Failed to initialize the libLog library's functions");
-  }
-
-  // We know the logging is initalized here so we can use it after this point
-  logKernel(LL_Info, "%s", "libLog.prx Initialized");
-
   g_Vibra.lgMotor = 0;
   g_Vibra.smMotor = 0;