Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-26 23:36:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #517 from sehraf/pr-filelist-fixes

Browse Source 
add thread names & remove warnings
This commit is contained in:
Cyril Soler 2016-09-27 09:59:51 +02:00 committed by GitHub
commit 0bcb6c323c
6 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/file_sharing/dir_hierarchy.cc
View File

@ -184,7 +184,7 @@ bool InternalFileHierarchyStorage::updateSubDirectoryList(const DirectoryStorage
return true; return true;
} }
RsFileHash InternalFileHierarchyStorage::createDirHash(const std::string& dir_name,const std::string& dir_parent_path) RsFileHash InternalFileHierarchyStorage::createDirHash(const std::string &/*dir_name*/, const std::string &/*dir_parent_path*/)
{ {
// What we need here: a unique identifier // What we need here: a unique identifier
// - that cannot be bruteforced to find the real directory name and path // - that cannot be bruteforced to find the real directory name and path
@ -226,7 +226,7 @@ bool InternalFileHierarchyStorage::removeDirectory(DirectoryStorage::EntryIndex
parent_dir.subdirs[i] = parent_dir.subdirs.back() ; parent_dir.subdirs[i] = parent_dir.subdirs.back() ;
parent_dir.subdirs.pop_back(); parent_dir.subdirs.pop_back();
bool res = recursRemoveDirectory(indx) ; recursRemoveDirectory(indx) ;
#ifdef DEBUG_DIRECTORY_STORAGE #ifdef DEBUG_DIRECTORY_STORAGE
print(); print();
std::string err ; std::string err ;

4
libretroshare/src/file_sharing/directory_storage.cc
View File

@ -426,6 +426,10 @@ void LocalDirectoryStorage::updateTimeStamps()
#ifdef DEBUG_LOCAL_DIRECTORY_STORAGE #ifdef DEBUG_LOCAL_DIRECTORY_STORAGE
std::cerr << "LocalDirectoryStorage: global last modf time is " << last_modf_time << " (which is " << time(NULL) - last_modf_time << " secs ago)" << std::endl; std::cerr << "LocalDirectoryStorage: global last modf time is " << last_modf_time << " (which is " << time(NULL) - last_modf_time << " secs ago)" << std::endl;
#else
// remove unused variable warning
// variable is only used for debugging
(void)last_modf_time;
#endif #endif
} }
} }

4
libretroshare/src/file_sharing/directory_updater.cc
View File

@ -55,7 +55,7 @@ void LocalDirectoryUpdater::setEnabled(bool b)
return ; return ;
if(b) if(b)
start() ; start("fs dir updater") ;
else else
shutdown(); shutdown();
@ -203,7 +203,7 @@ bool LocalDirectoryUpdater::inDirectoryCheck() const
return mHashCache->isRunning(); return mHashCache->isRunning();
} }
void LocalDirectoryUpdater::hash_callback(uint32_t client_param, const std::string& name, const RsFileHash& hash, uint64_t size) void LocalDirectoryUpdater::hash_callback(uint32_t client_param, const std::string &/*name*/, const RsFileHash &hash, uint64_t /*size*/)
{ {
if(!mSharedDirectories->updateHash(DirectoryStorage::EntryIndex(client_param),hash)) if(!mSharedDirectories->updateHash(DirectoryStorage::EntryIndex(client_param),hash))
std::cerr << "(EE) Cannot update file. Something's wrong." << std::endl; std::cerr << "(EE) Cannot update file. Something's wrong." << std::endl;

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

@ -252,7 +252,7 @@ bool HashStorage::requestHash(const std::string& full_path,uint64_t size,time_t
mHashCounter = 0; mHashCounter = 0;
mTotalHashedSize = 0; mTotalHashedSize = 0;
start() ; start("fs hash cache") ;
} }
return false; return false;
@ -301,7 +301,9 @@ bool HashStorage::locked_load()
} }
uint32_t offset = 0 ; uint32_t offset = 0 ;
HashStorageInfo info ; HashStorageInfo info ;
#ifdef HASHSTORAGE_DEBUG
uint32_t n=0; uint32_t n=0;
#endif
while(offset < data_size) while(offset < data_size)
if(readHashStorageInfo(data,data_size,offset,info)) if(readHashStorageInfo(data,data_size,offset,info))

