aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-05-07 14:41:10 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-05-07 14:52:56 +0000
commit0b97740bd02df274c1a3e26f294e827c8e5cfae1 (patch)
tree459185d167cfc3603a5bdd73fe09b62d9755634b
parentxmalloc: export xvasprintf() (diff)
config: implement LOG_AND_NOTIFY_* macros in terms of no-inline functions
Reduces code size by quite a lot: From: section size addr .text 37857 0 ... Total 45169 To: section size addr .text 31681 0 ... Total 38993 LTO release build goes from 500K -> 492K
-rw-r--r--config.c103
1 files changed, 68 insertions, 35 deletions
diff --git a/config.c b/config.c
index bf6e125a..69af3573 100644
--- a/config.c
+++ b/config.c
@@ -91,43 +91,76 @@ static const char *const binding_action_map[] = {
static_assert(ALEN(binding_action_map) == BIND_ACTION_COUNT,
"binding action map size mismatch");
-#define LOG_AND_NOTIFY_ERR(...) \
- do { \
- LOG_ERR(__VA_ARGS__); \
- char *text = xasprintf(__VA_ARGS__); \
- struct user_notification notif = { \
- .kind = USER_NOTIFICATION_ERROR, \
- .text = text, \
- }; \
- tll_push_back(conf->notifications, notif); \
- } while (0)
+static void NOINLINE PRINTF(5)
+log_and_notify(struct config *conf, enum log_class log_class,
+ const char *file, int lineno, const char *fmt, ...)
+{
+ enum user_notification_kind kind;
-#define LOG_AND_NOTIFY_WARN(...) \
- do { \
- LOG_WARN(__VA_ARGS__); \
- char *text = xasprintf(__VA_ARGS__); \
- struct user_notification notif = { \
- .kind = USER_NOTIFICATION_WARNING, \
- .text = text, \
- }; \
- tll_push_back(conf->notifications, notif); \
- } while (0)
+ switch (log_class) {
+ case LOG_CLASS_WARNING: kind = USER_NOTIFICATION_WARNING; break;
+ case LOG_CLASS_ERROR: kind = USER_NOTIFICATION_ERROR; break;
-#define LOG_AND_NOTIFY_ERRNO(...) \
- do { \
- int errno_copy = errno; \
- LOG_ERRNO(__VA_ARGS__); \
- int len = snprintf(NULL, 0, __VA_ARGS__); \
- int errno_len = snprintf(NULL, 0, ": %s", strerror(errno_copy)); \
- char *text = xmalloc(len + errno_len + 1); \
- snprintf(text, len + errno_len + 1, __VA_ARGS__); \
- snprintf(&text[len], errno_len + 1, ": %s", strerror(errno_copy)); \
- struct user_notification notif = { \
- .kind = USER_NOTIFICATION_ERROR, \
- .text = text, \
- }; \
- tll_push_back(conf->notifications, notif); \
- } while(0)
+ case LOG_CLASS_INFO:
+ case LOG_CLASS_DEBUG:
+ BUG("unsupported log class: %d", log_class);
+ break;
+ }
+
+ va_list va1, va2;
+ va_start(va1, fmt);
+ va_copy(va2, va1);
+
+ log_msg_va(log_class, LOG_MODULE, file, lineno, fmt, va1);
+
+ char *text = xvasprintf(fmt, va2);
+ tll_push_back(
+ conf->notifications,
+ ((struct user_notification){.kind = kind, .text = text}));
+
+ va_end(va2);
+ va_end(va1);
+}
+
+static void NOINLINE PRINTF(5)
+log_errno_and_notify(struct config *conf, enum log_class log_class,
+ const char *file, int lineno, const char *fmt, ...)
+{
+ int errno_copy = errno;
+
+ va_list va1, va2, va3;
+ va_start(va1, fmt);
+ va_copy(va2, va1);
+ va_copy(va3, va2);
+
+ log_errno_provided_va(
+ log_class, LOG_MODULE, file, lineno, errno_copy, fmt, va1);
+
+ int len = vsnprintf(NULL, 0, fmt, va2);
+ int errno_len = snprintf(NULL, 0, ": %s", strerror(errno_copy));
+
+ char *text = xmalloc(len + errno_len + 1);
+ vsnprintf(text, len + errno_len + 1, fmt, va3);
+ snprintf(&text[len], errno_len + 1, ": %s", strerror(errno_copy));
+
+ tll_push_back(
+ conf->notifications,
+ ((struct user_notification){
+ .kind = USER_NOTIFICATION_ERROR, .text = text}));
+
+ va_end(va3);
+ va_end(va2);
+ va_end(va1);
+}
+
+#define LOG_AND_NOTIFY_ERR(...) \
+ log_and_notify(conf, LOG_CLASS_ERROR, __FILE__, __LINE__, __VA_ARGS__)
+
+#define LOG_AND_NOTIFY_WARN(...) \
+ log_and_notify(conf, LOG_CLASS_WARNING, __FILE__, __LINE__, __VA_ARGS__)
+
+#define LOG_AND_NOTIFY_ERRNO(...) \
+ log_errno_and_notify(conf, LOG_CLASS_ERROR, __FILE__, __LINE__, __VA_ARGS__)
static char *
get_shell(void)