Skip to content
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.

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

Nit enhance 25 03 05 #2911

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix up
Signed-off-by: SamYuan1990 <[email protected]>
SamYuan1990 committed Mar 6, 2025
commit 15630d6d28a064c936ca5b426ab1d9be794fbf54
2 changes: 1 addition & 1 deletion src/brpc/policy/constant_concurrency_limiter.cpp
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ int ConstantConcurrencyLimiter::MaxConcurrency() {

ConstantConcurrencyLimiter*
ConstantConcurrencyLimiter::New(const AdaptiveMaxConcurrency& amc) const {
CHECK_EQ(amc.type(), AdaptiveMaxConcurrency.CONSTANT);
CHECK_EQ(amc.type(), AdaptiveMaxConcurrency::CONSTANT);
return new ConstantConcurrencyLimiter(static_cast<int>(amc));
}

4 changes: 2 additions & 2 deletions src/brpc/server.cpp
Original file line number Diff line number Diff line change
@@ -738,7 +738,7 @@ static int get_port_from_fd(int fd) {

bool Server::CreateConcurrencyLimiter(const AdaptiveMaxConcurrency& amc,
ConcurrencyLimiter** out) {
if (amc.type() == AdaptiveMaxConcurrency.UNLIMITED) {
if (amc.type() == AdaptiveMaxConcurrency::UNLIMITED) {
*out = NULL;
return true;
}
@@ -1086,7 +1086,7 @@ int Server::StartInternal(const butil::EndPoint& endpoint,
it->second.status->SetConcurrencyLimiter(NULL);
} else {
const AdaptiveMaxConcurrency* amc = &it->second.max_concurrency;
if (amc->type() == AdaptiveMaxConcurrency.UNLIMITED) {
if (amc->type() == AdaptiveMaxConcurrency::UNLIMITED) {
amc = &_options.method_max_concurrency;
}
ConcurrencyLimiter* cl = NULL;
2 changes: 1 addition & 1 deletion src/brpc/server.h
Original file line number Diff line number Diff line change
@@ -716,7 +716,7 @@ friend class Controller;
int SetServiceMaxConcurrency(T* service) {
if (NULL != service) {
const AdaptiveMaxConcurrency* amc = &service->_max_concurrency;
if (amc->type() == AdaptiveMaxConcurrency.UNLIMITED) {
if (amc->type() == AdaptiveMaxConcurrency::UNLIMITED) {
amc = &_options.method_max_concurrency;
}
ConcurrencyLimiter* cl = NULL;
8 changes: 4 additions & 4 deletions test/brpc_adaptive_class_unittest.cpp
Original file line number Diff line number Diff line change
@@ -31,13 +31,13 @@ const std::string kPooled = "PoOled";
TEST(AdaptiveMaxConcurrencyTest, ShouldConvertCorrectly) {
brpc::AdaptiveMaxConcurrency amc(0);

EXPECT_EQ(brpc::AdaptiveMaxConcurrency.UNLIMITED, amc.type());
EXPECT_EQ(brpc::AdaptiveMaxConcurrency.UNLIMITED, amc.value());
EXPECT_EQ(brpc::AdaptiveMaxConcurrency::UNLIMITED, amc.type());
EXPECT_EQ(brpc::AdaptiveMaxConcurrency::UNLIMITED, amc.value());
EXPECT_EQ(0, int(amc));
EXPECT_TRUE(amc == brpc::AdaptiveMaxConcurrency.UNLIMITED);
EXPECT_TRUE(amc == brpc::AdaptiveMaxConcurrency::UNLIMITED);

amc = 10;
EXPECT_EQ(brpc::AdaptiveMaxConcurrency.CONSTANT, amc.type());
EXPECT_EQ(brpc::AdaptiveMaxConcurrency::CONSTANT, amc.type());
EXPECT_EQ("10", amc.value());
EXPECT_EQ(10, int(amc));
EXPECT_EQ(amc, "10");