Merge pull request #2037 from luke-jr/printpriority

Allow -printpriority without -debug
This commit is contained in:
Gavin Andresen 2012-11-30 16:16:59 -08:00
commit aaef016a07

View file

@ -3730,6 +3730,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
// Priority order to process transactions // Priority order to process transactions
list<COrphan> vOrphan; // list memory doesn't move list<COrphan> vOrphan; // list memory doesn't move
map<uint256, vector<COrphan*> > mapDependers; map<uint256, vector<COrphan*> > mapDependers;
bool fPrintPriority = GetBoolArg("-printpriority");
// This vector will be sorted into a priority queue: // This vector will be sorted into a priority queue:
vector<TxPriority> vecPriority; vector<TxPriority> vecPriority;
@ -3876,7 +3877,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
nBlockSigOps += nTxSigOps; nBlockSigOps += nTxSigOps;
nFees += nTxFees; nFees += nTxFees;
if (fDebug && GetBoolArg("-printpriority")) if (fPrintPriority)
{ {
printf("priority %.1f feeperkb %.1f txid %s\n", printf("priority %.1f feeperkb %.1f txid %s\n",
dPriority, dFeePerKb, tx.GetHash().ToString().c_str()); dPriority, dFeePerKb, tx.GetHash().ToString().c_str());