mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-20 23:10:39 -04:00
add fileControl and fileCancel code in ftController
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
ewensun
parent
9d33feb6e6
commit
9b0bfb26c2
3 changed files with 320 additions and 236 deletions
|
|
@ -21,32 +21,22 @@
|
|||
*
|
||||
* Please report all bugs and problems to "retroshare@lunamutt.com".
|
||||
*
|
||||
*/
|
||||
|
||||
#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)
|
||||
{
|
||||
mHash = mFileCreator->getHash();
|
||||
mSize = mFileCreator->getFileSize();
|
||||
|
||||
// Dummy for Testing (should be handled independantly for
|
||||
// each peer.
|
||||
//mChunkSize = 10000;
|
||||
return;
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
#include "fttransfermodule.h"
|
||||
|
||||
ftTransferModule::ftTransferModule(ftFileCreator *fc, ftDataMultiplex *dm)
|
||||
:mFileCreator(fc), mMultiplexor(dm), mFlag(0)
|
||||
{
|
||||
mHash = mFileCreator->getHash();
|
||||
mSize = mFileCreator->getFileSize();
|
||||
|
||||
// Dummy for Testing (should be handled independantly for
|
||||
// each peer.
|
||||
//mChunkSize = 10000;
|
||||
return;
|
||||
}
|
||||
|
||||
ftTransferModule::~ftTransferModule()
|
||||
{}
|
||||
|
||||
|
|
@ -76,21 +66,11 @@ bool ftTransferModule::setPeerState(std::string peerId,uint32_t state,uint32_t m
|
|||
if (!found) mFileSources.push_back(peerId);
|
||||
|
||||
std::map<std::string,peerInfo>::iterator mit;
|
||||
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;
|
||||
mOnlinePeers[peerId] = pInfo;
|
||||
|
||||
mit = mOnlinePeers.find(peerId);
|
||||
if (mit == mOnlinePeers.end())
|
||||
{
|
||||
peerInfo pInfo(peerId,state,maxRate);
|
||||
mOnlinePeers[peerId] = pInfo;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -111,93 +91,98 @@ uint32_t ftTransferModule::getDataRate(std::string peerId)
|
|||
return (uint32_t) (mit->second).actualRate;
|
||||
}
|
||||
|
||||
|
||||
//interface to client module
|
||||
bool ftTransferModule::recvFileData(std::string peerId, uint64_t offset,
|
||||
uint32_t chunk_size, void *data)
|
||||
{
|
||||
#ifdef FT_DEBUG
|
||||
std::cerr << "ftTransferModule::recvFileData()";
|
||||
std::cerr << " peerId: " << peerId;
|
||||
std::cerr << " offset: " << offset;
|
||||
std::cerr << " chunksize: " << chunk_size;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
std::map<std::string,peerInfo>::iterator mit;
|
||||
mit = mOnlinePeers.find(peerId);
|
||||
if (mit == mOnlinePeers.end())
|
||||
return false;
|
||||
if ((mit->second).state != PQIPEER_DOWNLOADING)
|
||||
return false;
|
||||
if (offset != ((mit->second).offset + (mit->second).receivedSize))
|
||||
return false;
|
||||
(mit->second).receivedSize += chunk_size;
|
||||
(mit->second).state = PQIPEER_IDLE;
|
||||
|
||||
return storeData(offset, chunk_size, data);
|
||||
}
|
||||
|
||||
void ftTransferModule::requestData(std::string peerId, uint64_t offset, uint32_t chunk_size)
|
||||
{
|
||||
std::cerr << "ftTransferModule::requestData()";
|
||||
std::cerr << " peerId: " << peerId;
|
||||
std::cerr << " offset: " << offset;
|
||||
std::cerr << " chunk_size: " << chunk_size;
|
||||
std::cerr << std::endl;
|
||||
|
||||
mMultiplexor->sendDataRequest(peerId, mHash, mSize, offset,chunk_size);
|
||||
}
|
||||
|
||||
bool ftTransferModule::getChunk(uint64_t &offset, uint32_t &chunk_size)
|
||||
{
|
||||
std::cerr << "ftTransferModule::getChunk()";
|
||||
std::cerr << " Request: offset: " << offset;
|
||||
std::cerr << " chunk_size: " << chunk_size;
|
||||
std::cerr << std::endl;
|
||||
|
||||
bool val = mFileCreator->getMissingChunk(offset, chunk_size);
|
||||
|
||||
if (val)
|
||||
{
|
||||
std::cerr << "ftTransferModule::getChunk()";
|
||||
std::cerr << " Answer: offset: " << offset;
|
||||
std::cerr << " chunk_size: " << chunk_size;
|
||||
std::cerr << std::endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cerr << "ftTransferModule::getChunk()";
|
||||
std::cerr << " Answer: No Chunk Available";
|
||||
std::cerr << std::endl;
|
||||
}
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
bool ftTransferModule::storeData(uint64_t offset, uint32_t chunk_size,void *data)
|
||||
{
|
||||
std::cerr << "ftTransferModule::storeData()";
|
||||
std::cerr << " offset: " << offset;
|
||||
std::cerr << " chunk_size: " << chunk_size;
|
||||
std::cerr << std::endl;
|
||||
|
||||
return mFileCreator -> addFileData(offset, chunk_size, data);
|
||||
}
|
||||
|
||||
|
||||
//interface to client module
|
||||
bool ftTransferModule::recvFileData(std::string peerId, uint64_t offset,
|
||||
uint32_t chunk_size, void *data)
|
||||
{
|
||||
#ifdef FT_DEBUG
|
||||
std::cerr << "ftTransferModule::recvFileData()";
|
||||
std::cerr << " peerId: " << peerId;
|
||||
std::cerr << " offset: " << offset;
|
||||
std::cerr << " chunksize: " << chunk_size;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
std::map<std::string,peerInfo>::iterator mit;
|
||||
mit = mOnlinePeers.find(peerId);
|
||||
if (mit == mOnlinePeers.end())
|
||||
return false;
|
||||
if ((mit->second).state != PQIPEER_DOWNLOADING)
|
||||
return false;
|
||||
if (offset != ((mit->second).offset + (mit->second).receivedSize))
|
||||
return false;
|
||||
(mit->second).receivedSize += chunk_size;
|
||||
(mit->second).state = PQIPEER_IDLE;
|
||||
|
||||
return storeData(offset, chunk_size, data);
|
||||
}
|
||||
|
||||
void ftTransferModule::requestData(std::string peerId, uint64_t offset, uint32_t chunk_size)
|
||||
{
|
||||
std::cerr << "ftTransferModule::requestData()";
|
||||
std::cerr << " peerId: " << peerId;
|
||||
std::cerr << " offset: " << offset;
|
||||
std::cerr << " chunk_size: " << chunk_size;
|
||||
std::cerr << std::endl;
|
||||
|
||||
mMultiplexor->sendDataRequest(peerId, mHash, mSize, offset,chunk_size);
|
||||
}
|
||||
|
||||
bool ftTransferModule::getChunk(uint64_t &offset, uint32_t &chunk_size)
|
||||
{
|
||||
std::cerr << "ftTransferModule::getChunk()";
|
||||
std::cerr << " Request: offset: " << offset;
|
||||
std::cerr << " chunk_size: " << chunk_size;
|
||||
std::cerr << std::endl;
|
||||
|
||||
bool val = mFileCreator->getMissingChunk(offset, chunk_size);
|
||||
|
||||
if (val)
|
||||
{
|
||||
std::cerr << "ftTransferModule::getChunk()";
|
||||
std::cerr << " Answer: offset: " << offset;
|
||||
std::cerr << " chunk_size: " << chunk_size;
|
||||
std::cerr << std::endl;
|
||||
}
|
||||
else
|
||||
{
|
||||
std::cerr << "ftTransferModule::getChunk()";
|
||||
std::cerr << " Answer: No Chunk Available";
|
||||
std::cerr << std::endl;
|
||||
}
|
||||
|
||||
return val;
|
||||
}
|
||||
|
||||
bool ftTransferModule::storeData(uint64_t offset, uint32_t chunk_size,void *data)
|
||||
{
|
||||
std::cerr << "ftTransferModule::storeData()";
|
||||
std::cerr << " offset: " << offset;
|
||||
std::cerr << " chunk_size: " << chunk_size;
|
||||
std::cerr << std::endl;
|
||||
|
||||
return mFileCreator -> addFileData(offset, chunk_size, data);
|
||||
}
|
||||
|
||||
void ftTransferModule::queryInactive()
|
||||
{
|
||||
#ifdef FT_DEBUG
|
||||
std::ostringstream out;
|
||||
out<<"ftTransferModule::queryInactive()";
|
||||
out<<std:endl;
|
||||
std::cerr << out.str();
|
||||
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;
|
||||
uint32_t size;
|
||||
int delta;
|
||||
|
||||
int ts = time(NULL);
|
||||
uint64_t offset;
|
||||
uint32_t size;
|
||||
int delta;
|
||||
|
||||
std::map<std::string,peerInfo>::iterator mit;
|
||||
for(mit = mOnlinePeers.begin(); mit != mOnlinePeers.end(); mit++)
|
||||
{
|
||||
|
|
@ -263,33 +248,43 @@ 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::completeFileTransfer()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ftTransferModule::cancelTransfer()
|
||||
{
|
||||
}
|
||||
|
||||
bool ftTransferModule::completeFileTransfer()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
int ftTransferModule::tick()
|
||||
{
|
||||
queryInactive();
|
||||
|
|
@ -299,28 +294,28 @@ int ftTransferModule::tick()
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
void ftTransferModule::adjustSpeed()
|
||||
{
|
||||
|
||||
|
||||
void ftTransferModule::adjustSpeed()
|
||||
{
|
||||
std::map<std::string,peerInfo>::iterator mit;
|
||||
for(mit = mOnlinePeers.begin(); mit != mOnlinePeers.end(); mit++)
|
||||
{
|
||||
if (((mit->second).state == PQIPEER_DOWNLOADING)
|
||||
|| ((mit->second).state == PQIPEER_IDLE))
|
||||
{
|
||||
if ((actualRate < desiredRate) && ((mit->second).actualRate >= (mit->second).desiredRate))
|
||||
{
|
||||
(mit->second).desiredRate *= 1.1;
|
||||
}
|
||||
|
||||
if ((actualRate > desiredRate) && ((mit->second).actualRate < (mit->second).desiredRate))
|
||||
{
|
||||
(mit->second).desiredRate *= 0.9;
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
{
|
||||
if (((mit->second).state == PQIPEER_DOWNLOADING)
|
||||
|| ((mit->second).state == PQIPEER_IDLE))
|
||||
{
|
||||
if ((actualRate < desiredRate) && ((mit->second).actualRate >= (mit->second).desiredRate))
|
||||
{
|
||||
(mit->second).desiredRate *= 1.1;
|
||||
}
|
||||
|
||||
if ((actualRate > desiredRate) && ((mit->second).actualRate < (mit->second).desiredRate))
|
||||
{
|
||||
(mit->second).desiredRate *= 0.9;
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue