From 7c221d86240fa52939d61dd2bc558ccd0861a49a Mon Sep 17 00:00:00 2001 From: fasiondog Date: Sat, 9 May 2020 22:49:01 +0800 Subject: [PATCH] =?UTF-8?q?delete=20StealTask=20(=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9C=A8Python=E4=B8=AD=E7=9A=84=E4=BD=BF?= =?UTF-8?q?=E7=94=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utilities/task/StealMasterQueue.cpp | 48 ------ .../hikyuu/utilities/task/StealMasterQueue.h | 54 ------- .../utilities/task/StealRunnerQueue.cpp | 58 ------- .../hikyuu/utilities/task/StealRunnerQueue.h | 75 --------- .../hikyuu/utilities/task/StealTaskBase.cpp | 51 ------ .../hikyuu/utilities/task/StealTaskBase.h | 88 ---------- .../hikyuu/utilities/task/StealTaskGroup.cpp | 152 ------------------ .../hikyuu/utilities/task/StealTaskGroup.h | 85 ---------- .../hikyuu/utilities/task/StealTaskRunner.cpp | 132 --------------- .../hikyuu/utilities/task/StealTaskRunner.h | 81 ---------- .../hikyuu/utilities/test_taskGroup.cpp | 60 ------- hikyuu_cpp/unit_test/xmake.lua | 1 - 12 files changed, 885 deletions(-) delete mode 100644 hikyuu_cpp/hikyuu/utilities/task/StealMasterQueue.cpp delete mode 100644 hikyuu_cpp/hikyuu/utilities/task/StealMasterQueue.h delete mode 100644 hikyuu_cpp/hikyuu/utilities/task/StealRunnerQueue.cpp delete mode 100644 hikyuu_cpp/hikyuu/utilities/task/StealRunnerQueue.h delete mode 100644 hikyuu_cpp/hikyuu/utilities/task/StealTaskBase.cpp delete mode 100644 hikyuu_cpp/hikyuu/utilities/task/StealTaskBase.h delete mode 100644 hikyuu_cpp/hikyuu/utilities/task/StealTaskGroup.cpp delete mode 100644 hikyuu_cpp/hikyuu/utilities/task/StealTaskGroup.h delete mode 100644 hikyuu_cpp/hikyuu/utilities/task/StealTaskRunner.cpp delete mode 100644 hikyuu_cpp/hikyuu/utilities/task/StealTaskRunner.h delete mode 100644 hikyuu_cpp/unit_test/hikyuu/utilities/test_taskGroup.cpp diff --git a/hikyuu_cpp/hikyuu/utilities/task/StealMasterQueue.cpp b/hikyuu_cpp/hikyuu/utilities/task/StealMasterQueue.cpp deleted file mode 100644 index c3a91dfd..00000000 --- a/hikyuu_cpp/hikyuu/utilities/task/StealMasterQueue.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/* - * StealMasterQueue.cpp - * - * Copyright (c) hikyuu.org - * - * Created on: 2020-4-27 - * Author: fasiondog - */ - -#include "StealMasterQueue.h" - -namespace hku { - -// 将任务放入队列尾部 -void StealMasterQueue::push(const StealTaskPtr& item) { - std::lock_guard lk(m_mutex); - m_queue.push(item); - m_cond.notify_one(); -} - -// 工作线程等待并弹出头部任务，队列为空时，工作线程阻塞休眠并等待唤醒 -StealTaskPtr StealMasterQueue::wait_and_pop() { - std::unique_lock lk(m_mutex); - m_cond.wait(lk, [this] { return !m_queue.empty(); }); - auto result = m_queue.front(); - m_queue.pop(); - return result; -} - -// 尝试从队列头部弹出任务，如果队列为空则弹出空指针，不阻塞线程 -StealTaskPtr StealMasterQueue::try_pop() { - std::lock_guard lk(m_mutex); - StealTaskPtr result; - if (m_queue.empty()) { - return result; - } - result = m_queue.front(); - m_queue.pop(); - return result; -} - -// 队列是否为空 -bool StealMasterQueue::empty() const { - std::lock_guard lk(m_mutex); - return m_queue.empty(); -} - -} // namespace hku \ No newline at end of file diff --git a/hikyuu_cpp/hikyuu/utilities/task/StealMasterQueue.h b/hikyuu_cpp/hikyuu/utilities/task/StealMasterQueue.h deleted file mode 100644 index 0839f7cf..00000000 --- a/hikyuu_cpp/hikyuu/utilities/task/StealMasterQueue.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * StealMasterQueue.h - * - * Copyright (c) hikyuu.org - * - * Created on: 2020-4-27 - * Author: fasiondog - */ - -#pragma once -#ifndef HIKYUU_UTILITIES_TASK_STEAL_MASTER_QUEUE_H -#define HIKYUU_UTILITIES_TASK_STEAL_MASTER_QUEUE_H - -#include -#include -#include "StealTaskBase.h" - -namespace hku { - -/** - * 主线程任务队列 - * @ingroup TaskGroup - */ -class StealMasterQueue { -public: - StealMasterQueue() = default; - - /** - * 将任务放入队列尾部 - * @param item 待执行任务 - */ - void push(const StealTaskPtr& item); - - /** - * 工作线程等待并弹出头部任务，队列为空时，工作线程阻塞休眠并等待唤醒 - * @return 待执行任务 - */ - StealTaskPtr wait_and_pop(); - - /** 尝试从队列头部弹出任务，如果队列为空则弹出空指针，不阻塞线程 */ - StealTaskPtr try_pop(); - - /** 队列是否为空 */ - bool empty() const; - -private: - mutable std::mutex m_mutex; - std::queue m_queue; - std::condition_variable m_cond; -}; - -} /* namespace hku */ - -#endif /* HIKYUU_UTILITIES_TASK_STEAL_MASTER_QUEUE_H */ diff --git a/hikyuu_cpp/hikyuu/utilities/task/StealRunnerQueue.cpp b/hikyuu_cpp/hikyuu/utilities/task/StealRunnerQueue.cpp deleted file mode 100644 index a62f73bc..00000000 --- a/hikyuu_cpp/hikyuu/utilities/task/StealRunnerQueue.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* - * StealRunnerQueue.h - * - * Copyright (c) hikyuu.org - * - * Created on: 2020-4-27 - * Author: fasiondog - */ - -#include "StealRunnerQueue.h" - -namespace hku { - -/* 将数据插入队列头部 */ -void StealRunnerQueue::push_front(const StealTaskPtr& task) { - std::lock_guard lock(m_mutex); - m_queue.push_front(task); -} - -/* 将数据插入队列尾部 */ -void StealRunnerQueue::push_back(const StealTaskPtr& task) { - std::lock_guard lock(m_mutex); - m_queue.push_back(task); -} - -/* 队列是否为空 */ -bool StealRunnerQueue::empty() const { - std::lock_guard lock(m_mutex); - return m_queue.empty(); -} - -/* 尝试从队列头部弹出一条数数据, 如果失败返回空指针 */ -StealTaskPtr StealRunnerQueue::try_pop() { - std::lock_guard lock(m_mutex); - StealTaskPtr result; - if (m_queue.empty()) { - return result; - } - - result = m_queue.front(); - m_queue.pop_front(); - return result; -} - -/* 尝试从队列尾部偷取一条数据，失败返回空指针 */ -StealTaskPtr StealRunnerQueue::try_steal() { - std::lock_guard lock(m_mutex); - StealTaskPtr result; - if (m_queue.empty()) { - return result; - } - - result = m_queue.back(); - m_queue.pop_back(); - return result; -} - -} /* namespace hku */ \ No newline at end of file diff --git a/hikyuu_cpp/hikyuu/utilities/task/StealRunnerQueue.h b/hikyuu_cpp/hikyuu/utilities/task/StealRunnerQueue.h deleted file mode 100644 index d0591acb..00000000 --- a/hikyuu_cpp/hikyuu/utilities/task/StealRunnerQueue.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * StealRunnerQueue.h - * - * Copyright (c) hikyuu.org - * - * Created on: 2020-4-26 - * Author: fasiondog - */ - -#pragma once -#ifndef HIKYUU_UTILITIES_TASK_STEAL_RUNNER_QUEUE_H -#define HIKYUU_UTILITIES_TASK_STEAL_RUNNER_QUEUE_H - -#include -#include -#include "StealTaskBase.h" - -namespace hku { - -/** - * 工作线程任务队列 - * @ingroup TaskGroup - */ -class StealRunnerQueue { -public: - /** 构造函数 */ - StealRunnerQueue() = default; - ~StealRunnerQueue() = default; - - // 禁用赋值构造和赋值重载 - StealRunnerQueue(const StealRunnerQueue& other) = delete; - StealRunnerQueue& operator=(const StealRunnerQueue& other) = delete; - - /** - * 将任务插入队列头部 - * @param task 任务 - */ - void push_front(const StealTaskPtr& task); - - /** - * 将任务插入队列尾部 - * @param task 任务 - */ - void push_back(const StealTaskPtr& task); - - /** 队列是否为空 */ - bool empty() const; - - /** 队列当前大小 */ - size_t size() const { - return m_queue.size(); - } - - /** - * 尝试从队列头部弹出一条数数据，失败返回空指针 - * @param res 存储弹出的数据 - * @return 如果原本队列为空指针 - */ - StealTaskPtr try_pop(); - - /** - * 尝试从队列尾部偷取一条数据，失败返回空指针 - * @param res 存储偷取的数据 - * @return 返回任务指针或空指针 - */ - StealTaskPtr try_steal(); - -private: - std::deque m_queue; - mutable std::mutex m_mutex; -}; - -} /* namespace hku */ - -#endif /* HIKYUU_UTILITIES_TASK_STEAL_RUNNER_QUEUE_H */ diff --git a/hikyuu_cpp/hikyuu/utilities/task/StealTaskBase.cpp b/hikyuu_cpp/hikyuu/utilities/task/StealTaskBase.cpp deleted file mode 100644 index d9f004c3..00000000 --- a/hikyuu_cpp/hikyuu/utilities/task/StealTaskBase.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/* - * StealTaskBase.cpp - * - * Created on: 2010-3-19 - * Author: fasiondog - */ - -#include -#include "../../Log.h" -#include "../exception.h" -#include "StealTaskBase.h" -#include "StealTaskRunner.h" -#include "StealTaskGroup.h" - -namespace hku { - -StealTaskBase::StealTaskBase() : m_done(false) {} - -StealTaskBase::~StealTaskBase() {} - -void StealTaskBase::join() { - if (m_done) { - return; - } - - if (StealTaskRunner::m_local_runner) { - // 当前在子线程中 - StealTaskRunner::m_local_runner->taskJoin(shared_from_this()); - } else { - // 当前在主线程中 - HKU_CHECK(m_group, "This taks had not be added to any task group!"); - m_group->taskJoinInMaster(shared_from_this()); - } -} - -void StealTaskBase::invoke() { - try { - run(); - } catch (std::exception& e) { - HKU_ERROR(e.what()); - } catch (...) { - HKU_ERROR("Unknown error in task running!"); - } - m_done = true; -} - -void StealTaskBase::run() { - HKU_WARN("This is empty task!"); -} - -} // namespace hku diff --git a/hikyuu_cpp/hikyuu/utilities/task/StealTaskBase.h b/hikyuu_cpp/hikyuu/utilities/task/StealTaskBase.h deleted file mode 100644 index 07b83bb1..00000000 --- a/hikyuu_cpp/hikyuu/utilities/task/StealTaskBase.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * StealTaskBase.h - * - * Created on: 2010-3-19 - * Author: fasiondog - */ - -#pragma once -#ifndef STEALTASKBASE_H_ -#define STEALTASKBASE_H_ - -#ifndef HKU_API -#define HKU_API -#endif - -#include -#include - -namespace hku { - -class StealTaskRunner; -class StealTaskGroup; - -/** - * 并行任务基类 - * @ingroup TaskGroup - */ -class HKU_API StealTaskBase : public std::enable_shared_from_this { - friend class StealTaskRunner; - friend class StealTaskGroup; - -public: - StealTaskBase(); - virtual ~StealTaskBase(); - - /** - * 任务的实际执行动作，子类任务必须实现该接口 - */ - virtual void run(); - - /** - * 任务是否已完成 - */ - bool done() const { - return m_done; - } - - /** - * 等待任务完成 - */ - void join(); - -private: - // StealTaskRunner 实际执行任务 - void invoke(); - - void setTaskGroup(StealTaskGroup *group) { - m_group = group; - } - -private: - mutable bool m_done; // 标记该任务是否已执行完毕 - StealTaskGroup *m_group; // 任务组指针 -}; - -typedef std::shared_ptr StealTaskPtr; -typedef std::vector StealTaskList; -typedef std::shared_ptr StealTaskListPtr; - -typedef StealTaskBase TaskBase; -typedef StealTaskPtr TaskPtr; -typedef StealTaskList TaskList; -typedef StealTaskListPtr TaskListPtr; - -/** - * “停止”任务，用于指示工作线程停止运行 - */ -class StopTask : public StealTaskBase { -public: - StopTask() {} - virtual ~StopTask() {} - - void run(){}; -}; - -} // namespace hku - -#endif /* STEALTASKBASE_H_ */ diff --git a/hikyuu_cpp/hikyuu/utilities/task/StealTaskGroup.cpp b/hikyuu_cpp/hikyuu/utilities/task/StealTaskGroup.cpp deleted file mode 100644 index fe733e5e..00000000 --- a/hikyuu_cpp/hikyuu/utilities/task/StealTaskGroup.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/* - * StealTaskGroup.cpp - * - * Created on: 2010-3-19 - * Author: fasiondog - */ - -#include -#include "../../Log.h" -#include "../exception.h" -#include "StealTaskGroup.h" - -namespace hku { - -StealTaskGroup::StealTaskGroup(size_t groupSize) : m_currentRunnerId(0), m_done(false) { - m_runnerNum = (groupSize != 0) ? groupSize : std::thread::hardware_concurrency(); - m_runnerList.reserve(m_runnerNum); - - m_master_queue = std::make_shared(); - - // 创建工作线程队列 - for (auto i = 0; i < m_runnerNum; i++) { - m_runner_queues.push_back(std::make_shared()); - } - - // 创建工作线程 - for (size_t i = 0; i < m_runnerNum; i++) { - m_runnerList.push_back(std::make_shared(this, i)); - } - - // 启动各个工作线程 - for (auto runnerIter = m_runnerList.begin(); runnerIter != m_runnerList.end(); ++runnerIter) { - (*runnerIter)->start(); - } -} - -StealTaskGroup::~StealTaskGroup() { - if (!m_done) { - join(); - } -} - -StealTaskRunnerPtr StealTaskGroup::getCurrentRunner() { - StealTaskRunnerPtr result = m_runnerList[m_currentRunnerId]; - m_currentRunnerId++; - if (m_currentRunnerId >= m_runnerNum) { - m_currentRunnerId = 0; - } - return result; -} - -StealTaskPtr StealTaskGroup::addTask(const StealTaskPtr& task, bool inMain) { - HKU_CHECK(task, "Input task is nullptr!"); - task->setTaskGroup(this); - - // 如果指定不在主线程且当前线程有效时，插入到当前线性任务队列头部 - // 否则，放入主线程队列 - if (!inMain && StealTaskRunner::m_local_queue) { - StealTaskRunner::m_local_queue->push_front(task); - } else { - m_master_queue->push(task); - } - - return task; -} - -void StealTaskGroup::join() { - if (m_done) { - return; - } - - // 向主任务队列插入“停止”任务 - std::vector stopTaskList; - for (auto i = 0; i < m_runnerNum; i++) { - auto stopTask = std::make_shared(); - m_master_queue->push(stopTask); - } - - // 等待“停止”任务被执行 - for (auto& task : stopTaskList) { - task->join(); - } - - m_done = true; - - RunnerList::iterator runnerIter; - for (runnerIter = m_runnerList.begin(); runnerIter != m_runnerList.end(); ++runnerIter) { - (*runnerIter)->join(); - } -} - -void StealTaskGroup::stop() { - if (m_done) { - return; - } - - // 指示各子线程需要停止 - for (auto runnerIter = m_runnerList.begin(); runnerIter != m_runnerList.end(); ++runnerIter) { - (*runnerIter)->stop(); - } - - // 同时向主任务队列插入任务停止标识，以便唤醒休眠状态的子线程 - for (auto i = 0; i < m_runnerNum; i++) { - m_master_queue->push(std::make_shared()); - } - - m_done = true; -} - -void StealTaskGroup::taskJoinInMaster(const StealTaskPtr& waitingFor) { - while (waitingFor && !waitingFor->done()) { - auto task = m_master_queue->try_pop(); - if (task && !task->done()) { - task->invoke(); - } else { - stealInMaster(waitingFor); - } - std::this_thread::yield(); - } -} - -void StealTaskGroup::stealInMaster(const StealTaskPtr& waitingFor) { - StealTaskPtr task; - -#ifdef _WIN32 - std::srand((unsigned)time(NULL)); -#else - struct timeval tstart; - struct timezone tz; - gettimeofday(&tstart, &tz); - size_t temp = tstart.tv_usec; - std::srand(temp); -#endif - - size_t total = m_runnerNum; - size_t ran_num = std::rand() % total; - for (size_t i = 0; i < total; i++) { - if (waitingFor && waitingFor->done()) { - return; - } - - task = m_runner_queues[ran_num]->try_steal(); - if (task && !task->done()) { - task->invoke(); - return; - } - - ran_num = (ran_num + 1) % total; - } -} - -} // namespace hku diff --git a/hikyuu_cpp/hikyuu/utilities/task/StealTaskGroup.h b/hikyuu_cpp/hikyuu/utilities/task/StealTaskGroup.h deleted file mode 100644 index 8123c6f2..00000000 --- a/hikyuu_cpp/hikyuu/utilities/task/StealTaskGroup.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * StealTaskGroup.h - * - * Created on: 2010-3-19 - * Author: fasiondog - */ - -#pragma once -#ifndef HKU_UTILITIES_STEALTASKGROUP_H_ -#define HKU_UTILITIES_STEALTASKGROUP_H_ - -#include "StealMasterQueue.h" -#include "StealTaskRunner.h" -#include "StealRunnerQueue.h" - -namespace hku { - -/** - * 偷取式并行任务组 - * @ingroup TaskGroup - */ -class HKU_API StealTaskGroup { - friend class StealTaskRunner; - -public: - /** - * 构造函数 - * @param taskCount - 预计的任务总数 - * @param groupSize - 线程数量： 0表示自动选择同CPU数量的线程数 - * @return - */ - StealTaskGroup(size_t groupSize = 0); - - /** - * 析构函数 - */ - virtual ~StealTaskGroup(); - - /** - * 工作线程数量 - */ - size_t size() const { - return m_runnerNum; - } - - StealTaskRunnerPtr getCurrentRunner(); - - //增加一个任务 - StealTaskPtr addTask(const StealTaskPtr& task, bool inMain = true); - - //所有任务都已加入指示 - void stop(); - - //强制终止 - // void cancel(); - - //等待执行结束 - void join(); - - bool done() const { - return m_done; - } - - void taskJoinInMaster(const StealTaskPtr& waitingFor); - void stealInMaster(const StealTaskPtr& waitingFor); - -private: - typedef std::vector RunnerList; - RunnerList m_runnerList; - size_t m_runnerNum; - size_t m_currentRunnerId; //记录当前执行addTask任务时，需放入的TaskRunnerId，用于均衡任务分配 - bool m_done; // 任务组执行结束标志 - - std::shared_ptr m_master_queue; // 主任务队列 - std::vector> m_runner_queues; // 任务队列（每个工作线程一个） -}; - -typedef std::shared_ptr StealTaskGroupPtr; - -typedef StealTaskGroup TaskGroup; -typedef StealTaskGroupPtr TaskGroupPtr; - -} // namespace hku - -#endif /* HKU_UTILITIES_STEALTASKGROUP_H_ */ diff --git a/hikyuu_cpp/hikyuu/utilities/task/StealTaskRunner.cpp b/hikyuu_cpp/hikyuu/utilities/task/StealTaskRunner.cpp deleted file mode 100644 index 9395417a..00000000 --- a/hikyuu_cpp/hikyuu/utilities/task/StealTaskRunner.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/* - * StealTaskRunner.cpp - * - * Created on: 2010-3-19 - * Author: fasiondog - */ - -#ifdef _WIN32 -#include -#endif - -#include -#include -#include "../../Log.h" -#include "StealTaskRunner.h" -#include "StealTaskGroup.h" - -#define QUEUE_LOCK std::lock_guard lock(m_queue_mutex); - -namespace hku { - -StealTaskRunner::StealTaskRunner(StealTaskGroup* group, size_t id) : m_done(false) { - m_index = id; - m_group = group; -} - -StealTaskRunner::~StealTaskRunner() {} - -// 尝试从自己的任务队列中提取一个任务，供自己执行 -StealTaskPtr StealTaskRunner::takeTaskFromLocal() { - return m_local_queue->try_pop(); -} - -// 阻塞等待直至从主线程任务队列中获取到任务 -StealTaskPtr StealTaskRunner::takeTaskFromMasterAndWait() { - return m_local_group->m_master_queue->wait_and_pop(); -} - -// 尝试从其他子线程任务队列中偷取任务 -StealTaskPtr StealTaskRunner::takeTaskFromOther() { - StealTaskPtr task; - auto total = m_local_group->m_runnerNum; - for (size_t i = 0; i < total; ++i) { - size_t index = (m_local_index + i + 1) % total; - task = m_local_group->m_runner_queues[index]->try_steal(); - if (task && typeid(*task) != typeid(StopTask)) { - return task; - } - } - return task; -} - -/** - * 启动内部线程，执行分配的任务 - */ -void StealTaskRunner::start() { - m_thread = std::thread(std::bind(&StealTaskRunner::run, this)); -} - -/** - * 等待内部线程终止 - */ -void StealTaskRunner::join() { - if (m_thread.joinable()) { - m_thread.join(); - } -} - -void StealTaskRunner::stop() { - m_done = true; -} - -/** - * 循环执行所有分配的任务，线程函数 - */ -void StealTaskRunner::run() { - m_thread_id = std::this_thread::get_id(); - m_local_group = m_group; - m_local_runner = this; - m_local_queue = m_local_group->m_runner_queues[m_index].get(); - m_local_index = m_index; - m_locla_need_stop = false; - StealTaskPtr task; - try { - while (!m_done && (!task || typeid(*task) != typeid(StopTask))) { - // 从本地队列中获取待执行任务 - task = takeTaskFromLocal(); - - // 如果本地队列中没有取到任务，则尝试从其他子线程队列中偷取任务 - if (!task) { - task = takeTaskFromOther(); - } - - // 如果本地和其他子线程任务队列中都无法获取任务，则等待并直至从主任务队列中获取任务 - if (!task) { - task = takeTaskFromMasterAndWait(); - } - - if (task && !task->done()) { - task->invoke(); - } - std::this_thread::yield(); - } - } catch (std::exception& e) { - HKU_ERROR(e.what()); - } catch (...) { - HKU_ERROR("Unknown error!"); - } -} - -/** - * 在当前子线程中等待某一任务执行结束，如等待的任务未结束，则先执行其他任务 - * @param waitingFor - 等待结束的任务 - */ -void StealTaskRunner::taskJoin(const StealTaskPtr& waitingFor) { - while (waitingFor && !waitingFor->done()) { - // 如果获取的任务有效且任务未执行，则执行该任务; - // 否则从其他子线程任务队列中进行偷取 - auto task = takeTaskFromLocal(); - if (!task) { - task = takeTaskFromOther(); - } - - if (task && !task->done()) { - task->invoke(); - } - - std::this_thread::yield(); - } -} - -} // namespace hku diff --git a/hikyuu_cpp/hikyuu/utilities/task/StealTaskRunner.h b/hikyuu_cpp/hikyuu/utilities/task/StealTaskRunner.h deleted file mode 100644 index 0f53c06b..00000000 --- a/hikyuu_cpp/hikyuu/utilities/task/StealTaskRunner.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * StealTaskRunner.h - * - * Created on: 2010-3-19 - * Author: fasiondog - */ - -#pragma once -#ifndef STEALTASKRUNNER_H_ -#define STEALTASKRUNNER_H_ - -#include -#include -#include -#include -#include "StealTaskBase.h" -#include "StealRunnerQueue.h" - -namespace hku { - -class StealTaskGroup; - -/** - * 偷取式并行任务组内部执行引擎 - * @ingroup TaskGroup - */ -class StealTaskRunner { - friend class StealTaskGroup; - friend class StealTaskBase; - -public: - /** - * 子工作线程构造函数 - * @param group 所属任务组指针 - * @param id 所属任务组中的id - * @param stopTask 用于指示线程应停止运行的特殊任务 - */ - StealTaskRunner(StealTaskGroup* group, size_t id); - - virtual ~StealTaskRunner(); - -private: - StealTaskPtr takeTaskFromLocal(); // 从自己的任务队列中获取任务 - StealTaskPtr takeTaskFromMasterAndWait(); // 等待直至从主线程队列中获取任务 - StealTaskPtr takeTaskFromOther(); // 从其他线程队列偷取任务 - - void start(); - void join(); - void run(); - void taskJoin(const StealTaskPtr& waitingFor); - - void stop(); - - StealTaskGroup* getTaskRunnerGroup() { - return m_group; - } - - std::thread::id get_thread_id() const { - return m_thread_id; - } - -private: - size_t m_index; // 表示在任务组中的第几个线程 - StealTaskGroup* m_group; // 所属任务组的指针 - - inline static thread_local StealRunnerQueue* m_local_queue = nullptr; //本地任务队列 - inline static thread_local StealTaskGroup* m_local_group = nullptr; //任务组指针 - inline static thread_local StealTaskRunner* m_local_runner = nullptr; // 记录自身runner指针 - inline static thread_local size_t m_local_index = 0; // 在任务组中的序号(m_index) - inline static thread_local bool m_locla_need_stop = false; // 线程停止运行指示 - - std::atomic_bool m_done; //// 线程终止指示 - std::thread m_thread; // 本地工作线程 - std::thread::id m_thread_id; // 线程id -}; - -typedef std::shared_ptr StealTaskRunnerPtr; - -} // namespace hku - -#endif /* STEALTASKRUNNER_H_ */ diff --git a/hikyuu_cpp/unit_test/hikyuu/utilities/test_taskGroup.cpp b/hikyuu_cpp/unit_test/hikyuu/utilities/test_taskGroup.cpp deleted file mode 100644 index 16a489e2..00000000 --- a/hikyuu_cpp/unit_test/hikyuu/utilities/test_taskGroup.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* - * test_Parameter.cpp - * - * Created on: 2020-4-26 - * Author: fasiondog - */ - -#include "doctest/doctest.h" -#include -#include -#include -#include - -using namespace hku; - -/** - * @defgroup test_hikyuu_TaskGroup test_hikyuu_TaskGroup - * @ingroup test_hikyuu_utilities - * @{ - */ - -class TestTask : public TaskBase { -public: - TestTask(int i) : m_i(i) {} - virtual ~TestTask() = default; - - virtual void run() { - HKU_INFO("{}: ------------------- [{}]", m_i, std::this_thread::get_id()); - // fmt::print("{}: ----------------------\n", m_i); - } - -private: - int m_i; -}; - -/** @par 检测点 */ -TEST_CASE("test_TaskGroup") { - { - std::vector task_list; - { - SPEND_TIME(test_TaskGroup); - TaskGroup tg(8); - HKU_INFO("worker_num: {}", tg.size()); - HKU_INFO("main thread: {}", std::this_thread::get_id()); - - for (int i = 0; i < 100; i++) { - task_list.push_back(tg.addTask(std::make_shared(i))); - // CHECK(!task_list[i]->done()); - } - tg.join(); - } - CHECK(task_list.size() == 100); - for (auto& task : task_list) { - CHECK(task->done()); - } - } - // tg.run(); -} - -/** @} */ \ No newline at end of file diff --git a/hikyuu_cpp/unit_test/xmake.lua b/hikyuu_cpp/unit_test/xmake.lua index b61d3324..75193d20 100644 --- a/hikyuu_cpp/unit_test/xmake.lua +++ b/hikyuu_cpp/unit_test/xmake.lua @@ -85,7 +85,6 @@ target("small-test") end -- add files - add_files("./hikyuu/utilities/test_TaskGroup.cpp"); add_files("./hikyuu/utilities/test_ThreadPool.cpp"); --add_files("./hikyuu/hikyuu/**.cpp"); --add_files("./hikyuu/hikyuu/test_StockManager.cpp");