added infrastructure for gathering statistics about GxsTransport. Unfinished.

libretroshare/src/gxstrans/p3gxstrans.cc

@@ -31,6 +31,11 @@ p3GxsTrans::~p3GxsTrans()
 	}
 }
 
+bool p3GxsTrans::getStatistics(GxsTransStatistics& stats)
+{
+    stats.prefered_group_id = mPreferredGroupId;
+}
+
 bool p3GxsTrans::sendMail( RsGxsTransId& mailId,
                            GxsTransSubServices service,
                            const RsGxsId& own_gxsid, const RsGxsId& recipient,
@@ -120,9 +125,9 @@ void p3GxsTrans::handleResponse(uint32_t token, uint32_t req_type)
 			        && meta.mGroupId != mPreferredGroupId;
 
 			if(shoudlSubscribe)
-				subscribeToGroup(token, meta.mGroupId, true);
+				RsGenExchange::subscribeToGroup(token, meta.mGroupId, true);
 			else if(shoudlUnSubscribe)
-				subscribeToGroup(token, meta.mGroupId, false);
+				RsGenExchange::subscribeToGroup(token, meta.mGroupId, false);
 
 #ifdef GXS_MAIL_GRP_DEBUG
 			char buff[30];
@@ -337,7 +342,7 @@ void p3GxsTrans::notifyChanges(std::vector<RsGxsNotify*>& changes)
 			std::cout << "p3GxsTrans::notifyChanges(...) msgChange" << std::endl;
 			uint32_t token;
 			RsTokReqOptions opts; opts.mReqType = GXS_REQUEST_TYPE_MSG_DATA;
-			getTokenService()->requestMsgInfo( token, 0xcaca,
+			RsGenExchange::getTokenService()->requestMsgInfo( token, 0xcaca,
 			                                   opts, msgChange->msgChangeMap );
 			GxsTokenQueue::queueRequest(token, MAILS_UPDATE);
 
@@ -393,8 +398,8 @@ bool p3GxsTrans::requestGroupsData(const std::list<RsGxsGroupId>* groupIds)
 	//	std::cout << "p3GxsTrans::requestGroupsList()" << std::endl;
 	uint32_t token;
 	RsTokReqOptions opts; opts.mReqType = GXS_REQUEST_TYPE_GROUP_DATA;
-	if(!groupIds) getTokenService()->requestGroupInfo(token, 0xcaca, opts);
-	else getTokenService()->requestGroupInfo(token, 0xcaca, opts, *groupIds);
+	if(!groupIds) RsGenExchange::getTokenService()->requestGroupInfo(token, 0xcaca, opts);
+	else RsGenExchange::getTokenService()->requestGroupInfo(token, 0xcaca, opts, *groupIds);
 	GxsTokenQueue::queueRequest(token, GROUPS_LIST);
 	return true;
 }

libretroshare/src/gxstrans/p3gxstrans.h

@@ -26,6 +26,7 @@
 #include "gxstrans/p3gxstransitems.h"
 #include "services/p3idservice.h" // For p3IdService
 #include "util/rsthreads.h"
+#include "retroshare/rsgxstrans.h"
 
 struct p3GxsTrans;
 
@@ -76,18 +77,32 @@ struct GxsTransClient
  * @see GxsTransClient::receiveGxsTransMail(...),
  * @see GxsTransClient::notifyGxsTransSendStatus(...).
  */
-struct p3GxsTrans : RsGenExchange, GxsTokenQueue, p3Config
+class p3GxsTrans : public RsGenExchange, public GxsTokenQueue, public p3Config, public RsGxsTrans
 {
+public:
 	p3GxsTrans( RsGeneralDataService* gds, RsNetworkExchangeService* nes,
 	            p3IdService& identities ) :
 	    RsGenExchange( gds, nes, new RsGxsTransSerializer(),
 	                   RS_SERVICE_TYPE_GXS_TRANS, &identities,
 	                   AuthenPolicy(), GXS_STORAGE_PERIOD ),
-	    GxsTokenQueue(this), mIdService(identities),
+	    GxsTokenQueue(this),
+        RsGxsTrans(this),
+        mIdService(identities),
 	    mServClientsMutex("p3GxsTrans client services map mutex"),
 	    mOutgoingMutex("p3GxsTrans outgoing queue map mutex"),
 	    mIngoingMutex("p3GxsTrans ingoing queue map mutex") {}
-	~p3GxsTrans();
+
+	virtual ~p3GxsTrans();
+
+    /*!
+     * \brief getStatistics
+     * 				Gathers all sorts of statistics about the internals of p3GxsTrans, in order to display info about the running status,
+     * 			message transport, etc.
+     * \param stats This structure contains all statistics information.
+     * \return 		true is the call succeeds.
+     */
+
+	virtual bool getStatistics(GxsTransStatistics& stats);
 
 	/**
 	 * Send an email to recipient, in the process author of the email is

libretroshare/src/retroshare/rsgxstrans.h

@@ -0,0 +1,42 @@
+#include "retroshare/rstokenservice.h"
+#include "retroshare/rsgxsifacehelper.h"
+#include "retroshare/rsgxscommon.h"
+
+class RsGxsTransGroup
+{
+	public:
+	RsGroupMetaData mMeta;
+};
+
+class RsGxsTransMsg
+{
+public:
+	RsGxsTransMsg() : size(0),data(NULL) {}
+	virtual ~RsGxsTransMsg() { free(data) ; }
+
+public:
+	RsMsgMetaData mMeta;
+
+	uint32_t size ;
+	uint8_t *data ;
+};
+
+class RsGxsTrans: public RsGxsIfaceHelper
+{
+public:
+	struct GxsTransStatistics
+	{
+		RsGxsGroupId prefered_group_id ;
+	};
+
+	RsGxsTrans(RsGxsIface *gxs) : RsGxsIfaceHelper(gxs) {}
+
+	virtual ~RsGxsTrans() {}
+
+	virtual bool getStatistics(GxsTransStatistics& stats)=0;
+
+//	virtual bool getGroupData(const uint32_t &token, std::vector<RsGxsTransGroup> &groups) = 0;
+//	virtual bool getPostData(const uint32_t &token, std::vector<RsGxsTransMsg> &posts) = 0;
+};
+
+extern RsGxsTrans *rsgxstrans ;