Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

implement cancelTransfer and update transfer module for debug log

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
ewensun 2008-09-08 14:04:10 +00:00
parent 787159debe
commit 7b609a6aea
3 changed files with 110 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,7 +221,7 @@ bool ftController::FileRequest(std::string fname, std::string hash,
std::string savepath = mDownloadPath + "/" + fname;
std::string chunker = "default";
ftFileCreator *fc = new ftFileCreator(savepath, size, hash, chunker);
ftTransferModule *tm = new ftTransferModule(fc, mDataplex);
ftTransferModule *tm = new ftTransferModule(fc, mDataplex,this);
/* add into maps */
ftFileControl ftfc(fname, size, hash, flags, fc, tm);

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

@ -25,8 +25,8 @@
#include "fttransfermodule.h"
ftTransferModule::ftTransferModule(ftFileCreator *fc, ftDataMultiplex *dm)
:mFileCreator(fc), mMultiplexor(dm), mFlag(0)
ftTransferModule::ftTransferModule(ftFileCreator *fc, ftDataMultiplex *dm, ftController *fc)
:mFileCreator(fc), mMultiplexor(dm), mFtController(fc), mFlag(0)
{
mHash = mFileCreator->getHash();
mSize = mFileCreator->getFileSize();
@ -42,51 +42,46 @@ ftTransferModule::~ftTransferModule()
bool ftTransferModule::setFileSources(std::list<std::string> peerIds)
{
mFileSources.clear();
std::list<std::string>::iterator it;
for(it = peerIds.begin(); it != peerIds.end(); it++)
{
mFileSources.push_back(*it);
peerInfo pInfo;
mFileSources.insert(pair<std::string,peerInfo>(*it,pInfo));
}
return 1;
return true;
}
bool ftTransferModule::setPeerState(std::string peerId,uint32_t state,uint32_t maxRate) //state = ONLINE/OFFLINE
{
bool found = false;
std::list<std::string>::iterator it;
it = mFileSources.begin();
while (( it != mFileSources.end())&&(!found))
{
if ((*it) == peerId)
found = true;
it++;
}
if (!found) mFileSources.push_back(peerId);
std::map<std::string,peerInfo>::iterator mit;
mit = mOnlinePeers.find(peerId);
if (mit == mOnlinePeers.end())
{
peerInfo pInfo(peerId,state,maxRate);
mOnlinePeers[peerId] = pInfo;
}
else
{
mit = mFileSources.find(peerId);
if (mit == mFileSources.end()) return false;
(mit->second).state=state;
(mit->second).desiredRate=maxRate;
}
return 1;
if (state==PQIPEER_IDLE) mOnlinePeers.push_back(peerId);
return true;
}
uint32_t ftTransferModule::getDataRate(std::string peerId)
{
std::map<std::string,peerInfo>::iterator mit;
mit = mOnlinePeers.find(peerId);
if (mit == mOnlinePeers.end())
mit = mFileSources.find(peerId);
if (mit == mFileSources.end())
{
#ifdef FT_DEBUG
std::cerr << "ftTransferModule::getDataRate()";
std::cerr << " peerId: " << peerId;
std::cerr << " peer not exist in file sources " << std::endl;
#endif
return 0;
}
else
return (uint32_t) (mit->second).actualRate;
}
@ -103,14 +98,23 @@ bool ftTransferModule::recvFileData(std::string peerId, uint64_t 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())
mit = mFileSources.find(peerId);
if (mit == mFileSources.end())
return false;
if ((mit->second).state != PQIPEER_DOWNLOADING)
return false;
if (offset != ((mit->second).offset + (mit->second).receivedSize))
{
//fix me
//received data not expected
return false;
}
(mit->second).receivedSize += chunk_size;
(mit->second).state = PQIPEER_IDLE;
@ -119,28 +123,40 @@ bool ftTransferModule::recvFileData(std::string peerId, uint64_t offset,
void ftTransferModule::requestData(std::string peerId, uint64_t offset, uint32_t chunk_size)
{
#ifdef FT_DEBUG
std::cerr << "ftTransferModule::requestData()";
std::cerr << " peerId: " << peerId;
std::cerr << " hash: " << mHash;
std::cerr << " size: " << mSize;
std::cerr << " offset: " << offset;
std::cerr << " chunk_size: " << chunk_size;
std::cerr << std::endl;
#endif
mMultiplexor->sendDataRequest(peerId, mHash, mSize, offset,chunk_size);
}
bool ftTransferModule::getChunk(uint64_t &offset, uint32_t &chunk_size)
{
#ifdef FT_DEBUG
std::cerr << "ftTransferModule::getChunk()";
std::cerr << " Request: offset: " << offset;
std::cerr << " hash: " << mHash;
std::cerr << " size: " << mSize;
std::cerr << " offset: " << offset;
std::cerr << " chunk_size: " << chunk_size;
std::cerr << std::endl;
#endif
bool val = mFileCreator->getMissingChunk(offset, chunk_size);
#ifdef FT_DEBUG
if (val)
{
std::cerr << "ftTransferModule::getChunk()";
std::cerr << " Answer: offset: " << offset;
std::cerr << " Answer: Chunk Available";
std::cerr << " hash: " << mHash;
std::cerr << " size: " << mSize;
std::cerr << " offset: " << offset;
std::cerr << " chunk_size: " << chunk_size;
std::cerr << std::endl;
}
@ -150,16 +166,21 @@ bool ftTransferModule::getChunk(uint64_t &offset, uint32_t &chunk_size)
std::cerr << " Answer: No Chunk Available";
std::cerr << std::endl;
}
#endif
return val;
}
bool ftTransferModule::storeData(uint64_t offset, uint32_t chunk_size,void *data)
{
#ifdef FT_DEBUG
std::cerr << "ftTransferModule::storeData()";
std::cerr << " hash: " << mHash;
std::cerr << " size: " << mSize;
std::cerr << " offset: " << offset;
std::cerr << " chunk_size: " << chunk_size;
std::cerr << std::endl;
#endif
return mFileCreator -> addFileData(offset, chunk_size, data);
}
@ -167,11 +188,9 @@ bool ftTransferModule::storeData(uint64_t offset, uint32_t chunk_size,void *data
void ftTransferModule::queryInactive()
{
#ifdef FT_DEBUG
std::ostringstream out;
out<<"ftTransferModule::queryInactive()";
out<<std:endl;
std::cerr << out.str();
std::cerr << "ftTransferModule::queryInactive()" << std::endl;
#endif
if (mFileStatus.stat == ftFileStatus::PQIFILE_INIT)
mFileStatus.stat = ftFileStatus::PQIFILE_DOWNLOADING;
@ -179,62 +198,68 @@ void ftTransferModule::queryInactive()
return;
int ts = time(NULL);
uint64_t offset;
uint32_t size;
uint64_t req_offset;
uint32_t req_size;
int delta;
std::map<std::string,peerInfo>::iterator mit;
for(mit = mOnlinePeers.begin(); mit != mOnlinePeers.end(); mit++)
for(mit = mFileSources.begin(); mit != mFileSources.end(); mit++)
{
switch ((mit->second).state)
std::string peerId = mit->first;
peerInfo* pInfo = &mit->second;
switch (pInfo->state)
{
//Peer side has change from online to offline during transfer
case PQIPEER_NOT_ONLINE:
if (ts - ((mit->second).lastTS) > PQIPEER_OFFLINE_CHECK)
/*
if (ts - (pInfo->lastTS) > PQIPEER_OFFLINE_CHECK)
{//start to request data
size = TRANSFER_START_MIN;
if (getChunk(offset,size))
req_size = TRANSFER_START_MIN;
if (getChunk(req_offset,req_size))
{
(mit->second).offset = offset;
(mit->second).chunkSize = size;
(mit->second).lastTS = ts;
(mit->second).state = PQIPEER_DOWNLOADING;
requestData(mit->first, offset,size);
pInfo->offset = req_offset;
pInfo->chunkSize = req_size;
pInfo->lastTS = ts;
pInfo->state = PQIPEER_DOWNLOADING;
requestData(peerId, req_offset,req_size);
}
else mFlag = 1;
}
*/
break;
//file request has been sent to peer side, but no response received yet
case PQIPEER_DOWNLOADING:
if (ts - ((mit->second).lastTS) > PQIPEER_DOWNLOAD_CHECK)
requestData(mit->first, (mit->second).offset,(mit->second).chunkSize); //give a push
if (ts - (pInfo->lastTS) > PQIPEER_DOWNLOAD_CHECK)
requestData(peerId, pInfo->offset,pInfo->chunkSize); //give a push
actualRate += pInfo->actualRate;
actualRate += (mit->second).actualRate;
break;
//file response has been received or peer side is just ready for download
case PQIPEER_IDLE:
(mit->second).actualRate = (mit->second).chunkSize/(ts-(mit->second).lastTS);
if ((mit->second).actualRate < (mit->second).desiredRate)
pInfo->actualRate = pInfo->chunkSize/(ts-(pInfo->lastTS));
if (pInfo->actualRate < pInfo->desiredRate/2)
{
size = (mit->second).chunkSize * 2 ;
req_size = pInfo->chunkSize * 2 ;
}
else
{
size = (uint32_t ) ((mit->second).chunkSize * 0.9) ;
req_size = (uint32_t ) (pInfo->chunkSize * 0.9) ;
}
if (getChunk(offset,size))
if (getChunk(req_offset,req_size))
{
(mit->second).offset = offset;
(mit->second).chunkSize = size;
(mit->second).lastTS = ts;
(mit->second).state = PQIPEER_DOWNLOADING;
requestData(mit->first,offset,size);
pInfo->offset = req_offset;
pInfo->chunkSize = req_size;
pInfo->lastTS = ts;
pInfo->state = PQIPEER_DOWNLOADING;
requestData(peerId,req_offset,req_size);
}
else mFlag = 1;
actualRate += (mit->second).actualRate;
actualRate += pInfo->actualRate;
break;
//file transfer has been stopped
@ -278,10 +303,14 @@ bool ftTransferModule::resumeTransfer()
bool ftTransferModule::cancelTransfer()
{
mFileStatus.stat=ftFileStatus::PQIFILE_FAIL_CANCEL;
return 1;
}
bool ftTransferModule::completeFileTransfer()
{
mFtController->completeFile(mHash);
return true;
}
@ -299,7 +328,7 @@ int ftTransferModule::tick()
void ftTransferModule::adjustSpeed()
{
std::map<std::string,peerInfo>::iterator mit;
for(mit = mOnlinePeers.begin(); mit != mOnlinePeers.end(); mit++)
for(mit = mFileSources.begin(); mit != mFileSources.end(); mit++)
{
if (((mit->second).state == PQIPEER_DOWNLOADING)
|| ((mit->second).state == PQIPEER_IDLE))

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

@ -70,6 +70,11 @@ public:
class peerInfo
{
public:
peerInfo(std::string peerId_in):peerId(peerId_in),state(PQIPEER_NOT_ONLINE),desiredRate(0),actualRate(0),
offset(0),chunkSize(TRANSFER_START_MIN),receivedSize(0),lastTS(0)
{
return;
}
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)
@ -120,7 +125,7 @@ public:
class ftTransferModule
{
public:
ftTransferModule(ftFileCreator *fc, ftDataMultiplex *dm);
ftTransferModule(ftFileCreator *fc, ftDataMultiplex *dm, ftController *fc);
~ftTransferModule();
//interface to download controller
@ -155,14 +160,15 @@ private:
/* These have independent Mutexes / are const locally (no Mutex protection)*/
ftFileCreator *mFileCreator;
ftDataMultiplex *mMultiplexor;
ftController *mFtController;
std::string mHash;
uint64_t mSize;
RsMutex tfMtx; /* below is mutex protected */
std::list<std::string> mFileSources;
std::map<std::string,peerInfo> mOnlinePeers;
std::list<std::string> mOnlinePeers;
std::map<std::string,peerInfo> mFileSources;
bool mFlag; //1:transfer complete, 0: not complete
double desiredRate;