Skip to content

fix: reset module ptr when unregister_module #21

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
thweetkomputer merged 3 commits into from
Mar 16, 2026
Merged

fix: reset module ptr when unregister_module #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e789bb7
fix: reset module ptr when unregister_module
thweetkomputer Mar 13, 2026
4860474
fix
thweetkomputer Mar 16, 2026
0f7336c
fix
thweetkomputer Mar 16, 2026
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
15 changes: 15 additions & 0 deletions src/bthread/eloq_module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ namespace eloq {
}
registered_modules[i] = module;
registered_module_cnt.fetch_add(1, std::memory_order_release);
const auto non_null_modules =
std::count_if(registered_modules.begin(), registered_modules.end(),
[](EloqModule *registered_module) {
return registered_module != nullptr;
});
CHECK_EQ(static_cast<int>(non_null_modules),
registered_module_cnt.load(std::memory_order_acquire));
return 0;
}

Expand Down Expand Up @@ -79,7 +86,15 @@ namespace eloq {
registered_modules[i] = registered_modules[i + 1];
i++;
}
registered_modules[registered_modules.size() - 1] = nullptr;
registered_module_cnt.fetch_sub(1, std::memory_order_release);
const auto non_null_modules =
std::count_if(registered_modules.begin(), registered_modules.end(),
[](EloqModule *registered_module) {
return registered_module != nullptr;
});
CHECK_EQ(static_cast<int>(non_null_modules),
registered_module_cnt.load(std::memory_order_acquire));
lk.unlock();

while (module->registered_workers_.load(std::memory_order_acquire) != 0) {
Expand Down
3 changes: 3 additions & 0 deletions src/bthread/task_group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,12 +1318,15 @@ bool TaskGroup::HasTasks() {
void TaskGroup::CheckAndUpdateModules() {
if (modules_cnt_ != registered_module_cnt.load(std::memory_order_acquire)) {
std::shared_lock lk(eloq::module_mutex);
const int registered_module_count =
registered_module_cnt.load(std::memory_order_acquire);
const auto old_registered_modules = registered_modules_;
registered_modules_ = registered_modules;
lk.unlock();
const auto new_module_cnt = std::count_if(registered_modules_.begin(), registered_modules_.end(), [](eloq::EloqModule* module) {
return module != nullptr;
});
CHECK_EQ(static_cast<int>(new_module_cnt), registered_module_count);
Copy link
Collaborator

@MrGuin MrGuin Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

registered_module_count should be loaded again in the mutex protection area.

// new modules
for (auto i = modules_cnt_; i < new_module_cnt; ++i) {
registered_modules_[i]->registered_workers_.fetch_add(1, std::memory_order_relaxed);
Expand Down
Loading