Add jbpf-like logger (#73)

Author: doctorlai-msrc

src/logger/jrtc_logging.c

@@ -5,16 +5,30 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
+#include <sys/time.h>
 
 static const char* STR[] = {FOREACH_LOG_LEVEL(GENERATE_STRING)};
 
 void
 jrtc_default_va_logging(const char* domain, jrtc_logging_level level, const char* s, va_list arg)
 {
-    char output[LOGGING_BUFFER_LEN];
-    snprintf(output, LOGGING_BUFFER_LEN, "%s %s%s", domain, STR[level], s);
-
     if (level >= jrtc_logger_level) {
+        char output[LOGGING_BUFFER_LEN];
+
+        // Get current time in milliseconds
+        struct timeval tv;
+        gettimeofday(&tv, NULL);
+
+        // Format the timestamp
+        char timestamp[64];
+        struct tm* tm_info = gmtime(&tv.tv_sec);
+        strftime(timestamp, sizeof(timestamp), "%Y-%m-%dT%H:%M:%S", tm_info);
+        snprintf(timestamp + strlen(timestamp), sizeof(timestamp) - strlen(timestamp), ".%06ldZ", tv.tv_usec);
+
+        // Add timestamp and log level
+        snprintf(output, LOGGING_BUFFER_LEN, "%s %s%s%s", timestamp, domain, STR[level], s);
+
         FILE* where = level >= INFO ? stderr : stdout;
         vfprintf(where, output, arg);
         fflush(where);
@@ -26,7 +40,17 @@ jrtc_default_logging(const char* domain, jrtc_logging_level level, const char* s
 {
     if (level >= jrtc_logger_level) {
         char output[LOGGING_BUFFER_LEN];
-        snprintf(output, LOGGING_BUFFER_LEN, "%s %s%s", domain, STR[level], s);
+        // Get current time in milliseconds
+        struct timeval tv;
+        gettimeofday(&tv, NULL);
+
+        // Format the timestamp
+        char timestamp[64];
+        struct tm* tm_info = gmtime(&tv.tv_sec);
+        strftime(timestamp, sizeof(timestamp), "%Y-%m-%dT%H:%M:%S", tm_info);
+        snprintf(timestamp + strlen(timestamp), sizeof(timestamp) - strlen(timestamp), ".%06ldZ", tv.tv_usec);
+
+        snprintf(output, LOGGING_BUFFER_LEN, "%s %s %s", timestamp, domain, s);
         va_list ap;
         va_start(ap, s);
         FILE* where = level >= INFO ? stderr : stdout;

src/logger/jrtc_logging.h

@@ -7,6 +7,9 @@
 #include <stddef.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
 
 #pragma once
 #ifdef __cplusplus
@@ -39,13 +42,63 @@ extern "C"
 #define _STR(x) _VAL(x)
 #define _VAL(x) #x
 
+    static inline const char*
+    get_file_name(const char* file)
+    {
+        const char* p = strrchr(file, '/');
+        return p ? p + 1 : file;
+    }
+
+    static inline char*
+    get_domain(const char* file)
+    {
+        const char* p = strstr(file, "src/");
+        if (p) {
+            p += 4; // Move past "src/"
+            const char* q = strchr(p, '/');
+            if (q) {
+                size_t len = q - p;
+                char* domain = (char*)malloc(len + 1);
+                if (!domain) {
+                    return NULL; // Indicate failure
+                }
+                memcpy(domain, p, len);
+                domain[len] = '\0';
+                // make it uppercase
+                for (size_t i = 0; i < len; i++) {
+                    domain[i] = toupper(domain[i]);
+                }
+                return domain;
+            }
+        }
+        return NULL;
+    }
+
     // Function to generate the log prefix dynamically
     static inline const char*
     get_log_prefix(const char* file, const char* func, int line, const char* level)
     {
         static char buffer[256];
-        snprintf(buffer, sizeof(buffer), "[%s:%s:%s:%d]", level, file, func, line);
-        return buffer;
+        char* domain = get_domain(file);
+        // we may want to cache this, but for now we will just check the env var each time
+        int JRTC_VERBOSE_LOGGING = getenv("JRTC_VERBOSE_LOGGING") != NULL;
+        if (JRTC_VERBOSE_LOGGING) {
+            if (domain) {
+                snprintf(buffer, sizeof(buffer), "[JRTC][%s]:%s:%s:%d", domain, get_file_name(file), func, line);
+            } else {
+                snprintf(buffer, sizeof(buffer), "[JRTC]:%s:%s:%d", get_file_name(file), func, line);
+            }
+            free(domain);
+            return buffer;
+        } else {
+            if (domain) {
+                snprintf(buffer, sizeof(buffer), "[JRTC][%s]", domain);
+            } else {
+                snprintf(buffer, sizeof(buffer), "[JRTC]");
+            }
+            free(domain);
+            return buffer;
+        }
     }
 
 // Define macros using the helper function