Introduce -debugnet option, thereby quieting some redundant debug messages
Prior to this change, each TX typically generated 3+ debug messages, askfor tx 8644cc97480ba1537214 0 sending getdata: tx 8644cc97480ba1537214 askfor tx 8644cc97480ba1537214 1339640761000000 askfor tx 8644cc97480ba1537214 1339640881000000 CTxMemPool::accept() : accepted 8644cc9748 (poolsz 6857) After this change, there is only one message for each valid TX received CTxMemPool::accept() : accepted 22a73c5d8c (poolsz 42) and two messages for each orphan tx received ERROR: FetchInputs() : 673dc195aa mempool Tx prev not found 1e439346fc stored orphan tx 673dc195aa (mapsz 19) The -debugnet option, or its superset -debug, will restore the full debug output.
This commit is contained in:
parent
c4879a0c2f
commit
d07eaba195
5 changed files with 13 additions and 2 deletions
|
@ -344,6 +344,13 @@ bool AppInit2()
|
||||||
// ********************************************************* Step 3: parameter-to-internal-flags
|
// ********************************************************* Step 3: parameter-to-internal-flags
|
||||||
|
|
||||||
fDebug = GetBoolArg("-debug");
|
fDebug = GetBoolArg("-debug");
|
||||||
|
|
||||||
|
// -debug implies fDebug*
|
||||||
|
if (fDebug)
|
||||||
|
fDebugNet = true;
|
||||||
|
else
|
||||||
|
fDebugNet = GetBoolArg("-debugnet");
|
||||||
|
|
||||||
bitdb.SetDetach(GetBoolArg("-detachdb", false));
|
bitdb.SetDetach(GetBoolArg("-detachdb", false));
|
||||||
|
|
||||||
#if !defined(WIN32) && !defined(QT_GUI)
|
#if !defined(WIN32) && !defined(QT_GUI)
|
||||||
|
|
|
@ -3142,6 +3142,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
|
||||||
const CInv& inv = (*pto->mapAskFor.begin()).second;
|
const CInv& inv = (*pto->mapAskFor.begin()).second;
|
||||||
if (!AlreadyHave(txdb, inv))
|
if (!AlreadyHave(txdb, inv))
|
||||||
{
|
{
|
||||||
|
if (fDebugNet)
|
||||||
printf("sending getdata: %s\n", inv.ToString().c_str());
|
printf("sending getdata: %s\n", inv.ToString().c_str());
|
||||||
vGetData.push_back(inv);
|
vGetData.push_back(inv);
|
||||||
if (vGetData.size() >= 1000)
|
if (vGetData.size() >= 1000)
|
||||||
|
|
|
@ -296,6 +296,7 @@ public:
|
||||||
// We're using mapAskFor as a priority queue,
|
// We're using mapAskFor as a priority queue,
|
||||||
// the key is the earliest time the request can be sent
|
// the key is the earliest time the request can be sent
|
||||||
int64& nRequestTime = mapAlreadyAskedFor[inv];
|
int64& nRequestTime = mapAlreadyAskedFor[inv];
|
||||||
|
if (fDebugNet)
|
||||||
printf("askfor %s %"PRI64d"\n", inv.ToString().c_str(), nRequestTime);
|
printf("askfor %s %"PRI64d"\n", inv.ToString().c_str(), nRequestTime);
|
||||||
|
|
||||||
// Make sure not to reuse time indexes to keep things in the same order
|
// Make sure not to reuse time indexes to keep things in the same order
|
||||||
|
|
|
@ -58,6 +58,7 @@ using namespace std;
|
||||||
map<string, string> mapArgs;
|
map<string, string> mapArgs;
|
||||||
map<string, vector<string> > mapMultiArgs;
|
map<string, vector<string> > mapMultiArgs;
|
||||||
bool fDebug = false;
|
bool fDebug = false;
|
||||||
|
bool fDebugNet = false;
|
||||||
bool fPrintToConsole = false;
|
bool fPrintToConsole = false;
|
||||||
bool fPrintToDebugger = false;
|
bool fPrintToDebugger = false;
|
||||||
bool fRequestShutdown = false;
|
bool fRequestShutdown = false;
|
||||||
|
|
|
@ -105,6 +105,7 @@ inline void Sleep(int64 n)
|
||||||
extern std::map<std::string, std::string> mapArgs;
|
extern std::map<std::string, std::string> mapArgs;
|
||||||
extern std::map<std::string, std::vector<std::string> > mapMultiArgs;
|
extern std::map<std::string, std::vector<std::string> > mapMultiArgs;
|
||||||
extern bool fDebug;
|
extern bool fDebug;
|
||||||
|
extern bool fDebugNet;
|
||||||
extern bool fPrintToConsole;
|
extern bool fPrintToConsole;
|
||||||
extern bool fPrintToDebugger;
|
extern bool fPrintToDebugger;
|
||||||
extern bool fRequestShutdown;
|
extern bool fRequestShutdown;
|
||||||
|
|
Loading…
Reference in a new issue