Skip to content

[pull] main from ChunelFeng:main #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Apr 19, 2026
Merged

[pull] main from ChunelFeng:main #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion example/E05-HttpServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ class ProcessNode : public GNode {
CStatus run() override {
auto param = CGRAPH_GET_GPARAM_WITH_NO_EMPTY(HttpParam, EXAMPLE_PARAM_KEY);
{
// 从这里可以看出来，manager 中的每个pipeline，实际上都是
CGRAPH_PARAM_WRITE_CODE_BLOCK(param);
CGRAPH_ECHO("process step %d, sleep %d ms, val is %d, loop is %d",
STEP, MS, ++param->val_, ++param->loop_);
Expand Down
4 changes: 2 additions & 2 deletions src/UtilsCtrl/ThreadPool/UThreadPool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ class UThreadPool : public UThreadObject {

private:
CBool is_init_ { false }; // 是否初始化
std::atomic<CInt> cur_index_ { 0 }; // 记录放入的线程数
UAtomicQueue<UTask> task_queue_; // 用于存放普通任务
std::atomic<CIndex> cur_index_ { 0 }; // 记录被轮询到的线程index的位置
UAtomicQueue<UTask> task_queue_ {}; // 用于存放普通任务
UAtomicPriorityQueue<UTask> priority_task_queue_; // 运行时间较长的任务队列，仅在辅助线程中执行
std::vector<UThreadPrimaryPtr> primary_threads_; // 记录所有的主线程
std::list<std::unique_ptr<UThreadSecondary>> secondary_threads_; // 用于记录所有的辅助线程
Expand Down
Loading