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