Skip to content

merge bitcoin#13671, #17405, #18786, #18792, #20067: Deboostification#4246

Merged
UdjinM6 merged 5 commits intodashpay:developfrom
kwvg:deboostification
Jul 16, 2021
Merged

merge bitcoin#13671, #17405, #18786, #18792, #20067: Deboostification#4246
UdjinM6 merged 5 commits intodashpay:developfrom
kwvg:deboostification

Conversation

@kwvg
Copy link
Collaborator

@kwvg kwvg commented Jul 13, 2021

No description provided.

UdjinM6
UdjinM6 requested changes Jul 13, 2021
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.

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.

@PastaPastaPasta PastaPastaPasta added this to the 18 milestone Jul 14, 2021
@kwvg kwvg force-pushed the deboostification branch 3 times, most recently from aae814e to 52d7f81 Compare July 15, 2021 14:19
@kwvg kwvg changed the title merge bitcoin#13671, #13734, #18786, #18792, partial bitcoin#18234: Deboostification merge bitcoin#13671, #18786, #18792: Deboostification Jul 15, 2021
@kwvg kwvg force-pushed the deboostification branch from 52d7f81 to 5a12d1e Compare July 15, 2021 17:30
PastaPastaPasta
PastaPastaPasta requested changes Jul 15, 2021
View reviewed changes
@kwvg kwvg force-pushed the deboostification branch from 5a12d1e to 0b490a0 Compare July 15, 2021 18:35
UdjinM6
UdjinM6 requested changes Jul 15, 2021
View reviewed changes
Copy link

@UdjinM6 UdjinM6 left a comment •
edited
Loading

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)

@PastaPastaPasta
Copy link
Member

PastaPastaPasta commented Jul 15, 2021

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)

@UdjinM6
Copy link

UdjinM6 commented Jul 15, 2021

(unless either of you want to get that branch working)

working on it :)

@UdjinM6 UdjinM6 mentioned this pull request Jul 15, 2021
Merged
@UdjinM6
Copy link

UdjinM6 commented Jul 15, 2021

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.

@UdjinM6 UdjinM6 mentioned this pull request Jul 16, 2021
Merged
@kwvg
Copy link
Collaborator Author

kwvg commented Jul 16, 2021

18792 originally dropped boost/thread.hpp but apparently it was still required so I modified the commit and placed it back in

UdjinM6
UdjinM6 requested changes Jul 16, 2021
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.

18792 originally dropped boost/thread.hpp but 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.

kwvg and others added 5 commits July 16, 2021 20:19
@kwvg
merge bitcoin#13671: Remove boost/algorithm/string/case_conv.hpp
4619630
@fanquake @kwvg
merge bitcoin#17405: wallet: Remove unused boost::this_thread::interr…
f20f872 
…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
@kwvg
merge bitcoin#18786: Remove boost from ThreadImport
9ae5a4c
@kwvg @UdjinM6
merge bitcoin#18792: Remove boost from PeriodicFlush
db248e8 
Co-authored-by: UdjinM6 <[email protected]>
@kwvg
merge bitcoin#20067: remove use of boost::algorithm::replace_first
9af3760
@kwvg kwvg force-pushed the deboostification branch from 0b490a0 to 9af3760 Compare July 16, 2021 14:52
PastaPastaPasta
PastaPastaPasta approved these changes Jul 16, 2021
View reviewed changes
Copy link
Member

@PastaPastaPasta PastaPastaPasta 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 title merge bitcoin#13671, #18786, #18792: Deboostification merge bitcoin#13671, #17405, #18786, #18792, #20067: Deboostification Jul 16, 2021
UdjinM6
UdjinM6 approved these changes Jul 16, 2021
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

@UdjinM6 UdjinM6 merged commit 730a89f into dashpay:develop Jul 16, 2021
@UdjinM6 UdjinM6 mentioned this pull request Aug 27, 2021
Closed
@kwvg kwvg deleted the deboostification branch July 18, 2023 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18

Development

Successfully merging this pull request may close these issues.

4 participants

@kwvg @PastaPastaPasta @UdjinM6 @fanquake