fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 00:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

px4_log: fix TSAN issue using atomic

Browse Source
This commit is contained in:
Julian Oes
2026-02-18 21:03:32 +13:00
parent 3680775e5c
commit 9074c81838
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/common/px4_log.cpp
+7 -4
View File
@@ -50,12 +50,13 @@
#include <uORB/uORB.h>
#include <uORB/topics/log_message.h>
#include <drivers/drv_hrt.h>
#include <px4_platform_common/atomic.h>
#if defined(BOARD_ENABLE_LOG_HISTORY)
static LogHistory g_log_history;
#endif
static orb_advert_t orb_log_message_pub = nullptr;
static px4::atomic<orb_advert_t> orb_log_message_pub{nullptr};
__EXPORT const char *__px4_log_level_str[_PX4_LOG_LEVEL_PANIC + 1] = { "DEBUG", "INFO", "WARN", "ERROR", "PANIC" };
@@ -74,7 +75,7 @@ void px4_log_initialize(void)
log_message.severity = 6; // info
strcpy((char *)log_message.text, "initialized uORB logging");
log_message.timestamp = hrt_absolute_time();
orb_log_message_pub = orb_advertise(ORB_ID(log_message), &log_message);
orb_log_message_pub.store(orb_advertise(ORB_ID(log_message), &log_message));
}
__EXPORT void px4_log_modulename(int level, const char *module_name, const char *fmt, ...)
@@ -178,7 +179,9 @@ __EXPORT void px4_log_modulename(int level, const char *module_name, const char
}
/* publish an orb log message */
if (level >= _PX4_LOG_LEVEL_INFO && orb_log_message_pub) { //publish all messages
orb_advert_t orb_log_pub = orb_log_message_pub.load();
if (level >= _PX4_LOG_LEVEL_INFO && orb_log_pub) { //publish all messages
log_message_s log_message;
@@ -199,7 +202,7 @@ __EXPORT void px4_log_modulename(int level, const char *module_name, const char
va_end(argptr);
log_message.text[max_length - 1] = 0; //ensure 0-termination
log_message.timestamp = hrt_absolute_time();
orb_publish(ORB_ID(log_message), orb_log_message_pub, &log_message);
orb_publish(ORB_ID(log_message), orb_log_pub, &log_message);
}
}