logging: log_core: do not alias atomic_t

cfriedt · Christopher Friedt · commit 0d01f0b72a44 · 2022-07-21T13:47:16.000-04:00
Previously, a `uint32_t` was aliased as an `atomic_t`. However, with zephyrproject-rtos#39531, `atomic_t` is now a `long` under the hood, which is 64-bit on 64-bit platforms. Fixes zephyrproject-rtos#40369 Signed-off-by: Christopher Friedt <chrisfriedt@gmail.com>
diff --git a/subsys/logging/log_core.c b/subsys/logging/log_core.c
@@ -86,7 +86,7 @@ static bool backend_attached;
 static atomic_t buffered_cnt;
 static atomic_t dropped_cnt;
 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_longest;
 static struct k_timer log_process_thread_timer;
@@ -953,7 +953,7 @@ void log_free(void *str)
 	if (atomic_dec(&dup->refcount) == 1) {
 		k_mem_slab_free(&log_strdup_pool, (void **)&dup);
 		if (IS_ENABLED(CONFIG_LOG_STRDUP_POOL_PROFILING)) {
-			atomic_dec((atomic_t *)&log_strdup_in_use);
+			atomic_dec(&log_strdup_in_use);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ static bool backend_attached;`
`86`	`86`	`static atomic_t buffered_cnt;`
`87`	`87`	`static atomic_t dropped_cnt;`
`88`	`88`	`static k_tid_t proc_tid;`
`89`		`-static uint32_t log_strdup_in_use;`
	`89`	`+static atomic_t log_strdup_in_use;`
`90`	`90`	`static uint32_t log_strdup_max;`
`91`	`91`	`static uint32_t log_strdup_longest;`
`92`	`92`	`static struct k_timer log_process_thread_timer;`
`@@ -953,7 +953,7 @@ void log_free(void *str)`
`953`	`953`	`if (atomic_dec(&dup->refcount) == 1) {`
`954`	`954`	`k_mem_slab_free(&log_strdup_pool, (void **)&dup);`
`955`	`955`	`if (IS_ENABLED(CONFIG_LOG_STRDUP_POOL_PROFILING)) {`
`956`		`- atomic_dec((atomic_t *)&log_strdup_in_use);`
	`956`	`+ atomic_dec(&log_strdup_in_use);`
`957`	`957`	`}`
`958`	`958`	`}`
`959`	`959`	`}`