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

only assume availability for cache transfers. All other transfers now use ChunkMaps

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3853 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-11-22 20:57:53 +00:00
parent 0b9a5e5b2b
commit b94e4376a4
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,16 +65,17 @@ void Chunk::getSlice(uint32_t size_hint,ftChunk& chunk)
_offset += chunk.size ; _offset += chunk.size ;
} }
ChunkMap::ChunkMap(uint64_t s) ChunkMap::ChunkMap(uint64_t s,bool availability)
: _file_size(s), : _file_size(s),
_chunk_size(CHUNKMAP_FIXED_CHUNK_SIZE) // 1MB chunks _chunk_size(CHUNKMAP_FIXED_CHUNK_SIZE), // 1MB chunks
_assume_availability(availability)
{ {
uint64_t n = s/(uint64_t)_chunk_size ; uint64_t n = s/(uint64_t)_chunk_size ;
if(s% (uint64_t)_chunk_size != 0) if(s% (uint64_t)_chunk_size != 0)
++n ; ++n ;
_map.resize(n,FileChunksInfo::CHUNK_OUTSTANDING) ; _map.resize(n,FileChunksInfo::CHUNK_OUTSTANDING) ;
_strategy = FileChunksInfo::CHUNK_STRATEGY_STREAMING ; _strategy = FileChunksInfo::CHUNK_STRATEGY_RANDOM ;
_total_downloaded = 0 ; _total_downloaded = 0 ;
_file_is_complete = false ; _file_is_complete = false ;
#ifdef DEBUG_FTCHUNK #ifdef DEBUG_FTCHUNK
@ -355,13 +356,11 @@ uint32_t ChunkMap::getAvailableChunk(const std::string& peer_id,bool& map_is_too
{ {
SourceChunksInfo& pchunks(_peers_chunks_availability[peer_id]) ; SourceChunksInfo& pchunks(_peers_chunks_availability[peer_id]) ;
bool assume_availability = !(rsTurtle!=NULL && rsTurtle->isTurtlePeer(peer_id)) ;
// Ok, we don't have the info, so two cases: // Ok, we don't have the info, so two cases:
// - peer_id is a not a turtle peer, so he is considered having the full file source, so we init with a plain chunkmap // - peer_id is a not a turtle peer, so he is considered having the full file source, so we init with a plain chunkmap
// - otherwise, a source map needs to be obtained, so we init with a blank chunkmap // - otherwise, a source map needs to be obtained, so we init with a blank chunkmap
// //
if(assume_availability) if(_assume_availability)
{ {
pchunks.cmap._map.resize( CompressedChunkMap::getCompressedSize(_map.size()),~(uint32_t)0 ) ; pchunks.cmap._map.resize( CompressedChunkMap::getCompressedSize(_map.size()),~(uint32_t)0 ) ;
pchunks.TS = 0 ; pchunks.TS = 0 ;

6
libretroshare/src/ft/ftchunkmap.h
View File

@ -92,10 +92,7 @@ class ChunkMap
/// Constructor. Decides what will be the size of chunks and how many there will be. /// Constructor. Decides what will be the size of chunks and how many there will be.
ChunkMap(uint64_t file_size) ; ChunkMap(uint64_t file_size,bool assume_availability) ;
/// constructor from saved map info
ChunkMap(uint64_t file_size,const std::vector<uint32_t>& map,uint32_t chunk_size,uint32_t chunk_number,FileChunksInfo::ChunkStrategy s) ;
/// destructor /// destructor
virtual ~ChunkMap() {} virtual ~ChunkMap() {}
@ -184,6 +181,7 @@ class ChunkMap
std::map<std::string,SourceChunksInfo> _peers_chunks_availability ; //! what does each source peer have std::map<std::string,SourceChunksInfo> _peers_chunks_availability ; //! what does each source peer have
uint64_t _total_downloaded ; //! completion for the file uint64_t _total_downloaded ; //! completion for the file
bool _file_is_complete ; //! set to true when the file is complete. bool _file_is_complete ; //! set to true when the file is complete.
bool _assume_availability ; //! true if all sources always have the complete file.
}; };

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

@ -1200,7 +1200,9 @@ bool ftController::FileRequest(const std::string& fname, const std::string& has
if(flags & RS_FILE_HINTS_NETWORK_WIDE) if(flags & RS_FILE_HINTS_NETWORK_WIDE)
mTurtle->monitorFileTunnels(fname,hash,size) ; mTurtle->monitorFileTunnels(fname,hash,size) ;
ftFileCreator *fc = new ftFileCreator(savepath, size, hash); bool assume_availability = flags & RS_FILE_HINTS_CACHE ; // assume availability for cache files
ftFileCreator *fc = new ftFileCreator(savepath, size, hash,assume_availability);
ftTransferModule *tm = new ftTransferModule(fc, mDataplex,this); ftTransferModule *tm = new ftTransferModule(fc, mDataplex,this);
#ifdef CONTROL_DEBUG #ifdef CONTROL_DEBUG

8
libretroshare/src/ft/ftfilecreator.cc
View File

@ -17,8 +17,8 @@
* *
***********************************************************/ ***********************************************************/
ftFileCreator::ftFileCreator(std::string path, uint64_t size, std::string hash) ftFileCreator::ftFileCreator(std::string path, uint64_t size, std::string hash,bool assume_availability)
: ftFileProvider(path,size,hash), chunkMap(size) : ftFileProvider(path,size,hash), chunkMap(size,assume_availability)
{ {
/* /*
* FIXME any inits to do? * FIXME any inits to do?
@ -539,7 +539,9 @@ bool ftFileCreator::crossCheckChunkMap(const CRC32Map& ref,uint32_t& bad_chunks,
else else
{ {
printf(" cannot fseek!\n") ; printf(" cannot fseek!\n") ;
return false ; ++bad_chunks ;
++incomplete_chunks ;
map.reset(i) ;
} }
} }
else else

2
libretroshare/src/ft/ftfilecreator.h
View File

@ -40,7 +40,7 @@ class ftFileCreator: public ftFileProvider
{ {
public: public:
ftFileCreator(std::string savepath, uint64_t size, std::string hash); ftFileCreator(std::string savepath, uint64_t size, std::string hash,bool assume_availability);
~ftFileCreator(); ~ftFileCreator();