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

Added rsshared ptr helper object (only use in test for memory management)

Browse source 
Added first nxs_test
modified pserviceserver to allow better dependency injection 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7279 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2014-04-18 21:58:14 +00:00
parent a929f80596
commit ef8f48ae73
17 changed files with 340 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/pqi/pqiservice.cc
View file

@ -33,7 +33,7 @@ const int pqiservicezone = 60478;
* #define SERVICE_DEBUG 1
****/
void pqiService::setServiceServer(p3ServiceServer *server)
void pqiService::setServiceServer(p3ServiceServerIface *server)
{
mServiceServer = server;
}

23
libretroshare/src/pqi/pqiservice.h
View file

@ -55,7 +55,7 @@
// DataType is defined in the serialiser directory.
class RsRawItem;
class p3ServiceServer;
class p3ServiceServerIface;
class pqiService
@ -68,7 +68,7 @@ class pqiService
virtual ~pqiService() { return; }
public:
void setServiceServer(p3ServiceServer *server);
void setServiceServer(p3ServiceServerIface *server);
//
virtual bool recv(RsRawItem *) = 0;
virtual bool send(RsRawItem *item);
@ -78,7 +78,7 @@ virtual RsServiceInfo getServiceInfo() = 0;
virtual int tick() { return 0; }
private:
p3ServiceServer *mServiceServer; // const, no need for mutex.
p3ServiceServerIface *mServiceServer; // const, no need for mutex.
};
#include <map>
@ -89,7 +89,21 @@ virtual int tick() { return 0; }
* to the base level pqiPublisher instead.
*/
class p3ServiceServer
// use interface to allow DI
class p3ServiceServerIface
{
public:
virtual ~p3ServiceServerIface() {}
virtual bool recvItem(RsRawItem *) = 0;
virtual bool sendItem(RsRawItem *) = 0;
};
class p3ServiceServer : public p3ServiceServerIface
{
public:
p3ServiceServer(pqiPublisher *pub, p3ServiceControl *ctrl);
@ -100,6 +114,7 @@ bool recvItem(RsRawItem *);
bool sendItem(RsRawItem *);
int tick();
public:
private: