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

fixed a few bugs in internal directory storage structure

Browse Source
This commit is contained in:
mr-alice 2016-08-16 13:46:55 +02:00
parent 2668b6da1c
commit ca8f95c7f7
5 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,17 +101,23 @@ class InternalFileHierarchyStorage
for(uint32_t i=0;i<d.subdirs.size();)
if(subdirs.find(static_cast<DirEntry*>(mNodes[d.subdirs[i]])->dir_name) == subdirs.end())
{
std::cerr << "[directory storage] Removing subdirectory " << static_cast<DirEntry*>(mNodes[d.subdirs[i]])->dir_name << " with index " << d.subdirs[i] << std::endl;
if( !removeDirectory(d.subdirs[i]))
i++ ;
}
else
{
std::cerr << "[directory storage] Keeping existing subdirectory " << static_cast<DirEntry*>(mNodes[d.subdirs[i]])->dir_name << " with index " << d.subdirs[i] << std::endl;
should_create.erase(static_cast<DirEntry*>(mNodes[d.subdirs[i]])->dir_name) ;
++i;
}
for(std::set<std::string>::const_iterator it(should_create.begin());it!=should_create.end();++it)
{
std::cerr << "[directory storage] adding new subdirectory " << *it << " at index " << mNodes.size() << std::endl;
d.subdirs.push_back(mNodes.size()) ;
mNodes.push_back(new DirEntry(*it));
mNodes.back()->row = mNodes.size()-1;
@ -170,9 +176,13 @@ class InternalFileHierarchyStorage
if(it == subfiles.end()) // file does not exist anymore => delete
{
std::cerr << "[directory storage] removing non existing file " << f.file_name << " at index " << d.subfiles[i] << std::endl;
delete mNodes[d.subfiles[i]] ;
mNodes[d.subfiles[i]] = NULL ;
d.subfiles[i] = d.subfiles[d.subfiles.size()-1] ;
d.subfiles.pop_back();
continue;
}
@ -190,6 +200,8 @@ class InternalFileHierarchyStorage
for(std::map<std::string,DirectoryStorage::FileTS>::const_iterator it(new_files.begin());it!=new_files.end();++it)
{
std::cerr << "[directory storage] adding new file " << it->first << " at index " << mNodes.size() << std::endl;
d.subfiles.push_back(mNodes.size()) ;
mNodes.push_back(new FileEntry(it->first,it->second.size,it->second.modtime));
mNodes.back()->row = mNodes.size()-1;
@ -200,7 +212,12 @@ class InternalFileHierarchyStorage
bool updateHash(const DirectoryStorage::EntryIndex& file_index,const RsFileHash& hash)
{
if(!checkIndex(file_index,FileStorageNode::TYPE_FILE))
{
std::cerr << "[directory storage] (EE) cannot update file at index " << file_index << ". Not a valid index, or not a file." << std::endl;
return false;
}
std::cerr << "[directory storage] updating hash at index " << file_index << ", hash=" << hash << std::endl;
static_cast<FileEntry*>(mNodes[file_index])->file_hash = hash ;
return true;
@ -208,10 +225,15 @@ class InternalFileHierarchyStorage
bool updateFile(const DirectoryStorage::EntryIndex& file_index,const RsFileHash& hash, const std::string& fname,uint64_t size, const time_t modf_time)
{
if(!checkIndex(file_index,FileStorageNode::TYPE_FILE))
{
std::cerr << "[directory storage] (EE) cannot update file at index " << file_index << ". Not a valid index, or not a file." << std::endl;
return false;
}
FileEntry& fe(*static_cast<FileEntry*>(mNodes[file_index])) ;
std::cerr << "[directory storage] updating file entry at index " << file_index << ", name=" << fe.file_name << " size=" << fe.file_size << ", hash=" << fe.file_hash << std::endl;
fe.file_hash = hash;
fe.file_size = size;
fe.file_modtime = modf_time;
@ -321,6 +343,12 @@ private:
void recursPrint(int depth,DirectoryStorage::EntryIndex node) const
{
std::string indent(2*depth,' ');
if(mNodes[node] == NULL)
{
std::cerr << "EMPTY NODE !!" << std::endl;
return ;
}
DirEntry& d(*static_cast<DirEntry*>(mNodes[node]));
std::cerr << indent << "dir:" << d.dir_name << std::endl;

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

@ -83,12 +83,6 @@ void LocalDirectoryUpdater::recursUpdateSharedDir(const std::string& cumulated_p
librs::util::FolderIterator dirIt(cumulated_path);
if(!dirIt.isValid())
{
mSharedDirectories->removeDirectory(indx) ; // this is a complex operation since it needs to *update* it so that it is kept consistent.
return ;
}
// collect subdirs and subfiles
std::map<std::string,DirectoryStorage::FileTS> subfiles ;

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

@ -12,7 +12,9 @@ static const uint32_t MAX_INACTIVITY_SLEEP_TIME = 2*1000*1000;
HashStorage::HashStorage(const std::string& save_file_name)
: mFilePath(save_file_name), mHashMtx("Hash Storage mutex")
{
mInactivitySleepTime = DEFAULT_INACTIVITY_SLEEP_TIME;
mRunning = false ;
load() ;
}
@ -63,7 +65,11 @@ void HashStorage::data_tick()
}
mInactivitySleepTime = DEFAULT_INACTIVITY_SLEEP_TIME;
job = mFilesToHash.begin()->second ;
{
RS_STACK_MUTEX(mHashMtx) ;
job = mFilesToHash.begin()->second ;
mFilesToHash.erase(mFilesToHash.begin()) ;
}
std::cerr << "Hashing file " << job.full_path << "..." ; std::cerr.flush();
@ -77,8 +83,6 @@ void HashStorage::data_tick()
else
std::cerr << "done."<< std::endl;
mFilesToHash.erase(mFilesToHash.begin()) ;
// store the result
HashStorageInfo& info(mFiles[job.full_path]);

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

@ -84,6 +84,6 @@ private:
RsMutex mHashMtx ;
bool mRunning;
uint32_t mInactivitySleepTime = 50*1000 ;
uint32_t mInactivitySleepTime ;
};

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

@ -203,21 +203,16 @@ void p3FileDatabase::cleanup()
//
for(std::set<RsPeerId>::const_iterator it(friend_set.begin());it!=friend_set.end();++it)
{
P3FILELISTS_DEBUG() << " adding missing remote dir entry for friend " << *it << std::endl;
// Check if a remote directory exists for that friend, possibly creating the index.
uint32_t i;
for(i=0;i<mDirectories.size() && mDirectories[i] != NULL;++i);
uint32_t friend_index = getFriendIndex(*it) ;
if(i == mDirectories.size())
mDirectories.push_back(NULL) ;
if(mDirectories.size() > friend_index && mDirectories[friend_index] != NULL)
continue ;
mDirectories[i] = new RemoteDirectoryStorage(*it,makeRemoteFileName(*it));
P3FILELISTS_DEBUG() << " adding missing remote dir entry for friend " << *it << ", with index " << friend_index << std::endl;
if(mFriendIndexTab.size() <= i)
mFriendIndexTab.resize(i+1) ;
mFriendIndexTab[i] = *it ;
mFriendIndexMap[*it] = i;
mDirectories[friend_index] = new RemoteDirectoryStorage(*it,makeRemoteFileName(*it));
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_MAP_CHANGED ;
}
@ -249,19 +244,33 @@ uint32_t p3FileDatabase::getFriendIndex(const RsPeerId& pid)
if(!found)
{
std::cerr << "(EE) FriendIndexTab is full. This is weird. Do you really have more than 1024 friends??" << std::endl;
return 1024 ;
found = mFriendIndexTab.size();
mFriendIndexTab.push_back(pid);
}
if(mFriendIndexTab.size() >= (1 << NB_FRIEND_INDEX_BITS) )
{
std::cerr << "(EE) FriendIndexTab is full. This is weird. Do you really have more than " << (1<<NB_FRIEND_INDEX_BITS) << " friends??" << std::endl;
return 1 << NB_FRIEND_INDEX_BITS ;
}
mFriendIndexTab[found] = pid ;
mFriendIndexMap[pid] = found;
if(mDirectories.size() <= found)
mDirectories.resize(found+1,NULL) ;
IndicateConfigChanged();
return found ;
}
else
{
if(mDirectories.size() <= it->second)
mDirectories.resize(it->second+1,NULL) ;
return it->second;
}
}
const RsPeerId& p3FileDatabase::getFriendFromIndex(uint32_t indx) const