From 5fd296e3ad9fbbbac2b2bb7daad3e25c0b26640c Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sat, 29 Jan 2022 18:24:37 +0800
Subject: [PATCH] Avoid frequently wait if log tag prop not found (#1580)

---
 daemon/src/main/cpp/logcat.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/daemon/src/main/cpp/logcat.cpp b/daemon/src/main/cpp/logcat.cpp
index 0c246fe7..fe90a511 100644
--- a/daemon/src/main/cpp/logcat.cpp
+++ b/daemon/src/main/cpp/logcat.cpp
@@ -249,7 +249,7 @@ void Logcat::EnsureLogWatchDog() {
     constexpr static auto kLogdMainSizeProp = "persist.logd.size.main"sv;
     constexpr static auto kLogdCrashSizeProp = "persist.logd.size.crash"sv;
     constexpr static size_t kErr = -1;
-    std::thread([this] {
+    std::thread watch_dog([this] {
         while (true) {
             auto logd_size = GetByteProp(kLogdSizeProp);
             auto logd_tag = GetStrProp(kLogdTagProp);
@@ -276,8 +276,12 @@ void Logcat::EnsureLogWatchDog() {
             }
             if (!__system_property_wait(pi, serial, &serial, nullptr)) break;
             if (pi != nullptr) Log("\nResetting log settings\n");
+            else std::this_thread::sleep_for(1s);
+            // log tag prop was not found; to avoid frequently trigger wait, sleep for a while
         }
-    }).detach();
+    });
+    pthread_setname_np(watch_dog.native_handle(), "watchdog");
+    watch_dog.detach();
 }
 
 void Logcat::Run() {