From 8c92a2d5a1f3f4535651830451b40cacb2aeea09 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sun, 25 Jun 2023 22:18:14 +0800
Subject: [PATCH] Make JavaDebuggable Guard thread free

---
 lsplant/src/main/jni/lsplant.cc | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/lsplant/src/main/jni/lsplant.cc b/lsplant/src/main/jni/lsplant.cc
index 926085e..a77303b 100644
--- a/lsplant/src/main/jni/lsplant.cc
+++ b/lsplant/src/main/jni/lsplant.cc
@@ -613,6 +613,26 @@ std::string GetProxyMethodShorty(JNIEnv *env, jobject proxy_method) {
     return out;
 }
 
+struct JavaDebuggableGuard {
+    JavaDebuggableGuard() {
+        std::unique_lock lk(lock);
+        if (count.fetch_add(1, std::memory_order_acq_rel) == 0) {
+            Runtime::Current()->SetJavaDebuggable(
+                    Runtime::RuntimeDebugState::kJavaDebuggableAtInit);
+        }
+    }
+
+    ~JavaDebuggableGuard() {
+        std::unique_lock lk(lock);
+        if (count.fetch_sub(1, std::memory_order_acq_rel) == 1) {
+            Runtime::Current()->SetJavaDebuggable(Runtime::RuntimeDebugState::kNonJavaDebuggable);
+        }
+    }
+
+    inline static std::atomic_size_t count{0};
+    inline static std::mutex lock;
+};
+
 }  // namespace
 
 inline namespace v2 {
@@ -819,15 +839,7 @@ using ::lsplant::IsHooked;
 }
 
 [[maybe_unused]] bool MakeDexFileTrusted(JNIEnv *env, jobject cookie) {
-    struct Guard {
-        Guard() {
-            Runtime::Current()->SetJavaDebuggable(
-                Runtime::RuntimeDebugState::kJavaDebuggableAtInit);
-        }
-        ~Guard() {
-            Runtime::Current()->SetJavaDebuggable(Runtime::RuntimeDebugState::kNonJavaDebuggable);
-        }
-    } guard;
+    JavaDebuggableGuard guard;
     if (!cookie) return false;
     return DexFile::SetTrusted(env, cookie);
 }