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

fixed hashing thread

Browse source
This commit is contained in:
mr-alice 2016-07-28 00:48:28 +02:00
parent d86b89b15a
commit 463f21c85c
6 changed files with 92 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

52
libretroshare/src/file_sharing/hash_cache.cc
View file

@ -6,13 +6,14 @@
HashStorage::HashStorage(const std::string& save_file_name)
: mFilePath(save_file_name), mHashMtx("Hash Storage mutex")
{
mRunning = false ;
}
void HashStorage::data_tick()
{
std::cerr << "Ticking hash thread." << std::endl;
FileHashJob job;
RsFileHash hash;
uint64_t size ;
{
RS_STACK_MUTEX(mHashMtx) ;
@ -21,33 +22,29 @@ void HashStorage::data_tick()
return ;
job = mFilesToHash.begin()->second ;
std::cerr << "Hashing file " << job.full_path << "..." ; std::cerr.flush();
if(!RsDirUtil::getFileHash(job.full_path, hash,size, this))
std::cerr << "ERROR: cannot hash file " << job.full_path << std::endl;
else
std::cerr << "done."<< std::endl;
mFilesToHash.erase(mFilesToHash.begin()) ;
if(mFilesToHash.empty())
{
std::cerr << "Stopping hashing thread." << std::endl;
shutdown();
mRunning = false ;
std::cerr << "done." << std::endl;
}
}
std::cerr << "Hashing file " << job.full_path << "..." ; std::cerr.flush();
RsFileHash hash;
uint64_t size ;
if(!RsDirUtil::getFileHash(job.full_path, hash,size, this))
{
std::cerr << "ERROR" << std::endl;
return;
}
// update the hash storage
// call the client
job.client->hash_callback(job.client_param, job.full_path, hash, size);
std::cerr << "done."<< std::endl;
if(mFilesToHash.empty())
{
std::cerr << "Starting hashing thread." << std::endl;
fullstop();
std::cerr << "done." << std::endl;
}
if(!hash.isNull())
job.client->hash_callback(job.client_param, job.full_path, hash, size);
}
bool HashStorage::requestHash(const std::string& full_path,uint64_t size,time_t mod_time,RsFileHash& known_hash,HashStorageClient *c,uint32_t client_param)
@ -81,8 +78,9 @@ bool HashStorage::requestHash(const std::string& full_path,uint64_t size,time_t
mFilesToHash[full_path] = job;
if(!isRunning())
if(!mRunning)
{
mRunning = true ;
std::cerr << "Starting hashing thread." << std::endl;
start() ;
}