Skip to content

修复客户端流控不准问题 #67

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

Open
comeonkai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

修复客户端流控不准问题 #67

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
3 changes: 2 additions & 1 deletion sdk/include/Type.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,8 @@ class MyRateLimiter : public RateLimiter {
int64_t tokenIncreaseAmount = duration * rate_/1000;
int64_t tokenAmountMax = tokenIncreaseAmount + currentAmount_;
currentAmount_ = tokenAmountMax > capacity_ ? capacity_ : tokenAmountMax;
// 避免 Acquire 失败场景，因lastTokenGiven_未更新导致 currentAmount_ 重复添加令牌
lastTokenGiven_ = currentTime;
// 极端情况下，want > 总容量，直接放过
if (want > capacity_) {
std::pair<bool, std::time_t> res(true, 0);
Expand All @@ -300,7 +302,6 @@ class MyRateLimiter : public RateLimiter {
std::pair<bool, std::time_t> res(false, timeToWait);
return res;
}
lastTokenGiven_ = std::chrono::steady_clock::now();
currentAmount_ = currentAmount_ - want;
std::pair<bool, std::time_t> res(true, 0);
return res;
Expand Down