Move wallet callbacks into cs_main (this effectively reverts #7946) #9583

pull TheBlueMatt wants to merge 1 commits into bitcoin:master from TheBlueMatt:2017-01-revert-7946 changing 1 files +8 −9
  1. TheBlueMatt commented at 4:06 PM on January 19, 2017: contributor

    This is an alternative to #9570 as well as at least two other fixes which would be required to wallet consistency issues generated by #7946, none of which I believe are reasonable to make 0.14.

  2. TheBlueMatt force-pushed on Jan 19, 2017
  3. in src/validation.cpp:None in f73bd2c370 outdated 
    2472 | @@ -2473,20 +2473,20 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
2473 |              pindexNewTip = chainActive.Tip();
2474 |              pindexFork = chainActive.FindFork(pindexOldTip);
2475 |              fInitialDownload = IsInitialBlockDownload();
2476 | +
2477 | +            // throw all transactions though the signal-interface
2478 | +            // while _not_ holding the cs_main lock
    sipa commented at 4:24 PM on January 19, 2017:

    This comments seems outdated now.

    TheBlueMatt commented at 4:31 PM on January 19, 2017:

    Fixed

  4. in src/validation.cpp:None in f73bd2c370 outdated 
    2480 | +                assert(pair.second);
2481 | +                const CBlock& block = *(pair.second);
2482 | +                for (unsigned int i = 0; i < block.vtx.size(); i++)
2483 | +                    GetMainSignals().SyncTransaction(*block.vtx[i], pair.first, i);
2484 | +            }
2485 |          }
    sipa commented at 4:26 PM on January 19, 2017:

    I think you need to clear connectTrace.blocksConnected here.

    TheBlueMatt commented at 4:30 PM on January 19, 2017:

    It will be automatically when it continues the loop.

    sipa commented at 11:35 PM on January 20, 2017:

    Oh, loop-scoped variable, never mind.

  5. TheBlueMatt cross-referenced this on Jan 19, 2017 from issue Block Wallet RPCs until wallet is synced to our current chain by TheBlueMatt
  6. Move wallet callbacks into cs_main (this effectively reverts #7946) 989989354b
  7. TheBlueMatt force-pushed on Jan 19, 2017
  8. morcos cross-referenced this on Jan 19, 2017 from issue Notify on removal by morcos
  9. morcos commented at 6:07 PM on January 19, 2017: member

    utACK

    I know we think this is on the top of our minds for further improvement, but I think it would make sense to document at least in the comments and maybe also the commit message why this matter.

  10. TheBlueMatt commented at 6:58 PM on January 19, 2017: contributor

    Fixes #9584 and #9148 temporarily, with a hope for reversion in 0.15.

  11. jonasschnelli commented at 7:20 PM on January 19, 2017: contributor

    utACK 989989354b68d3954fe2742b96c53eeb2e8a7670. I think it make sense to apply this revert and go for a better solution in 0.15.

  12. laanwj added this to the milestone 0.14.0 on Jan 19, 2017
  13. laanwj commented at 7:25 PM on January 19, 2017: member

    Concept ACK

  14. jtimon commented at 8:08 PM on January 19, 2017: contributor

    Concept ACK

  15. MarcoFalke commented at 8:22 PM on January 19, 2017: member

    Concept ACK

  16. gmaxwell commented at 8:27 PM on January 19, 2017: contributor

    Concept ACK.

  17. TheBlueMatt referenced this in commit 4c1fe09b3f on Jan 20, 2017
  18. TheBlueMatt referenced this in commit e97b94fc67 on Jan 20, 2017
  19. TheBlueMatt referenced this in commit dbe3075fae on Jan 20, 2017
  20. TheBlueMatt referenced this in commit 14dece1801 on Jan 20, 2017
  21. TheBlueMatt referenced this in commit a8c28a1984 on Jan 20, 2017
  22. TheBlueMatt referenced this in commit a07db1f0fb on Jan 20, 2017
  23. sipa commented at 11:35 PM on January 20, 2017: member

    utACK

  24. TheBlueMatt referenced this in commit 7bf80cbeab on Jan 20, 2017
  25. TheBlueMatt referenced this in commit b9c04b76a3 on Jan 20, 2017
  26. TheBlueMatt referenced this in commit b802a5bb8c on Jan 20, 2017
  27. TheBlueMatt referenced this in commit e5802a1864 on Jan 20, 2017
  28. TheBlueMatt referenced this in commit 4977fec015 on Jan 20, 2017
  29. TheBlueMatt referenced this in commit 402c3368f8 on Jan 20, 2017
  30. TheBlueMatt referenced this in commit ce8029dacb on Jan 23, 2017
  31. TheBlueMatt referenced this in commit dda1f3c78c on Jan 23, 2017
  32. laanwj commented at 6:43 AM on January 23, 2017: member

    utACK 9899893

  33. laanwj merged this on Jan 23, 2017
  34. laanwj closed this on Jan 23, 2017
  35. laanwj referenced this in commit eafba4e273 on Jan 23, 2017
  36. TheBlueMatt cross-referenced this on Jan 23, 2017 from issue Wallet RPCs can return stale info due to ProcessNewBlock Race by TheBlueMatt
  37. TheBlueMatt referenced this in commit 80ac497c9a on Jan 23, 2017
  38. TheBlueMatt referenced this in commit 997f1d8643 on Jan 25, 2017
  39. TheBlueMatt referenced this in commit acd7b69d15 on Feb 8, 2017
  40. TheBlueMatt referenced this in commit a61a6de7ce on Feb 8, 2017
  41. TheBlueMatt referenced this in commit 1eb9e4cbb0 on Feb 8, 2017
  42. TheBlueMatt referenced this in commit e1c2b46e1c on Feb 18, 2017
  43. TheBlueMatt referenced this in commit 57ad383265 on Feb 18, 2017
  44. TheBlueMatt referenced this in commit c5e8a0b92a on Mar 6, 2017
  45. TheBlueMatt referenced this in commit 6266b75cc0 on Mar 7, 2017
  46. TheBlueMatt referenced this in commit dcfd01cf1c on Mar 8, 2017
  47. TheBlueMatt referenced this in commit 647bd58b95 on Apr 10, 2017
  48. TheBlueMatt referenced this in commit 76856f237d on Apr 17, 2017
  49. TheBlueMatt referenced this in commit ea402b2097 on Apr 26, 2017
  50. TheBlueMatt referenced this in commit fac8c1f0ad on Apr 26, 2017
  51. TheBlueMatt referenced this in commit a3e3a757e4 on Apr 26, 2017
  52. TheBlueMatt referenced this in commit 31091c5cfb on Apr 26, 2017
  53. TheBlueMatt referenced this in commit b6a3a6eecf on Apr 26, 2017
  54. TheBlueMatt referenced this in commit ba1890ec30 on Apr 26, 2017
  55. TheBlueMatt referenced this in commit 7da495a80a on Apr 26, 2017
  56. TheBlueMatt referenced this in commit 7407d36589 on Apr 26, 2017
  57. TheBlueMatt referenced this in commit 36b1a253d2 on Apr 27, 2017
  58. TheBlueMatt referenced this in commit e0681b45f2 on Apr 27, 2017
  59. TheBlueMatt referenced this in commit 4115319fe1 on Apr 27, 2017
  60. TheBlueMatt cross-referenced this on Apr 27, 2017 from issue Call wallet notify callbacks in scheduler thread (without cs_main) by TheBlueMatt
  61. TheBlueMatt referenced this in commit b7317f8b8e on May 3, 2017
  62. TheBlueMatt cross-referenced this on May 4, 2017 from issue Synchronization problems with wallet. by morcos
  63. TheBlueMatt referenced this in commit c2b16b9a30 on May 4, 2017
  64. TheBlueMatt referenced this in commit 2f1a5e82b5 on May 5, 2017
  65. TheBlueMatt referenced this in commit 48689173e9 on Jun 8, 2017
  66. TheBlueMatt referenced this in commit 0a81eaeaa6 on Jun 8, 2017
  67. TheBlueMatt referenced this in commit 699fb26fdd on Jun 8, 2017
  68. TheBlueMatt referenced this in commit f17a525765 on Jun 9, 2017
  69. TheBlueMatt referenced this in commit 1f3234a4e7 on Jun 9, 2017
  70. TheBlueMatt referenced this in commit 5230dedad5 on Jun 21, 2017
  71. TheBlueMatt referenced this in commit 547223bffd on Jun 21, 2017
  72. TheBlueMatt referenced this in commit f10d4a3c58 on Jun 21, 2017
  73. TheBlueMatt referenced this in commit 0c457ac81e on Jun 21, 2017
  74. TheBlueMatt referenced this in commit 3879786467 on Jul 7, 2017
  75. TheBlueMatt referenced this in commit 417066ed81 on Jul 7, 2017
  76. TheBlueMatt referenced this in commit 62e416d714 on Jul 11, 2017
  77. TheBlueMatt referenced this in commit 2b24e583d1 on Aug 14, 2017
  78. TheBlueMatt referenced this in commit 2a41f6aed6 on Aug 17, 2017
  79. TheBlueMatt referenced this in commit 4b6a0c9aad on Sep 12, 2017
  80. jnewbery referenced this in commit e28cb7409e on Sep 13, 2017
  81. TheBlueMatt referenced this in commit 63afb38340 on Oct 1, 2017
  82. TheBlueMatt referenced this in commit 51ca6003ca on Oct 1, 2017
  83. TheBlueMatt referenced this in commit e6e43a85c8 on Oct 13, 2017
  84. TheBlueMatt referenced this in commit 2960f2f22a on Oct 13, 2017
  85. TheBlueMatt referenced this in commit e545dedf72 on Oct 13, 2017
  86. laanwj referenced this in commit 927a1d7d08 on Nov 15, 2017
  87. codablock referenced this in commit 8420dd2073 on Jan 19, 2018
  88. codablock referenced this in commit 5f211ce25f on Jan 20, 2018
  89. codablock referenced this in commit 9ba8a31d03 on Jan 21, 2018
  90. HashUnlimited referenced this in commit 50ade5feeb on Mar 13, 2018
  91. andvgal referenced this in commit 56ce909b20 on Jan 6, 2019
  92. CryptoCentric referenced this in commit 9ee01b7423 on Feb 27, 2019
  93. PastaPastaPasta referenced this in commit 61758874b8 on Feb 13, 2020
  94. PastaPastaPasta referenced this in commit 76ed385c03 on Feb 13, 2020
  95. PastaPastaPasta referenced this in commit 3eb80fdcd5 on Feb 29, 2020
  96. PastaPastaPasta referenced this in commit 803530c83d on Feb 29, 2020
  97. furszy cross-referenced this on Aug 2, 2020 from issue [Validation] Reduce cs_main locks during ConnectTip/SyncWithWallets by furszy
  98. furszy referenced this in commit a4738c5301 on Feb 10, 2021
  99. furszy referenced this in commit aec5755671 on Feb 18, 2021
  100. furszy referenced this in commit a0b8ac4ea9 on Feb 19, 2021
  101. furszy referenced this in commit c7ab4901f1 on Feb 21, 2021
  102. ckti referenced this in commit 38a9ad2b41 on Mar 28, 2021
  103. gades referenced this in commit 1459aa5a72 on Jun 30, 2021
  104. bitcoin locked this on Sep 8, 2021
Contributors
TheBlueMattsipamorcosjonasschnellilaanwjjtimonMarcoFalkegmaxwell

Milestone
0.14.0

Linked (view graph)
#7946 Reduce cs_main locks during ConnectTip/SyncWithWallets#9148 Wallet RPCs can return stale info due to ProcessNewBlock Race#9371 Notify on removal#9570 Block Wallet RPCs until wallet is synced to our current chain#9584 Synchronization problems with wallet.#10286 Call wallet notify callbacks in scheduler thread (without cs_main)
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: 2026-05-19 06:55 UTC