diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-05-15 15:34:47 -0700 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-05-15 15:39:56 -0700 |
commit | b6ee855b411ee9bc39f935d0da3298a773a2ed37 (patch) | |
tree | 8aa8a135e1a0416081d6bbc044729140ed84d86c /src | |
parent | 8bd16ee12fc8ef6723e0572c29b979c15b92b4f4 (diff) | |
parent | 4f3782ed67e5707961f33b702a81bff4880f7b7f (diff) | |
download | bitcoin-b6ee855b411ee9bc39f935d0da3298a773a2ed37.tar.xz |
Merge #10380: [doc] Removing comments about dirty entries on txmempool
4f3782e [doc] Removing comments about dirty entries on txmempool (Simone Madeo)
Tree-SHA512: 12ffad7237e2a8ec658cfcff263dad5a2220beadda48d67095df90c2f8ea55ffb6891d919698893b625965fb3069a05e7901fac6cceb3d1228e6833356408074
Diffstat (limited to 'src')
-rw-r--r-- | src/txmempool.h | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/txmempool.h b/src/txmempool.h index 94987ef4d1..9cb73fcc0c 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -60,11 +60,6 @@ class CTxMemPool; * (nCountWithDescendants, nSizeWithDescendants, and nModFeesWithDescendants) for * all ancestors of the newly added transaction. * - * If updating the descendant state is skipped, we can mark the entry as - * "dirty", and set nSizeWithDescendants/nModFeesWithDescendants to equal nTxSize/ - * nFee+feeDelta. (This can potentially happen during a reorg, where we limit the - * amount of work we're willing to do to avoid consuming too much CPU.) - * */ class CTxMemPoolEntry @@ -83,9 +78,7 @@ private: // Information about descendants of this transaction that are in the // mempool; if we remove this transaction we must remove all of these - // descendants as well. if nCountWithDescendants is 0, treat this entry as - // dirty, and nSizeWithDescendants and nModFeesWithDescendants will not be - // correct. + // descendants as well. uint64_t nCountWithDescendants; //!< number of descendant transactions uint64_t nSizeWithDescendants; //!< ... and size CAmount nModFeesWithDescendants; //!< ... and total fees (all including us) @@ -116,7 +109,7 @@ public: size_t DynamicMemoryUsage() const { return nUsageSize; } const LockPoints& GetLockPoints() const { return lockPoints; } - // Adjusts the descendant state, if this entry is not dirty. + // Adjusts the descendant state. void UpdateDescendantState(int64_t modifySize, CAmount modifyFee, int64_t modifyCount); // Adjusts the ancestor state void UpdateAncestorState(int64_t modifySize, CAmount modifyFee, int64_t modifyCount, int modifySigOps); @@ -399,14 +392,6 @@ enum class MemPoolRemovalReason { * CalculateMemPoolAncestors() takes configurable limits that are designed to * prevent these calculations from being too CPU intensive. * - * Adding transactions from a disconnected block can be very time consuming, - * because we don't have a way to limit the number of in-mempool descendants. - * To bound CPU processing, we limit the amount of work we're willing to do - * to properly update the descendant information for a tx being added from - * a disconnected block. If we would exceed the limit, then we instead mark - * the entry as "dirty", and set the feerate for sorting purposes to be equal - * the feerate of the transaction without any descendants. - * */ class CTxMemPool { |