Inlining sync.cpp with latest upstream, first step. #1335
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Feb 16, 2020
Merged
Merged
furszy
force-pushed
the
2020_sync_updates_1
branch
from
b39141e to
de57678
Compare
random-zebra
left a comment
random-zebra
left a comment
There was a problem hiding this comment.
Code ACK with a little question.
furszy
force-pushed
the
2020_sync_updates_1
branch
from
de57678 to
c453f8c
Compare
random-zebra
previously approved these changes
Feb 18, 2020
random-zebra
left a comment
random-zebra
left a comment
There was a problem hiding this comment.
ACK c453f8c15a3bb80f08e1c50bcf4957872ac57101
Collaborator
|
needs rebase |
1) Refactor: * Call sync.h primitives "locks" and "mutexes" instead of "blocks" and "waitable critical sections" to match current coding conventions and c++11 standard names. 2) Make LOCK, LOCK2, TRY_LOCK work with Mutex 3) WAIT_LOCK added.
furszy
force-pushed
the
2020_sync_updates_1
branch
from
c453f8c to
cbe90ab
Compare
Author
|
rebased. |
Fuzzbawls
approved these changes
Feb 25, 2020
furszy
added a commit
that referenced
this pull request
Mar 3, 2020
cfac9cf [Unittest] sync_tests backport. (furszy) f6ddf52 sync: Add RecursiveMutex type alias (furszy) 40a1004 Add debug_lockorder code (without unit test) (furszy) ab83d0d move-only: PASTE macros to util/macros.h (furszy) 25ebf51 Sync.h: AssertLockNotHeld backported. (furszy) Pull request description: This was done on top of #1335 (Starts on 7921802). Effort to bring us up-to-date with upstream's sync.h/cpp sources. The only task that left to be fully up-to-date with upstream, that will leave for a third PR because it touches other areas of the sources and want to keep this as small as possible, is the `CCriticalSection` removal and replacement with the `RecursiveMutex` typedef. ACKs for top commit: random-zebra: ACK cfac9cf Fuzzbawls: ACK cfac9cf Tree-SHA512: 1b6ed0e9be26232dd9b37a0629d9601f5f8967a523fa0d856542eef69c239fab8693980d925c012b5927447622fb601affa8fe6207360d58d7e61019800f33e2
furszy
added a commit
that referenced
this pull request
Mar 4, 2020
7e493df Using WAIT_LOCK macro instead of WaitableLock. (furszy) a0d0e33 [Refactor] Complete move from CCriticalSection to identical RecursiveMutex (both are AnnotatedMixin<std::recursive_mutex>). (furszy) 6608757 doc: Add comment to cs_main and mempool::cs (furszy) Pull request description: This was done on top of #1335 and #1336 (Starting in bb575f8). Effort to bring us up up-to-date with upstream's sync.h/cpp sources. This PR contains: * A complete move from CCriticalSection to identical RecursiveMutex (both are AnnotatedMixin<std::recursive_mutex>). * Using WAIT_LOCK macro instead of WaitableLock. ACKs for top commit: random-zebra: utACK 7e493df Fuzzbawls: utACK 7e493df Tree-SHA512: 539fe93566f90246409606acb0aaeb3a5f839110cb96af7868654738685a07b9e1332f8362a04d328825291007d24c80d0b34b1318edc4afe84a8ac8e5affe61
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of a group of updates that will be doing from upstream to get up-to-date with latest sync.h/cpp sources.
This first PR involves:
RenameThreadmethod calls where modified to use the newutil::ThreadRenamemethod).