cli: ensure queries always receive a map

[babeltrace.git] / src / cli / logging.h

diff --git a/src/cli/logging.h b/src/cli/logging.h
index dd6c1d091373a55476d5694f6c23126fdecd4d67..581f12fbc251c3bc342558c2038a2323008008a0 100644 (file)
--- a/src/cli/logging.h
+++ b/src/cli/logging.h
@@ -28,4 +28,16 @@
 
 BT_LOG_LEVEL_EXTERN_SYMBOL(bt_cli_log_level);
 
+#define BT_CLI_LOG_AND_APPEND(_lvl, _fmt, ...)                         \
+       do {                                                            \
+               BT_LOG_WRITE(_lvl, BT_LOG_TAG, _fmt, ##__VA_ARGS__);    \
+               (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN( \
+                       "Babeltrace CLI", _fmt, ##__VA_ARGS__);         \
+       } while (0)
+
+#define BT_CLI_LOGE_APPEND_CAUSE(_fmt, ...)                            \
+       BT_CLI_LOG_AND_APPEND(BT_LOG_ERROR, _fmt, ##__VA_ARGS__)
+#define BT_CLI_LOGW_APPEND_CAUSE(_fmt, ...)                            \
+       BT_CLI_LOG_AND_APPEND(BT_LOG_WARNING, _fmt, ##__VA_ARGS__)
+
 #endif /* CLI_LOGGING_H */