Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 21:58:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed #ifdef USE_NEW_CHUNK_CHECKING_CODE, since it is enabled by default now. Also removed the use of assume_availablility to put chunks or not in checking mode. This was inconsistent. As a side effect, cache files of size > 1MB get chunk-checked as well, which is good

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6050 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-12-27 21:16:33 +00:00
parent c11c602568
commit b2214fcd46
1 changed files with 1 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libretroshare/src/ft/ftchunkmap.cc
View file

@ -27,8 +27,6 @@
* #define DEBUG_FTCHUNK 1 * #define DEBUG_FTCHUNK 1
*********/ *********/
#define USE_NEW_CHUNK_CHECKING_CODE
#ifdef DEBUG_FTCHUNK #ifdef DEBUG_FTCHUNK
#include <assert.h> #include <assert.h>
#endif #endif
@ -165,21 +163,12 @@ void ChunkMap::dataReceived(const ftChunk::ChunkId& cid)
std::cerr << "*** ChunkMap::dataReceived: Chunk is complete. Removing it." << std::endl ; std::cerr << "*** ChunkMap::dataReceived: Chunk is complete. Removing it." << std::endl ;
#endif #endif
#ifdef USE_NEW_CHUNK_CHECKING_CODE _map[n] = FileChunksInfo::CHUNK_CHECKING ;
// In this case (cache files, mainly) we rely on the final hash-checking only.
//
if(_assume_availability)
_map[n] = FileChunksInfo::CHUNK_DONE ;
else
#endif
_map[n] = FileChunksInfo::CHUNK_CHECKING ;
if(n > 0 || _file_size > CHUNKMAP_FIXED_CHUNK_SIZE) // dont' put <1MB files into checking mode. This is useless. if(n > 0 || _file_size > CHUNKMAP_FIXED_CHUNK_SIZE) // dont' put <1MB files into checking mode. This is useless.
_chunks_checking_queue.push_back(n) ; _chunks_checking_queue.push_back(n) ;
#ifdef USE_NEW_CHUNK_CHECKING_CODE
else else
_map[n] = FileChunksInfo::CHUNK_DONE ; _map[n] = FileChunksInfo::CHUNK_DONE ;
#endif
_slices_to_download.erase(itc) ; _slices_to_download.erase(itc) ;
@ -197,11 +186,7 @@ void ChunkMap::updateTotalDownloaded()
for(uint32_t i=0;i<_map.size();++i) for(uint32_t i=0;i<_map.size();++i)
switch(_map[i]) switch(_map[i])
{ {
#ifdef USE_NEW_CHUNK_CHECKING_CODE
case FileChunksInfo::CHUNK_CHECKING: _file_is_complete = false ; case FileChunksInfo::CHUNK_CHECKING: _file_is_complete = false ;
#else
case FileChunksInfo::CHUNK_CHECKING: //_file_is_complete = false ;********WARNING******** Re-enable this when users have massively switched to chunk checking code
#endif
case FileChunksInfo::CHUNK_DONE: _total_downloaded += sizeOfChunk(i) ; case FileChunksInfo::CHUNK_DONE: _total_downloaded += sizeOfChunk(i) ;
break ; break ;
default: default:
@ -256,12 +241,7 @@ void ChunkMap::setChunkCheckingResult(uint32_t chunk_number,bool check_succeeded
_file_is_complete = true ; _file_is_complete = true ;
for(uint32_t i=0;i<_map.size();++i) for(uint32_t i=0;i<_map.size();++i)
#ifdef USE_NEW_CHUNK_CHECKING_CODE
if(_map[i] != FileChunksInfo::CHUNK_DONE) if(_map[i] != FileChunksInfo::CHUNK_DONE)
#else
if(_map[i] != FileChunksInfo::CHUNK_DONE && _map[i] != FileChunksInfo::CHUNK_CHECKING)
#endif
{ {
_file_is_complete = false ; _file_is_complete = false ;
break ; break ;
@ -637,13 +617,6 @@ void ChunkMap::getAvailabilityMap(CompressedChunkMap& compressed_map) const
void ChunkMap::forceCheck() void ChunkMap::forceCheck()
{ {
#ifdef USE_NEW_CHUNK_CHECKING_CODE
// In this case (cache files, mainly) we rely on the final hash-checking only.
//
if(_assume_availability)
return ;
#endif
for(uint32_t i=0;i<_map.size();++i) for(uint32_t i=0;i<_map.size();++i)
{ {
_map[i] = FileChunksInfo::CHUNK_CHECKING ; _map[i] = FileChunksInfo::CHUNK_CHECKING ;