11
libretroshare/src/file_sharing/p3filelists.cc
View File

@ -239,7 +239,7 @@ void p3FileDatabase::startThreads()
#ifdef DEBUG_P3FILELISTS #ifdef DEBUG_P3FILELISTS
P3FILELISTS_DEBUG() << "Starting directory watcher thread..." ; P3FILELISTS_DEBUG() << "Starting directory watcher thread..." ;
#endif #endif
mLocalDirWatcher->start(); mLocalDirWatcher->start("fs dir watcher");
#ifdef DEBUG_P3FILELISTS #ifdef DEBUG_P3FILELISTS
P3FILELISTS_DEBUG() << "Done." << std::endl; P3FILELISTS_DEBUG() << "Done." << std::endl;
#endif #endif
@ -458,8 +458,7 @@ void p3FileDatabase::cleanup()
for(std::set<RsPeerId>::const_iterator it(friend_set.begin());it!=friend_set.end();++it) for(std::set<RsPeerId>::const_iterator it(friend_set.begin());it!=friend_set.end();++it)
{ {
// Check if a remote directory exists for that friend, possibly creating the index. // Check if a remote directory exists for that friend, possibly creating the index.
locked_getFriendIndex(*it) ;
uint32_t friend_index = locked_getFriendIndex(*it) ;
} }
// cancel existing requests for which the peer is offline // cancel existing requests for which the peer is offline
@ -639,8 +638,8 @@ bool p3FileDatabase::findChildPointer(void *ref, int row, void *& result, FileSe
convertEntryIndexToPointer(mRemoteDirectories[row]->root(),row+1,result); convertEntryIndexToPointer(mRemoteDirectories[row]->root(),row+1,result);
return true; return true;
} }
else else
return false; return false;
uint32_t fi; uint32_t fi;
DirectoryStorage::EntryIndex e ; DirectoryStorage::EntryIndex e ;
@ -788,7 +787,7 @@ int p3FileDatabase::RequestDirDetails(void *ref, DirDetails& d, FileSearchFlags
return true; return true;
} }
int p3FileDatabase::RequestDirDetails(const RsPeerId& uid,const std::string& path, DirDetails &details) const int p3FileDatabase::RequestDirDetails(const RsPeerId &/*uid*/, const std::string &/*path*/, DirDetails &/*details*/) const
{ {
NOT_IMPLEMENTED(); NOT_IMPLEMENTED();
return 0; return 0;

2
libretroshare/src/file_sharing/rsfilelistitems.cc
View File

@ -226,10 +226,12 @@ RsFileListsSyncResponseItem* RsFileListsSerialiser::deserialFileListsSyncRespons
RsFileListsSyncResponseItem* item = new RsFileListsSyncResponseItem(); RsFileListsSyncResponseItem* item = new RsFileListsSyncResponseItem();
/*
uint32_t entry_index ; // index of the directory to sync uint32_t entry_index ; // index of the directory to sync
uint32_t flags; // used to say that it's a request or a response, say that the directory has been removed, ask for further update, etc. uint32_t flags; // used to say that it's a request or a response, say that the directory has been removed, ask for further update, etc.
uint32_t last_known_recurs_modf_TS; // time of last modification, computed over all files+directories below. uint32_t last_known_recurs_modf_TS; // time of last modification, computed over all files+directories below.
uint64_t request_id; // use to determine if changes that have occured since last hash uint64_t request_id; // use to determine if changes that have occured since last hash
*/
ok &= item->entry_hash.deserialise(data, *size, offset); ok &= item->entry_hash.deserialise(data, *size, offset);
ok &= item->checksum.deserialise(data, *size, offset); ok &= item->checksum.deserialise(data, *size, offset);