michaelh/zephyr
1
0
Fork 0
Code Releases Activity

logging: log_core: do not alias atomic_t

Browse source 
Previously, a `uint32_t` was aliased as an `atomic_t`. However,
with #39531, `atomic_t` is now a `long` under the hood, which
is 64-bit on 64-bit platforms.

Fixes #40369

Signed-off-by: Christopher Friedt <chrisfriedt@gmail.com>
This commit is contained in:
Christopher Friedt 2021-11-16 13:37:12 -05:00 • committed by Carles Cufí
commit 5dc6686c63
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/logging/log_core.c
View file

@ -85,7 +85,7 @@ static bool backend_attached;
static atomic_t buffered_cnt; static atomic_t buffered_cnt;
static atomic_t dropped_cnt; static atomic_t dropped_cnt;
static k_tid_t proc_tid; static k_tid_t proc_tid;
static uint32_t log_strdup_in_use; static atomic_t log_strdup_in_use;
static uint32_t log_strdup_max; static uint32_t log_strdup_max;
static uint32_t log_strdup_longest; static uint32_t log_strdup_longest;
static struct k_timer log_process_thread_timer; static struct k_timer log_process_thread_timer;
@ -939,7 +939,7 @@ void z_log_free(void *str)
if (atomic_dec(&dup->refcount) == 1) { if (atomic_dec(&dup->refcount) == 1) {
k_mem_slab_free(&log_strdup_pool, (void **)&dup); k_mem_slab_free(&log_strdup_pool, (void **)&dup);
if (IS_ENABLED(CONFIG_LOG_STRDUP_POOL_PROFILING)) { if (IS_ENABLED(CONFIG_LOG_STRDUP_POOL_PROFILING)) {
atomic_dec((atomic_t *)&log_strdup_in_use); atomic_dec(&log_strdup_in_use);
} }
} }
} }