diff options
| -rw-r--r-- | src/intel/Makefile.sources | 4 | ||||
| -rw-r--r-- | src/intel/common/intel_log.c | 87 | ||||
| -rw-r--r-- | src/intel/common/intel_log.h | 82 | ||||
| -rw-r--r-- | src/intel/common/meson.build | 1 |
4 files changed, 173 insertions, 1 deletions
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index b8355337f83..da018dcc6a4 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -18,7 +18,9 @@ COMMON_FILES = \ common/gen_l3_config.c \ common/gen_l3_config.h \ common/gen_urb_config.c \ - common/gen_sample_positions.h + common/gen_sample_positions.h \ + common/intel_log.c \ + common/intel_log.h COMPILER_FILES = \ compiler/brw_cfg.cpp \ diff --git a/src/intel/common/intel_log.c b/src/intel/common/intel_log.c new file mode 100644 index 00000000000..cebdd6dd6d8 --- /dev/null +++ b/src/intel/common/intel_log.c @@ -0,0 +1,87 @@ +/* + * Copyright © 2017 Google, Inc. + * + * 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 (including the next + * paragraph) 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 <stdarg.h> + +#ifdef ANDROID +#include <android/log.h> +#else +#include <stdio.h> +#endif + +#include "intel_log.h" + +#ifdef ANDROID +static inline android_LogPriority +level_to_android(enum intel_log_level l) +{ + switch (l) { + case INTEL_LOG_ERROR: return ANDROID_LOG_ERROR; + case INTEL_LOG_WARN: return ANDROID_LOG_WARN; + case INTEL_LOG_INFO: return ANDROID_LOG_INFO; + case INTEL_LOG_DEBUG: return ANDROID_LOG_DEBUG; + } + + unreachable("bad intel_log_level"); +} +#endif + +#ifndef ANDROID +static inline const char * +level_to_str(enum intel_log_level l) +{ + switch (l) { + case INTEL_LOG_ERROR: return "error"; + case INTEL_LOG_WARN: return "warning"; + case INTEL_LOG_INFO: return "info"; + case INTEL_LOG_DEBUG: return "debug"; + } + + unreachable("bad intel_log_level"); +} +#endif + +void +intel_log(enum intel_log_level level, const char *tag, const char *format, ...) +{ + va_list va; + + va_start(va, format); + intel_log_v(level, tag, format, va); + va_end(va); +} + +void +intel_log_v(enum intel_log_level level, const char *tag, const char *format, + va_list va) +{ +#ifdef ANDROID + __android_log_vprint(level_to_android(level), tag, format, va); +#else + flockfile(stderr); + fprintf(stderr, "%s: %s: ", tag, level_to_str(level)); + vfprintf(stderr, format, va); + fprintf(stderr, "\n"); + funlockfile(stderr); +#endif +} diff --git a/src/intel/common/intel_log.h b/src/intel/common/intel_log.h new file mode 100644 index 00000000000..0f28109a0a4 --- /dev/null +++ b/src/intel/common/intel_log.h @@ -0,0 +1,82 @@ +/* + * Copyright 2017 Google + * + * 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 (including the next + * paragraph) 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 INTEL_LOG_H +#define INTEL_LOG_H + +#include <stdarg.h> + +#include "util/macros.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef INTEL_LOG_TAG +#define INTEL_LOG_TAG "INTEL-MESA" +#endif + +enum intel_log_level { + INTEL_LOG_ERROR, + INTEL_LOG_WARN, + INTEL_LOG_INFO, + INTEL_LOG_DEBUG, +}; + +void PRINTFLIKE(3, 4) +intel_log(enum intel_log_level, const char *tag, const char *format, ...); + +void +intel_log_v(enum intel_log_level, const char *tag, const char *format, + va_list va); + +#define intel_loge(fmt, ...) intel_log(INTEL_LOG_ERROR, (INTEL_LOG_TAG), (fmt), ##__VA_ARGS__) +#define intel_logw(fmt, ...) intel_log(INTEL_LOG_WARN, (INTEL_LOG_TAG), (fmt), ##__VA_ARGS__) +#define intel_logi(fmt, ...) intel_log(INTEL_LOG_INFO, (INTEL_LOG_TAG), (fmt), ##__VA_ARGS__) +#ifdef DEBUG +#define intel_logd(fmt, ...) intel_log(INTEL_LOG_DEBUG, (INTEL_LOG_TAG), (fmt), ##__VA_ARGS__) +#else +#define intel_logd(fmt, ...) __intel_log_use_args((fmt), ##__VA_ARGS__) +#endif + +#define intel_loge_v(fmt, va) intel_log_v(INTEL_LOG_ERROR, (INTEL_LOG_TAG), (fmt), (va)) +#define intel_logw_v(fmt, va) intel_log_v(INTEL_LOG_WARN, (INTEL_LOG_TAG), (fmt), (va)) +#define intel_logi_v(fmt, va) intel_log_v(INTEL_LOG_INFO, (INTEL_LOG_TAG), (fmt), (va)) +#ifdef DEBUG +#define intel_logd_v(fmt, va) intel_log_v(INTEL_LOG_DEBUG, (INTEL_LOG_TAG), (fmt), (va)) +#else +#define intel_logd_v(fmt, va) __intel_log_use_args((fmt), (va)) +#endif + + +#ifndef DEBUG +/* Suppres -Wunused */ +static inline void PRINTFLIKE(1, 2) +__intel_log_use_args(const char *format, ...) { } +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* INTEL_LOG_H */ diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build index 90068ee7e5d..6b0af929d9e 100644 --- a/src/intel/common/meson.build +++ b/src/intel/common/meson.build @@ -32,6 +32,7 @@ files_libintel_common = files( 'gen_l3_config.h', 'gen_urb_config.c', 'gen_sample_positions.h', + 'intel_log.c', ) libintel_common = static_library( |