Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-03 11:54:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

removed channel delete feature

Browse source 
added optimisation suggestion with load/savelist

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3920 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2010-12-18 19:35:07 +00:00
parent d3a6f7316c
commit 2f559dae96
37 changed files with 133 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libretroshare/src/ft/ftcontroller.cc
View file

@ -1862,10 +1862,9 @@ RsSerialiser *ftController::setupSerialiser()
return rss;
}
std::list<RsItem *> ftController::saveList(bool &cleanup)
bool ftController::saveList(bool &cleanup, std::list<RsItem *>& saveData)
{
std::list<RsItem *> saveData;
/* it can delete them! */
cleanup = true;
@ -1977,11 +1976,11 @@ std::list<RsItem *> ftController::saveList(bool &cleanup)
}
/* list completed! */
return saveData;
return true;
}
bool ftController::loadList(std::list<RsItem *> load)
bool ftController::loadList(std::list<RsItem *>& load)
{
std::list<RsItem *>::iterator it;
std::list<RsTlvKeyValue>::iterator kit;

4
libretroshare/src/ft/ftcontroller.h
View file

@ -206,8 +206,8 @@ class ftController: public CacheTransfer, public RsThread, public pqiMonitor, pu
/* p3Config Interface */
virtual RsSerialiser *setupSerialiser();
virtual std::list<RsItem *> saveList(bool &cleanup);
virtual bool loadList(std::list<RsItem *> load);
virtual bool saveList(bool &cleanup, std::list<RsItem *>&);
virtual bool loadList(std::list<RsItem *>& load);
bool loadConfigMap(std::map<std::string, std::string> &configMap);
private:

8
libretroshare/src/ft/ftdbase.cc
View file

@ -205,9 +205,9 @@ RsSerialiser *ftFiMonitor::setupSerialiser()
const std::string hash_cache_duration_ss("HASH_CACHE_DURATION");
const std::string hash_cache_ss("HASH_CACHE");
std::list<RsItem *> ftFiMonitor::saveList(bool &cleanup)
bool ftFiMonitor::saveList(bool &cleanup, std::list<RsItem *>& sList)
{
std::list<RsItem *> sList;
cleanup = true;
@ -256,11 +256,11 @@ std::list<RsItem *> ftFiMonitor::saveList(bool &cleanup)
/* Add KeyValue to saveList */
sList.push_back(rskv);
return sList;
return true;
}
bool ftFiMonitor::loadList(std::list<RsItem *> load)
bool ftFiMonitor::loadList(std::list<RsItem *>& load)
{
/* for each item, check it exists ....
* - remove any that are dead (or flag?)

4
libretroshare/src/ft/ftdbase.h
View file

@ -78,8 +78,8 @@ class ftFiMonitor: public FileIndexMonitor, public ftSearch, public p3Config
protected:
virtual RsSerialiser *setupSerialiser();
virtual std::list<RsItem *> saveList(bool &cleanup);
virtual bool loadList(std::list<RsItem *> load);
virtual bool saveList(bool &cleanup, std::list<RsItem *>&);
virtual bool loadList(std::list<RsItem *>& load);
};

8
libretroshare/src/ft/ftextralist.cc
View file

@ -363,9 +363,9 @@ RsSerialiser *ftExtraList::setupSerialiser()
return rss;
}
std::list<RsItem *> ftExtraList::saveList(bool &cleanup)
bool ftExtraList::saveList(bool &cleanup, std::list<RsItem *>& sList)
{
std::list<RsItem *> sList;
cleanup = true;
@ -397,11 +397,11 @@ std::list<RsItem *> ftExtraList::saveList(bool &cleanup)
sList.push_back(fi);
}
return sList;
return true;
}
bool ftExtraList::loadList(std::list<RsItem *> load)
bool ftExtraList::loadList(std::list<RsItem *>& load)
{
/* for each item, check it exists ....
* - remove any that are dead (or flag?)

4
libretroshare/src/ft/ftextralist.h
View file

@ -151,8 +151,8 @@ virtual void run();
**/
protected:
virtual RsSerialiser *setupSerialiser();
virtual std::list<RsItem *> saveList(bool &cleanup);
virtual bool loadList(std::list<RsItem *> load);
virtual bool saveList(bool &cleanup, std::list<RsItem*>&);
virtual bool loadList(std::list<RsItem *>& load);
private:

8
libretroshare/src/ft/ftserver.cc
View file

@ -705,13 +705,13 @@ RsSerialiser *ftServer::setupSerialiser()
return NULL;
}
std::list<RsItem *> ftServer::saveList(bool &cleanup)
bool ftServer::saveList(bool &cleanup, std::list<RsItem *>& list)
{
std::list<RsItem *> list;
return list;
return true;
}
bool ftServer::loadList(std::list<RsItem *> load)
bool ftServer::loadList(std::list<RsItem *>& load)
{
return true;
}

4
libretroshare/src/ft/ftserver.h
View file

@ -241,8 +241,8 @@ bool handleFileData();
protected:
/* Key Functions to be overloaded for Full Configuration */
virtual RsSerialiser *setupSerialiser();
virtual std::list<RsItem *> saveList(bool &cleanup);
virtual bool loadList(std::list<RsItem *> load);
virtual bool saveList(bool &cleanup, std::list<RsItem *>&);
virtual bool loadList(std::list<RsItem *>& load);
private:
bool loadConfigMap(std::map<std::string, std::string> &configMap);