Merge #11599: scripted-diff: Small locking rename
ClosedPublic
Actions

Authored by jasonbcox on May 8 2019, 19:11.

Details

Reviewers

deadalnix
Fabien
markblundeberg

Group Reviewers

Restricted Project

Commits

rSTAGINGf479c40b04e3: Merge #11599: scripted-diff: Small locking rename
rABCf479c40b04e3: Merge #11599: scripted-diff: Small locking rename

Summary

190bf62be1214b072513c7fd7e01cc191723967c scripted-diff: Small locking rename (Russell Yanofsky)

Pull request description:

Call sync.h primitives "locks" and "mutexes" instead of "blocks" and "waitable critical sections" to match current coding conventions and c++11 standard names.

This PR does not rename the "CCriticalSection" class (though this could be done as a followup) because it's used everywhere and would swamp the other changes in this PR. Plain mutexes should mostly be preferred instead of recursive mutexes in new code anyway.

Tree-SHA512: 39b5b2be8f7a98227be8ab0648bdbb1b620944659bdc1eb9a15b0fcc0c930457fa0c03170cfedaeee0007ea716c526b31a8d84a86dd2333ce9d8bfabd773fe45

Backport of Core PR11599
https://github.com/bitcoin/bitcoin/pull/11599/files

Test Plan

make check
test_runner.py

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

jasonbcox created this revision.May 8 2019, 19:11

Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 8 2019, 19:11

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

jasonbcox mentioned this in D2995: Merge #12842: Prevent concurrent savemempool.May 8 2019, 19:20

jasonbcox added a child revision: D2995: Merge #12842: Prevent concurrent savemempool.May 8 2019, 19:20

Harbormaster completed remote builds in B5762: Diff 8523.May 8 2019, 19:27

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

jasonbcox edited the summary of this revision. (Show Details)May 9 2019, 00:16

For fun, I tried running the script and picked up some changes:

new { and } in sync.h -- I guess you added those manually.
the comment removed from sync.h leaves a residue of /** and */ (due to ABC/core commenting style changes).

This revision is now accepted and ready to land.May 9 2019, 01:02

Fabien accepted this revision.May 9 2019, 06:20

Closed by commit rABCf479c40b04e3: Merge #11599: scripted-diff: Small locking rename (authored by Wladimir J. van der Laan <laanwj@gmail.com>, committed by jasonbcox). · Explain WhyMay 9 2019, 16:32

This revision was automatically updated to reflect the committed changes.

jasonbcox added a commit: rSTAGINGf479c40b04e3: Merge #11599: scripted-diff: Small locking rename.Sep 18 2019, 23:25