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

added display of hash progress

Browse Source
This commit is contained in:
mr-alice 2016-09-15 21:40:53 +02:00
parent d3b46221ff
commit 2343c91055
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libretroshare/src/file_sharing/hash_cache.cc
View File

@ -41,12 +41,33 @@ HashStorage::HashStorage(const std::string& save_file_name)
mInactivitySleepTime = DEFAULT_INACTIVITY_SLEEP_TIME; mInactivitySleepTime = DEFAULT_INACTIVITY_SLEEP_TIME;
mRunning = false ; mRunning = false ;
mLastSaveTime = 0 ; mLastSaveTime = 0 ;
mTotalSizeToHash = 0;
mTotalFilesToHash = 0;
{ {
RS_STACK_MUTEX(mHashMtx) ; RS_STACK_MUTEX(mHashMtx) ;
locked_load() ; locked_load() ;
} }
} }
static std::string friendlyUnit(uint64_t val)
{
const std::string units[5] = {"B","KB","MB","GB","TB"};
char buf[50] ;
double fact = 1.0 ;
for(unsigned int i=0; i<5; ++i)
if(double(val)/fact < 1024.0)
{
sprintf(buf,"%2.2f",double(val)/fact) ;
return std::string(buf) + " " + units[i];
}
else
fact *= 1024.0f ;
sprintf(buf,"%2.2f",double(val)/fact*1024.0f) ;
return std::string(buf) + " TB";
}
void HashStorage::data_tick() void HashStorage::data_tick()
{ {
@ -93,6 +114,8 @@ void HashStorage::data_tick()
std::cerr << "Stopping hashing thread." << std::endl; std::cerr << "Stopping hashing thread." << std::endl;
shutdown(); shutdown();
mRunning = false ; mRunning = false ;
mTotalSizeToHash = 0;
mTotalFilesToHash = 0;
std::cerr << "done." << std::endl; std::cerr << "done." << std::endl;
} }
@ -110,6 +133,7 @@ void HashStorage::data_tick()
{ {
RS_STACK_MUTEX(mHashMtx) ; RS_STACK_MUTEX(mHashMtx) ;
job = mFilesToHash.begin()->second ; job = mFilesToHash.begin()->second ;
mFilesToHash.erase(mFilesToHash.begin()) ; mFilesToHash.erase(mFilesToHash.begin()) ;
} }
@ -117,9 +141,9 @@ void HashStorage::data_tick()
std::cerr << "Hashing file " << job.full_path << "..." ; std::cerr.flush(); std::cerr << "Hashing file " << job.full_path << "..." ; std::cerr.flush();
std::string tmpout; std::string tmpout;
//rs_sprintf(tmpout, "%lu/%lu (%s - %d%%) : %s", cnt+1, n_files, friendlyUnit(size).c_str(), int(size/double(total_size)*100.0), fe.name.c_str()) ; rs_sprintf(tmpout, "%lu/%lu (%s - %d%%) : %s", mHashCounter+1, mTotalFilesToHash, friendlyUnit(mTotalHashedSize).c_str(), int(mTotalHashedSize/double(mTotalSizeToHash)*100.0), job.full_path.c_str()) ;
RsServer::notify()->notifyHashingInfo(NOTIFY_HASHTYPE_HASH_FILE, job.full_path) ; RsServer::notify()->notifyHashingInfo(NOTIFY_HASHTYPE_HASH_FILE, tmpout) ;
if(!RsDirUtil::getFileHash(job.full_path, hash,size, this)) if(!RsDirUtil::getFileHash(job.full_path, hash,size, this))
std::cerr << "ERROR: cannot hash file " << job.full_path << std::endl; std::cerr << "ERROR: cannot hash file " << job.full_path << std::endl;
@ -139,6 +163,8 @@ void HashStorage::data_tick()
info.hash = hash; info.hash = hash;
mChanged = true ; mChanged = true ;
++mHashCounter ;
mTotalHashedSize += size ;
} }
} }
// call the client // call the client
@ -181,16 +207,23 @@ bool HashStorage::requestHash(const std::string& full_path,uint64_t size,time_t
FileHashJob job ; FileHashJob job ;
job.client = c ; job.client = c ;
job.size = size ;
job.client_param = client_param ; job.client_param = client_param ;
job.full_path = full_path ; job.full_path = full_path ;
job.ts = mod_time ; job.ts = mod_time ;
mFilesToHash[full_path] = job; mFilesToHash[full_path] = job;
mTotalSizeToHash += size ;
++mTotalFilesToHash;
if(!mRunning) if(!mRunning)
{ {
mRunning = true ; mRunning = true ;
std::cerr << "Starting hashing thread." << std::endl; std::cerr << "Starting hashing thread." << std::endl;
mHashCounter = 0;
mTotalHashedSize = 0;
start() ; start() ;
} }

5
libretroshare/src/file_sharing/hash_cache.h
View File

@ -97,6 +97,7 @@ private:
struct FileHashJob struct FileHashJob
{ {
std::string full_path; std::string full_path;
uint64_t size ;
HashStorageClient *client; HashStorageClient *client;
uint32_t client_param ; uint32_t client_param ;
time_t ts; time_t ts;
@ -110,7 +111,11 @@ private:
RsMutex mHashMtx ; RsMutex mHashMtx ;
bool mRunning; bool mRunning;
uint32_t mHashCounter;
uint32_t mInactivitySleepTime ; uint32_t mInactivitySleepTime ;
uint64_t mTotalSizeToHash ;
uint64_t mTotalHashedSize ;
uint64_t mTotalFilesToHash ;
time_t mLastSaveTime ; time_t mLastSaveTime ;
}; };