mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-06 07:06:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

u/logging: Implement global log level.

Browse source 
Adds a `XRT_LOG` environemnt option.

Example:
```
XRT_LOG=debug
```
This commit is contained in:
Lubosz Sarnecki 2020-12-18 15:30:19 +01:00 committed by Jakob Bornecrantz
parent 8bdff9a61a
commit adcd0aff1a
2 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/xrt/auxiliary/util/u_logging.c
View file

@ -11,10 +11,26 @@
#include "xrt/xrt_config_os.h" #include "xrt/xrt_config_os.h"
#include "xrt/xrt_config_build.h" #include "xrt/xrt_config_build.h"
#include "util/u_debug.h"
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
DEBUG_GET_ONCE_LOG_OPTION(global_log, "XRT_LOG", U_LOGGING_WARN)
enum u_logging_level global_log_level;
static bool _is_log_level_initialized;
void
_log_level_init()
{
if (!_is_log_level_initialized) {
global_log_level = debug_get_log_option_global_log();
_is_log_level_initialized = true;
}
}
#if defined(XRT_OS_ANDROID) #if defined(XRT_OS_ANDROID)
@ -42,6 +58,7 @@ u_log(const char *file,
const char *format, const char *format,
...) ...)
{ {
_log_level_init();
// print_prefix(func, level); // print_prefix(func, level);
android_LogPriority prio = u_log_convert_priority(level); android_LogPriority prio = u_log_convert_priority(level);
va_list args; va_list args;
@ -59,6 +76,7 @@ u_log_xdev(const char *file,
const char *format, const char *format,
...) ...)
{ {
_log_level_init();
android_LogPriority prio = u_log_convert_priority(level); android_LogPriority prio = u_log_convert_priority(level);
va_list args; va_list args;
va_start(args, format); va_start(args, format);
@ -113,6 +131,8 @@ u_log(const char *file,
const char *format, const char *format,
...) ...)
{ {
_log_level_init();
char buf[16384] = {0}; char buf[16384] = {0};
int remainingBuffer = sizeof(buf) - 2; int remainingBuffer = sizeof(buf) - 2;
@ -136,6 +156,8 @@ u_log_xdev(const char *file,
const char *format, const char *format,
...) ...)
{ {
_log_level_init();
char buf[16384] = {0}; char buf[16384] = {0};
int remainingBuffer = sizeof(buf) - 1; int remainingBuffer = sizeof(buf) - 1;
@ -240,6 +262,8 @@ u_log(const char *file,
const char *format, const char *format,
...) ...)
{ {
_log_level_init();
print_prefix(func, level); print_prefix(func, level);
va_list args; va_list args;
@ -259,6 +283,8 @@ u_log_xdev(const char *file,
const char *format, const char *format,
...) ...)
{ {
_log_level_init();
print_prefix(func, level); print_prefix(func, level);
va_list args; va_list args;

12
src/xrt/auxiliary/util/u_logging.h
View file

@ -68,11 +68,11 @@ struct xrt_device;
} while (false) } while (false)
// clang-format off // clang-format off
#define U_LOG_T(...) U_LOG(U_LOGGING_TRACE, __VA_ARGS__) #define U_LOG_T(...) U_LOG_IFL_T(global_log_level, __VA_ARGS__)
#define U_LOG_D(...) U_LOG(U_LOGGING_DEBUG, __VA_ARGS__) #define U_LOG_D(...) U_LOG_IFL_D(global_log_level, __VA_ARGS__)
#define U_LOG_I(...) U_LOG(U_LOGGING_INFO, __VA_ARGS__) #define U_LOG_I(...) U_LOG_IFL_I(global_log_level, __VA_ARGS__)
#define U_LOG_W(...) U_LOG(U_LOGGING_WARN, __VA_ARGS__) #define U_LOG_W(...) U_LOG_IFL_W(global_log_level, __VA_ARGS__)
#define U_LOG_E(...) U_LOG(U_LOGGING_ERROR, __VA_ARGS__) #define U_LOG_E(...) U_LOG_IFL_E(global_log_level, __VA_ARGS__)
#define U_LOG_IFL_T(cond_level, ...) U_LOG_IFL(U_LOGGING_TRACE, cond_level, __VA_ARGS__) #define U_LOG_IFL_T(cond_level, ...) U_LOG_IFL(U_LOGGING_TRACE, cond_level, __VA_ARGS__)
#define U_LOG_IFL_D(cond_level, ...) U_LOG_IFL(U_LOGGING_DEBUG, cond_level, __VA_ARGS__) #define U_LOG_IFL_D(cond_level, ...) U_LOG_IFL(U_LOGGING_DEBUG, cond_level, __VA_ARGS__)
@ -103,6 +103,8 @@ enum u_logging_level
U_LOGGING_RAW, //!< Special level for raw printing, prints a new-line. U_LOGGING_RAW, //!< Special level for raw printing, prints a new-line.
}; };
extern enum u_logging_level global_log_level;
void void
u_log(const char *file, u_log(const char *file,
int line, int line,