styles: 不显示指定锁的模板类型

MaaXYZ · Dec 4, 2024 · 4f567eb · 4f567eb
1 parent 368f33f
commit 4f567eb
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/source/MaaAdbControlUnit/Screencap/Minicap/MinicapStream.cpp b/source/MaaAdbControlUnit/Screencap/Minicap/MinicapStream.cpp
@@ -51,7 +51,7 @@ std::optional<cv::Mat> MinicapStream::screencap()
 {
     LogDebug;
 
-    std::unique_lock<std::mutex> locker(mutex_);
+    std::unique_lock locker(mutex_);
 
     using namespace std::chrono_literals;
     cond_.wait_for(locker, 2s); // 等下一帧
@@ -163,7 +163,7 @@ void MinicapStream::pulling()
         auto size_opt = read(4);
         if (!size_opt) {
             LogError << "read size failed";
-            std::unique_lock<std::mutex> locker(mutex_);
+            std::unique_lock locker(mutex_);
             image_ = cv::Mat();
             continue;
         }
@@ -172,7 +172,7 @@ void MinicapStream::pulling()
         auto data_opt = read(size);
         if (!data_opt) {
             LogError << "read data failed";
-            std::unique_lock<std::mutex> locker(mutex_);
+            std::unique_lock locker(mutex_);
             image_ = cv::Mat();
             continue;
         }
@@ -181,12 +181,12 @@ void MinicapStream::pulling()
 
         if (!img_opt || img_opt->empty()) {
             LogError << "decode jpg failed";
-            std::unique_lock<std::mutex> locker(mutex_);
+            std::unique_lock locker(mutex_);
             image_ = cv::Mat();
             continue;
         }
 
-        std::unique_lock<std::mutex> locker(mutex_);
+        std::unique_lock locker(mutex_);
         image_ = std::move(*img_opt);
         cond_.notify_all();
     }

diff --git a/source/MaaFramework/Base/AsyncRunner.hpp b/source/MaaFramework/Base/AsyncRunner.hpp
@@ -82,12 +82,12 @@ inline void AsyncRunner<Item>::release()
     exit_ = true;
 
     {
-        std::unique_lock<std::mutex> queue_lock(queue_mutex_);
+        std::unique_lock queue_lock(queue_mutex_);
         queue_cond_.notify_all();
     }
 
     {
-        std::unique_lock<std::mutex> compl_lock(compl_mutex_);
+        std::unique_lock compl_lock(compl_mutex_);
         compl_cond_.notify_all();
     }
 
