-
Notifications
You must be signed in to change notification settings - Fork 1.2k
merge bitcoin#13671, #17405, #18786, #18792, #20067: Deboostification #4246
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
Conversation
UdjinM6
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
13734 was already merged recently
18234 missing earlier scheduler related backports. This part is critical, would prefer to postpone it for now and backport them in the right order.
aae814e to
52d7f81
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
18792 should drop #include <boost/thread.hpp> in src/wallet/db.cpp like in the original PR. 18792 requires 17405 (which in its turn requires 11911) to be compilable (I hope), pls see https://github.com/UdjinM6/dash/commits/pr4246
EDIT: Hmm.. tests failed, so I guess smth else is missing (or maybe I backported them incorrectly)
|
TBH I would just prefer to maybe mark 18792 as partial and merge as is (unless either of you want to get that branch working) |
working on it :) |
|
Decided to backport 11911 in a separate PR #4263 since it's kind of unrelated to "deboostification". Once it's merged backporting 17405 and 18792 should be trivial. |
|
18792 originally dropped |
UdjinM6
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
18792 originally dropped
boost/thread.hppbut apparently it was still required so I modified the commit and placed it back in
Pls revert this to make 18792 complete. Rebasing and adding 17405 (e.g. 1722e83) should fix the issue.
…uption_point fad1de6 wallet: Remove unused boost::this_thread::interruption_point (MarcoFalke) Pull request description: `BerkeleyEnvironment::Open` is only called from the main thread (init) or an http rpc thread, neither of which can be interrupted, so remove the useless interruption point. `BerkeleyEnvironment{}` is only used in tests, which run in a single process/thread, so remove the useless interruption point. ACKs for top commit: laanwj: ACK fad1de6 fanquake: ACK fad1de6 Tree-SHA512: dacd8398e966e4a6ce5cf7d3ed821c9c267eff40b14c0635085441647cdb72d1642807f89355419f1710f814c7963e35a10d102d0b985c7198261dfc736256f8
Co-authored-by: UdjinM6 <[email protected]>
PastaPastaPasta
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
UdjinM6
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK
No description provided.