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

added chunk request info, and chunk download info. Corrected bug displaying speed for stalled transfers. Warning: needs full recompilation

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3935 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-12-26 10:58:02 +00:00
parent 304bbf55cf
commit 40efe19efa
7 changed files with 69 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libretroshare/src/ft/ftchunkmap.h
View file

@ -38,10 +38,10 @@ class ftChunk
friend std::ostream& operator<<(std::ostream& o,const ftChunk& f) ;
uint64_t offset;
uint64_t size;
ChunkId id ;
time_t ts;
uint64_t offset; // current offset of the slice
uint64_t size; // size remaining to download
ChunkId id ; // id of the chunk. Equal to the starting offset of the chunk
time_t ts; // time of last data received
std::string peer_id ;
};

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

@ -373,30 +373,6 @@ bool ftFileCreator::getMissingChunk(const std::string& peer_id,uint32_t size_hin
#endif
source_chunk_map_needed = false ;
/* check for freed chunks */
time_t ts = time(NULL);
// 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;
// }
// }
uint32_t& chunks_for_this_peer(mChunksPerPeer[peer_id].cnt) ;
if(chunks_for_this_peer >= MAX_FTCHUNKS_PER_PEER)
@ -433,6 +409,22 @@ void ftFileCreator::getChunkMap(FileChunksInfo& info)
RsStackMutex stack(ftcMutex); /********** STACK LOCKED MTX ******/
chunkMap.getChunksInfo(info) ;
// add info pending requests, handled by ftFileCreator
//
info.pending_slices.clear();
for(std::map<uint64_t, ftChunk>::iterator it = mChunks.begin();it!=mChunks.end();++it)
{
int n = it->second.id / info.chunk_size ;
FileChunksInfo::SliceInfo si ;
si.start = it->second.offset - n*info.chunk_size ;
si.size = it->second.size ;
si.peer_id = it->second.peer_id ;
info.pending_slices[n].push_back(si) ;
}
}
bool ftFileCreator::locked_printChunkMap()

11
libretroshare/src/retroshare/rstypes.h
View file

@ -289,6 +289,13 @@ class FileChunksInfo
enum ChunkState { CHUNK_DONE=2, CHUNK_ACTIVE=1, CHUNK_OUTSTANDING=0 } ;
enum ChunkStrategy { CHUNK_STRATEGY_STREAMING, CHUNK_STRATEGY_RANDOM } ;
struct SliceInfo
{
uint32_t start ;
uint32_t size ;
std::string peer_id ;
};
uint64_t file_size ; // real size of the file
uint32_t chunk_size ; // size of chunks
uint32_t flags ;
@ -303,6 +310,10 @@ class FileChunksInfo
// For each chunk (by chunk number), gives the completion of the chunk.
//
std::vector<std::pair<uint32_t,uint32_t> > active_chunks ;
// The list of pending requests, chunk per chunk (by chunk id)
//
std::map<uint32_t, std::vector<SliceInfo> > pending_slices ;
};
class CompressedChunkMap