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

add fileControl and fileCancel code in ftController

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
ewensun 2008-09-08 08:44:37 +00:00
parent 9d33feb6e6
commit 9b0bfb26c2
3 changed files with 320 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libretroshare/src/ft/ftcontroller.cc
View File

@ -280,13 +280,57 @@ bool ftController::FileRequest(std::string fname, std::string hash,
bool ftController::FileCancel(std::string hash)
{
/* TODO */
return false;
#ifdef CONTROL_DEBUG
std::cerr << "ftController::FileCancel" << std::endl;
#endif
/*check if the file in the download map*/
std::map<std::string,ftFileControl>::iterator mit;
mit=mDownloads.find(hash);
if (mit==mDownloads.end())
{
#ifdef CONTROL_DEBUG
std::cerr<<"ftController::FileCancel file is not found in mDownloads"<<std::endl;
#endif
return false;
}
/*find the point to transfer module*/
ftTransferModule* ft=(mit->second).mTransfer;
ft->cancelTransfer();
return true;
}
bool ftController::FileControl(std::string hash, uint32_t flags)
{
return false;
#ifdef CONTROL_DEBUG
std::cerr << "ftController::FileControl(" << hash << ",";
std::cerr << flags << ")"<<std::endl;
#endif
/*check if the file in the download map*/
std::map<std::string,ftFileControl>::iterator mit;
mit=mDownloads.find(hash);
if (mit==mDownloads.end())
{
#ifdef CONTROL_DEBUG
std::cerr<<"ftController::FileControl file is not found in mDownloads"<<std::endl;
#endif
return false;
}
/*find the point to transfer module*/
ftTransferModule* ft=(mit->second).mTransfer;
switch (flags)
{
case RS_FILE_CTRL_PAUSE:
ft->stopTransfer();
break;
case RS_FILE_CTRL_START:
ft->resumeTransfer();
break;
default:
return false;
}
return true;
}
bool ftController::FileClearCompleted()

39
libretroshare/src/ft/fttransfermodule.cc
View File

@ -25,16 +25,6 @@
#include "fttransfermodule.h"
const uint32_t PQIPEER_OFFLINE_CHECK = 120; /* check every 2 minutes */
const uint32_t PQIPEER_DOWNLOAD_TIMEOUT = 60; /* time it out, -> offline after 60 secs */
const uint32_t PQIPEER_DOWNLOAD_CHECK = 10; /* desired delta = 10 secs */
const uint32_t PQIPEER_DOWNLOAD_TOO_FAST = 8; /* 8 secs */
const uint32_t PQIPEER_DOWNLOAD_TOO_SLOW = 12; /* 12 secs */
const uint32_t PQIPEER_DOWNLOAD_MIN_DELTA = 5; /* 5 secs */
const uint32_t TRANSFER_START_MIN = 10000; /* 10000 byte min limit */
const uint32_t TRANSFER_START_MAX = 10000; /* 10000 byte max limit */
ftTransferModule::ftTransferModule(ftFileCreator *fc, ftDataMultiplex *dm)
:mFileCreator(fc), mMultiplexor(dm), mFlag(0)
{
@ -79,18 +69,8 @@ bool ftTransferModule::setPeerState(std::string peerId,uint32_t state,uint32_t m
mit = mOnlinePeers.find(peerId);
if (mit == mOnlinePeers.end())
{
peerInfo pInfo;
/* Initialise it properly */
pInfo.peerId = peerId;
pInfo.state = state;
pInfo.offset = 0;
pInfo.chunkSize = TRANSFER_START_MIN;
pInfo.receivedSize = 0;
pInfo.lastTS = 0;
pInfo.actualRate = 0;
pInfo.desiredRate = maxRate;
peerInfo pInfo(peerId,state,maxRate);
mOnlinePeers[peerId] = pInfo;
}
else
{
@ -192,6 +172,11 @@ void ftTransferModule::queryInactive()
out<<std:endl;
std::cerr << out.str();
#endif
if (mFileStatus.stat == ftFileStatus::PQIFILE_INIT)
mFileStatus.stat = ftFileStatus::PQIFILE_DOWNLOADING;
if (mFileStatus.stat != ftFileStatus::PQIFILE_DOWNLOADING)
return;
int ts = time(NULL);
uint64_t offset;
@ -263,28 +248,38 @@ void ftTransferModule::queryInactive()
}
bool ftTransferModule::stopTransfer()
bool ftTransferModule::pauseTransfer()
{
/*
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()
{
/*
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()
{
}
bool ftTransferModule::completeFileTransfer()
{
return true;

77
libretroshare/src/ft/fttransfermodule.h
View File

@ -50,29 +50,71 @@ const int PQIPEER_DOWNLOADING = 0x0002;
const int PQIPEER_IDLE = 0x0004;
const int PQIPEER_SUSPEND = 0x0010;
const uint32_t PQIPEER_OFFLINE_CHECK = 120; /* check every 2 minutes */
const uint32_t PQIPEER_DOWNLOAD_TIMEOUT = 60; /* time it out, -> offline after 60 secs */
const uint32_t PQIPEER_DOWNLOAD_CHECK = 10; /* desired delta = 10 secs */
const uint32_t PQIPEER_DOWNLOAD_TOO_FAST = 8; /* 8 secs */
const uint32_t PQIPEER_DOWNLOAD_TOO_SLOW = 12; /* 12 secs */
const uint32_t PQIPEER_DOWNLOAD_MIN_DELTA = 5; /* 5 secs */
const uint32_t TRANSFER_START_MIN = 10000; /* 10000 byte min limit */
const uint32_t TRANSFER_START_MAX = 10000; /* 10000 byte max limit */
/*
class Request
{
public:
uint64_t offset;
uint32_t chunkSize;
public:
uint64_t offset;
uint32_t chunkSize;
};
*/
class peerInfo
{
public:
std::string peerId;
uint32_t state;
double desiredRate;
double actualRate;
public:
peerInfo(std::string peerId_in,uint32_t state_in,uint32_t maxRate_in):
peerId(peerId_in),state(state_in),desiredRate(maxRate_in),actualRate(0),
offset(0),chunkSize(TRANSFER_START_MIN),receivedSize(0),lastTS(0)
{
return;
}
std::string peerId;
uint32_t state;
double desiredRate;
double actualRate;
//current file data request
uint64_t offset;
uint32_t chunkSize;
//current file data request
uint64_t offset;
uint32_t chunkSize;
//already received data size
uint32_t receivedSize;
//already received data size
uint32_t receivedSize;
time_t lastTS;
time_t lastTS;
};
class ftFileStatus
{
enum Status {
PQIFILE_INIT,
PQIFILE_NOT_ONLINE,
PQIFILE_DOWNLOADING,
PQIFILE_PAUSE,
PQIFILE_COMPLETE,
PQIFILE_FAIL,
PQIFILE_FAIL_CANCEL,
PQIFILE_FAIL_NOT_AVAIL,
PQIFILE_FAIL_NOT_OPEN,
PQIFILE_FAIL_NOT_SEEK,
PQIFILE_FAIL_NOT_WRITE,
PQIFILE_FAIL_NOT_READ,
PQIFILE_FAIL_BAD_PATH
};
public:
ftFileStatus(std::string hash_in):hash(hash_in),stat(PQIFILE_INIT)
{
return;
}
std::string hash;
Status stat;
};
class ftTransferModule
@ -85,8 +127,9 @@ public:
bool setFileSources(std::list<std::string> peerIds);
bool setPeerState(std::string peerId,uint32_t state,uint32_t maxRate); //state = ONLINE/OFFLINE
uint32_t getDataRate(std::string peerId);
bool stopTransfer();
bool pauseTransfer();
bool resumeTransfer();
bool cancelTransfer();
bool completeFileTransfer();
//interface to multiplex module
@ -124,6 +167,8 @@ private:
bool mFlag; //1:transfer complete, 0: not complete
double desiredRate;
double actualRate;
ftFileStatus mFileStatus; //used for pause/resume file transfer
};
#endif //FT_TRANSFER_MODULE_HEADER