diff options
Diffstat (limited to 'libmisc')
| -rw-r--r-- | libmisc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libmisc/assert.c | 6 | ||||
| -rw-r--r-- | libmisc/include/libmisc/log.h | 31 | ||||
| -rw-r--r-- | libmisc/log.c | 19 |
4 files changed, 55 insertions, 2 deletions
diff --git a/libmisc/CMakeLists.txt b/libmisc/CMakeLists.txt index 68b6910..1394978 100644 --- a/libmisc/CMakeLists.txt +++ b/libmisc/CMakeLists.txt @@ -7,6 +7,7 @@ add_library(libmisc INTERFACE) target_include_directories(libmisc SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include) target_sources(libmisc INTERFACE assert.c + log.c ) target_compile_options(libmisc INTERFACE "$<$<COMPILE_LANGUAGE:C>:-fplan9-extensions>") diff --git a/libmisc/assert.c b/libmisc/assert.c index 911cea3..dbf25b7 100644 --- a/libmisc/assert.c +++ b/libmisc/assert.c @@ -5,9 +5,11 @@ */ #include <stdbool.h> /* for bool, true, false */ -#include <stdio.h> /* for printf() */ #include <stdlib.h> /* for abort() */ +#define LOG_NAME ASSERT +#include <libmisc/log.h> /* for errorf() */ + #include <libmisc/assert.h> #ifndef NDEBUG @@ -18,7 +20,7 @@ void __assert_msg_fail(const char *expr, static bool in_fail = false; if (!in_fail) { in_fail = true; - printf("error: %s:%u:%s(): assertion \"%s\" failed%s%s\n", + errorf("%s:%u:%s(): assertion \"%s\" failed%s%s", file, line, func, expr, msg ? ": " : "", msg); diff --git a/libmisc/include/libmisc/log.h b/libmisc/include/libmisc/log.h new file mode 100644 index 0000000..eb9db3b --- /dev/null +++ b/libmisc/include/libmisc/log.h @@ -0,0 +1,31 @@ +/* libmisc/log.h - stdio logging + * + * Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +#ifndef _LIBMISC_LOG_H_ +#define _LIBMISC_LOG_H_ + +#ifndef LOG_NAME + #error "each compilation unit that includes <libmisc/log.h> must define LOG_NAME" +#endif + +#ifdef NDEBUG + #define _LOG_NDEBUG 1 +#else + #define _LOG_NDEBUG 0 +#endif +#define _LOG_STR(x) #x +#define __LOG_CAT3(a, b, c) a ## b ## c +#define _LOG_CAT3(a, b, c) __LOG_CAT3(a, b, c) + +__attribute__((format(printf, 1, 2))) +int _log_printf(const char *format, ...); + +#define errorf(fmt, ...) do { _log_printf("error: " _LOG_STR(LOG_NAME) ": " fmt "\n" __VA_OPT__(,) __VA_ARGS__); } while (0) +#define infof(fmt, ...) do { _log_printf("info : " _LOG_STR(LOG_NAME) ": " fmt "\n" __VA_OPT__(,) __VA_ARGS__); } while (0) +#define debugf(fmt, ...) do { if (_LOG_CAT3(CONFIG_, LOG_NAME, _DEBUG) && !_LOG_NDEBUG) \ + _log_printf("debug: " _LOG_STR(LOG_NAME) ": " fmt "\n" __VA_OPT__(,) __VA_ARGS__); } while (0) + +#endif /* _LIBMISC_LOG_H_ */ diff --git a/libmisc/log.c b/libmisc/log.c new file mode 100644 index 0000000..a1ec10f --- /dev/null +++ b/libmisc/log.c @@ -0,0 +1,19 @@ +/* libmisc/log.c - stdio logging + * + * Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com> + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +#include <stdio.h> /* for vprintf() */ +#include <stdarg.h> /* for va_list, va_start(), va_end() */ + +#define LOG_NAME +#include <libmisc/log.h> + +int _log_printf(const char *format, ...) { + va_list va; + va_start(va, format); + int ret = vprintf(format, va); + va_end(va); + return ret; +} |