Add basic logging functionality
All checks were successful
Release / release (push) Successful in 6s

This commit is contained in:
2026-05-17 18:40:10 +01:00
parent 2e5163ba33
commit c67a448d00
9 changed files with 169 additions and 2 deletions

View File

@@ -1 +1 @@
1.0.4 1.1.0

99
src/log/log.c Normal file
View File

@@ -0,0 +1,99 @@
// vim:fileencoding=utf-8:foldmethod=marker
#include "log.h"
#include "../common/aliases/aliases.h"
#include "../common/assert/assert.h"
#include "../os/file/file.h"
#define LOG_LEVEL_STR_LENGTH 8
#define LOG_PREFIX_BUF_LENGTH 16
typedef struct {
WFile *outlog;
WFile *errlog;
LogLevel level;
} LogConfig;
wapp_intern LogConfig LOG_CONFIG = {
.level = WAPP_LOG_DEBUG,
};
wapp_intern Str8RO LOG_LEVEL_STRINGS[COUNT_LOG_LEVEL] = {
[WAPP_LOG_FATAL] = wapp_str8_lit_ro_initialiser_list("[ FATAL ] "),
[WAPP_LOG_CRITICAL] = wapp_str8_lit_ro_initialiser_list("[ CRITICAL ] "),
[WAPP_LOG_ERROR] = wapp_str8_lit_ro_initialiser_list("[ ERROR ] "),
[WAPP_LOG_WARNING] = wapp_str8_lit_ro_initialiser_list("[ WARNING ] "),
[WAPP_LOG_INFO] = wapp_str8_lit_ro_initialiser_list("[ INFO ] "),
[WAPP_LOG_DEBUG] = wapp_str8_lit_ro_initialiser_list("[ DEBUG ] "),
};
wapp_intern void _write_log_line(WFile *fp, const Logger *logger, Str8 msg, LogLevel level);
void wapp_log_set_level(LogLevel level) {
LOG_CONFIG.level = level;
}
void wapp_log_configure(WFile *outlog, WFile *errlog, LogLevel level) {
LOG_CONFIG.outlog = outlog;
LOG_CONFIG.errlog = errlog;
LOG_CONFIG.level = level;
}
Logger wapp_log_make_logger(Str8 name) {
return (Logger){ .name = name };
}
void wapp_log_debug(const Logger *logger, Str8 msg) {
wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_DEBUG) { return; }
WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
_write_log_line(fp, logger, msg, WAPP_LOG_DEBUG);
}
void wapp_log_info(const Logger *logger, Str8 msg) {
wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_INFO) { return; }
WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
_write_log_line(fp, logger, msg, WAPP_LOG_INFO);
}
void wapp_log_warning(const Logger *logger, Str8 msg) {
wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_WARNING) { return; }
WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
_write_log_line(fp, logger, msg, WAPP_LOG_WARNING);
}
void wapp_log_error(const Logger *logger, Str8 msg) {
wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_ERROR) { return; }
WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
_write_log_line(fp, logger, msg, WAPP_LOG_ERROR);
}
void wapp_log_critical(const Logger *logger, Str8 msg) {
wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_CRITICAL) { return; }
WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
_write_log_line(fp, logger, msg, WAPP_LOG_CRITICAL);
}
void wapp_log_fatal(const Logger *logger, Str8 msg) {
wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
if (LOG_CONFIG.level < WAPP_LOG_FATAL) { return; }
WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
_write_log_line(fp, logger, msg, WAPP_LOG_FATAL);
}
wapp_intern void _write_log_line(WFile *fp, const Logger *logger, Str8 msg, LogLevel level) {
wapp_file_write((void *)LOG_LEVEL_STRINGS[level].buf, fp, LOG_LEVEL_STRINGS[level].size);
wapp_file_write((void *)logger->name.buf, fp, logger->name.size);
wapp_file_write((void *)": ", fp, 2);
wapp_file_write((void *)msg.buf, fp, msg.size);
wapp_file_write((void *)"\n", fp, 1);
}

34
src/log/log.h Normal file
View File

