From 375ec0405f7341af296d7b92a1fe99e8ff361015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 1 Nov 2016 14:21:39 +0200 Subject: [PATCH] core: remove superfluous meter, fix missing pending nofunds --- core/tx_pool.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/core/tx_pool.go b/core/tx_pool.go index 49f5c98b05..3c8dd8d035 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -58,21 +58,19 @@ var ( var ( // Metrics for the pending pool - pendingDiscardMeter = metrics.NewMeter("txpool/pending/discard") - pendingReplaceMeter = metrics.NewMeter("txpool/pending/replace") - pendingRLMeter = metrics.NewMeter("txpool/pending/ratelimit") // Dropped due to rate limiting - pendingNofundsMeter = metrics.NewMeter("txpool/pending/nofunds") // Dropped due to out-of-funds - pendingTooOldMeter = metrics.NewMeter("txpool/pending/oldnonce") // Dropped due to old nonce + pendingDiscardMeter = metrics.NewMeter("txpool/pending/discard") + pendingReplaceMeter = metrics.NewMeter("txpool/pending/replace") + pendingRLMeter = metrics.NewMeter("txpool/pending/ratelimit") // Dropped due to rate limiting + pendingNofundsMeter = metrics.NewMeter("txpool/pending/nofunds") // Dropped due to out-of-funds // Metrics for the queued pool - queuedDiscardMeter = metrics.NewMeter("txpool/queued/discard") - queuedReplaceMeter = metrics.NewMeter("txpool/queued/replace") - queuedRLMeter = metrics.NewMeter("txpool/queued/ratelimit") // Dropped due to rate limiting - queuedNofundsMeter = metrics.NewMeter("txpool/queued/nofunds") // Dropped due to out-of-funds - queuedTooOldMeter = metrics.NewMeter("txpool/queued/oldnonce") // Dropped due to old nonce + queuedDiscardMeter = metrics.NewMeter("txpool/queued/discard") + queuedReplaceMeter = metrics.NewMeter("txpool/queued/replace") + queuedRLMeter = metrics.NewMeter("txpool/queued/ratelimit") // Dropped due to rate limiting + queuedNofundsMeter = metrics.NewMeter("txpool/queued/nofunds") // Dropped due to out-of-funds // General tx metrics - invalidTxMeter = metrics.NewMeter("txpool/invalid") + invalidTxMeter = metrics.NewMeter("txpool/invalid") ) type stateFn func() (*state.StateDB, error) @@ -516,7 +514,6 @@ func (pool *TxPool) promoteExecutables() { glog.Infof("Removed old queued transaction: %v", tx) } delete(pool.all, tx.Hash()) - queuedTooOldMeter.Mark(1) } // Drop all transactions that are too costly (low balance) drops, _ := list.Filter(state.GetBalance(addr)) @@ -668,6 +665,7 @@ func (pool *TxPool) demoteUnexecutables() { glog.Infof("Removed unpayable pending transaction: %v", tx) } delete(pool.all, tx.Hash()) + pendingNofundsMeter.Mark(1) } for _, tx := range invalids { if glog.V(logger.Core) {