refactor: remove attach/detach thread management (#1240)

Author: Aliothmoon

include/MaaControlUnit/ControlUnitAPI.h

@@ -90,9 +90,6 @@ class AndroidNativeControlUnitAPI : public ControlUnitAPI
 {
 public:
     ~AndroidNativeControlUnitAPI() override = default;
-
-    virtual void* attach_thread() const = 0;
-    virtual int detach_thread(void* env) const = 0;
 };
 
 class Win32ControlUnitAPI

source/MaaAndroidNativeControlUnit/General/AndroidExternalLib.cpp

@@ -33,8 +33,6 @@ std::optional<AndroidNativeNS::AndroidExternalFunctions>
 
     bool ok = get_required_function<AndroidNativeNS::GetLockedPixelsSignature>(get_locked_pixels_func_name_, funcs.get_locked_pixels);
     ok = ok && get_required_function<AndroidNativeNS::UnlockPixelsSignature>(unlock_pixels_func_name_, funcs.unlock_pixels);
-    ok = ok && get_required_function<AndroidNativeNS::AttachThreadSignature>(attach_thread_func_name_, funcs.attach_thread);
-    ok = ok && get_required_function<AndroidNativeNS::DetachThreadSignature>(detach_thread_func_name_, funcs.detach_thread);
     ok = ok
          && get_required_function<AndroidNativeNS::DispatchInputMessageSignature>(
              dispatch_input_message_func_name_,

source/MaaAndroidNativeControlUnit/General/AndroidExternalLib.h

@@ -85,22 +85,16 @@ struct MethodParam
 
 using GetLockedPixelsSignature = FrameInfo();
 using UnlockPixelsSignature = int(FrameInfo);
-using AttachThreadSignature = void*();
-using DetachThreadSignature = int(void*);
 using DispatchInputMessageSignature = int(MethodParam);
 
 using GetLockedPixelsFunc = boost::function<GetLockedPixelsSignature>;
 using UnlockPixelsFunc = boost::function<UnlockPixelsSignature>;
-using AttachThreadFunc = boost::function<AttachThreadSignature>;
-using DetachThreadFunc = boost::function<DetachThreadSignature>;
 using DispatchInputMessageFunc = boost::function<DispatchInputMessageSignature>;
 
 struct AndroidExternalFunctions
 {
     GetLockedPixelsFunc get_locked_pixels { };
     UnlockPixelsFunc unlock_pixels { };
-    AttachThreadFunc attach_thread { };
-    DetachThreadFunc detach_thread { };
     DispatchInputMessageFunc dispatch_input_message { };
 };
 
@@ -116,8 +110,6 @@ class AndroidNativeExternalLibraryHolder : public LibraryHolder<AndroidNativeExt
 private:
     static constexpr auto get_locked_pixels_func_name_ = "GetLockedPixels";
     static constexpr auto unlock_pixels_func_name_ = "UnlockPixels";
-    static constexpr auto attach_thread_func_name_ = "AttachThread";
-    static constexpr auto detach_thread_func_name_ = "DetachThread";
     static constexpr auto dispatch_input_message_func_name_ = "DispatchInputMessage";
 };
 

source/MaaAndroidNativeControlUnit/General/ScopedThreadAttach.h

@@ -3,7 +3,6 @@
 #include <algorithm>
 #include <utility>
 
-#include "General/ScopedThreadAttach.h"
 #include "MaaUtils/Logger.h"
 #include "MaaUtils/Platform.h"
 
@@ -109,10 +108,6 @@ bool AndroidNativeControlUnitMgr::screencap(cv::Mat& image)
         return false;
     }
 
-    if (const ScopedThreadAttach attach(&*funcs_); !attach.attached()) {
-        return false;
-    }
-
     const FrameInfo info = funcs_->get_locked_pixels();
     const bool need_unlock = info.frame_ref != nullptr;
 
