scripted-diff: Replace CCriticalSection with RecursiveMutex #17891

pull MarcoFalke wants to merge 2 commits into bitcoin:master from MarcoFalke:2001-c2-CC changing 79 files +127 −128
  1. MarcoFalke commented at 4:28 pm on January 7, 2020: member

    RecursiveMutex better clarifies that the mutex is recursive, see also the standard library naming: https://en.cppreference.com/w/cpp/thread/recursive_mutex

    For that reason, and to avoid different people asking me the same question repeatedly (e.g. #15932#pullrequestreview-339175124 ), remove the outdated alias CCriticalSection with a scripted-diff

  2. MarcoFalke added the label Refactoring on Jan 7, 2020
  3. practicalswift commented at 4:40 pm on January 7, 2020: contributor
    Concept ACK: explicit is better than implicit :)
  4. DrahtBot commented at 6:34 pm on January 7, 2020: member

    The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #17261 (Make ScriptPubKeyMan an actual interface and the wallet to have multiple by achow101)
    • #16528 ([WIP] Native Descriptor Wallets (take 2) by achow101)
    • #10443 (Add fee_est tool for debugging fee estimation code by ryanofsky)

    If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

  5. promag commented at 6:40 pm on January 7, 2020: member
    ACK dc0e8b6b3f665cf764af5c26e3745316ceb95302.
  6. practicalswift commented at 9:27 pm on January 7, 2020: contributor
    ACK dc0e8b6b3f665cf764af5c26e3745316ceb95302 – scripted diff looks correct
  7. jtimon commented at 10:46 pm on January 9, 2020: contributor
    ACK dc0e8b6b3f665cf764af5c26e3745316ceb95302
  8. fanquake commented at 1:08 am on January 14, 2020: member
    Ugh. Messed up my merge order here, should have done this before #17906. @MarcoFalke can you please rebase.
  9. DrahtBot added the label Needs rebase on Jan 14, 2020
  10. scripted-diff: Replace CCriticalSection with RecursiveMutex
    -BEGIN VERIFY SCRIPT-
     # Delete outdated alias for RecursiveMutex
     sed -i -e '/CCriticalSection/d'                 ./src/sync.h
     # Replace use of outdated alias with RecursiveMutex
     sed -i -e 's/CCriticalSection/RecursiveMutex/g' $(git grep -l CCriticalSection)
    -END VERIFY SCRIPT-
    6cbe620964
  11. scripted-diff: Bump copyright of files changed in 2020
    -BEGIN VERIFY SCRIPT-
    ./contrib/devtools/copyright_header.py update ./
    -END VERIFY SCRIPT-
    e09c701e01
  12. MarcoFalke force-pushed on Jan 14, 2020
  13. DrahtBot removed the label Needs rebase on Jan 14, 2020
  14. MarcoFalke commented at 7:52 pm on January 14, 2020: member
    Rebased and added another scripted diff to also bump the copyright headers of modified files in one go
  15. practicalswift commented at 9:39 pm on January 14, 2020: contributor
    ACK e09c701e0110350f78366fb837308c086b6503c0 – scripted diff looks correct
  16. fanquake requested review from promag on Jan 15, 2020
  17. fanquake requested review from Empact on Jan 15, 2020
  18. fanquake requested review from jtimon on Jan 15, 2020
  19. promag commented at 0:46 am on January 15, 2020: member
    ACK e09c701e0110350f78366fb837308c086b6503c0
  20. Empact commented at 5:21 am on January 15, 2020: member

    ACK https://github.com/bitcoin/bitcoin/pull/17891/commits/e09c701e0110350f78366fb837308c086b6503c0 diff and scripts look correct

    nit: ideally copyrights commit would be separate because unrelated, but all diffs are comments and it’s scripted so nbd.

    Speaking of, could the copyright script be run automatically / periodically? I understand not wanting to run it via CI, but I would prefer either automatically/periodically or every time via CI over manually/sporadically.

  21. Empact approved
  22. fanquake referenced this in commit af05bd9e1e on Jan 15, 2020
  23. fanquake merged this on Jan 15, 2020
  24. fanquake closed this on Jan 15, 2020

  25. MarcoFalke deleted the branch on Jan 15, 2020
  26. deadalnix referenced this in commit ddfb85a6c1 on Apr 25, 2020
  27. ftrader referenced this in commit a039f77235 on Aug 17, 2020
  28. DrahtBot locked this on Feb 15, 2022

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-23 12:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me