Browse Source

collect more info on tx pooling and block finding for getmininginfo

0.8
Luke Dashjr 14 years ago
parent
commit
340f0876ea
  1. 3
      src/bitcoinrpc.cpp
  2. 15
      src/main.cpp
  3. 3
      src/main.h

3
src/bitcoinrpc.cpp

@ -368,11 +368,14 @@ Value getmininginfo(const Array& params, bool fHelp) @@ -368,11 +368,14 @@ Value getmininginfo(const Array& params, bool fHelp)
Object obj;
obj.push_back(Pair("blocks", (int)nBestHeight));
obj.push_back(Pair("currentblocksize",(uint64_t)nLastBlockSize));
obj.push_back(Pair("currentblocktx",(uint64_t)nLastBlockTx));
obj.push_back(Pair("difficulty", (double)GetDifficulty()));
obj.push_back(Pair("errors", GetWarnings("statusbar")));
obj.push_back(Pair("generate", (bool)fGenerateBitcoins));
obj.push_back(Pair("genproclimit", (int)(fLimitProcessors ? nLimitProcessors : -1)));
obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
obj.push_back(Pair("pooledtx", (uint64_t)nPooledTx));
obj.push_back(Pair("testnet", fTestNet));
return obj;
}

15
src/main.cpp

@ -559,8 +559,11 @@ bool CTransaction::AcceptToMemoryPool(bool fCheckInputs, bool* pfMissingInputs) @@ -559,8 +559,11 @@ bool CTransaction::AcceptToMemoryPool(bool fCheckInputs, bool* pfMissingInputs)
return AcceptToMemoryPool(txdb, fCheckInputs, pfMissingInputs);
}
uint64 nPooledTx = 0;
bool CTransaction::AddToMemoryPoolUnchecked()
{
printf("AcceptToMemoryPoolUnchecked(): size %lu\n", mapTransactions.size());
// Add to memory pool without checking anything. Don't call this directly,
// call AcceptToMemoryPool to properly check the transaction first.
CRITICAL_BLOCK(cs_mapTransactions)
@ -570,6 +573,7 @@ bool CTransaction::AddToMemoryPoolUnchecked() @@ -570,6 +573,7 @@ bool CTransaction::AddToMemoryPoolUnchecked()
for (int i = 0; i < vin.size(); i++)
mapNextTx[vin[i].prevout] = CInPoint(&mapTransactions[hash], i);
nTransactionsUpdated++;
++nPooledTx;
}
return true;
}
@ -584,6 +588,7 @@ bool CTransaction::RemoveFromMemoryPool() @@ -584,6 +588,7 @@ bool CTransaction::RemoveFromMemoryPool()
mapNextTx.erase(txin.prevout);
mapTransactions.erase(GetHash());
nTransactionsUpdated++;
--nPooledTx;
}
return true;
}
@ -2887,6 +2892,9 @@ public: @@ -2887,6 +2892,9 @@ public:
};
uint64 nLastBlockTx = 0;
uint64 nLastBlockSize = 0;
CBlock* CreateNewBlock(CReserveKey& reservekey)
{
CBlockIndex* pindexPrev = pindexBest;
@ -2974,6 +2982,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) @@ -2974,6 +2982,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
// Collect transactions into block
map<uint256, CTxIndex> mapTestPool;
uint64 nBlockSize = 1000;
uint64 nBlockTx = 0;
int nBlockSigOps = 100;
while (!mapPriority.empty())
{
@ -3008,6 +3017,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) @@ -3008,6 +3017,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
pblock->vtx.push_back(tx);
nBlockSize += nTxSize;
nBlockSigOps += nTxSigOps;
++nBlockTx;
// Add transactions that depend on this one to the priority queue
uint256 hash = tx.GetHash();
@ -3024,6 +3034,11 @@ CBlock* CreateNewBlock(CReserveKey& reservekey) @@ -3024,6 +3034,11 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
}
}
}
nLastBlockTx = nBlockTx;
nLastBlockSize = nBlockSize;
printf("CreateNewBlock(): total size %lu\n", nBlockSize);
}
pblock->vtx[0].vout[0].nValue = GetBlockValue(pindexPrev->nHeight+1, nFees);

3
src/main.h

@ -62,7 +62,10 @@ extern CBigNum bnBestChainWork; @@ -62,7 +62,10 @@ extern CBigNum bnBestChainWork;
extern CBigNum bnBestInvalidWork;
extern uint256 hashBestChain;
extern CBlockIndex* pindexBest;
extern uint64 nPooledTx;
extern unsigned int nTransactionsUpdated;
extern uint64 nLastBlockTx;
extern uint64 nLastBlockSize;
extern double dHashesPerSec;
extern int64 nHPSTimerStart;
extern int64 nTimeBestReceived;

Loading…
Cancel
Save