@@ -336,10 +331,6 @@ bool AndroidNativeControlUnitMgr::validate_contact(int contact)
 
 bool AndroidNativeControlUnitMgr::dispatch_input_message(MethodParam param) const
 {
-    if (const ScopedThreadAttach attach(&*funcs_); !attach.attached()) {
-        return false;
-    }
-
     int ret = funcs_->dispatch_input_message(param);
     if (ret == 0) {
         return true;
@@ -374,22 +365,4 @@ cv::Point AndroidNativeControlUnitMgr::get_touch_up_point(int contact) const
     };
 }
 
-void* AndroidNativeControlUnitMgr::attach_thread() const
-{
-    if (!funcs_) {
-        LogError << "library is not loaded";
-        return nullptr;
-    }
-    return funcs_->attach_thread();
-}
-
-int AndroidNativeControlUnitMgr::detach_thread(void* env) const
-{
-    if (!funcs_) {
-        LogError << "library is not loaded";
-        return -1;
-    }
-    return funcs_->detach_thread(env);
-}
-
 MAA_CTRL_UNIT_NS_END

source/MaaAndroidNativeControlUnit/Manager/AndroidNativeControlUnitMgr.cpp

@@ -55,9 +55,6 @@ class AndroidNativeControlUnitMgr : public AndroidNativeControlUnitAPI
 
     json::object get_info() const override;
 
-    void* attach_thread() const override;
-    int detach_thread(void* env) const override;
-
 private:
     static bool validate_contact(int contact);
     bool dispatch_input_message(AndroidNativeNS::MethodParam param) const;

source/MaaAndroidNativeControlUnit/Manager/AndroidNativeControlUnitMgr.h

@@ -9,53 +9,6 @@
 
 MAA_CTRL_NS_BEGIN
 
-namespace
-{
-
-#ifdef __ANDROID__
-class ScopedAndroidNativeThreadAttach
-{
-public:
-    explicit ScopedAndroidNativeThreadAttach(const std::shared_ptr<MAA_CTRL_UNIT_NS::ControlUnitAPI>& control_unit)
-        : unit_(std::dynamic_pointer_cast<MAA_CTRL_UNIT_NS::AndroidNativeControlUnitAPI>(control_unit))
-    {
-        if (!unit_ || !unit_->connected()) {
-            return;
-        }
-
-        env_ = unit_->attach_thread();
-        attach_failed_ = env_ == nullptr;
-        if (attach_failed_) {
-            LogError << "Android native control unit attach_thread returned nullptr";
-        }
-    }
-
-    ScopedAndroidNativeThreadAttach(const ScopedAndroidNativeThreadAttach&) = delete;
-    ScopedAndroidNativeThreadAttach& operator=(const ScopedAndroidNativeThreadAttach&) = delete;
-
-    ~ScopedAndroidNativeThreadAttach()
-    {
-        if (!unit_ || !env_) {
-            return;
-        }
-
-        int ret = unit_->detach_thread(env_);
-        if (ret != 0) {
-            LogWarn << "Android native control unit detach_thread failed" << VAR(ret);
-        }
-    }
-
-    bool ready() const { return !attach_failed_; }
-
-private:
-    std::shared_ptr<MAA_CTRL_UNIT_NS::AndroidNativeControlUnitAPI> unit_;
-    void* env_ = nullptr;
-    bool attach_failed_ = false;
-};
-#endif
-
-} // namespace
-
 ControllerAgent::ControllerAgent(std::shared_ptr<MAA_CTRL_UNIT_NS::ControlUnitAPI> control_unit)
     : control_unit_(std::move(control_unit))
 {
@@ -968,13 +921,6 @@ bool ControllerAgent::run_action(typename AsyncRunner<Action>::Id id, Action act
 {
     bool ret = false;
 
-#ifdef __ANDROID__
-    const ScopedAndroidNativeThreadAttach attach(control_unit_);
-    if (!attach.ready()) {
-        return false;
-    }
-#endif
-
     bool notify = false;
     {
         std::unique_lock lock { focus_ids_mutex_ };