Skip to content

[pull] main from ChunelFeng:main #286

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
Mar 23, 2026
Merged

[pull] main from ChunelFeng:main #286

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
10 changes: 8 additions & 2 deletions src/UtilsCtrl/ThreadPool/Queue/UAtomicQueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,10 @@ class UAtomicQueue : public UQueueObject {
* @return
*/
CVoid reset() {
ready_flag_ = false;
{
CGRAPH_UNIQUE_LOCK lk(mutex_);
ready_flag_ = false;
}
cv_.notify_all();
}

Expand All @@ -155,7 +158,10 @@ class UAtomicQueue : public UQueueObject {
* @return
*/
CVoid setup() {
ready_flag_ = true;
{
CGRAPH_UNIQUE_LOCK lk(mutex_);
ready_flag_ = true;
}
queue_ = {};
}

Expand Down
2 changes: 1 addition & 1 deletion src/UtilsCtrl/ThreadPool/Thread/UThreadSecondary.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class UThreadSecondary : public UThreadBase {
*/
CVoid waitRunTask(const CMSec ms) {
const auto& task = pool_task_queue_->popWithTimeout(ms);
if (nullptr != task) {
if (task) {
runTask(*task);
}
}
Expand Down
Loading