@@ -102,7 +102,7 @@ inline void AsyncRunner<Item>::working()
     // LogFunc;
 
     while (!exit_) {
-        std::unique_lock<std::mutex> queue_lock(queue_mutex_);
+        std::unique_lock queue_lock(queue_mutex_);
 
         if (queue_.empty()) {
             running_ = false;
@@ -117,7 +117,7 @@ inline void AsyncRunner<Item>::working()
         queue_.pop_front();
         queue_lock.unlock();
 
-        std::unique_lock<std::shared_mutex> status_lock(status_mutex_);
+        std::unique_lock status_lock(status_mutex_);
         status_map_[id] = MaaStatus_Running;
         status_lock.unlock();
 
@@ -127,7 +127,7 @@ inline void AsyncRunner<Item>::working()
         status_map_[id] = ret ? MaaStatus_Succeeded : MaaStatus_Failed;
         status_lock.unlock();
 
-        std::unique_lock<std::mutex> compl_lock(compl_mutex_);
+        std::unique_lock compl_lock(compl_mutex_);
         compl_id_ = id;
         compl_cond_.notify_all();
     }
@@ -140,12 +140,12 @@ inline typename AsyncRunner<Item>::Id AsyncRunner<Item>::post(Item item, bool bl
 
     Id id = MaaInvalidId;
     {
-        std::unique_lock<std::mutex> queue_lock(queue_mutex_);
+        std::unique_lock queue_lock(queue_mutex_);
         id = ++cross_inst_id_;
         queue_.emplace_back(id, std::move(item));
 
         {
-            std::unique_lock<std::shared_mutex> status_lock(status_mutex_);
+            std::unique_lock status_lock(status_mutex_);
             status_map_.emplace(id, MaaStatus_Pending);
         }
 
@@ -166,7 +166,7 @@ inline void AsyncRunner<Item>::wait(Id id) const
     // LogFunc << VAR(id);
 
     while (!exit_) {
-        std::unique_lock<std::mutex> compl_lock(compl_mutex_);
+        std::unique_lock compl_lock(compl_mutex_);
         if (id <= compl_id_) {
             return;
         }
@@ -181,7 +181,7 @@ inline void AsyncRunner<Item>::wait_all() const
     LogFunc;
 
     while (!exit_) {
-        std::unique_lock<std::mutex> compl_lock(compl_mutex_);
+        std::unique_lock compl_lock(compl_mutex_);
         if (!running_) {
             return;
         }
@@ -193,7 +193,7 @@ inline void AsyncRunner<Item>::wait_all() const
 template <typename Item>
 inline MaaStatus AsyncRunner<Item>::status(Id id) const
 {
-    std::shared_lock<std::shared_mutex> status_lock(status_mutex_);
+    std::shared_lock status_lock(status_mutex_);
 
     auto iter = status_map_.find(id);
     if (iter == status_map_.end()) {
@@ -208,19 +208,19 @@ inline void AsyncRunner<Item>::clear()
     // LogFunc;
 
     {
-        std::unique_lock<std::mutex> queue_lock(queue_mutex_);
+        std::unique_lock queue_lock(queue_mutex_);
         queue_ = {};
         queue_cond_.notify_all();
     }
 
     {
-        std::unique_lock<std::mutex> compl_lock(compl_mutex_);
+        std::unique_lock compl_lock(compl_mutex_);
         compl_id_ = cross_inst_id_;
         compl_cond_.notify_all();
     }
 
     {
-        std::unique_lock<std::shared_mutex> status_lock(status_mutex_);
+        std::unique_lock status_lock(status_mutex_);
         status_map_.clear();
     }
 }

diff --git a/source/MaaFramework/Controller/ControllerAgent.cpp b/source/MaaFramework/Controller/ControllerAgent.cpp
@@ -218,7 +218,7 @@ bool ControllerAgent::input_text(const std::string& text)
 
 cv::Mat ControllerAgent::screencap()
 {
-    std::unique_lock<std::mutex> lock(image_mutex_);
+    std::unique_lock lock(image_mutex_);
     auto id = post_screencap_impl();
     if (wait(id) != MaaStatus_Succeeded) {
         return {};

diff --git a/source/MaaUtils/Logger/Logger.cpp b/source/MaaUtils/Logger/Logger.cpp
@@ -122,7 +122,7 @@ bool Logger::rotate()
         return false;
     }
 
-    std::unique_lock<std::mutex> trace_lock(trace_mutex_);
+    std::unique_lock trace_lock(trace_mutex_);
     if (ofs_.is_open()) {
         ofs_.close();
     }
@@ -157,7 +157,7 @@ void Logger::open()
 
     std::filesystem::create_directories(log_dir_);
 
-    std::unique_lock<std::mutex> trace_lock(trace_mutex_);
+    std::unique_lock trace_lock(trace_mutex_);
     if (ofs_.is_open()) {
         ofs_.close();
     }
@@ -183,7 +183,7 @@ void Logger::close()
     internal_dbg() << "Close log";
     internal_dbg() << kSplitLine;
 
-    std::unique_lock<std::mutex> trace_lock(trace_mutex_);
+    std::unique_lock trace_lock(trace_mutex_);
     if (ofs_.is_open()) {
         ofs_.close();
     }

diff --git a/source/include/LibraryHolder/LibraryHolder.h b/source/include/LibraryHolder/LibraryHolder.h
@@ -48,7 +48,7 @@ inline bool LibraryHolder<T>::load_library(const std::filesystem::path& libname)
 {
     LogFunc << VAR(libname);
 
-    std::unique_lock<std::mutex> lock(mutex_);
+    std::unique_lock lock(mutex_);
 
     if (module_.is_loaded()) {
         if (libname_ != libname) {
@@ -87,7 +87,7 @@ inline void LibraryHolder<T>::unload_library()
 {
     LogFunc << VAR(libname_);
 
-    std::unique_lock<std::mutex> lock(mutex_);
+    std::unique_lock lock(mutex_);
 
     if (!module_.is_loaded()) {
         LogDebug << "LibraryHolder already unloaded";
@@ -114,7 +114,7 @@ inline boost::function<FuncT> LibraryHolder<T>::get_function(const std::string&
 {
     LogFunc << VAR(func_name);
 
-    std::unique_lock<std::mutex> lock(mutex_);
+    std::unique_lock lock(mutex_);
 
     if (!module_.is_loaded()) {
         LogError << "LibraryHolder not loaded";

diff --git a/source/include/Utils/LoggerUtils.h b/source/include/Utils/LoggerUtils.h
@@ -138,7 +138,7 @@ class MAA_UTILS_API LogStream
 
     ~LogStream()
     {
-        std::unique_lock<std::mutex> lock(mutex_);
+        std::unique_lock lock(mutex_);
 
         if (stdout_) {
             std::cout << stdout_string() << std::endl;