@@ -0,0 +1,34 @@
// vim:fileencoding=utf-8:foldmethod=marker
#ifndef LOG_H
#define LOG_H
#include "../os/file/file.h"
#include "../base/strings/str8/str8.h"
typedef enum {
WAPP_LOG_FATAL,
WAPP_LOG_CRITICAL,
WAPP_LOG_ERROR,
WAPP_LOG_WARNING,
WAPP_LOG_INFO,
WAPP_LOG_DEBUG,
COUNT_LOG_LEVEL,
} LogLevel;
typedef struct {
Str8 name;
} Logger;
void wapp_log_set_level(LogLevel level);
void wapp_log_configure(WFile *outlog, WFile *errlog, LogLevel level);
Logger wapp_log_make_logger(Str8 name);
void wapp_log_debug(const Logger *logger, Str8 msg);
void wapp_log_info(const Logger *logger, Str8 msg);
void wapp_log_warning(const Logger *logger, Str8 msg);
void wapp_log_error(const Logger *logger, Str8 msg);
void wapp_log_critical(const Logger *logger, Str8 msg);
void wapp_log_fatal(const Logger *logger, Str8 msg);
#endif // !LOG_H

10
src/log/wapp_log.c Normal file
View File

@@ -0,0 +1,10 @@
// vim:fileencoding=utf-8:foldmethod=marker
#ifndef WAPP_LOG_C
#define WAPP_LOG_C
#include "log.c"
#include "../base/wapp_base.c"
#include "../os/wapp_os.c"
#endif // !WAPP_LOG_C

11
src/log/wapp_log.h Normal file
View File

@@ -0,0 +1,11 @@
// vim:fileencoding=utf-8:foldmethod=marker
#ifndef WAPP_LOG_H
#define WAPP_LOG_H
#include "log.h"
#include "../common/wapp_common.h"
#include "../base/wapp_base.h"
#include "../os/wapp_os.h"
#endif // !WAPP_LOG_H

View File

@@ -34,9 +34,18 @@ typedef enum {
FILE_SEEK_ORIGIN_COUNT, FILE_SEEK_ORIGIN_COUNT,
} FileSeekOrigin; } FileSeekOrigin;
// Return value should not be cached as it's not guaranteed to remain the same. Always call
// wapp_file_stdin to get the standard input stream
wapp_extern WFile *wapp_file_stdin(void); wapp_extern WFile *wapp_file_stdin(void);
// Return value should not be cached as it's not guaranteed to remain the same. Always call
// wapp_file_stdout to get the standard output stream
wapp_extern WFile *wapp_file_stdout(void); wapp_extern WFile *wapp_file_stdout(void);
// Return value should not be cached as it's not guaranteed to remain the same. Always call
// wapp_file_stderr to get the standard error stream
wapp_extern WFile *wapp_file_stderr(void); wapp_extern WFile *wapp_file_stderr(void);
WFile *wapp_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode); WFile *wapp_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
i64 wapp_file_get_current_position(WFile *file); i64 wapp_file_get_current_position(WFile *file);
i64 wapp_file_seek(WFile *file, i64 offset, FileSeekOrigin origin); i64 wapp_file_seek(WFile *file, i64 offset, FileSeekOrigin origin);

View File

@@ -12,6 +12,8 @@
BEGIN_C_LINKAGE BEGIN_C_LINKAGE
#endif // !WAPP_PLATFORM_CPP #endif // !WAPP_PLATFORM_CPP
// TODO (Abdelrahman): Look into moving away from stdio in the implementation
void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour); void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour);
void wapp_shell_termcolour_clear_colour(void); void wapp_shell_termcolour_clear_colour(void);

View File

@@ -6,8 +6,9 @@
#include "wapp.h" #include "wapp.h"
#include "base/wapp_base.c" #include "base/wapp_base.c"
#include "os/wapp_os.c" #include "os/wapp_os.c"
#include "log/wapp_log.c"
#include "prng/wapp_prng.c" #include "prng/wapp_prng.c"
#include "uuid/uuid.c" #include "uuid/wapp_uuid.c"
#include "testing/wapp_testing.c" #include "testing/wapp_testing.c"
#endif // !WAPP_C #endif // !WAPP_C

View File

@@ -6,6 +6,7 @@
#include "common/wapp_common.h" #include "common/wapp_common.h"
#include "base/wapp_base.h" #include "base/wapp_base.h"
#include "os/wapp_os.h" #include "os/wapp_os.h"
#include "log/wapp_log.h"
#include "prng/wapp_prng.h" #include "prng/wapp_prng.h"
#include "uuid/wapp_uuid.h" #include "uuid/wapp_uuid.h"
#include "testing/wapp_testing.h" #include "testing/wapp_testing.h"