-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Consolidate logging with a unified interface
Currently, various messages are displayed while the window system is running, but their format and usage are inconsistent. Additionally, depending on the scenario, it may be useful to adjust the color scheme or disable logging output altogether. The rxi/log.c [1] offers a robust solution for these needs, and it would be beneficial to integrate it into the core implementation of the window system to standardize logging and enhance flexibility. - log_trace - log_debug - log_info - log_warn - log_error - log_fatal [1] https://github.com/rxi/log.c Close #47
- Loading branch information
Showing
9 changed files
with
286 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,170 @@ | ||
/* | ||
* Copyright (c) 2020 rxi | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to | ||
* deal in the Software without restriction, including without limitation the | ||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or | ||
* sell copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | ||
* IN THE SOFTWARE. | ||
*/ | ||
|
||
#include <stdio.h> | ||
|
||
#include "log.h" | ||
|
||
#define MAX_CALLBACKS 32 | ||
|
||
typedef struct { | ||
log_func_t fn; | ||
void *udata; | ||
int level; | ||
} callback_t; | ||
|
||
static struct { | ||
void *udata; | ||
log_lock_func_t lock; | ||
int level; | ||
bool quiet; | ||
callback_t callbacks[MAX_CALLBACKS]; | ||
} L; | ||
|
||
static const char *level_strings[] = { | ||
"TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL", | ||
}; | ||
|
||
#if defined(CONFIG_LOGGING_COLOR) | ||
static const char *level_colors[] = { | ||
"\x1b[94m", "\x1b[36m", "\x1b[32m", "\x1b[33m", "\x1b[31m", "\x1b[35m", | ||
}; | ||
#endif | ||
|
||
static void stdout_callback(log_event_t *ev) | ||
{ | ||
char buf[16]; | ||
buf[strftime(buf, sizeof(buf), "%H:%M:%S", ev->time)] = '\0'; | ||
#if defined(CONFIG_LOGGING_COLOR) | ||
fprintf(ev->udata, "%s %s%-5s\x1b[0m \x1b[90m%s:%d:\x1b[0m ", buf, | ||
level_colors[ev->level], level_strings[ev->level], ev->file, | ||
ev->line); | ||
#else | ||
fprintf(ev->udata, "%s %-5s %s:%d: ", buf, level_strings[ev->level], | ||
ev->file, ev->line); | ||
#endif | ||
vfprintf(ev->udata, ev->fmt, ev->ap); | ||
fprintf(ev->udata, "\n"); | ||
fflush(ev->udata); | ||
} | ||
|
||
static void file_callback(log_event_t *ev) | ||
{ | ||
char buf[64]; | ||
buf[strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", ev->time)] = '\0'; | ||
fprintf(ev->udata, "%s %-5s %s:%d: ", buf, level_strings[ev->level], | ||
ev->file, ev->line); | ||
vfprintf(ev->udata, ev->fmt, ev->ap); | ||
fprintf(ev->udata, "\n"); | ||
fflush(ev->udata); | ||
} | ||
|
||
static void lock(void) | ||
{ | ||
if (L.lock) | ||
L.lock(true, L.udata); | ||
} | ||
|
||
static void unlock(void) | ||
{ | ||
if (L.lock) | ||
L.lock(false, L.udata); | ||
} | ||
|
||
const char *log_level_string(int level) | ||
{ | ||
return level_strings[level]; | ||
} | ||
|
||
void log_set_lock(log_lock_func_t fn, void *udata) | ||
{ | ||
L.lock = fn; | ||
L.udata = udata; | ||
} | ||
|
||
void log_set_level(int level) | ||
{ | ||
L.level = level; | ||
} | ||
|
||
void log_set_quiet(bool enable) | ||
{ | ||
L.quiet = enable; | ||
} | ||
|
||
int log_add_callback(log_func_t fn, void *udata, int level) | ||
{ | ||
for (int i = 0; i < MAX_CALLBACKS; i++) { | ||
if (!L.callbacks[i].fn) { | ||
L.callbacks[i] = (callback_t){fn, udata, level}; | ||
return 0; | ||
} | ||
} | ||
return -1; | ||
} | ||
|
||
int log_add_fp(FILE *fp, int level) | ||
{ | ||
return log_add_callback(file_callback, fp, level); | ||
} | ||
|
||
static void init_event(log_event_t *ev, void *udata) | ||
{ | ||
if (!ev->time) { | ||
time_t t = time(NULL); | ||
ev->time = localtime(&t); | ||
} | ||
ev->udata = udata; | ||
} | ||
|
||
void log_impl(int level, const char *file, int line, const char *fmt, ...) | ||
{ | ||
log_event_t ev = { | ||
.fmt = fmt, | ||
.file = file, | ||
.line = line, | ||
.level = level, | ||
}; | ||
|
||
lock(); | ||
|
||
if (!L.quiet && level >= L.level) { | ||
init_event(&ev, stderr); | ||
va_start(ev.ap, fmt); | ||
stdout_callback(&ev); | ||
va_end(ev.ap); | ||
} | ||
|
||
#ifdef CONFIG_LOGGING_CALLBACK | ||
for (int i = 0; i < MAX_CALLBACKS && L.callbacks[i].fn; i++) { | ||
callback_t *cb = &L.callbacks[i]; | ||
if (level >= cb->level) { | ||
init_event(&ev, cb->udata); | ||
va_start(ev.ap, fmt); | ||
cb->fn(&ev); | ||
va_end(ev.ap); | ||
} | ||
} | ||
#endif | ||
|
||
unlock(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
/** | ||
* Copyright (c) 2020 rxi | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to | ||
* deal in the Software without restriction, including without limitation the | ||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or | ||
* sell copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in | ||
* all copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | ||
* IN THE SOFTWARE. | ||
*/ | ||
|
||
#ifndef _TWIN_LOGGING_H_ | ||
#define _TWIN_LOGGING_H_ | ||
|
||
#include <stdarg.h> | ||
#include <stdbool.h> | ||
#include <time.h> | ||
|
||
typedef struct { | ||
va_list ap; | ||
const char *fmt; | ||
const char *file; | ||
struct tm *time; | ||
void *udata; | ||
int line; | ||
int level; | ||
} log_event_t; | ||
|
||
typedef void (*log_func_t)(log_event_t *ev); | ||
typedef void (*log_lock_func_t)(bool lock, void *udata); | ||
|
||
enum { LOGC_TRACE, LOGC_DEBUG, LOGC_INFO, LOGC_WARN, LOGC_ERROR, LOGC_FATAL }; | ||
|
||
#if defined(CONFIG_LOGGING) | ||
#define log_trace(...) log_impl(LOGC_TRACE, __FILE__, __LINE__, __VA_ARGS__) | ||
#define log_debug(...) log_impl(LOGC_DEBUG, __FILE__, __LINE__, __VA_ARGS__) | ||
#define log_info(...) log_impl(LOGC_INFO, __FILE__, __LINE__, __VA_ARGS__) | ||
|
||
#else /* !CONFIG_LOGGING */ | ||
#define log_trace(...) \ | ||
do { \ | ||
} while (0) | ||
#define log_debug(...) \ | ||
do { \ | ||
} while (0) | ||
#define log_info(...) \ | ||
do { \ | ||
} while (0) | ||
#endif /* CONFIG_LOGGING */ | ||
|
||
#define log_warn(...) log_impl(LOGC_WARN, __FILE__, __LINE__, __VA_ARGS__) | ||
#define log_error(...) log_impl(LOGC_ERROR, __FILE__, __LINE__, __VA_ARGS__) | ||
#define log_fatal(...) log_impl(LOGC_FATAL, __FILE__, __LINE__, __VA_ARGS__) | ||
|
||
const char *log_level_string(int level); | ||
void log_set_lock(log_lock_func_t fn, void *udata); | ||
void log_set_level(int level); | ||
void log_set_quiet(bool enable); | ||
int log_add_callback(log_func_t fn, void *udata, int level); | ||
int log_add_fp(FILE *fp, int level); | ||
|
||
#if defined(CONFIG_LOGGING) | ||
void log_impl(int level, const char *file, int line, const char *fmt, ...); | ||
#else | ||
#define log_impl(...) \ | ||
do { \ | ||
/* dummy implementation */ \ | ||
} while (0) | ||
#endif | ||
|
||
#endif /* _TWIN_LOGGING_H_ */ |