ryantimwilson / rpms / systemd

Forked from rpms/systemd 2 months ago
Clone
Brian Stinson 2593d8
From 0160499e86642f159a972be0196bf7c8a1d19ea8 Mon Sep 17 00:00:00 2001
Brian Stinson 2593d8
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Brian Stinson 2593d8
Date: Mon, 22 Oct 2018 12:04:13 +0900
Brian Stinson 2593d8
Subject: [PATCH] sd-device: introduce log_device_*() macros
Brian Stinson 2593d8
Brian Stinson 2593d8
(cherry picked from commit b0cba0ca526ed2d86e283a0fcfebdf0a4d4bea9b)
Brian Stinson 2593d8
Brian Stinson 2593d8
Related: #1753369
Brian Stinson 2593d8
---
Brian Stinson 2593d8
 src/libsystemd/sd-device/device-util.h | 27 ++++++++++++++++++++++++++
Brian Stinson 2593d8
 1 file changed, 27 insertions(+)
Brian Stinson 2593d8
Brian Stinson 2593d8
diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h
Brian Stinson 2593d8
index 6dcd2645e6..448dfc63d7 100644
Brian Stinson 2593d8
--- a/src/libsystemd/sd-device/device-util.h
Brian Stinson 2593d8
+++ b/src/libsystemd/sd-device/device-util.h
Brian Stinson 2593d8
@@ -33,3 +33,30 @@
Brian Stinson 2593d8
         for (device = sd_device_enumerator_get_subsystem_first(enumerator); \
Brian Stinson 2593d8
              device;                                                        \
Brian Stinson 2593d8
              device = sd_device_enumerator_get_subsystem_next(enumerator))
Brian Stinson 2593d8
+
Brian Stinson 2593d8
+#define log_device_full(device, level, error, ...)                      \
Brian Stinson 2593d8
+        ({                                                              \
Brian Stinson 2593d8
+                const char *_sysname = NULL, *_subsystem = NULL;        \
Brian Stinson 2593d8
+                sd_device *_d = (device);                               \
Brian Stinson 2593d8
+                int _level = (level), _error = (error);                 \
Brian Stinson 2593d8
+                                                                        \
Brian Stinson 2593d8
+                if (_d && _unlikely_(log_get_max_level() >= _level)) {  \
Brian Stinson 2593d8
+                        (void) sd_device_get_sysname(_d, &_sysname);    \
Brian Stinson 2593d8
+                        (void) sd_device_get_subsystem(_d, &_subsystem); \
Brian Stinson 2593d8
+                }                                                       \
Brian Stinson 2593d8
+                log_object_internal(_level, _error, __FILE__, __LINE__, __func__, \
Brian Stinson 2593d8
+                                    _sysname ? "DEVICE=" : NULL, _sysname, \
Brian Stinson 2593d8
+                                    _subsystem ? "SUBSYSTEM=" : NULL, _subsystem, ##__VA_ARGS__); \
Brian Stinson 2593d8
+        })
Brian Stinson 2593d8
+
Brian Stinson 2593d8
+#define log_device_debug(link, ...)   log_device_full(link, LOG_DEBUG, 0, ##__VA_ARGS__)
Brian Stinson 2593d8
+#define log_device_info(link, ...)    log_device_full(link, LOG_INFO, 0, ##__VA_ARGS__)
Brian Stinson 2593d8
+#define log_device_notice(link, ...)  log_device_full(link, LOG_NOTICE, 0, ##__VA_ARGS__)
Brian Stinson 2593d8
+#define log_device_warning(link, ...) log_device_full(link, LOG_WARNING, 0, ##__VA_ARGS__)
Brian Stinson 2593d8
+#define log_device_error(link, ...)   log_device_full(link, LOG_ERR, 0, ##__VA_ARGS__)
Brian Stinson 2593d8
+
Brian Stinson 2593d8
+#define log_device_debug_errno(link, error, ...)   log_device_full(link, LOG_DEBUG, error, ##__VA_ARGS__)
Brian Stinson 2593d8
+#define log_device_info_errno(link, error, ...)    log_device_full(link, LOG_INFO, error, ##__VA_ARGS__)
Brian Stinson 2593d8
+#define log_device_notice_errno(link, error, ...)  log_device_full(link, LOG_NOTICE, error, ##__VA_ARGS__)
Brian Stinson 2593d8
+#define log_device_warning_errno(link, error, ...) log_device_full(link, LOG_WARNING, error, ##__VA_ARGS__)
Brian Stinson 2593d8
+#define log_device_error_errno(link, error, ...)   log_device_full(link, LOG_ERR, error, ##__VA_ARGS__)