X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Flog.h;h=9dd68df500fde3f4458f15872ed788440a40a134;hb=086891e5c1;hp=a3e23a855cf570e5db94ef6151a807324bb648ae;hpb=cb41ff2922b8a555c01d52e1038ac26360253c15;p=elogind.git

diff --git a/src/shared/log.h b/src/shared/log.h
index a3e23a855..9dd68df50 100644
--- a/src/shared/log.h
+++ b/src/shared/log.h
@@ -25,6 +25,8 @@
 #include <stdarg.h>
 #include <syslog.h>
 #include <sys/signalfd.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include <errno.h>
 
 #include "macro.h"
@@ -75,44 +77,49 @@ void log_parse_environment(void);
 
 int log_meta(
                 int level,
+                int error,
                 const char*file,
                 int line,
                 const char *func,
-                const char *format, ...) _printf_(5,6);
+                const char *format, ...) _printf_(6,7);
 
 int log_metav(
                 int level,
+                int error,
                 const char*file,
                 int line,
                 const char *func,
                 const char *format,
-                va_list ap) _printf_(5,0);
+                va_list ap) _printf_(6,0);
 
 int log_meta_object(
                 int level,
+                int error,
                 const char*file,
                 int line,
                 const char *func,
                 const char *object_name,
                 const char *object,
-                const char *format, ...) _printf_(7,8);
+                const char *format, ...) _printf_(8,9);
 
 int log_metav_object(
                 int level,
+                int error,
                 const char*file,
                 int line,
                 const char *func,
                 const char *object_name,
                 const char *object,
                 const char *format,
-                va_list ap) _printf_(7,0);
+                va_list ap) _printf_(8,0);
 
 int log_struct_internal(
                 int level,
+                int error,
                 const char *file,
                 int line,
                 const char *func,
-                const char *format, ...) _printf_(5,0) _sentinel_;
+                const char *format, ...) _printf_(6,0) _sentinel_;
 
 int log_oom_internal(
                 const char *file,
@@ -122,11 +129,13 @@ int log_oom_internal(
 /* This modifies the buffer passed! */
 int log_dump_internal(
                 int level,
+                int error,
                 const char*file,
                 int line,
                 const char *func,
                 char *buffer);
 
+/* Logging for various assertions */
 noreturn void log_assert_failed(
                 const char *text,
                 const char *file,
@@ -145,17 +154,30 @@ void log_assert_failed_return(
                 int line,
                 const char *func);
 
-#define log_full(level, ...) \
-do { \
-        if (log_get_max_level() >= (level)) \
-                log_meta((level), __FILE__, __LINE__, __func__, __VA_ARGS__); \
-} while (0)
-
-#define log_debug(...)   log_full(LOG_DEBUG,   __VA_ARGS__)
-#define log_info(...)    log_full(LOG_INFO,    __VA_ARGS__)
-#define log_notice(...)  log_full(LOG_NOTICE,  __VA_ARGS__)
-#define log_warning(...) log_full(LOG_WARNING, __VA_ARGS__)
-#define log_error(...)   log_full(LOG_ERR,     __VA_ARGS__)
+/* Logging with level */
+#define log_full_errno(level, error, ...)                               \
+        do {                                                            \
+                if (log_get_max_level() >= (level))                     \
+                        log_meta((level), error, __FILE__, __LINE__, __func__, __VA_ARGS__); \
+        } while (false)
+
+#define log_full(level, ...) log_full_errno(level, 0, __VA_ARGS__)
+
+/* Normal logging */
+#define log_debug(...)     log_full(LOG_DEBUG,   __VA_ARGS__)
+#define log_info(...)      log_full(LOG_INFO,    __VA_ARGS__)
+#define log_notice(...)    log_full(LOG_NOTICE,  __VA_ARGS__)
+#define log_warning(...)   log_full(LOG_WARNING, __VA_ARGS__)
+#define log_error(...)     log_full(LOG_ERR,     __VA_ARGS__)
+#define log_emergency(...) log_full(getpid() == 1 ? LOG_EMERG : LOG_ERR, __VA_ARGS__)
+
+/* Logging triggered by an errno-like error */
+#define log_debug_errno(error, ...)     log_full_errno(LOG_DEBUG,   error, __VA_ARGS__)
+#define log_info_errno(error, ...)      log_full_errno(LOG_INFO,    error, __VA_ARGS__)
+#define log_notice_errno(error, ...)    log_full_errno(LOG_NOTICE,  error, __VA_ARGS__)
+#define log_warning_errno(error, ...)   log_full_errno(LOG_WARNING, error, __VA_ARGS__)
+#define log_error_errno(error, ...)     log_full_errno(LOG_ERR,     error, __VA_ARGS__)
+#define log_emergency_errno(error, ...) log_full_errno(getpid() == 1 ? LOG_EMERG : LOG_ERR, __VA_ARGS__)
 
 #ifdef LOG_TRACE
 #  define log_trace(...) log_debug(__VA_ARGS__)
@@ -163,12 +185,14 @@ do { \
 #  define log_trace(...) do {} while(0)
 #endif
 
-#define log_struct(level, ...) log_struct_internal(level, __FILE__, __LINE__, __func__, __VA_ARGS__)
-
-#define log_oom() log_oom_internal(__FILE__, __LINE__, __func__)
+/* Structured logging */
+#define log_struct(level, ...) log_struct_internal(level, 0, __FILE__, __LINE__, __func__, __VA_ARGS__)
+#define log_struct_errno(level, error, ...) log_struct_internal(level, error, __FILE__, __LINE__, __func__, __VA_ARGS__)
 
 /* This modifies the buffer passed! */
-#define log_dump(level, buffer) log_dump_internal(level, __FILE__, __LINE__, __func__, buffer)
+#define log_dump(level, buffer) log_dump_internal(level, 0, __FILE__, __LINE__, __func__, buffer)
+
+#define log_oom() log_oom_internal(__FILE__, __LINE__, __func__)
 
 bool log_on_console(void) _pure_;