Skip to content

Move close(pipe_[]) from Teardown() to Deinitialize #1648

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
asopov-here merged 1 commit into from
Nov 28, 2025
Merged

Move close(pipe_[]) from Teardown() to Deinitialize #1648

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
10 changes: 5 additions & 5 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 @@ -558,6 +558,11 @@ void NetworkCurl::Deinitialize() {
}
#endif
thread_.join();

#if (defined OLP_SDK_NETWORK_HAS_PIPE) || (defined OLP_SDK_NETWORK_HAS_PIPE2)
close(pipe_[0]);
close(pipe_[1]);
#endif
} else {
// We are trying to stop the very thread we are in. This is not recommended,
// but we try to handle it gracefully. This could happen by calling from one
Expand Down Expand Up @@ -589,11 +594,6 @@ void NetworkCurl::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 Down
Loading