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

changed a bit the file transfer strategy. To be tested further.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3898 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-12-07 17:09:21 +00:00
parent a79d2a8e53
commit f5bfc8c92a
4 changed files with 50 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

58
libretroshare/src/ft/ftfilecreator.cc
View file

@ -8,8 +8,8 @@
* #define FILE_DEBUG 1
******/
#define CHUNK_MAX_AGE 20
#define CHUNK_MAX_AGE 40
#define MAX_FTCHUNKS_PER_PEER 5
/***********************************************************
*
@ -202,6 +202,7 @@ void ftFileCreator::removeInactiveChunks()
{
std::map<uint64_t,ftChunk>::iterator tmp(it) ;
++it ;
--mChunksPerPeer[tmp->second.peer_id].cnt ;
mChunks.erase(tmp) ;
}
else
@ -320,8 +321,11 @@ int ftFileCreator::locked_notifyReceived(uint64_t offset, uint32_t chunk_size)
chunk.offset += chunk_size;
mChunks[chunk.offset] = chunk;
}
else // notify the chunkmap that the slice is finished
else // notify the chunkmap that the slice is finished, and decrement the number of chunks for this peer.
{
chunkMap.dataReceived(chunk.id) ;
--mChunksPerPeer[chunk.peer_id].cnt ;
}
_last_recv_time_t = time(NULL) ;
@ -371,26 +375,36 @@ bool ftFileCreator::getMissingChunk(const std::string& peer_id,uint32_t size_hin
/* check for freed chunks */
time_t ts = time(NULL);
time_t old = ts-CHUNK_MAX_AGE;
// time_t old = ts-CHUNK_MAX_AGE;
//
// std::map<uint64_t, ftChunk>::iterator it;
// for(it = mChunks.begin(); it != mChunks.end(); it++)
// {
// /* very simple algorithm */
// if (it->second.ts < old)
// {
//#ifdef FILE_DEBUG
// std::cerr << "ffc::getMissingChunk() Re-asking for an old chunk";
// std::cerr << std::endl;
//#endif
//
// /* retry this one */
// it->second.ts = ts;
// size = it->second.size;
// offset = it->second.offset;
//
// return true;
// }
// }
std::map<uint64_t, ftChunk>::iterator it;
for(it = mChunks.begin(); it != mChunks.end(); it++)
uint32_t& chunks_for_this_peer(mChunksPerPeer[peer_id].cnt) ;
if(chunks_for_this_peer >= MAX_FTCHUNKS_PER_PEER)
{
/* very simple algorithm */
if (it->second.ts < old)
{
#ifdef FILE_DEBUG
std::cerr << "ffc::getMissingChunk() Re-asking for an old chunk";
std::cerr << std::endl;
std::cerr << "ffc::getMissingChunk() too many chunks for peer " << peer_id << std::endl ;
#endif
/* retry this one */
it->second.ts = ts;
size = it->second.size;
offset = it->second.offset;
return true;
}
return false ;
}
/* else allocate a new chunk */
@ -409,6 +423,8 @@ bool ftFileCreator::getMissingChunk(const std::string& peer_id,uint32_t size_hin
offset = chunk.offset ;
size = chunk.size ;
++chunks_for_this_peer ; // increase number of chunks for this peer.
return true; /* cos more data to get */
}
@ -436,6 +452,10 @@ bool ftFileCreator::locked_printChunkMap()
for(it = mChunks.begin(); it != mChunks.end(); it++)
std::cerr << " " << it->second << std::endl ;
std::cerr << "Active chunks per peer:" << std::endl ;
for(std::map<std::string,ZeroInitCounter>::const_iterator it(mChunksPerPeer.begin());it!=mChunksPerPeer.end();++it)
std::cerr << " " << it->first << "\t: " << it->second.cnt << std::endl;
return true;
}