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.

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

Jump to bottom

Remove ConnContext pointers to prevent manual allocation #1499

Merged
merged 2 commits into from
Jun 18, 2023
Merged

Remove ConnContext pointers to prevent manual allocation #1499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb5d206
Remove ConnContext pointers to prevent manual allocation
PragmaTwice Jun 16, 2023
6dc6860
remove delConnContext
PragmaTwice Jun 16, 2023
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
45 changes: 17 additions & 28 deletions src/server/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,6 @@ Server::~Server() {
worker_thread.reset();
}

for (const auto &iter : conn_ctxs_) {
delete iter.first;
}

lua::DestroyState(lua_);
libevent_global_shutdown();
}
Expand Down Expand Up @@ -363,7 +359,7 @@ int Server::PublishMessage(const std::string &channel, const std::string &msg) {
std::vector<ConnContext> to_publish_conn_ctxs;
if (auto iter = pubsub_channels_.find(channel); iter != pubsub_channels_.end()) {
for (const auto &conn_ctx : iter->second) {
to_publish_conn_ctxs.emplace_back(*conn_ctx);
to_publish_conn_ctxs.emplace_back(conn_ctx);
}
}

Expand All @@ -373,7 +369,7 @@ int Server::PublishMessage(const std::string &channel, const std::string &msg) {
for (const auto &iter : pubsub_patterns_) {
if (util::StringMatch(iter.first, channel, 0)) {
for (const auto &conn_ctx : iter.second) {
to_publish_patterns_conn_ctxs.emplace_back(*conn_ctx);
to_publish_patterns_conn_ctxs.emplace_back(conn_ctx);
patterns.emplace_back(iter.first);
}
}
Expand Down Expand Up @@ -412,11 +408,11 @@ int Server::PublishMessage(const std::string &channel, const std::string &msg) {
void Server::SubscribeChannel(const std::string &channel, redis::Connection *conn) {
std::lock_guard<std::mutex> guard(pubsub_channels_mu_);

auto conn_ctx = new ConnContext(conn->Owner(), conn->GetFD());
auto conn_ctx = ConnContext(conn->Owner(), conn->GetFD());
conn_ctxs_[conn_ctx] = true;

if (auto iter = pubsub_channels_.find(channel); iter == pubsub_channels_.end()) {
pubsub_channels_.emplace(channel, std::list<ConnContext *>{conn_ctx});
pubsub_channels_.emplace(channel, std::list<ConnContext>{conn_ctx});
} else {
iter->second.emplace_back(conn_ctx);
}
Expand All @@ -431,8 +427,8 @@ void Server::UnsubscribeChannel(const std::string &channel, redis::Connection *c
}

for (const auto &conn_ctx : iter->second) {
if (conn->GetFD() == conn_ctx->fd && conn->Owner() == conn_ctx->owner) {
delConnContext(conn_ctx);
if (conn->GetFD() == conn_ctx.fd && conn->Owner() == conn_ctx.owner) {
conn_ctxs_.erase(conn_ctx);
iter->second.remove(conn_ctx);
if (iter->second.empty()) {
pubsub_channels_.erase(iter);
Expand Down Expand Up @@ -468,11 +464,11 @@ void Server::ListChannelSubscribeNum(const std::vector<std::string> &channels,
void Server::PSubscribeChannel(const std::string &pattern, redis::Connection *conn) {
std::lock_guard<std::mutex> guard(pubsub_channels_mu_);

auto conn_ctx = new ConnContext(conn->Owner(), conn->GetFD());
auto conn_ctx = ConnContext(conn->Owner(), conn->GetFD());
conn_ctxs_[conn_ctx] = true;

if (auto iter = pubsub_patterns_.find(pattern); iter == pubsub_patterns_.end()) {
pubsub_patterns_.emplace(pattern, std::list<ConnContext *>{conn_ctx});
pubsub_patterns_.emplace(pattern, std::list<ConnContext>{conn_ctx});
} else {
iter->second.emplace_back(conn_ctx);
}
Expand All @@ -487,8 +483,8 @@ void Server::PUnsubscribeChannel(const std::string &pattern, redis::Connection *
}

for (const auto &conn_ctx : iter->second) {
if (conn->GetFD() == conn_ctx->fd && conn->Owner() == conn_ctx->owner) {
delConnContext(conn_ctx);
if (conn->GetFD() == conn_ctx.fd && conn->Owner() == conn_ctx.owner) {
conn_ctxs_.erase(conn_ctx);
iter->second.remove(conn_ctx);
if (iter->second.empty()) {
pubsub_patterns_.erase(iter);
Expand All @@ -501,11 +497,11 @@ void Server::PUnsubscribeChannel(const std::string &pattern, redis::Connection *
void Server::BlockOnKey(const std::string &key, redis::Connection *conn) {
std::lock_guard<std::mutex> guard(blocking_keys_mu_);

auto conn_ctx = new ConnContext(conn->Owner(), conn->GetFD());
auto conn_ctx = ConnContext(conn->Owner(), conn->GetFD());
conn_ctxs_[conn_ctx] = true;

if (auto iter = blocking_keys_.find(key); iter == blocking_keys_.end()) {
blocking_keys_.emplace(key, std::list<ConnContext *>{conn_ctx});
blocking_keys_.emplace(key, std::list<ConnContext>{conn_ctx});
} else {
iter->second.emplace_back(conn_ctx);
}
Expand All @@ -522,8 +518,8 @@ void Server::UnblockOnKey(const std::string &key, redis::Connection *conn) {
}

for (const auto &conn_ctx : iter->second) {
if (conn->GetFD() == conn_ctx->fd && conn->Owner() == conn_ctx->owner) {
delConnContext(conn_ctx);
if (conn->GetFD() == conn_ctx.fd && conn->Owner() == conn_ctx.owner) {
conn_ctxs_.erase(conn_ctx);
iter->second.remove(conn_ctx);
if (iter->second.empty()) {
blocking_keys_.erase(iter);
Expand Down Expand Up @@ -588,11 +584,11 @@ void Server::WakeupBlockingConns(const std::string &key, size_t n_conns) {

while (n_conns-- && !iter->second.empty()) {
auto conn_ctx = iter->second.front();
auto s = conn_ctx->owner->EnableWriteEvent(conn_ctx->fd);
auto s = conn_ctx.owner->EnableWriteEvent(conn_ctx.fd);
if (!s.IsOK()) {
LOG(ERROR) << "[server] Failed to enable write event on blocked client " << conn_ctx->fd << ": " << s.Msg();
LOG(ERROR) << "[server] Failed to enable write event on blocked client " << conn_ctx.fd << ": " << s.Msg();
}
delConnContext(conn_ctx);
conn_ctxs_.erase(conn_ctx);
iter->second.pop_front();
}
}
Expand Down Expand Up @@ -620,13 +616,6 @@ void Server::OnEntryAddedToStream(const std::string &ns, const std::string &key,
}
}

void Server::delConnContext(ConnContext *c) {
if (auto iter = conn_ctxs_.find(c); iter != conn_ctxs_.end()) {
delete iter->first;
conn_ctxs_.erase(iter);
}
}

void Server::updateCachedTime() {
time_t ret = util::GetTimeStamp();
if (ret == -1) return;
Expand Down
20 changes: 15 additions & 5 deletions src/server/server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,18 @@ struct DBScanInfo {
struct ConnContext {
Worker *owner;
int fd;

ConnContext(Worker *w, int fd) : owner(w), fd(fd) {}

bool operator<(const ConnContext &c) const {
if (owner == c.owner) {
return fd < c.fd;
}

return owner < c.owner;
}

bool operator==(const ConnContext &c) const { return owner == c.owner && fd == c.fd; }
};

struct StreamConsumer {
Expand Down Expand Up @@ -238,7 +249,6 @@ class Server {
private:
void cron();
void recordInstantaneousMetrics();
void delConnContext(ConnContext *c);
static void updateCachedTime();
Status autoResizeBlockAndSST();
void updateWatchedKeysFromRange(const std::vector<std::string> &args, const redis::CommandKeyRange &range);
Expand Down Expand Up @@ -282,11 +292,11 @@ class Server {
LogCollector<SlowEntry> slow_log_;
LogCollector<PerfEntry> perf_log_;

std::map<ConnContext *, bool> conn_ctxs_;
std::map<std::string, std::list<ConnContext *>> pubsub_channels_;
std::map<std::string, std::list<ConnContext *>> pubsub_patterns_;
std::map<ConnContext, bool> conn_ctxs_;
std::map<std::string, std::list<ConnContext>> pubsub_channels_;
std::map<std::string, std::list<ConnContext>> pubsub_patterns_;
std::mutex pubsub_channels_mu_;
std::map<std::string, std::list<ConnContext *>> blocking_keys_;
std::map<std::string, std::list<ConnContext>> blocking_keys_;
std::mutex blocking_keys_mu_;

std::atomic<int> blocked_clients_{0};
Expand Down