From 14f534b9931805c8509fd2a5bec12e55b7b76f24 Mon Sep 17 00:00:00 2001 From: icex2 Date: Thu, 15 Aug 2024 11:34:31 +0200 Subject: [PATCH] fix: Log fatal force flush Summary: Test Plan: --- Module.mk | 2 ++ src/main/iface-core/log.h | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/Module.mk b/Module.mk index 16142c3..57aac8c 100644 --- a/Module.mk +++ b/Module.mk @@ -192,6 +192,7 @@ include src/main/popnhook1/Module.mk include src/main/popnio/Module.mk include src/main/procmon/Module.mk include src/main/pcbidgen/Module.mk +include src/main/sdk-hook/Module.mk include src/main/sdvxhook/Module.mk include src/main/sdvxhook2-cn/Module.mk include src/main/sdvxhook2/Module.mk @@ -280,6 +281,7 @@ $(zipdir)/iidx-09-to-12.zip: \ dist/iidx/iidxhook-10.conf \ dist/iidx/iidxhook-11.conf \ dist/iidx/iidxhook-12.conf \ + dist/iidx/inject-09.xml \ dist/iidx/vefx.txt \ build/bin/indep-32/iidx-irbeat-patch.exe \ dist/iidx/iidx-irbeat-patch-09.bat \ diff --git a/src/main/iface-core/log.h b/src/main/iface-core/log.h index 1858add..a935e7e 100644 --- a/src/main/iface-core/log.h +++ b/src/main/iface-core/log.h @@ -86,9 +86,18 @@ * @param ... Additional arguments according to the specified arguments in the * printf format string */ +// Additional empty log statement to trigger flush on some sinks. +// Otherwise, the last message might get lost #define log_fatal(...) \ do { \ + _bt_core_log_api.v1.fatal( \ + LOG_MODULE, \ + "%s:%d: function `%s'", \ + __FILE__, \ + __LINE__, \ + __FUNCTION__); \ _bt_core_log_api.v1.fatal(LOG_MODULE, __VA_ARGS__); \ + _bt_core_log_api.v1.fatal(LOG_MODULE, ""); \ abort(); \ } while (0)