Merge pull request 'Merge timer-functionality into main' (#1)

Reviewed-on: #1

.gitignore

@@ -1 +1,2 @@
 build/
+logs/*.log

LLog.c

@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "time.h"
+#include <stdarg.h>
 
 int timer_array_append(timer_array* array, lTimer timer) {
     if (array->count >= array->capacity) {
@@ -15,36 +16,133 @@ int timer_array_append(timer_array* array, lTimer timer) {
     return array->count - 1;
 }
 
+int lLogString_array_append(lLogString_array* array, lLogString* string) {
+    if (array->count >= array->capacity) {
+        if (array->capacity == 0) array->capacity = 8;
+        else array->capacity *= 2;
+
+        array->items = realloc(array->items, array->capacity * sizeof(*array->items));
+    }
+    array->items[array->count++] = string;
+    return array->count - 1;
+}
+
+Logger* Logger_new(lLogString* logfolder, int history_enabled) {
+    Logger* logger = calloc(1, sizeof(Logger));
+    logger->historyEnabled = history_enabled;
+    logger->logFileEnabled = 1;
+    
+    time_t time_now = time(NULL);
+    char file_name[64];
+    
+    strftime(file_name, sizeof(file_name), "%Y-%m-%d--%H:%M:%S.log", localtime(&time_now));
+
+    lLogString* logFile = lLogString_new("%.*s/%s", (int)logfolder->len, logfolder->buf, file_name);
+    logger->log_file = fopen(logFile->buf, "a");
+    
+    if (logger->log_file == NULL) {
+        logger->logFileEnabled = 0;
+        lLog(logger, 
+            lERROR, 
+            lLogString_new("Could not open log file: \"%.*s\" Continuing without log file.", (int)logFile->len, logFile->buf)
+        );
+    }
+
+    return logger;
+}
+
 int create_timer(Logger* logger) {
     return timer_array_append(&logger->timers, (lTimer){});
 }
 
 void start_timer(Logger* logger, int timer_id) {
     if (logger->timers.count < (timer_id + 1)) return;
-    logger->timers.items[timer_id].time.start = time(NULL);
+    lTimer* timer = &logger->timers.items[timer_id];
+
+    timer->time.start = time(NULL);
 }
 
 void stop_timer(Logger* logger, int timer_id) {
     if (logger->timers.count < (timer_id + 1)) return;
-    logger->timers.items[timer_id].time.end = time(NULL);
+    lTimer* timer = &logger->timers.items[timer_id];
+    
+    // next property will never be set to 0 unless it is uninitialized
+    if (timer->next != 0) {
+        stop_timer(logger, timer->next);
+    } else {
+        timer->time.end = time(NULL);
+    }
 }
 
-lLogString to_lLogString(const char* string) {
+void pause_timer(Logger* logger, int timer_id) {
-    lLogString str;
+    if (logger->timers.count < (timer_id + 1)) return;
-    str.buf = (char *)string;
+    lTimer* timer = &logger->timers.items[timer_id];
-    if (string == NULL) {
+
-        str.len = 0;
+    stop_timer(logger, timer_id);
-    } else {
+    timer->next = create_timer(logger);
-        str.len = strlen(string);
 }
+
+void resume_timer(Logger* logger, int timer_id) {
+    if (logger->timers.count < (timer_id + 1)) return;
+    lTimer* timer = &logger->timers.items[timer_id];
+
+    if (timer->next != 0) {
+        resume_timer(logger, logger->timers.items[timer_id].next);
+    } else {
+        start_timer(logger, timer_id);
+    }
+}
+
+double get_elapsed_time(Logger* logger, int timer_id) {
+    if (timer_id != 0) if (0) {}
+    if (logger->timers.count < (timer_id + 1)) return 0.0f;
+    lTimer* timer = &logger->timers.items[timer_id];
+    double current_elapsed = difftime(timer->time.end, timer->time.start);
+
+    if (timer->next != 0) {
+        return get_elapsed_time(logger, timer->next) + current_elapsed;
+    }
+
+    return current_elapsed;
+}
+
+lLogString* lLogString_new(const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+
+    char temp_string[max_string_len];
+    vsnprintf(temp_string, max_string_len, fmt, args);
+    
+    va_end(args);
+    
+    lLogString* str = calloc(1, sizeof(lLogString));
+    str->len = strlen(temp_string);
+
+    str->buf = malloc(str->len + 1);
+    if (str->buf != NULL) {
+        strcpy(str->buf, temp_string);
+    }
+
     return str;
 };
 
-void lLog(Logger logger, enum lLogLevel LOG_LEVEL, lLogString MESSAGE) {
+int Logger_write_to_log(Logger* logger, lLogString* string) {
+    if (logger->logFileEnabled == 0 || logger->log_file == NULL) return 1;
+    fprintf(logger->log_file, "%.*s", (int)string->len, string->buf);
+    
+    return 0;
+}
+
+int lLog(Logger* logger, enum lLogLevel LOG_LEVEL, lLogString* MESSAGE) {
     char* LOG_LEVEL_STRING = LOG_LEVEL == 0 ? "INFO" :
                              LOG_LEVEL == 1 ? "WARNING" :
                              LOG_LEVEL == 2 ? "ERROR" :
                              LOG_LEVEL == 3 ? "DEBUG" :
                              "invalid_log_level";
-    printf("[%s]: %.*s\n", LOG_LEVEL_STRING, (int)MESSAGE.len, MESSAGE.buf);
+    lLogString* formated_message = lLogString_new("[%s]: %.*s\n", LOG_LEVEL_STRING, (int)MESSAGE->len, MESSAGE->buf);
+    
+    if (logger->logFileEnabled) Logger_write_to_log(logger, formated_message);
+    printf("%.*s", (int)formated_message->len, formated_message->buf);
+    
+    return lLogString_array_append(&logger->history, formated_message);
 }

include/LLog.h

@@ -2,6 +2,16 @@
 #define LLog_H
 
 #include "time.h"
+#include <stdarg.h>
+#include <stdio.h>
+
+#ifndef max_string_len
+#define max_string_len 1024
+#endif
+
+#define LLog_Author "Lucielle <luci@git.lunarware.tech>"
+#define LLog_Repo "https://git.lunarware.tech/lucielle/LLog"
+#define LLog_Version "1.0.1"
 
 typedef struct {
     char *buf;
@@ -22,6 +32,7 @@ typedef struct {
 
 typedef struct {
     lTimespan time;
+    int next;
 } lTimer;
 
 typedef struct {
@@ -29,20 +40,34 @@ typedef struct {
     size_t capacity;
     lTimer* items;
 } timer_array;
-
 int timer_array_append(timer_array* array, lTimer timer);
 
 typedef struct {
-    lLogString logfolder;
+    size_t count;
+    size_t capacity;
+    lLogString** items;
+} lLogString_array;
+int lLogString_array_append(lLogString_array* array, lLogString* string);
+
+typedef struct {
+    FILE* log_file;
     timer_array timers;
+    int historyEnabled;
+    int logFileEnabled;
+    lLogString_array history;
+
 } Logger;
+Logger* Logger_new(lLogString* logfolder, int history_enabled);
 
 int create_timer(Logger* logger);
 void start_timer(Logger* logger, int timer_id);
 void stop_timer(Logger* logger, int timer_id);
+void pause_timer(Logger* logger, int timer_id);
+void resume_timer(Logger* logger, int timer_id);
+double get_elapsed_time(Logger* logger, int timer_id);
 
-lLogString to_lLogString(const char* string);
+lLogString* lLogString_new(const char* fmt, ...);
 
-void lLog(Logger logger, enum lLogLevel LOG_LEVEL, lLogString MESSAGE);
+int lLog(Logger* logger, enum lLogLevel LOG_LEVEL, lLogString* MESSAGE);
 
 #endif

test/test.c

@@ -1,20 +1,27 @@
 #include "../include/LLog.h"
-#include <stdio.h>
 #include <unistd.h>
 
 int main(void) {
-    Logger logger = {0};
+    Logger* logger = Logger_new(lLogString_new("./logs"), 1);
-    lLog(logger, lINFO, to_lLogString("Hello, INFO!"));
+    lLog(logger, lINFO, lLogString_new("Author: %s", LLog_Author));
-    lLog(logger, lWARNING, to_lLogString("Hello, WARNING!"));
+    lLog(logger, lINFO, lLogString_new("Repo: %s", LLog_Repo));
-    lLog(logger, lERROR, to_lLogString("Hello, ERROR!"));
+    lLog(logger, lINFO, lLogString_new("Version: %s\n", LLog_Version));
-    lLog(logger, lDEBUG, to_lLogString("Hello, DEBUG!"));
 
-    int timer = create_timer(&logger);
+    lLog(logger, lINFO, lLogString_new("Hello, INFO!"));
-    lTimespan* time_object = &logger.timers.items[timer].time;
-    start_timer(&logger, timer);
     
-    sleep(5);
+    lLog(logger, lWARNING, lLogString_new("Hello, WARNING!"));
+    lLog(logger, lERROR, lLogString_new("Hello, ERROR!"));
+    lLog(logger, lDEBUG, lLogString_new("Hello, DEBUG!"));
+    int timer = create_timer(logger);
     
-    stop_timer(&logger, timer);
+    start_timer(logger, timer);
-    printf("\n%f seconds.\n", difftime(time_object->end, time_object->start));
+    
+    sleep(4);
+    pause_timer(logger, timer);
+    sleep(2);
+    resume_timer(logger, timer);
+    sleep(2);
+    stop_timer(logger, timer);
+
+    lLog(logger, lINFO, lLogString_new("%f seconds.", get_elapsed_time(logger, timer)));
 }