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

simplified the chunk drawing code a little bit

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-03-01 23:41:42 +00:00
parent 1fb605cfa9
commit 4c3905e257
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libretroshare/src/ft/ftchunkmap.cc
View File

@ -539,7 +539,6 @@ uint32_t ChunkMap::getAvailableChunk(const std::string& peer_id,bool& map_is_too
uint32_t available_chunks = 0 ; uint32_t available_chunks = 0 ;
uint32_t available_chunks_before_max_dist = 0 ; uint32_t available_chunks_before_max_dist = 0 ;
uint32_t max_dist = 0; // id of the highest downloaded chunk
for(unsigned int i=0;i<_map.size();++i) for(unsigned int i=0;i<_map.size();++i)
if(_map[i] == FileChunksInfo::CHUNK_OUTSTANDING) if(_map[i] == FileChunksInfo::CHUNK_OUTSTANDING)
@ -548,35 +547,26 @@ uint32_t ChunkMap::getAvailableChunk(const std::string& peer_id,bool& map_is_too
++available_chunks ; ++available_chunks ;
} }
else else
{
max_dist = i ;
available_chunks_before_max_dist = available_chunks ; available_chunks_before_max_dist = available_chunks ;
}
if(available_chunks > 0) if(available_chunks > 0)
{ {
uint32_t chunk_jump ;
uint32_t chosen_chunk_number ; uint32_t chosen_chunk_number ;
switch(_strategy) switch(_strategy)
{ {
case FileChunksInfo::CHUNK_STRATEGY_STREAMING: chunk_jump = 2 ; case FileChunksInfo::CHUNK_STRATEGY_STREAMING: chosen_chunk_number = 0 ;
chosen_chunk_number = 0 ;
break ; break ;
case FileChunksInfo::CHUNK_STRATEGY_RANDOM: chunk_jump = _map.size() ; case FileChunksInfo::CHUNK_STRATEGY_RANDOM: chosen_chunk_number = rand() % available_chunks ;
chosen_chunk_number = rand() % available_chunks ;
break ; break ;
case FileChunksInfo::CHUNK_STRATEGY_PROGRESSIVE: chunk_jump = FT_CHUNKMAP_MAX_CHUNK_JUMP ; case FileChunksInfo::CHUNK_STRATEGY_PROGRESSIVE: chosen_chunk_number = rand() % std::min(available_chunks, available_chunks_before_max_dist+FT_CHUNKMAP_MAX_CHUNK_JUMP) ;
chosen_chunk_number = rand() % std::min(available_chunks, available_chunks_before_max_dist+FT_CHUNKMAP_MAX_CHUNK_JUMP) ;
break ; break ;
default: default:
chunk_jump = _map.size() ;
chosen_chunk_number = 0 ; chosen_chunk_number = 0 ;
} }
uint32_t max_chunk = std::min((uint32_t)_map.size(),max_dist + chunk_jump) ;
uint32_t j=0 ; uint32_t j=0 ;
for(uint32_t i=0;i<max_chunk;++i) for(uint32_t i=0;i<_map.size();++i)
if(_map[i] == FileChunksInfo::CHUNK_OUTSTANDING && (peer_chunks->is_full || peer_chunks->cmap[i])) if(_map[i] == FileChunksInfo::CHUNK_OUTSTANDING && (peer_chunks->is_full || peer_chunks->cmap[i]))
{ {
if(j == chosen_chunk_number) if(j == chosen_chunk_number)