From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 20 Nov 2024 14:12:25 +0000 (+0100)
Subject: process-util: use our usual tristate semantics for is_main_thread()
X-Git-Tag: v258-rc1~1900^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07612aab66dc771a9c7aca07c74940fb6447f3fa;p=thirdparty%2Fsystemd.git

process-util: use our usual tristate semantics for is_main_thread()

While at it, _unlikely_ is dropped, as requested in
https://github.com/systemd/systemd/pull/35242#discussion_r1880096233
---

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 3253a9c3fb0..59dfaa07f3d 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -1226,12 +1226,12 @@ int pid_from_same_root_fs(pid_t pid) {
 }
 
 bool is_main_thread(void) {
-        static thread_local int cached = 0;
+        static thread_local int cached = -1;
 
-        if (_unlikely_(cached == 0))
-                cached = getpid_cached() == gettid() ? 1 : -1;
+        if (cached < 0)
+                cached = getpid_cached() == gettid();
 
-        return cached > 0;
+        return cached;
 }
 
 bool oom_score_adjust_is_valid(int oa) {