blockman: Properly guard blockfile members #24456

pull dongcarl wants to merge 3 commits into bitcoin:master from dongcarl:2022-02-kirby-p4 changing 4 files +23 −12
  1. dongcarl commented at 6:00 pm on March 1, 2022: member

    Logically a rebase of: #15191 Based on and split off from: #22564

    Last commit arose out of review: #22564 (review)

  2. DrahtBot added the label Block storage on Mar 1, 2022
  3. DrahtBot added the label P2P on Mar 1, 2022
  4. DrahtBot added the label RPC/REST/ZMQ on Mar 1, 2022
  5. DrahtBot added the label Validation on Mar 1, 2022
  6. DrahtBot added the label Wallet on Mar 1, 2022
  7. DrahtBot commented at 6:18 am on March 2, 2022: 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:

    • #24595 (deploymentstatus: move g_versionbitscache global to ChainstateManager by ajtowns)
    • #24571 (p2p: Prevent block index fingerprinting by sending additional getheaders messages by dergoegge)
    • #24543 (net processing: Move remaining globals into PeerManagerImpl by dergoegge)
    • #24232 (assumeutxo: add init and completion logic by jamesob)
    • #24202 (rpc: allow dumptxoutset to dump human-readable data by w0xlt)
    • #24171 (p2p: Sync chain more readily from inbound peers during IBD by sdaftuar)
    • #24098 (rest: Use query parameters to control resource loading by stickies-v)
    • #24008 (assumeutxo: net_processing changes by jamesob)
    • #23599 (Tidy up RPCTxSerializationFlags by MarcoFalke)
    • #23443 (p2p: Erlay support signaling by naumenkogs)
    • #21726 (Improve Indices on pruned nodes via prune blockers by fjahr)
    • #20030 (validation: Remove useless call to mempool->clear() by MarcoFalke)
    • #19888 (rpc, test: Improve getblockstats for unspendables by fjahr)

    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.

  8. DrahtBot added the label Needs rebase on Mar 7, 2022
  9. dongcarl marked this as a draft on Mar 7, 2022
  10. dongcarl force-pushed on Mar 7, 2022
  11. dongcarl commented at 2:16 pm on March 7, 2022: member

    Pushed 422f1f37e6a89a36bc09d5898f08e5cf7263ac81 -> 1b95be4ebe3eeea404cb44f35f31ce6d58e2bbe8

    • Rebased over master
  12. DrahtBot removed the label Needs rebase on Mar 7, 2022
  13. DrahtBot added the label Needs rebase on Mar 17, 2022
  14. dongcarl force-pushed on Mar 24, 2022
  15. dongcarl commented at 6:52 pm on March 24, 2022: member

    Pushed 1b95be4ebe3eeea404cb44f35f31ce6d58e2bbe8 -> f097cc3b23dede7d3afec9a6bea48e76f9bb4938

  16. DrahtBot removed the label Needs rebase on Mar 24, 2022
  17. DrahtBot added the label Needs rebase on Apr 6, 2022
  18. DrahtBot commented at 7:48 am on April 6, 2022: member

    🐙 This pull request conflicts with the target branch and needs rebase.

    Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a “draft”.

  19. blockman: Properly guard blockfile members
    Add GUARDED_BY(cs_LastBlockFile) annotations to:
    - m_blockfile_info
    - m_last_blockfile
    - m_check_for_pruning
    
    Add locking annotations as appropriate.
    
    [META] Some of these LOCK annotations will be turned into a
           AssertLockHeld+EXCLUSIVE_LOCKS_REQUIRED combo in the next commit
    55edcef68d
  20. blockman: Replace some LOCKs with require annotations da4cd7ae1f
  21. validation: Guard nBlockReverseSequenceId with cs_main
    It is only used in CChainState::PreciousBlock with ::cs_main locked.
    d69bca183f
  22. dongcarl force-pushed on May 4, 2022
  23. dongcarl commented at 3:32 pm on May 4, 2022: member

    Pushed f097cc3b23dede7d3afec9a6bea48e76f9bb4938 -> d69bca183f1320cd5438fb18d32d80fbc0c5fdfe

    • Rebased over master
  24. dongcarl commented at 3:32 pm on May 4, 2022: member
    Not going to nurse this PR anymore, feel free to take for yourself!
  25. dongcarl closed this on May 4, 2022

  26. fanquake added the label Up for grabs on May 4, 2022
  27. DrahtBot locked this on May 4, 2023

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-21 09:12 UTC

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