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

ported branch v0.5.0 commits 2529 and 2544 to trunk

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-03-15 12:57:08 +00:00
parent a4d1e61aa2
commit cc17744ee3
13 changed files with 123 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -277,7 +277,7 @@ void ftController::tickTransfers()
// Collect all non queued files.
//
for(std::map<std::string,ftFileControl*>::iterator it(mDownloads.begin()); it != mDownloads.end(); it++)
if(it->second->mState != ftFileControl::QUEUED)
if(it->second->mState != ftFileControl::QUEUED && it->second->mState != ftFileControl::PAUSED)
priority_tab[it->second->mPriority].push_back(it->second->mTransfer) ;
// 2 - tick arrays with a probability proportional to priority
@ -412,7 +412,9 @@ void ftController::checkDownloadQueue()
time_t now = time(NULL) ;
for(std::map<std::string,ftFileControl*>::const_iterator it(mDownloads.begin());it!=mDownloads.end();++it)
if(it->second->mState != ftFileControl::QUEUED && now - it->second->mCreator->lastRecvTimeStamp() > (time_t)MAX_TIME_INACTIVE_REQUEUED)
if( it->second->mState != ftFileControl::QUEUED
&& it->second->mState != ftFileControl::PAUSED
&& now - it->second->mCreator->lastRecvTimeStamp() > (time_t)MAX_TIME_INACTIVE_REQUEUED)
{
locked_bottomQueue(it->second->mQueuePosition) ;
#ifdef DEBUG_DWLQUEUE
@ -555,7 +557,7 @@ void ftController::locked_checkQueueElement(uint32_t pos)
mTurtle->monitorFileTunnels(_queue[pos]->mName,_queue[pos]->mHash,_queue[pos]->mSize) ;
}
if(pos >= _max_active_downloads && _queue[pos]->mState != ftFileControl::QUEUED)
if(pos >= _max_active_downloads && _queue[pos]->mState != ftFileControl::QUEUED && _queue[pos]->mState != ftFileControl::PAUSED)
{
_queue[pos]->mState = ftFileControl::QUEUED ;
_queue[pos]->mCreator->closeFile() ;
@ -1315,10 +1317,12 @@ bool ftController::FileCancel(std::string hash)
bool ftController::FileControl(std::string hash, uint32_t flags)
{
#ifdef CONTROL_DEBUG
//#ifdef CONTROL_DEBUG
std::cerr << "ftController::FileControl(" << hash << ",";
std::cerr << flags << ")"<<std::endl;
#endif
//#endif
RsStackMutex stack(ctrlMutex); /******* LOCKED ********/
/*check if the file in the download map*/
std::map<std::string,ftFileControl*>::iterator mit=mDownloads.find(hash);
if (mit==mDownloads.end())
@ -1330,14 +1334,15 @@ bool ftController::FileControl(std::string hash, uint32_t flags)
}
/*find the point to transfer module*/
ftTransferModule* ft=(mit->second)->mTransfer;
switch (flags)
{
case RS_FILE_CTRL_PAUSE:
ft->pauseTransfer();
mit->second->mState = ftFileControl::PAUSED ;
std::cerr << "setting state to " << ftFileControl::PAUSED << std::endl ;
break;
case RS_FILE_CTRL_START:
ft->resumeTransfer();
mit->second->mState = ftFileControl::DOWNLOADING ;
std::cerr << "setting state to " << ftFileControl::DOWNLOADING << std::endl ;
break;
default:
return false;
@ -1564,6 +1569,9 @@ bool ftController::FileDetails(std::string hash, FileInfo &info)
if(it->second->mState == ftFileControl::QUEUED)
info.downloadStatus = FT_STATE_QUEUED ;
if(it->second->mState == ftFileControl::PAUSED)
info.downloadStatus = FT_STATE_PAUSED ;
info.tfRate = totalRate;
info.size = (it->second)->mSize;

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

@ -69,7 +69,8 @@ class ftFileControl
enum { DOWNLOADING = 0,
COMPLETED = 1,
ERROR_COMPLETION = 2,
QUEUED = 3
QUEUED = 3,
PAUSED = 4
};
ftFileControl();

31
libretroshare/src/ft/fttransfermodule.cc
View file

@ -403,37 +403,6 @@ bool ftTransferModule::queryInactive()
return true;
}
bool ftTransferModule::pauseTransfer()
{
RsStackMutex stack(tfMtx); /******* STACK LOCKED ******/
/*
std::map<std::string,peerInfo>::iterator mit;
for(mit = mOnlinePeers.begin(); mit != mOnlinePeers.end(); mit++)
{
(mit->second).state = PQIPEER_SUSPEND;
}
*/
mFileStatus.stat=ftFileStatus::PQIFILE_PAUSE;
return 1;
}
bool ftTransferModule::resumeTransfer()
{
RsStackMutex stack(tfMtx); /******* STACK LOCKED ******/
/*
std::map<std::string,peerInfo>::iterator mit;
for(mit = mOnlinePeers.begin(); mit != mOnlinePeers.end(); mit++)
{
(mit->second).state = PQIPEER_IDLE;
}
*/
mFileStatus.stat=ftFileStatus::PQIFILE_DOWNLOADING;
return 1;
}
bool ftTransferModule::cancelTransfer()
{
RsStackMutex stack(tfMtx); /******* STACK LOCKED ******/

3
libretroshare/src/ft/fttransfermodule.h
View file

@ -105,7 +105,6 @@ public:
PQIFILE_INIT,
PQIFILE_NOT_ONLINE,
PQIFILE_DOWNLOADING,
PQIFILE_PAUSE,
PQIFILE_COMPLETE,
PQIFILE_FAIL,
PQIFILE_FAIL_CANCEL,
@ -138,8 +137,6 @@ public:
bool getFileSources(std::list<std::string> &peerIds);
bool getPeerState(std::string peerId,uint32_t &state,uint32_t &tfRate);
uint32_t getDataRate(std::string peerId);
bool pauseTransfer();
bool resumeTransfer();
bool cancelTransfer();
bool completeFileTransfer();

1
libretroshare/src/rsiface/rstypes.h
View file

@ -45,6 +45,7 @@ const uint32_t FT_STATE_WAITING = 0x0002 ;
const uint32_t FT_STATE_DOWNLOADING = 0x0003 ;
const uint32_t FT_STATE_COMPLETE = 0x0004 ;
const uint32_t FT_STATE_QUEUED = 0x0005 ;
const uint32_t FT_STATE_PAUSED = 0x0006 ;
class TransferInfo
{