Finished Notifications in p3ServiceControl:

- added extra Mutex to make notifications work.
 - Added ServiceControl tick to ServiceServer.
 - switched p3discovery2 from pqiMonitor -> pqiServiceMonitor



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7201 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-03-23 03:30:59 +00:00
parent 708f6d6b43
commit a06064e167
6 changed files with 212 additions and 66 deletions

View file

@ -1604,15 +1604,20 @@ int RsServer::StartupRetroShare()
/**************************************************************************/
/* need to Monitor too! */
mLinkMgr->addMonitor(serviceInfo);
mLinkMgr->addMonitor(pqih);
mLinkMgr->addMonitor(serviceCtrl);
mLinkMgr->addMonitor(serviceInfo);
// below should be changed to pqiServiceMonitors....
mLinkMgr->addMonitor(mCacheStrapper);
mLinkMgr->addMonitor(mDisc);
mLinkMgr->addMonitor(msgSrv);
mLinkMgr->addMonitor(mStatusSrv);
mLinkMgr->addMonitor(chatSrv);
mLinkMgr->addMonitor(mBwCtrl);
// Services that have been changed to pqiServiceMonitor
serviceCtrl->registerServiceMonitor(mDisc, mDisc->getServiceInfo().mServiceType);
/* must also add the controller as a Monitor...
* a little hack to get it to work.
*/