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

simplified p3FileList code a little bit: removed mFriendIndexTab and made locked_getFriendIndex() create the remote directories on demand

Browse source
This commit is contained in:
csoler 2016-09-26 22:06:30 +02:00
parent fc1a350869
commit a2ff5d27c5
2 changed files with 41 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

97
libretroshare/src/file_sharing/p3filelists.cc
View file

@ -67,7 +67,7 @@ p3FileDatabase::p3FileDatabase(p3ServiceControl *mpeers)
throw std::runtime_error("Cannot create base directory to store/access file sharing files.") ; throw std::runtime_error("Cannot create base directory to store/access file sharing files.") ;
// loads existing indexes for friends. Some might be already present here. // loads existing indexes for friends. Some might be already present here.
// //
mRemoteDirectories.clear() ; // we should load them! mRemoteDirectories.clear() ; // we should load them!
mOwnId = mpeers->getOwnId() ; mOwnId = mpeers->getOwnId() ;
@ -76,7 +76,7 @@ p3FileDatabase::p3FileDatabase(p3ServiceControl *mpeers)
mLocalDirWatcher = new LocalDirectoryUpdater(mHashCache,mLocalSharedDirs) ; mLocalDirWatcher = new LocalDirectoryUpdater(mHashCache,mLocalSharedDirs) ;
mUpdateFlags = P3FILELISTS_UPDATE_FLAG_NOTHING_CHANGED ; mUpdateFlags = P3FILELISTS_UPDATE_FLAG_NOTHING_CHANGED ;
mLastRemoteDirSweepTS = 0 ; mLastRemoteDirSweepTS = 0 ;
mLastCleanupTime = 0 ; mLastCleanupTime = 0 ;
@ -154,16 +154,16 @@ RsServiceInfo p3FileDatabase::getServiceInfo()
} }
int p3FileDatabase::tick() int p3FileDatabase::tick()
{ {
// tick the input/output list of update items and process them // tick the input/output list of update items and process them
// //
tickRecv() ; tickRecv() ;
tickSend() ; tickSend() ;
time_t now = time(NULL) ; time_t now = time(NULL) ;
// cleanup // cleanup
// - remove/delete shared file lists for people who are not friend anymore // - remove/delete shared file lists for people who are not friend anymore
// - // -
if(mLastCleanupTime + 5 < now) if(mLastCleanupTime + 5 < now)
{ {
@ -176,7 +176,7 @@ int p3FileDatabase::tick()
if(last_print_time + 20 < now) if(last_print_time + 20 < now)
{ {
RS_STACK_MUTEX(mFLSMtx) ; RS_STACK_MUTEX(mFLSMtx) ;
#ifdef DEBUG_FILE_HIERARCHY #ifdef DEBUG_FILE_HIERARCHY
mLocalSharedDirs->print(); mLocalSharedDirs->print();
#endif #endif
@ -439,10 +439,18 @@ void p3FileDatabase::cleanup()
friend_set.erase(mRemoteDirectories[i]->peerId()); friend_set.erase(mRemoteDirectories[i]->peerId());
mFriendIndexMap.erase(mRemoteDirectories[i]->peerId()); mFriendIndexMap.erase(mRemoteDirectories[i]->peerId());
mFriendIndexTab[i].clear();
delete mRemoteDirectories[i]; delete mRemoteDirectories[i];
mRemoteDirectories[i] = NULL ; mRemoteDirectories[i] = NULL ;
// now, in order to avoid empty seats, just move the last one here, and update indexes
mRemoteDirectories[i] = mRemoteDirectories.back();
mRemoteDirectories.pop_back();
mFriendIndexMap[mRemoteDirectories[i]->peerId()] = i;
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_DIRS_CHANGED ;
} }
// look through the remaining list of friends, which are the ones for which no remoteDirectoryStorage class has been allocated. // look through the remaining list of friends, which are the ones for which no remoteDirectoryStorage class has been allocated.
@ -452,21 +460,6 @@ void p3FileDatabase::cleanup()
// 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.
uint32_t friend_index = locked_getFriendIndex(*it) ; uint32_t friend_index = locked_getFriendIndex(*it) ;
if(mRemoteDirectories.size() > friend_index && mRemoteDirectories[friend_index] != NULL)
continue ;
#ifdef DEBUG_P3FILELISTS
P3FILELISTS_DEBUG() << " adding missing remote dir entry for friend " << *it << ", with index " << friend_index << std::endl;
#endif
if(mRemoteDirectories.size() <= friend_index)
mRemoteDirectories.resize(friend_index+1,NULL) ;
mRemoteDirectories[friend_index] = new RemoteDirectoryStorage(*it,makeRemoteFileName(*it));
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_DIRS_CHANGED ;
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_MAP_CHANGED ;
} }
// cancel existing requests for which the peer is offline // cancel existing requests for which the peer is offline
@ -511,8 +504,8 @@ uint32_t p3FileDatabase::locked_getFriendIndex(const RsPeerId& pid)
{ {
// allocate a new index for that friend, and tell that we should save. // allocate a new index for that friend, and tell that we should save.
uint32_t found = 0 ; uint32_t found = 0 ;
for(uint32_t i=0;i<mFriendIndexTab.size();++i) for(uint32_t i=0;i<mRemoteDirectories.size();++i)
if(mFriendIndexTab[i].isNull()) if(mRemoteDirectories[i] == NULL)
{ {
found = i ; found = i ;
break; break;
@ -520,22 +513,25 @@ uint32_t p3FileDatabase::locked_getFriendIndex(const RsPeerId& pid)
if(!found) if(!found)
{ {
found = mFriendIndexTab.size(); found = mRemoteDirectories.size();
mFriendIndexTab.push_back(pid); mRemoteDirectories.push_back(new RemoteDirectoryStorage(pid,makeRemoteFileName(pid)));
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_DIRS_CHANGED ;
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_MAP_CHANGED ;
#ifdef DEBUG_P3FILELISTS
P3FILELISTS_DEBUG() << " adding missing remote dir entry for friend " << *it << ", with index " << friend_index << std::endl;
#endif
} }
if(mFriendIndexTab.size() >= (1 << NB_FRIEND_INDEX_BITS) ) if(mRemoteDirectories.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; 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 ; return 1 << NB_FRIEND_INDEX_BITS ;
} }
mFriendIndexTab[found] = pid ;
mFriendIndexMap[pid] = found; mFriendIndexMap[pid] = found;
if(mRemoteDirectories.size() <= found)
mRemoteDirectories.resize(found,NULL) ;
IndicateConfigChanged(); IndicateConfigChanged();
return found ; return found ;
@ -543,27 +539,22 @@ uint32_t p3FileDatabase::locked_getFriendIndex(const RsPeerId& pid)
else else
{ {
if(mRemoteDirectories.size() <= it->second) if(mRemoteDirectories.size() <= it->second)
mRemoteDirectories.resize(it->second,NULL) ; {
mRemoteDirectories.resize(it->second+1,NULL) ;
mRemoteDirectories[it->second] = new RemoteDirectoryStorage(pid,makeRemoteFileName(pid));
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_DIRS_CHANGED ;
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_MAP_CHANGED ;
#ifdef DEBUG_P3FILELISTS
P3FILELISTS_DEBUG() << " adding missing remote dir entry for friend " << *it << ", with index " << friend_index << std::endl;
#endif
}
return it->second; return it->second;
} }
} }
const RsPeerId& p3FileDatabase::locked_getFriendFromIndex(uint32_t indx) const
{
static const RsPeerId null_id ;
if(indx >= mFriendIndexTab.size())
return null_id ;
if(mFriendIndexTab[indx].isNull())
{
std::cerr << "(EE) null friend id requested from index " << indx << ": this is a bug, most likely" << std::endl;
return null_id ;
}
return mFriendIndexTab[indx];
}
bool p3FileDatabase::convertPointerToEntryIndex(const void *p, EntryIndex& e, uint32_t& friend_index) bool p3FileDatabase::convertPointerToEntryIndex(const void *p, EntryIndex& e, uint32_t& friend_index)
{ {
// trust me, I can do this ;-) // trust me, I can do this ;-)
@ -1352,12 +1343,6 @@ void p3FileDatabase::handleDirSyncResponse(RsFileListsSyncResponseItem *sitem)
// make sure we have a remote directory for that friend. // make sure we have a remote directory for that friend.
if(mRemoteDirectories.size() <= fi)
mRemoteDirectories.resize(fi+1,NULL) ;
if(mRemoteDirectories[fi] == NULL)
mRemoteDirectories[fi] = new RemoteDirectoryStorage(item->PeerId(),makeRemoteFileName(item->PeerId()));
if(!mRemoteDirectories[fi]->getIndexFromDirHash(item->entry_hash,entry_index)) if(!mRemoteDirectories[fi]->getIndexFromDirHash(item->entry_hash,entry_index))
{ {
std::cerr << std::endl; std::cerr << std::endl;

1
libretroshare/src/file_sharing/p3filelists.h
View file

@ -196,7 +196,6 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub
static bool convertEntryIndexToPointer(const EntryIndex &e, uint32_t friend_index, void *& p); static bool convertEntryIndexToPointer(const EntryIndex &e, uint32_t friend_index, void *& p);
static bool convertPointerToEntryIndex(const void *p, EntryIndex& e, uint32_t& friend_index) ; static bool convertPointerToEntryIndex(const void *p, EntryIndex& e, uint32_t& friend_index) ;
uint32_t locked_getFriendIndex(const RsPeerId& pid); uint32_t locked_getFriendIndex(const RsPeerId& pid);
const RsPeerId& locked_getFriendFromIndex(uint32_t indx) const;
void handleDirSyncRequest (RsFileListsSyncRequestItem *) ; void handleDirSyncRequest (RsFileListsSyncRequestItem *) ;
void handleDirSyncResponse (RsFileListsSyncResponseItem *) ; void handleDirSyncResponse (RsFileListsSyncResponseItem *) ;