Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 21:58:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

debug info removal

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7880 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-01-26 20:08:51 +00:00
parent a94465fd3a
commit b7ab9c7e27
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
libbitdht/src/bitdht/bdpeer.cc
View file

@ -336,14 +336,14 @@ int bdSpace::find_node(const bdNodeId *id, int number, std::list<bdId> &matchIds
mFns->bdDistance(id, &(mOwnId), &dist); mFns->bdDistance(id, &(mOwnId), &dist);
int buckno = mFns->bdBucketDistance(&dist); int buckno = mFns->bdBucketDistance(&dist);
std::cerr << "bdSpace::find_node(NodeId:"; #ifdef DEBUG_BD_SPACE
std::cerr << "bdSpace::find_node(NodeId:";
mFns->bdPrintNodeId(std::cerr, id); mFns->bdPrintNodeId(std::cerr, id);
std::cerr << ")"; std::cerr << ")";
std::cerr << " Number: " << number; std::cerr << " Number: " << number;
std::cerr << " Bucket #: " << buckno; std::cerr << " Bucket #: " << buckno;
std::cerr << std::endl; std::cerr << std::endl;
#ifdef DEBUG_BD_SPACE
#endif #endif
bdBucket &buck = buckets[buckno]; bdBucket &buck = buckets[buckno];
@ -352,10 +352,12 @@ int bdSpace::find_node(const bdNodeId *id, int number, std::list<bdId> &matchIds
int matchCount = 0; int matchCount = 0;
for(eit = buck.entries.begin(); eit != buck.entries.end(); eit++) for(eit = buck.entries.begin(); eit != buck.entries.end(); eit++)
{ {
std::cerr << "bdSpace::find_node() Checking Against Peer: "; #ifdef DEBUG_BD_SPACE
std::cerr << "bdSpace::find_node() Checking Against Peer: ";
mFns->bdPrintId(std::cerr, &(eit->mPeerId)); mFns->bdPrintId(std::cerr, &(eit->mPeerId));
std::cerr << " withFlags: " << eit->mPeerFlags; std::cerr << " withFlags: " << eit->mPeerFlags;
std::cerr << std::endl; std::cerr << std::endl;
#endif
if ((!with_flags) || ((with_flags & eit->mPeerFlags) == with_flags)) if ((!with_flags) || ((with_flags & eit->mPeerFlags) == with_flags))
{ {
@ -364,10 +366,12 @@ int bdSpace::find_node(const bdNodeId *id, int number, std::list<bdId> &matchIds
matchIds.push_back(eit->mPeerId); matchIds.push_back(eit->mPeerId);
matchCount++; matchCount++;
std::cerr << "bdSpace::find_node() Found Matching Peer: "; #ifdef DEBUG_BD_SPACE
std::cerr << "bdSpace::find_node() Found Matching Peer: ";
mFns->bdPrintId(std::cerr, &(eit->mPeerId)); mFns->bdPrintId(std::cerr, &(eit->mPeerId));
std::cerr << " withFlags: " << eit->mPeerFlags; std::cerr << " withFlags: " << eit->mPeerFlags;
std::cerr << std::endl; std::cerr << std::endl;
#endif
} }
} }
else else
@ -377,17 +381,19 @@ int bdSpace::find_node(const bdNodeId *id, int number, std::list<bdId> &matchIds
//matchIds.push_back(eit->mPeerId); //matchIds.push_back(eit->mPeerId);
//matchCount++; //matchCount++;
std::cerr << "bdSpace::find_node() Found (WITHOUT FLAGS) Matching Peer: "; #ifdef DEBUG_BD_SPACE
std::cerr << "bdSpace::find_node() Found (WITHOUT FLAGS) Matching Peer: ";
mFns->bdPrintId(std::cerr, &(eit->mPeerId)); mFns->bdPrintId(std::cerr, &(eit->mPeerId));
std::cerr << " withFlags: " << eit->mPeerFlags; std::cerr << " withFlags: " << eit->mPeerFlags;
std::cerr << std::endl; std::cerr << std::endl;
#endif
} }
} }
} }
std::cerr << "bdSpace::find_node() Found " << matchCount << " Matching Peers";
std::cerr << std::endl << std::endl;
#ifdef DEBUG_BD_SPACE #ifdef DEBUG_BD_SPACE
std::cerr << "bdSpace::find_node() Found " << matchCount << " Matching Peers";
std::cerr << std::endl << std::endl;
#endif #endif
return matchCount; return matchCount;
@ -451,18 +457,22 @@ int bdSpace::clean_node_flags(uint32_t flags)
{ {
if (flags & eit->mPeerFlags) if (flags & eit->mPeerFlags)
{ {
std::cerr << "bdSpace::clean_node_flags() Found Match: "; #ifdef DEBUG_BD_SPACE
std::cerr << "bdSpace::clean_node_flags() Found Match: ";
mFns->bdPrintId(std::cerr, &(eit->mPeerId)); mFns->bdPrintId(std::cerr, &(eit->mPeerId));
std::cerr << " withFlags: " << eit->mPeerFlags; std::cerr << " withFlags: " << eit->mPeerFlags;
std::cerr << std::endl; std::cerr << std::endl;
#endif
count++; count++;
eit->mPeerFlags &= ~flags; eit->mPeerFlags &= ~flags;
} }
} }
} }
std::cerr << "bdSpace::clean_node_flags() Cleaned " << count << " Matching Peers"; #ifdef DEBUG_BD_SPACE
std::cerr << std::endl; std::cerr << "bdSpace::clean_node_flags() Cleaned " << count << " Matching Peers";
std::cerr << std::endl;
#endif
return count; return count;
} }