diff options
author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2013-02-12 13:36:23 +0000 |
---|---|---|
committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2013-02-12 13:36:23 +0000 |
commit | 6204a046f3d3c610925afe8bba404bbb2f0f0c4d (patch) | |
tree | c95fa62c57ae2f8bc7abc56a535d8fa027243860 /src/shared/log.h | |
parent | 8fee3eb8a8550892d0dcf4431b861aacd49e57ec (diff) | |
parent | dee4c244254bb49d1ffa8bd7171ae9cce596d2d0 (diff) | |
download | systemd-6204a046f3d3c610925afe8bba404bbb2f0f0c4d.tar.gz |
Merge tag 'v197' into pauls-trove/sd-update
systemd 197
Diffstat (limited to 'src/shared/log.h')
-rw-r--r-- | src/shared/log.h | 88 |
1 files changed, 67 insertions, 21 deletions
diff --git a/src/shared/log.h b/src/shared/log.h index ab894df172..9aafcb4100 100644 --- a/src/shared/log.h +++ b/src/shared/log.h @@ -27,6 +27,7 @@ #include <errno.h> #include "macro.h" +#include "sd-id128.h" typedef enum LogTarget{ LOG_TARGET_CONSOLE, @@ -70,30 +71,70 @@ void log_close_console(void); void log_parse_environment(void); int log_meta( - int level, - const char*file, - int line, - const char *func, - const char *format, ...) _printf_attr_(5,6); + int level, + const char*file, + int line, + const char *func, + const char *format, ...) _printf_attr_(5,6); int log_metav( - int level, - const char*file, - int line, - const char *func, - const char *format, - va_list ap); - -_noreturn_ void log_assert_failed(const char *text, const char *file, int line, const char *func); -_noreturn_ void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func); + int level, + const char*file, + int line, + const char *func, + const char *format, + va_list ap); + +int log_meta_object( + int level, + const char*file, + int line, + const char *func, + const char *object_name, + const char *object, + const char *format, ...) _printf_attr_(7,8); + +int log_metav_object( + int level, + const char*file, + int line, + const char *func, + const char *object_name, + const char *object, + const char *format, + va_list ap); + +int log_struct_internal( + int level, + const char *file, + int line, + const char *func, + const char *format, ...) _sentinel_; + +int log_oom_internal( + const char *file, + int line, + const char *func); /* This modifies the buffer passed! */ int log_dump_internal( - int level, - const char*file, - int line, - const char *func, - char *buffer); + int level, + const char*file, + int line, + const char *func, + char *buffer); + +_noreturn_ void log_assert_failed( + const char *text, + const char *file, + int line, + const char *func); + +_noreturn_ void log_assert_failed_unreachable( + const char *text, + const char *file, + int line, + const char *func); #define log_full(level, ...) log_meta(level, __FILE__, __LINE__, __func__, __VA_ARGS__) @@ -103,11 +144,16 @@ int log_dump_internal( #define log_warning(...) log_meta(LOG_WARNING, __FILE__, __LINE__, __func__, __VA_ARGS__) #define log_error(...) log_meta(LOG_ERR, __FILE__, __LINE__, __func__, __VA_ARGS__) -int __log_oom(const char *file, int line, const char *func); -#define log_oom() __log_oom(__FILE__, __LINE__, __func__) +#define log_struct(level, ...) log_struct_internal(level, __FILE__, __LINE__, __func__, __VA_ARGS__) + +#define log_oom() log_oom_internal(__FILE__, __LINE__, __func__) /* This modifies the buffer passed! */ #define log_dump(level, buffer) log_dump_internal(level, __FILE__, __LINE__, __func__, buffer) +bool log_on_console(void); + const char *log_target_to_string(LogTarget target); LogTarget log_target_from_string(const char *s); + +#define MESSAGE_ID(x) "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(x) |