fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

重构任务队列为双端队列

Browse Source
This commit is contained in:
MistEO
2021-08-29 23:26:20 +08:00
parent f9bfe0b444
commit 7dbe2f99f1
3 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
MeoAssistance/Assistance.cpp
View File

@@ -214,7 +214,7 @@ bool Assistance::start_ocr_test_task(std::vector<std::string> text_vec, bool nee
auto task_ptr = std::make_shared<TestOcrTask>(task_callback, (void*)this);
task_ptr->set_text(std::move(text_vec), need_click);
m_tasks_queue.emplace(task_ptr);
m_tasks_deque.emplace_back(task_ptr);
m_thread_idle = false;
m_condvar.notify_one();
@@ -236,7 +236,7 @@ bool Assistance::start_open_recruit(const std::vector<int>& required_level, bool
task_ptr->set_param(required_level, set_time);
task_ptr->set_retry_times(OpenRecruitTaskRetyrTimesDefault);
task_ptr->set_task_chain("OpenRecruit");
m_tasks_queue.emplace(task_ptr);
m_tasks_deque.emplace_back(task_ptr);
m_thread_idle = false;
m_condvar.notify_one();
@@ -256,7 +256,7 @@ bool asst::Assistance::start_to_identify_opers()
auto task_ptr = std::make_shared<IdentifyOperTask>(task_callback, (void*)this);
task_ptr->set_task_chain("IdentifyOpers");
m_tasks_queue.emplace(task_ptr);
m_tasks_deque.emplace_back(task_ptr);
m_thread_idle = false;
m_condvar.notify_one();
@@ -294,11 +294,11 @@ bool asst::Assistance::start_infrast()
append_match_task(InfrastTaskCahin, { "Manufacturing" });
// 识别并选择最优解干员组合
//auto task_ptr = std::make_shared<InfrastStationTask>(task_callback, (void*)this);
//task_ptr->set_facility("Manufacturing");
//task_ptr->set_task_chain(InfrastTaskCahin);
//task_ptr->set_all_opers_info(std::move(ret.value()));
//m_tasks_queue.emplace(task_ptr);
auto task_ptr = std::make_shared<InfrastStationTask>(task_callback, (void*)this);
task_ptr->set_facility("Manufacturing");
task_ptr->set_task_chain(InfrastTaskCahin);
task_ptr->set_all_opers_info(std::move(ret.value()));
m_tasks_deque.emplace_back(task_ptr);
m_thread_idle = false;
m_condvar.notify_one();
@@ -318,8 +318,8 @@ void Assistance::stop(bool block)
{ // 外部调用
lock = std::unique_lock<std::mutex>(m_mutex);
}
decltype(m_tasks_queue) empty;
m_tasks_queue.swap(empty);
decltype(m_tasks_deque) empty;
m_tasks_deque.swap(empty);
clear_exec_times();
m_identify_ptr->clear_cache();
}
@@ -346,18 +346,19 @@ void Assistance::working_proc(Assistance* p_this)
{
//DebugTraceScope("Assistance::working_proc Loop");
std::unique_lock<std::mutex> lock(p_this->m_mutex);
if (!p_this->m_thread_idle && !p_this->m_tasks_queue.empty())
if (!p_this->m_thread_idle && !p_this->m_tasks_deque.empty())
{
auto start_time = std::chrono::system_clock::now();
std::shared_ptr<AbstractTask> task_ptr = p_this->m_tasks_queue.front();
std::shared_ptr<AbstractTask> task_ptr = p_this->m_tasks_deque.front();
// 先pop出来，如果执行失败再还原回去
p_this->m_tasks_deque.pop_front();
task_ptr->set_ptr(p_this->m_window_ptr, p_this->m_view_ptr, p_this->m_control_ptr, p_this->m_identify_ptr);
task_ptr->set_exit_flag(&p_this->m_thread_idle);
bool ret = task_ptr->run();
if (ret)
{
retry_times = 0;
// 任务执行成功了直接pop
p_this->m_tasks_queue.pop();
}
else
{
@@ -371,20 +372,21 @@ void Assistance::working_proc(Assistance* p_this)
p_this->task_callback(AsstMsg::TaskError, std::move(task_error_json), p_this);
retry_times = 0;
p_this->m_tasks_queue.pop();
}
else
{
++retry_times;
// 执行失败再还原回去
p_this->m_tasks_deque.emplace_front(task_ptr);
}
}
// 如果下个任务是识别，就按识别的延时来；如果下个任务是点击，就按点击的延时来；……
// 如果都符合，就取个最大值
int delay = 0;
if (!p_this->m_tasks_queue.empty())
if (!p_this->m_tasks_deque.empty())
{
int next_type = p_this->m_tasks_queue.front()->get_task_type();
int next_type = p_this->m_tasks_deque.front()->get_task_type();
std::vector<int> candidate_delay = { 0 };
if (next_type & TaskType::TaskTypeClick)
{
@@ -457,7 +459,7 @@ void Assistance::task_callback(AsstMsg msg, const json::value& detail, void* cus
more_detail["type"] = "ProcessTask";
[[fallthrough]];
case AsstMsg::AppendTask:
p_this->append_task(more_detail);
p_this->append_task(more_detail, true);
return; // 这俩消息Assistance会新增任务，外部不需要处理，直接拦掉
break;
case AsstMsg::OpersIdtfResult:
@@ -472,16 +474,22 @@ void Assistance::task_callback(AsstMsg msg, const json::value& detail, void* cus
p_this->append_callback(msg, std::move(more_detail));
}
void asst::Assistance::append_match_task(const std::string& task_chain, const std::vector<std::string>& tasks, int retry_times)
void asst::Assistance::append_match_task(
const std::string& task_chain, const std::vector<std::string>& tasks, int retry_times, bool front)
{
auto task_ptr = std::make_shared<ProcessTask>(task_callback, (void*)this);
task_ptr->set_task_chain(task_chain);
task_ptr->set_tasks(tasks);
task_ptr->set_retry_times(retry_times);
m_tasks_queue.emplace(task_ptr);
if (front) {
m_tasks_deque.emplace_front(task_ptr);
}
else {
m_tasks_deque.emplace_back(task_ptr);
}
}
void asst::Assistance::append_task(const json::value& detail)
void asst::Assistance::append_task(const json::value& detail, bool front)
{
std::string task_type = detail.at("type").as_string();
std::string task_chain = detail.get("task_chain", "");
@@ -497,7 +505,12 @@ void asst::Assistance::append_task(const json::value& detail)
Rect rect(rect_json[0].as_integer(), rect_json[1].as_integer(), rect_json[2].as_integer(), rect_json[3].as_integer());
task_ptr->set_rect(std::move(rect));
m_tasks_queue.emplace(task_ptr);
if (front) {
m_tasks_deque.emplace_front(task_ptr);
}
else {
m_tasks_deque.emplace_back(task_ptr);
}
}
else if (task_type == "ProcessTask")
{
@@ -514,7 +527,7 @@ void asst::Assistance::append_task(const json::value& detail)
{
next_vec.emplace_back(detail.at("task").as_string());
}
append_match_task(task_chain, next_vec, retry_times);
append_match_task(task_chain, next_vec, retry_times, front);
}
// else if // TODO
}

7
MeoAssistance/Assistance.h
View File

@@ -7,6 +7,7 @@
#include <optional>
#include <unordered_map>
#include <queue>
#include <deque>
#include "AsstDef.h"
#include "Task.h"
@@ -59,8 +60,8 @@ namespace asst {
static void msg_proc(Assistance* p_this);
static void task_callback(AsstMsg msg, const json::value& detail, void* custom_arg);
void append_match_task(const std::string& task_chain, const std::vector<std::string>& tasks, int retry_times = ProcessTaskRetryTimesDefault);
void append_task(const json::value& detail);
void append_match_task(const std::string& task_chain, const std::vector<std::string>& tasks, int retry_times = ProcessTaskRetryTimesDefault, bool front = false);
void append_task(const json::value& detail, bool front = false);
void append_callback(AsstMsg msg, json::value detail);
void clear_exec_times();
static void set_opers_idtf_result(const json::value& detail); // 保存干员识别结果
@@ -74,7 +75,7 @@ namespace asst {
bool m_inited = false;
bool m_thread_exit = false;
std::queue<std::shared_ptr<AbstractTask>> m_tasks_queue;
std::deque<std::shared_ptr<AbstractTask>> m_tasks_deque;
AsstCallback m_callback = nullptr;
void* m_callback_arg = nullptr;

23
MeoAssistance/ProcessTask.cpp
View File

@@ -32,6 +32,7 @@ bool ProcessTask::run()
json::value task_start_json = json::object{
{ "task_type", "ProcessTask" },
{ "task_chain", m_task_chain},
{ "tasks", json::array(m_cur_tasks_name)}
};
m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
@@ -131,28 +132,6 @@ bool ProcessTask::run()
std::shared_ptr<TaskInfo> ProcessTask::match_image(Rect* matched_rect)
{
//// 如果当前仅有一个任务，且这个任务的阈值是0（说明是justreturn的），就不抓图像识别了，直接返回就行
//if (m_cur_tasks_name.size() == 1)
//{
// // 能走到这个函数里的，肯定是ProcessTaskInfo，直接转
// auto task_info_ptr = std::dynamic_pointer_cast<MatchTaskInfo>(
// Configer::get_instance().m_all_tasks_info[m_cur_tasks_name[0]]);
// if (task_info_ptr->templ_threshold == 0) {
// json::value callback_json;
// callback_json["threshold"] = 0.0;
// callback_json["algorithm"] = "JustReturn";
// callback_json["rect"] = json::array({ 0, 0, 0, 0 });
// callback_json["name"] = m_cur_tasks_name[0];
// callback_json["algorithm_id"] = static_cast<std::underlying_type<ProcessTaskType>::type>(
// AlgorithmType::JustReturn);
// callback_json["value"] = 0;
// m_callback(AsstMsg::ImageFindResult, callback_json, m_callback_arg);
// m_callback(AsstMsg::ImageMatched, callback_json, m_callback_arg);
// return task_info_ptr;
// }
//}
const cv::Mat& cur_image = get_format_image();
if (cur_image.empty() || cur_image.rows < 100) {
return nullptr;