Skip to content

fix some race #39

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
Rustamchuk merged 3 commits into from
Jul 28, 2026
Merged

fix some race #39

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3c4576
fix some race
Jul 28, 2026
5b4f7d9
fix some race
Jul 28, 2026
d2d9e25
fix some race
Jul 28, 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
12 changes: 5 additions & 7 deletions statshouse.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ class TransportTCP : public TransportUDPBase {
int sock = -1;
std::thread th;
std::atomic<size_t> would_block_bytes{0};
std::atomic_bool force_reconnect{false};
bool force_reconnect = false;
std::chrono::steady_clock::time_point last_stuck_recon{std::chrono::steady_clock::now()};
};
struct send_result {
Expand Down Expand Up @@ -987,9 +987,9 @@ class TransportTCP : public TransportUDPBase {
return flush_packet_result::ok;
}
if (enqueue(*secondary, payload)) {
primary->force_reconnect.store(true, std::memory_order_relaxed);
{
std::lock_guard<std::mutex> lock{primary->mu};
primary->force_reconnect = true;
primary->cv.notify_one();
}
std::lock_guard<std::mutex> lock{route_mu_};
Expand Down Expand Up @@ -1018,9 +1018,10 @@ class TransportTCP : public TransportUDPBase {
{
std::unique_lock<std::mutex> lock{w->mu};
w->cv.wait(lock, [this, w]() {
return stop_.load() || !w->queue.empty() || w->force_reconnect.load(std::memory_order_relaxed);
return stop_.load() || !w->queue.empty() || w->force_reconnect;
});
if (w->force_reconnect.exchange(false, std::memory_order_relaxed)) {
if (w->force_reconnect) {
w->force_reconnect = false;
need_recon = true;
}
if (!w->queue.empty()) {
Expand Down Expand Up @@ -1051,9 +1052,6 @@ class TransportTCP : public TransportUDPBase {

void send_payload_with_reconnect(worker &w, const std::vector<char> &payload) {
for (;;) {
if (w.force_reconnect.exchange(false, std::memory_order_relaxed)) {
maybe_stuck_reconnect(w);
}
if (w.sock < 0 && !reconnect(w)) {
if (stop_.load()) {
return;
Expand Down