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

Revert "Switched sync.{cpp,h} to std threading primitives." #5982

Merged
merged 1 commit into from Jun 1, 2022
Merged

Revert "Switched sync.{cpp,h} to std threading primitives." #5982

merged 1 commit into from Jun 1, 2022

Conversation

str4d
Copy link
Contributor

@str4d str4d commented May 31, 2022

This partially reverts commit 4ad38a4
to fix a deadlock introduced by that commit.

Part of #5980.

@str4d
Revert "Switched sync.{cpp,h} to std threading primitives."
eb18044 
This partially reverts commit 4ad38a4
to fix a deadlock introduced by that commit.

Part of zcash#5980.
@str4d str4d added C-bug Category: This is a bug C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase. labels May 31, 2022
@str4d str4d added this to the Release 5.0.1 milestone May 31, 2022
@str4d str4d added the A-networking Area: Networking code label May 31, 2022
@str4d str4d mentioned this pull request May 31, 2022
Open
@str4d
Copy link
Contributor Author

str4d commented May 31, 2022

To test this, perform the following with both current master (which should hang) and this PR (which should exit cleanly):

  • Run a zcashd node built with the target commit.
  • Wait until the node has 8 outgoing connections.
  • Stop the node (e.g. zcash-cli stop).

LarryRuane
LarryRuane reviewed Jun 1, 2022
View reviewed changes
Copy link
Collaborator

@LarryRuane LarryRuane left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK eb18044
I was able to reproduce the problem reliably on master, and this PR fixes the problem (one attempt).

daira
daira approved these changes Jun 1, 2022
View reviewed changes
Copy link
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@str4d str4d merged commit 9ba8a96 into zcash:master Jun 1, 2022
@str4d str4d deleted the 5980-revert-csemaphore-boost-removal branch June 1, 2022 03:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LarryRuane LarryRuane LarryRuane left review comments

@daira daira daira approved these changes

Assignees
No one assigned
Labels
A-networking Area: Networking code C-bug Category: This is a bug C-upstream-port Category: Changes that are ported from the Bitcoin Core codebase.
Projects
None yet
Milestone
Release 5.1.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@str4d @daira @LarryRuane