Skip to content

Fix a redundant BeforeAdditionalRefReleased call #3174

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
chenBright merged 1 commit into from
Dec 17, 2025
Merged

Fix a redundant BeforeAdditionalRefReleased call #3174

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
9 changes: 4 additions & 5 deletions src/brpc/versioned_ref_with_id.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,10 +504,9 @@ int VersionedRefWithId<T>::ReleaseAdditionalReference() {
do {
AdditionalRefStatus expect = ADDITIONAL_REF_USING;
if (_additional_ref_status.compare_exchange_strong(
expect, ADDITIONAL_REF_RECYCLED,
butil::memory_order_relaxed,
butil::memory_order_relaxed)) {
BeforeAdditionalRefReleasedWrapper();
expect, ADDITIONAL_REF_RECYCLED,
butil::memory_order_relaxed,
butil::memory_order_relaxed)) {
WRAPPER_CALL(BeforeAdditionalRefReleased, static_cast<T*>(this));
return Dereference();
}
Expand Down Expand Up @@ -591,7 +590,7 @@ void VersionedRefWithId<T>::Revive(int32_t at_least_nref) {

int32_t nref = NRefOfVRef(vref);
if (nref < at_least_nref) {
// Set the status to REF_RECYLED since no one uses this socket
// Set the status to REF_RECYCLED since no one uses this socket
_additional_ref_status.store(
ADDITIONAL_REF_RECYCLED, butil::memory_order_relaxed);
CHECK_EQ(1, nref);
Expand Down
9 changes: 2 additions & 7 deletions test/bthread_work_stealing_queue_unittest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "butil/macros.h"
#include "butil/scoped_lock.h"
#include "bthread/work_stealing_queue.h"
#include "bthread/processor.h"

namespace {
typedef size_t value_type;
Expand All @@ -39,13 +40,7 @@ void* steal_thread(void* arg) {
if (q->steal(&val)) {
stolen->push_back(val);
} else {
#if defined(ARCH_CPU_ARM_FAMILY)
asm volatile("yield\n": : :"memory");
#elif defined(ARCH_CPU_LOONGARCH64_FAMILY)
asm volatile("nop\n": : :"memory");
#else
asm volatile("pause\n": : :"memory");
#endif
cpu_relax();
}
}
return stolen;
Expand Down
Loading