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.

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

Inlining sync.cpp with latest upstream, first step. #1335

Merged
merged 8 commits into from
Feb 25, 2020

Conversation

furszy
Copy link

@furszy furszy commented Feb 15, 2020

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:

  • sync.h/cpp code refactor + reorg.
  • threadnames.h/cpp file creation + connection (where "connection" means that all of the previous RenameThread method calls where modified to use the new util::ThreadRename method).

@furszy furszy self-assigned this Feb 15, 2020
This was referenced Feb 16, 2020
@random-zebra random-zebra added this to the 4.1.0 milestone Feb 17, 2020
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

Code ACK with a little question.

src/util/threadnames.cpp Show resolved Hide resolved
random-zebra
random-zebra previously approved these changes Feb 18, 2020
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

ACK c453f8c

@Fuzzbawls
Copy link
Collaborator

needs rebase

@furszy
Copy link
Author

furszy commented Feb 22, 2020

rebased.

Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

rebase utACK cbe90ab

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.

ACK cbe90ab

@random-zebra random-zebra merged commit 535baaa into PIVX-Project:master 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
@random-zebra random-zebra added this to In Progress in perpetual updating PIVX Core to BTC Core via automation Mar 21, 2020
@random-zebra random-zebra moved this from In Progress to Done in perpetual updating PIVX Core to BTC Core Mar 21, 2020
@furszy furszy deleted the 2020_sync_updates_1 branch November 29, 2022 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

3 participants