Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-25 17:21:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed debug info

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-03-17 14:45:52 +00:00
parent 456177ef11
commit c9f99c0be9
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libretroshare/src/ft/ftdatamultiplex.cc
View File

@ -493,9 +493,9 @@ bool ftDataMultiplex::recvSingleChunkCrc(const std::string& peerId, const std::s
{ {
RsStackMutex stack(dataMtx); /******* LOCK MUTEX ******/ RsStackMutex stack(dataMtx); /******* LOCK MUTEX ******/
//#ifdef MPLEX_DEBUG #ifdef MPLEX_DEBUG
std::cerr << "ftDataMultiplex::recvSingleChunkCrc() Received crc of file " << hash << ", from peer id " << peerId << ", chunk " << chunk_number << ", crc=" << crc.toStdString() << std::endl; std::cerr << "ftDataMultiplex::recvSingleChunkCrc() Received crc of file " << hash << ", from peer id " << peerId << ", chunk " << chunk_number << ", crc=" << crc.toStdString() << std::endl;
//#endif #endif
std::map<std::string, ftClient>::iterator it = mClients.find(hash); std::map<std::string, ftClient>::iterator it = mClients.find(hash);
@ -524,9 +524,9 @@ bool ftDataMultiplex::recvSingleChunkCrc(const std::string& peerId, const std::s
sha1cache._received.push_back(chunk_number) ; sha1cache._received.push_back(chunk_number) ;
//#ifdef MPLEX_DEBUG #ifdef MPLEX_DEBUG
std::cerr << "ftDataMultiplex::recvSingleChunkCrc() stored in cache. " << std::endl; std::cerr << "ftDataMultiplex::recvSingleChunkCrc() stored in cache. " << std::endl;
//#endif #endif
return true ; return true ;
} }
@ -547,7 +547,9 @@ bool ftDataMultiplex::dispatchReceivedChunkCheckSum()
{ {
std::map<std::string, ftClient>::iterator itc = mClients.find(it->first); std::map<std::string, ftClient>::iterator itc = mClients.find(it->first);
#ifdef MPLEX_DEBUG
std::cerr << "ftDataMultiplex::dispatchReceivedChunkCheckSum(): treating hash " << it->first << std::endl; std::cerr << "ftDataMultiplex::dispatchReceivedChunkCheckSum(): treating hash " << it->first << std::endl;
#endif
if(itc == mClients.end()) if(itc == mClients.end())
{ {
@ -566,7 +568,9 @@ bool ftDataMultiplex::dispatchReceivedChunkCheckSum()
++n ; ++n ;
continue ; continue ;
} }
#ifdef MPLEX_DEBUG
std::cerr << "ftDataMultiplex::dispatchReceivedChunkCheckSum(): checking chunk " << chunk_number << " with hash " << it->second._map[chunk_number].toStdString() << std::endl; std::cerr << "ftDataMultiplex::dispatchReceivedChunkCheckSum(): checking chunk " << chunk_number << " with hash " << it->second._map[chunk_number].toStdString() << std::endl;
#endif
client->verifyChunk(chunk_number,it->second._map[chunk_number]) ; client->verifyChunk(chunk_number,it->second._map[chunk_number]) ;
it->second._received[n] = it->second._received.back() ; it->second._received[n] = it->second._received.back() ;
@ -676,7 +680,9 @@ bool ftDataMultiplex::handleRecvCRC32MapRequest(const std::string& peerId, const
if(found) if(found)
{ {
#ifdef MPLEX_DEBUG
std::cerr << "File CRC32 map was obtained successfully. Sending it." << std::endl ; std::cerr << "File CRC32 map was obtained successfully. Sending it." << std::endl ;
#endif
mDataSend->sendCRC32Map(peerId,hash,cmap); mDataSend->sendCRC32Map(peerId,hash,cmap);
return true ; return true ;
@ -755,7 +761,9 @@ bool ftDataMultiplex::computeAndSendCRC32Map(const std::string& peerId, const st
} }
} }
#ifdef MPLEX_DEBUG
std::cerr << "Computing CRC32Map for file " << filename << ", hash=" << hash << ", size=" << filesize << std::endl; std::cerr << "Computing CRC32Map for file " << filename << ", hash=" << hash << ", size=" << filesize << std::endl;
#endif
FILE *fd = RsDirUtil::rs_fopen(filename.c_str(),"rb") ; FILE *fd = RsDirUtil::rs_fopen(filename.c_str(),"rb") ;
@ -781,7 +789,9 @@ bool ftDataMultiplex::computeAndSendCRC32Map(const std::string& peerId, const st
_cached_crc32maps[hash] = std::pair<time_t,CRC32Map>(time(NULL),cmap) ; _cached_crc32maps[hash] = std::pair<time_t,CRC32Map>(time(NULL),cmap) ;
} }
#ifdef MPLEX_DEBUG
std::cerr << "File CRC32 was successfully computed. Sending it." << std::endl ; std::cerr << "File CRC32 was successfully computed. Sending it." << std::endl ;
#endif
mDataSend->sendCRC32Map(peerId,hash,cmap); mDataSend->sendCRC32Map(peerId,hash,cmap);
return true ; return true ;
@ -823,7 +833,9 @@ bool ftDataMultiplex::handleRecvChunkCrcRequest(const std::string& peerId, const
{ {
// look into the sha1sum cache // look into the sha1sum cache
#ifdef MPLEX_DEBUG
std::cerr << "ftDataMultiplex::handleRecvChunkMapReq() looking for chunk " << chunk_number << " for hash " << hash << std::endl; std::cerr << "ftDataMultiplex::handleRecvChunkMapReq() looking for chunk " << chunk_number << " for hash " << hash << std::endl;
#endif
Sha1CheckSum crc ; Sha1CheckSum crc ;
bool found = false ; bool found = false ;
@ -843,7 +855,9 @@ bool ftDataMultiplex::handleRecvChunkCrcRequest(const std::string& peerId, const
if(found) if(found)
{ {
#ifdef MPLEX_DEBUG
std::cerr << "ftDataMultiplex::handleRecvChunkMapReq() found in cache ! Sending " << crc.toStdString() << std::endl; std::cerr << "ftDataMultiplex::handleRecvChunkMapReq() found in cache ! Sending " << crc.toStdString() << std::endl;
#endif
mDataSend->sendSingleChunkCRC(peerId,hash,chunk_number,crc); mDataSend->sendSingleChunkCRC(peerId,hash,chunk_number,crc);
return true ; return true ;
} }
@ -867,17 +881,17 @@ bool ftDataMultiplex::handleRecvChunkCrcRequest(const std::string& peerId, const
// //
if(!found) if(!found)
{ {
//#ifdef MPLEX_DEBUG #ifdef MPLEX_DEBUG
std::cerr << "ftDataMultiplex::handleRecvChunkMapReq() ERROR: No matching file Provider for hash " << hash ; std::cerr << "ftDataMultiplex::handleRecvChunkMapReq() ERROR: No matching file Provider for hash " << hash ;
std::cerr << std::endl; std::cerr << std::endl;
//#endif #endif
if(!handleSearchRequest(peerId,hash)) if(!handleSearchRequest(peerId,hash))
return false ; return false ;
//#ifdef MPLEX_DEBUG #ifdef MPLEX_DEBUG
std::cerr << "ftDataMultiplex::handleRecvChunkMapReq() A new file Provider has been made up for hash " << hash ; std::cerr << "ftDataMultiplex::handleRecvChunkMapReq() A new file Provider has been made up for hash " << hash ;
std::cerr << std::endl; std::cerr << std::endl;
//#endif #endif
} }
{ {
@ -896,7 +910,9 @@ bool ftDataMultiplex::handleRecvChunkCrcRequest(const std::string& peerId, const
} }
} }
#ifdef MPLEX_DEBUG
std::cerr << "Computing Sha1 for chunk " << chunk_number<< " of file " << filename << ", hash=" << hash << ", size=" << filesize << std::endl; std::cerr << "Computing Sha1 for chunk " << chunk_number<< " of file " << filename << ", hash=" << hash << ", size=" << filesize << std::endl;
#endif
unsigned char *buf = new unsigned char[ChunkMap::CHUNKMAP_FIXED_CHUNK_SIZE] ; unsigned char *buf = new unsigned char[ChunkMap::CHUNKMAP_FIXED_CHUNK_SIZE] ;
FILE *fd = RsDirUtil::rs_fopen(filename.c_str(),"rb") ; FILE *fd = RsDirUtil::rs_fopen(filename.c_str(),"rb") ;