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

- Added service_createGroup function which gives access to group keys and grpItem just before GXS group creation

Browse source 
- Temp fix for GXS services hang on dummy data generation. Given each GXS service own thread and chunked grp creation (separate thread may need to be permanent, no obvious around move grp gen cost away from critical path of tick, but unscientifically increases each services thread tick period to reduce cpu cost)

- change grpId assignment from hash of grp data to admin keyid

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5772 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2012-11-04 01:38:48 +00:00
parent e42cc1123c
commit 49096d29d2
3 changed files with 189 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libretroshare/src/rsserver/rsinit.cc
View file

@ -1830,7 +1830,7 @@ RsTurtle *rsTurtle = NULL ;
#include "services/p3photoserviceV2.h"
// Not too many to convert now!
//#include "services/p3wikiserviceVEG.h"
#include "services/p3wikiserviceVEG.h"
#include "services/p3wireVEG.h"
//#include "services/p3idserviceVEG.h"
#include "services/p3forumsVEG.h"
@ -2281,8 +2281,8 @@ int RsServer::StartupRetroShare()
#ifdef ENABLE_GXS_SERVICES
// Testing New Cache Services.
//p3WikiServiceVEG *mWikis = new p3WikiServiceVEG(RS_SERVICE_GXSV1_TYPE_WIKI);
//pqih -> addService(mWikis);
p3WikiServiceVEG *mWikis = new p3WikiServiceVEG(RS_SERVICE_GXSV1_TYPE_WIKI);
pqih -> addService(mWikis);
// Testing New Cache Services.
p3WireVEG *mWire = new p3WireVEG(RS_SERVICE_GXSV1_TYPE_WIRE);
@ -2371,12 +2371,17 @@ int RsServer::StartupRetroShare()
/*** start up GXS core runner ***/
GxsCoreServer* mGxsCore = new GxsCoreServer();
mGxsCore->addService(mGxsIdService);
// GxsCoreServer* mGxsCore = new GxsCoreServer();
//mGxsCore->addService(mGxsIdService);
#if ENABLE_OTHER_GXS_SERVICES
mGxsCore->addService(mPhotoV2);
mGxsCore->addService(mPosted);
mGxsCore->addService(mWiki);
createThread(*mGxsIdService);
createThread(*mPhotoV2);
createThread(*mPosted);
createThread(*mWiki);
//
// mGxsCore->addService(mPhotoV2);
// mGxsCore->addService(mPosted);
// mGxsCore->addService(mWiki);
#endif
// cores ready start up GXS net servers
@ -2396,7 +2401,7 @@ int RsServer::StartupRetroShare()
#endif
// start up gxs core server
createThread(*mGxsCore);
//createThread(*mGxsCore);
#endif