igsc: lib: add timestamps to logs

Add timestamps to logs. Retrieve the time using
locatime() standard library function.

Signed-off-by: Vitaly Lubart <vitaly.lubart@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>

Author: vlubart

include/gcc/config.h

@@ -19,6 +19,12 @@
 #define  mockable
 #endif
 
+#include <time.h>
+static inline void gsc_localtime(const time_t* timer, struct tm* buf )
+{
+    localtime_r(timer, buf);
+}
+
 #endif /* defined(__clang__) || defined(__GNUC__) */
 
 #endif /* !__IGSC_GCC_CONFIG_H__ */

include/msvc/config.h

@@ -19,7 +19,12 @@
 #define  mockable_static static
 #define  mockable
 
-#endif /* _MSC_VER */
+#include <time.h>
+static inline void gsc_localtime(const time_t* timer, struct tm* buf )
+{
+    localtime_s(buf, timer);
+}
 
+#endif /* _MSC_VER */
 
 #endif /*__IGSC_MSVC_CONFIG_H__ */

lib/igsc_log.c

@@ -3,6 +3,7 @@
  * Copyright (C) 2023 Intel Corporation
  */
 
+#include <time.h>
 #include "msvc/config.h"
 #include "gcc/config.h"
 #include "igsc_lib.h"
@@ -39,3 +40,19 @@ igsc_log_func_t igsc_get_log_callback_func(void)
 {
     return igsc_log_func;
 }
+
+const char *gsc_time(char *buffer, size_t buff_len)
+{
+    time_t curtime;
+    struct tm timeinfo = {0};
+    size_t ret;
+
+    if (!buffer)
+       return NULL;
+    curtime = time(NULL);
+    gsc_localtime(&curtime, &timeinfo);
+    ret = strftime(buffer, buff_len, "%c", &timeinfo);
+    buffer[ret] = 0;
+    return buffer;
+}
+

lib/igsc_log.h

@@ -49,35 +49,41 @@
         #define trace_print(fmt, ...) fprintf(stdout, fmt, ##__VA_ARGS__)
 #endif /* SYSLOG */
 
+#define MAX_TIME_STRING_LEN 128
+const char *gsc_time(char *buffer, size_t buff_len);
 #define gsc_debug(_fmt_, ...) \
     if (igsc_get_log_level() >= IGSC_LOG_LEVEL_DEBUG) { \
+        char __time_buf[MAX_TIME_STRING_LEN]; \
         if (NULL == igsc_get_log_callback_func()) { \
-            debug_print(PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
-                        __FILE__, __func__, __LINE__,  ##__VA_ARGS__); \
+            debug_print("%s: " PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
+                        gsc_time(__time_buf, sizeof(__time_buf)), __FILE__, __func__, __LINE__,  ##__VA_ARGS__); \
         } else { \
-            igsc_log_func_t igsc_log_func = igsc_get_log_callback_func(); igsc_log_func(IGSC_LOG_LEVEL_DEBUG, PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
-                        __FILE__, __func__, __LINE__,  ##__VA_ARGS__); \
+            igsc_log_func_t igsc_log_func = igsc_get_log_callback_func(); igsc_log_func(IGSC_LOG_LEVEL_DEBUG, "%s: " PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
+                        gsc_time(__time_buf, sizeof(__time_buf)), __FILE__, __func__, __LINE__,  ##__VA_ARGS__); \
         }   \
     }
 
 #define gsc_trace(_fmt_, ...) \
     if (igsc_get_log_level() >= IGSC_LOG_LEVEL_TRACE) { \
+        char __time_buf[MAX_TIME_STRING_LEN]; \
         if (NULL == igsc_get_log_callback_func()) { \
-            trace_print(PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
-                        __FILE__, __func__, __LINE__,  ##__VA_ARGS__) \
+            trace_print("%s: " PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
+                        gsc_time(__time_buf, sizeof(__time_buf)), __FILE__, __func__, __LINE__,  ##__VA_ARGS__) \
         } else { \
-              igsc_log_func_t igsc_log_func = igsc_get_log_callback_func(); igsc_log_func(IGSC_LOG_LEVEL_TRACE, PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
-                        __FILE__, __func__, __LINE__,  ##__VA_ARGS__); \
+              igsc_log_func_t igsc_log_func = igsc_get_log_callback_func(); igsc_log_func(IGSC_LOG_LEVEL_TRACE, "%s: " PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
+                        gsc_time(__time_buf, sizeof(__time_buf)), __FILE__, __func__, __LINE__,  ##__VA_ARGS__); \
         } \
     }
 
 #define gsc_error(_fmt_, ...) \
     if (NULL == igsc_get_log_callback_func()) { \
-        error_print(PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
-                    __FILE__, __func__, __LINE__, ##__VA_ARGS__); \
+        char __time_buf[MAX_TIME_STRING_LEN]; \
+        error_print("%s: " PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
+                    gsc_time(__time_buf, sizeof(__time_buf)), __FILE__, __func__, __LINE__, ##__VA_ARGS__); \
     } else { \
-          igsc_log_func_t igsc_log_func = igsc_get_log_callback_func(); igsc_log_func(IGSC_LOG_LEVEL_ERROR, PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
-                        __FILE__, __func__, __LINE__,  ##__VA_ARGS__); \
+        char __time_buf[MAX_TIME_STRING_LEN]; \
+        igsc_log_func_t igsc_log_func = igsc_get_log_callback_func(); igsc_log_func(IGSC_LOG_LEVEL_ERROR, "%s: " PACKAGE_LOG_NAME ": (%s:%s():%d) " _fmt_, \
+                    gsc_time(__time_buf, sizeof(__time_buf)), __FILE__, __func__, __LINE__,  ##__VA_ARGS__); \
     }
 
 #endif /* __IGSC_UTILS_H__ */