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

Sync upgrade, part 3 #1337

Merged
merged 3 commits into from
Mar 4, 2020
Merged

Sync upgrade, part 3 #1337

merged 3 commits into from
Mar 4, 2020

Conversation

furszy
Copy link

@furszy furszy commented Feb 16, 2020

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 AnnotatedMixinstd::recursive_mutex).

  • Using WAIT_LOCK macro instead of WaitableLock.

@furszy furszy self-assigned this Feb 16, 2020
@furszy
Copy link
Author

furszy commented Feb 16, 2020

Same as on #1336, the cmake new files dependencies are missing, will need to rebase this again on top of #1336 once it's merged to pass travis.

@random-zebra
Copy link

Rebase needed (#1336 merged).

@furszy
Copy link
Author

furszy commented Mar 3, 2020

Rebased on top of master.

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.

utACK 7e493df

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 7e493df

@furszy furszy merged commit c5fc9cc into PIVX-Project:master Mar 4, 2020
@furszy furszy mentioned this pull request Mar 4, 2020
@furszy furszy deleted the 2020_sync_update_3 branch November 29, 2022 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants