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

Backport #10231: [Qt] Reduce a significant cs_main lock freeze #1704

Merged
merged 1 commit into from
Oct 31, 2017
Merged

Backport #10231: [Qt] Reduce a significant cs_main lock freeze #1704

merged 1 commit into from
Oct 31, 2017
+32 −10

Conversation

codablock
Copy link

This is a backport of bitcoin#10231, which fixes the lagging UI currently seen in testnet when large blocks are getting processed.

@UdjinM6 UdjinM6 added this to the 12.2 milestone Oct 31, 2017
UdjinM6
UdjinM6 approved these changes Oct 31, 2017
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

schinzelh
schinzelh approved these changes Oct 31, 2017
View reviewed changes
Copy link

@schinzelh schinzelh left a comment

Choose a reason for hiding this comment

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

utACK

@UdjinM6 UdjinM6 changed the base branch from develop to v0.12.2.x October 31, 2017 14:47
@UdjinM6 UdjinM6 changed the base branch from v0.12.2.x to develop October 31, 2017 14:48
@UdjinM6 UdjinM6 modified the milestones: 12.2, 12.2.1 Oct 31, 2017
@UdjinM6
Copy link

UdjinM6 commented Oct 31, 2017

Needs to be rebased/cherry-picked on top of 12.2, otherwise postponing till 12.2.1

@codablock codablock changed the base branch from develop to v0.12.2.x October 31, 2017 19:58
@laanwj @codablock
Merge bitcoin#10231: [Qt] Reduce a significant cs_main lock freeze
746d487 
4082fb0 Add missing <atomic> header in clientmodel.h (Jonas Schnelli)
928d4a9 Set both time/height header caches at the same time (Jonas Schnelli)
610a917 Declare headers height/time cache mutable, re-set the methods const (Jonas Schnelli)
cf92bce Update the remaining blocks left in modaloverlay at init. (Jonas Schnelli)
7148f5e Reduce cs_main locks during modal overlay by adding an atomic cache (Jonas Schnelli)

Tree-SHA512: a92ca22f90b8b2a5e8eb94fdce531ef44542e21a8dbbb0693f7723d7018592cb68de687a2a0aac91d31cbf019793f8e922550656d2b130ed3d854d60630341db
@codablock
Copy link
Author

Rebased and changed base to 12.2.

To get this into the develop branch, I'd suggest to later merge v0.12.2.x into develop.
But for the future, we should maybe think about a better way to handle such cases. For example, create all PRs with develop as base and then manually cherry pick into the release branches. I think Bitcoin already has an established workflow with some helper scripts for this.

@UdjinM6 UdjinM6 modified the milestones: 12.2.1, 12.2 Oct 31, 2017
@UdjinM6 UdjinM6 merged commit d23adcc into dashpay:v0.12.2.x Oct 31, 2017
@codablock codablock deleted the fix_ui_lags branch January 25, 2018 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@schinzelh schinzelh schinzelh approved these changes

@UdjinM6 UdjinM6 UdjinM6 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
12.2
Development

Successfully merging this pull request may close these issues.
4 participants
@codablock @UdjinM6 @schinzelh @laanwj