Skip to content

Fix NetworkCurl race on pipe close #1719

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
andrey-kashcheev merged 1 commit into from
Jul 29, 2026
Merged

Fix NetworkCurl race on pipe close #1719

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
24 changes: 12 additions & 12 deletions olp-cpp-sdk-core/src/http/curl/NetworkCurl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,20 +575,20 @@ void NetworkCurl::Deinitialize() {
std::lock_guard<std::mutex> init_lock(init_mutex_);

// Stop worker thread
if (!IsStarted()) {
auto expected_state = WorkerState::STARTED;
if (!impl_->state_->compare_exchange_strong(expected_state,
WorkerState::STOPPING)) {
OLP_SDK_LOG_DEBUG(kLogTag, "Already deinitialized, this=" << this);
return;
}

OLP_SDK_LOG_TRACE(kLogTag, "Deinitialize NetworkCurl, this=" << this);

{
std::lock_guard<std::mutex> lock(impl_->event_mutex_);
*impl_->state_ = WorkerState::STOPPING;
}

if (thread_.get_id() != std::this_thread::get_id()) {
impl_->NotifyEvent();
{
std::lock_guard<std::mutex> lock(impl_->event_mutex_);
impl_->NotifyEvent();
}
thread_.join();
} else {
// We are trying to stop the very thread we are in. This could happen if the
Expand Down Expand Up @@ -625,6 +625,11 @@ void NetworkCurl::Impl::Teardown() {
// cURL teardown
curl_multi_cleanup(curl_);
curl_ = nullptr;

#if (defined OLP_SDK_NETWORK_HAS_PIPE) || (defined OLP_SDK_NETWORK_HAS_PIPE2)
close(pipe_[0]);
close(pipe_[1]);
#endif
}

// Handle completed messages
Expand All @@ -636,11 +641,6 @@ void NetworkCurl::Impl::Teardown() {
.WithError("Offline: network is deinitialized"));
}
}

#if (defined OLP_SDK_NETWORK_HAS_PIPE) || (defined OLP_SDK_NETWORK_HAS_PIPE2)
close(pipe_[0]);
close(pipe_[1]);
#endif
}

bool NetworkCurl::IsStarted() const { return impl_->IsStarted(); }
Expand Down
Loading