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

fixed up plugin system to work with v0.6

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7287 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-04-20 14:20:13 +00:00
parent 2d2a906ef2
commit ca6b463a31
7 changed files with 134 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libretroshare/src/plugins/pluginmanager.cc
View file

@ -40,8 +40,7 @@ std::string RsPluginManager::_local_cache_dir ;
std::string RsPluginManager::_remote_cache_dir ;
std::vector<std::string> RsPluginManager::_plugin_directories ;
ftServer *RsPluginManager::_ftserver = NULL ;
p3LinkMgr *RsPluginManager::_linkmgr = NULL ;
RsServiceControl *RsPluginManager::_service_control = NULL ;
typedef RsPlugin *(*RetroSharePluginEntry)(void) ;
RsPluginHandler *rsPlugins ;
@ -363,18 +362,6 @@ bool RsPluginManager::loadPlugin(const std::string& plugin_name)
return true;
}
p3LinkMgr *RsPluginManager::getLinkMgr() const
{
assert(_linkmgr != NULL) ;
return _linkmgr ;
}
ftServer *RsPluginManager::getFileServer() const
{
assert(_ftserver != NULL) ;
return _ftserver ;
}
const std::string& RsPluginManager::getLocalCacheDir() const
{
assert(!_local_cache_dir.empty()) ;
@ -385,6 +372,11 @@ const std::string& RsPluginManager::getRemoteCacheDir() const
assert(!_remote_cache_dir.empty()) ;
return _remote_cache_dir ;
}
RsServiceControl *RsPluginManager::getServiceControl() const
{
assert(_service_control);
return _service_control ;
}
void RsPluginManager::slowTickPlugins(time_t seconds)
{
for(uint32_t i=0;i<_plugins.size();++i)
@ -531,13 +523,13 @@ bool RsPluginManager::saveList(bool& cleanup, std::list<RsItem*>& list)
return true;
}
RsCacheService::RsCacheService(uint16_t service_type,uint32_t tick_delay, RsPluginHandler* pgHandler)
: CacheSource(service_type, true, pgHandler->getFileServer()->getCacheStrapper(), pgHandler->getLocalCacheDir()),
CacheStore (service_type, true, pgHandler->getFileServer()->getCacheStrapper(), pgHandler->getFileServer()->getCacheTransfer(), pgHandler->getRemoteCacheDir()),
p3Config(),
_tick_delay_in_seconds(tick_delay)
{
}
// RsCacheService::RsCacheService(uint16_t service_type,uint32_t tick_delay, RsPluginHandler* pgHandler)
// : CacheSource(service_type, true, pgHandler->getFileServer()->getCacheStrapper(), pgHandler->getLocalCacheDir()),
// CacheStore (service_type, true, pgHandler->getFileServer()->getCacheStrapper(), pgHandler->getFileServer()->getCacheTransfer(), pgHandler->getRemoteCacheDir()),
// p3Config(),
// _tick_delay_in_seconds(tick_delay)
// {
// }
RsPQIService::RsPQIService(uint16_t service_type,uint32_t /*tick_delay_in_seconds*/, RsPluginHandler* /*pgHandler*/)
: p3Service(),p3Config()