logging: log_core: do not alias atomic_t

cfriedt · carlescufi · commit 5dc6686c63e7 · 2021-11-17T12:25:10.000+01:00
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>
diff --git a/subsys/logging/log_core.c b/subsys/logging/log_core.c
@@ -85,7 +85,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;
@@ -939,7 +939,7 @@ void z_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
`@@ -85,7 +85,7 @@ static bool backend_attached;`
`85`	`85`	`static atomic_t buffered_cnt;`
`86`	`86`	`static atomic_t dropped_cnt;`
`87`	`87`	`static k_tid_t proc_tid;`
`88`		`-static uint32_t log_strdup_in_use;`
	`88`	`+static atomic_t log_strdup_in_use;`
`89`	`89`	`static uint32_t log_strdup_max;`
`90`	`90`	`static uint32_t log_strdup_longest;`
`91`	`91`	`static struct k_timer log_process_thread_timer;`
`@@ -939,7 +939,7 @@ void z_log_free(void *str)`
`939`	`939`	`if (atomic_dec(&dup->refcount) == 1) {`
`940`	`940`	`k_mem_slab_free(&log_strdup_pool, (void **)&dup);`
`941`	`941`	`if (IS_ENABLED(CONFIG_LOG_STRDUP_POOL_PROFILING)) {`
`942`		`- atomic_dec((atomic_t *)&log_strdup_in_use);`
	`942`	`+ atomic_dec(&log_strdup_in_use);`
`943`	`943`	`}`
`944`	`944`	`}`
`945`	`945`	`}`