Skip to content

refactor: Replace boost::mutex,condition_var,chrono with std equivalents in scheduler#2517

Merged
furszy merged 5 commits intoPIVX-Project:masterfrom
random-zebra:202108_scheduler-deboost
Aug 27, 2021
Merged

refactor: Replace boost::mutex,condition_var,chrono with std equivalents in scheduler#2517
furszy merged 5 commits intoPIVX-Project:masterfrom
random-zebra:202108_scheduler-deboost

Conversation

@random-zebra
Copy link

@random-zebra random-zebra commented Aug 18, 2021

Backports bitcoin#18234 [Anthony Towns]

Motivated by 18227, but should stand alone. Changing from boost::condition_var to std::condition_var means threadGroup.interrupt_all isn't enough to interrupt serviceQueue anymore, so that means calling stop() before join_all() is needed. And the existing reverselock.h code doesn't work with sync.h's DebugLock code (because the reversed lock won't be removed from g_lockstack which then leads to incorrect potential deadlock warnings), so I've replaced that with a dedicated class and macro that's aware of our debug lock behaviour.
Fixes 16027, Fixes 14200, Fixes 18227

First commit coming from bitcoin#16117

This should fix #2515

MarcoFalke and others added 5 commits August 18, 2021 17:17
@random-zebra
util: Add UnintrruptibleSleep
004c064
@random-zebra
scheduler: don't rely on boost interrupt on shutdown
a8705a1 
>>> adapted from bitcoin/bitcoin@306f71b

Calling interrupt_all() will immediately stop the scheduler, so it's
safe to invoke stop() beforehand, and this removes the reliance on boost
to interrupt serviceQueue().
@ajtowns @random-zebra
sync.h: add REVERSE_LOCK
15f292b
@ajtowns @random-zebra
scheduler: switch from boost to std
55ac6de 
Changes from boost::chrono to std::chrono, boost::condition_var to
std::condition_var, boost::mutex to sync.h Mutex, and reverselock.h to
sync.h REVERSE_LOCK. Also adds threadsafety annotations to CScheduler
members.
@random-zebra
[Cleanup] Drop unused reverselock.h
b2ac70f
@random-zebra random-zebra added this to the 5.4.0 milestone Aug 18, 2021
@random-zebra random-zebra self-assigned this Aug 18, 2021
furszy
furszy approved these changes Aug 23, 2021
View reviewed changes
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

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

code review ACK b2ac70f

Fuzzbawls
Fuzzbawls approved these changes Aug 26, 2021
View reviewed changes
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

utACK b2ac70f

@furszy furszy merged commit c8ad2c1 into PIVX-Project:master Aug 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Fuzzbawls Fuzzbawls Fuzzbawls approved these changes

+1 more reviewer

@furszy furszy furszy approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@random-zebra random-zebra

Labels

Bug Refactoring Upstream

Projects

None yet

Milestone

5.4.0

Development

Successfully merging this pull request may close these issues.

[Bug] PIVX wallet crashes when PC goes to sleep and wakes up afterwards

4 participants

@random-zebra @furszy @Fuzzbawls @ajtowns