diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-10-22 12:04:13 +0900 |
|---|---|---|
| committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2019-10-23 14:35:44 +0200 |
| commit | 0160499e86642f159a972be0196bf7c8a1d19ea8 (patch) | |
| tree | 701513bd19a611ab9913abee023cde19acc0fae0 | |
| parent | cc3c020a5f4fc577dbd2da769c22b77e37ae4e30 (diff) | |
| download | systemd-0160499e86642f159a972be0196bf7c8a1d19ea8.tar.gz | |
sd-device: introduce log_device_*() macros
(cherry picked from commit b0cba0ca526ed2d86e283a0fcfebdf0a4d4bea9b)
Related: #1753369
| -rw-r--r-- | src/libsystemd/sd-device/device-util.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h index 6dcd2645e6..448dfc63d7 100644 --- a/src/libsystemd/sd-device/device-util.h +++ b/src/libsystemd/sd-device/device-util.h @@ -33,3 +33,30 @@ for (device = sd_device_enumerator_get_subsystem_first(enumerator); \ device; \ device = sd_device_enumerator_get_subsystem_next(enumerator)) + +#define log_device_full(device, level, error, ...) \ + ({ \ + const char *_sysname = NULL, *_subsystem = NULL; \ + sd_device *_d = (device); \ + int _level = (level), _error = (error); \ + \ + if (_d && _unlikely_(log_get_max_level() >= _level)) { \ + (void) sd_device_get_sysname(_d, &_sysname); \ + (void) sd_device_get_subsystem(_d, &_subsystem); \ + } \ + log_object_internal(_level, _error, __FILE__, __LINE__, __func__, \ + _sysname ? "DEVICE=" : NULL, _sysname, \ + _subsystem ? "SUBSYSTEM=" : NULL, _subsystem, ##__VA_ARGS__); \ + }) + +#define log_device_debug(link, ...) log_device_full(link, LOG_DEBUG, 0, ##__VA_ARGS__) +#define log_device_info(link, ...) log_device_full(link, LOG_INFO, 0, ##__VA_ARGS__) +#define log_device_notice(link, ...) log_device_full(link, LOG_NOTICE, 0, ##__VA_ARGS__) +#define log_device_warning(link, ...) log_device_full(link, LOG_WARNING, 0, ##__VA_ARGS__) +#define log_device_error(link, ...) log_device_full(link, LOG_ERR, 0, ##__VA_ARGS__) + +#define log_device_debug_errno(link, error, ...) log_device_full(link, LOG_DEBUG, error, ##__VA_ARGS__) +#define log_device_info_errno(link, error, ...) log_device_full(link, LOG_INFO, error, ##__VA_ARGS__) +#define log_device_notice_errno(link, error, ...) log_device_full(link, LOG_NOTICE, error, ##__VA_ARGS__) +#define log_device_warning_errno(link, error, ...) log_device_full(link, LOG_WARNING, error, ##__VA_ARGS__) +#define log_device_error_errno(link, error, ...) log_device_full(link, LOG_ERR, error, ##__VA_ARGS__) |