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

code cleaning. Removed debug info

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-10-16 16:49:35 +00:00
parent c8f6770b7d
commit 630e7dfe6b
2 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libretroshare/src/ft/ftcontroller.cc
View file

@ -63,7 +63,6 @@
* #define CONTROL_DEBUG 1 * #define CONTROL_DEBUG 1
* #define DEBUG_DWLQUEUE 1 * #define DEBUG_DWLQUEUE 1
*****/ *****/
#define CONTROL_DEBUG 1
static const uint32_t SAVE_TRANSFERS_DELAY = 61 ; // save transfer progress every 61 seconds. static const uint32_t SAVE_TRANSFERS_DELAY = 61 ; // save transfer progress every 61 seconds.
static const uint32_t INACTIVE_CHUNKS_CHECK_DELAY = 60 ; // time after which an inactive chunk is released static const uint32_t INACTIVE_CHUNKS_CHECK_DELAY = 60 ; // time after which an inactive chunk is released
@ -167,8 +166,6 @@ void ftController::addFileSource(const std::string& hash,const std::string& peer
{ {
it->second->mTransfer->addFileSource(peer_id); it->second->mTransfer->addFileSource(peer_id);
// setPeerState(it->second.mTransfer, peer_id, rate, mConnMgr->isOnline(peer_id));
#ifdef CONTROL_DEBUG #ifdef CONTROL_DEBUG
std::cerr << "... added." << std::endl ; std::cerr << "... added." << std::endl ;
#endif #endif
@ -194,8 +191,6 @@ void ftController::removeFileSource(const std::string& hash,const std::string& p
it->second->mTransfer->removeFileSource(peer_id); it->second->mTransfer->removeFileSource(peer_id);
it->second->mCreator->removeFileSource(peer_id); it->second->mCreator->removeFileSource(peer_id);
// setPeerState(it->second.mTransfer, peer_id, rate, mConnMgr->isOnline(peer_id));
#ifdef CONTROL_DEBUG #ifdef CONTROL_DEBUG
std::cerr << "... added." << std::endl ; std::cerr << "... added." << std::endl ;
#endif #endif
@ -1386,10 +1381,10 @@ bool ftController::FileCancel(const std::string& hash)
bool ftController::FileControl(const std::string& hash, uint32_t flags) bool ftController::FileControl(const std::string& hash, uint32_t flags)
{ {
//#ifdef CONTROL_DEBUG #ifdef CONTROL_DEBUG
std::cerr << "ftController::FileControl(" << hash << ","; std::cerr << "ftController::FileControl(" << hash << ",";
std::cerr << flags << ")"<<std::endl; std::cerr << flags << ")"<<std::endl;
//#endif #endif
RsStackMutex stack(ctrlMutex); /******* LOCKED ********/ RsStackMutex stack(ctrlMutex); /******* LOCKED ********/
/*check if the file in the download map*/ /*check if the file in the download map*/
@ -1416,7 +1411,6 @@ bool ftController::FileControl(const std::string& hash, uint32_t flags)
break; break;
case RS_FILE_CTRL_FORCE_CHECK: case RS_FILE_CTRL_FORCE_CHECK:
// mit->second->mState = ftFileControl::CHECKING_HASH ;
mit->second->mTransfer->forceCheck(); mit->second->mTransfer->forceCheck();
std::cerr << "setting state to " << ftFileControl::CHECKING_HASH << std::endl ; std::cerr << "setting state to " << ftFileControl::CHECKING_HASH << std::endl ;
break; break;

8
libretroshare/src/ft/ftcontroller.h
View file

@ -239,23 +239,15 @@ class ftController: public CacheTransfer, public RsThread, public pqiMonitor, pu
RsMutex ctrlMutex; RsMutex ctrlMutex;
// std::list<FileInfo> incomingQueue;
std::map<std::string, ftFileControl*> mCompleted; std::map<std::string, ftFileControl*> mCompleted;
std::map<std::string, ftFileControl*> mDownloads; std::map<std::string, ftFileControl*> mDownloads;
std::vector<ftFileControl*> _queue ; std::vector<ftFileControl*> _queue ;
//std::map<std::string, ftTransferModule *> mTransfers;
//std::map<std::string, ftFileCreator *> mFileCreators;
std::string mConfigPath; std::string mConfigPath;
std::string mDownloadPath; std::string mDownloadPath;
std::string mPartialsPath; std::string mPartialsPath;
/**** SPEED QUEUES ****/ /**** SPEED QUEUES ****/
// std::list<std::string> mSlowQueue;
// std::list<std::string> mStreamQueue;
// std::list<std::string> mFastQueue;
/* callback list (for File Completion) */ /* callback list (for File Completion) */
RsMutex doneMutex; RsMutex doneMutex;