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.

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

Avoid a deadlock where a reader lock and a writer lock were both wanted #4649

Merged
merged 1 commit into from Nov 21, 2017

Conversation

Projects
None yet
4 participants
@pirapira
Member

pirapira commented Nov 13, 2017

Fixes #4642

@pirapira pirapira requested review from chfast and gumb0 Nov 13, 2017

@codecov-io

This comment has been minimized.

Show comment
Hide comment
@codecov-io

codecov-io Nov 13, 2017

Codecov Report

Merging #4649 into develop will decrease coverage by 3.3%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #4649      +/-   ##
===========================================
- Coverage    58.14%   54.83%   -3.31%     
===========================================
  Files         1086     1610     +524     
  Lines        56044    69634   +13590     
  Branches      3715     7252    +3537     
===========================================
+ Hits         32585    38183    +5598     
- Misses       22392    30127    +7735     
- Partials      1067     1324     +257
Impacted Files Coverage Δ
libethereum/BlockChain.cpp 71.96% <100%> (+1.41%) ⬆️
...b97bd5/9d3cb74/Install/include/cryptopp/argnames.h 0% <0%> (-100%) ⬇️
BlockChain.h 4.54% <0%> (-95.46%) ⬇️
...b97bd5/9d3cb74/Install/include/cryptopp/rijndael.h 0% <0%> (-75%) ⬇️
libethereum/CommonNet.h 25% <0%> (-75%) ⬇️
State.h 37.5% <0%> (-62.5%) ⬇️
RLPXSocket.h 40% <0%> (-60%) ⬇️
...b/db97bd5/9d3cb74/Install/include/cryptopp/modes.h 18.18% <0%> (-55.82%) ⬇️
...l/include/boost/multiprecision/cpp_int/checked.hpp 50% <0%> (-50%) ⬇️
ModularServer.h 0% <0%> (-50%) ⬇️
... and 897 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8f8cdc8...f357a5e. Read the comment docs.

codecov-io commented Nov 13, 2017

Codecov Report

Merging #4649 into develop will decrease coverage by 3.3%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #4649      +/-   ##
===========================================
- Coverage    58.14%   54.83%   -3.31%     
===========================================
  Files         1086     1610     +524     
  Lines        56044    69634   +13590     
  Branches      3715     7252    +3537     
===========================================
+ Hits         32585    38183    +5598     
- Misses       22392    30127    +7735     
- Partials      1067     1324     +257
Impacted Files Coverage Δ
libethereum/BlockChain.cpp 71.96% <100%> (+1.41%) ⬆️
...b97bd5/9d3cb74/Install/include/cryptopp/argnames.h 0% <0%> (-100%) ⬇️
BlockChain.h 4.54% <0%> (-95.46%) ⬇️
...b97bd5/9d3cb74/Install/include/cryptopp/rijndael.h 0% <0%> (-75%) ⬇️
libethereum/CommonNet.h 25% <0%> (-75%) ⬇️
State.h 37.5% <0%> (-62.5%) ⬇️
RLPXSocket.h 40% <0%> (-60%) ⬇️
...b/db97bd5/9d3cb74/Install/include/cryptopp/modes.h 18.18% <0%> (-55.82%) ⬇️
...l/include/boost/multiprecision/cpp_int/checked.hpp 50% <0%> (-50%) ⬇️
ModularServer.h 0% <0%> (-50%) ⬇️
... and 897 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8f8cdc8...f357a5e. Read the comment docs.

@pirapira pirapira removed the in progress label Nov 14, 2017

@chfast

chfast approved these changes Nov 21, 2017

@pirapira pirapira merged commit 53dee9b into develop Nov 21, 2017

8 of 9 checks passed

codecov/project/tests 82.88% (-0.1%) compared to 8f8cdc8
Details
ci/circleci: Linux-Clang5 Your tests passed on CircleCI!
Details
ci/circleci: Linux-GCC6-Debug Your tests passed on CircleCI!
Details
ci/circleci: macOS-XCode9 Your tests passed on CircleCI!
Details
codecov/patch 100% of diff hit (target 50%)
Details
codecov/project Absolute coverage decreased by -3.3% but relative coverage increased by +41.85% compared to 8f8cdc8
Details
codecov/project/app Absolute coverage decreased by -3.16% but relative coverage increased by +46.03% compared to 8f8cdc8
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@pirapira pirapira deleted the avoid_deadlock_soltest branch Nov 21, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment