feat: Implement logging to pmlogd

Author: tuxuser

service/CMakeLists.txt

@@ -52,6 +52,8 @@ set(BIN_NAME loader_service)
 
 set(SRC_LIST
     ${CMAKE_SOURCE_DIR}/src/main.c
+    ${CMAKE_SOURCE_DIR}/src/log.c
+    ${CMAKE_SOURCE_DIR}/src/utils.c
 )
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/dist/")
@@ -62,6 +64,8 @@ set(CMAKE_EXE_LINKER_FLAGS "-Wl,--allow-shlib-undefined")
 set_target_properties(${BIN_NAME} PROPERTIES LINKER_LANGUAGE C)
 
 target_link_libraries (${BIN_NAME}
+    rt
+    pthread
     ${GTHREAD2_LDFLAGS}
     ${PBNJSON_LDFLAGS}
     ${LS2_LDFLAGS}

service/src/log.c

@@ -0,0 +1,63 @@
+#include "log.h"
+#include "utils.h"
+#include <PmLogLib.h>
+#include <stdint.h>
+#include <time.h>
+
+uint64_t start = 0;
+PmLogContext context;
+LogLevel current_log_level = Info;
+
+void log_init()
+{
+    PmLogGetContext("hyperion-webos", &context);
+}
+
+void log_set_level(LogLevel level)
+{
+    current_log_level = level;
+}
+
+void log_printf(LogLevel level, const char* module, const char* fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    const char* level_str;
+    const char* color_str;
+
+    if (start == 0)
+        start = getticks_us();
+
+    if (level == Debug) {
+        level_str = "DBG";
+        color_str = "\x1b[34m";
+    } else if (level == Info) {
+        level_str = "INFO";
+        color_str = "\x1b[36m";
+    } else if (level == Warning) {
+        level_str = "WARN";
+        color_str = "\x1b[33m";
+    } else {
+        level_str = "ERR";
+        color_str = "\x1b[31m";
+    }
+
+    char formatted[1024];
+    int prefix = snprintf(formatted, 1024, "%s: ", module);
+
+    if (prefix < 0 || prefix > 1024) {
+        // This shall only happen if module is 1020 characters long.
+        fprintf(stderr, "Log message truncated...\n");
+        return;
+    }
+
+    vsnprintf(formatted + prefix, 1024 - prefix, fmt, args);
+
+    _PmLogMsgKV(context, (PmLogLevel)level, 0, level == Debug ? NULL : level_str, 0, NULL, NULL, formatted);
+
+    if (level <= current_log_level) {
+        fprintf(stderr, "%10.3fs %s[%4s %-20s]\x1b[0m %s\n", (getticks_us() - start) / 1000000.0, color_str, level_str, module, formatted + prefix);
+    }
+
+    va_end(args);
+}

service/src/log.h

@@ -0,0 +1,29 @@
+#pragma once
+#include <stdarg.h>
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Shorthand for PmLogLevel: https://github.com/openwebos/pmloglib/blob/master/include/public/PmLogLib.h.in#L163
+typedef enum {
+    Error = 3,
+    Warning = 4,
+    Info = 6,
+    Debug = 7,
+} LogLevel;
+
+void log_init();
+void log_set_level(LogLevel level);
+void log_printf(LogLevel level, const char* module, const char* fmt, ...);
+
+#define LOG(level, ...) log_printf(level, __func__, __VA_ARGS__)
+#define ERR(...) LOG(Error, __VA_ARGS__)
+#define WARN(...) LOG(Warning, __VA_ARGS__)
+#define INFO(...) LOG(Info, __VA_ARGS__)
+#define DBG(...) LOG(Debug, __VA_ARGS__)
+
+#ifdef __cplusplus
+}
+#endif

service/src/main.c

@@ -10,6 +10,7 @@
 #include <luna-service2/lunaservice.h>
 #include <pbnjson.h>
 #include "service.h"
+#include "log.h"
 
 GMainLoop *gmainLoop;
 
@@ -156,7 +157,7 @@ int hyperiond_stop(service_t* service)
         ERR("hyperiond_stop: pthread_join failed, res=%d", res);
         return 4;
     }
-    service->execution_thread = NULL;
+    service->execution_thread = (pthread_t) NULL;
 
     return 0;
 }
@@ -336,6 +337,7 @@ int main()
     service.daemon_pid = 0;
     service.hyperiond_version = NULL;
 
+    log_init();
     LSErrorInit(&lserror);
 
     // create a GMainLoop

service/src/utils.c

@@ -0,0 +1,9 @@
+#include "utils.h"
+#include <time.h>
+
+uint64_t getticks_us()
+{
+    struct timespec tp;
+    clock_gettime(CLOCK_MONOTONIC, &tp);
+    return tp.tv_sec * 1000000 + tp.tv_nsec / 1000;
+}

service/src/utils.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <stdint.h>
+
+uint64_t getticks_us();