removed TokenQueue from UserNotify

libretroshare/src/retroshare/rsgxschannels.h

@@ -409,6 +409,14 @@ public:
 	virtual bool subscribeToChannel( const RsGxsGroupId& channelId,
 	                                 bool subscribe ) = 0;
 
+    /**
+     * \brief Retrieve statistics about the channel service
+	 * @jsonapi{development}
+     * \param[out] stat       Statistics structure
+     * \return
+     */
+    virtual bool getChannelServiceStatistics(GxsServiceStatistic& stat) =0;
+
     /**
      * \brief Retrieve statistics about the given channel
 	 * @jsonapi{development}
@@ -418,6 +426,7 @@ public:
      */
     virtual bool getChannelStatistics(const RsGxsGroupId& channelId,GxsGroupStatistic& stat) =0;
 
+
 	/**
 	 * @brief Request remote channels search
 	 * @jsonapi{development}

libretroshare/src/retroshare/rsgxsforums.h

@@ -219,6 +219,14 @@ public:
 	 */
 	virtual bool getForumsSummaries(std::list<RsGroupMetaData>& forums) = 0;
 
+    /**
+     * @brief returns statistics for the forum service
+	 * @jsonapi{development}
+     * @param[out] stat     statistics struct
+     * @return              false if the call fails
+     */
+	virtual bool getForumServiceStatistics(GxsServiceStatistic& stat) =0;
+
     /**
      * @brief returns statistics about a particular forum
 	 * @jsonapi{development}
@@ -228,6 +236,7 @@ public:
      */
 	virtual bool getForumStatistics(const RsGxsGroupId& forumId,GxsGroupStatistic& stat)=0;
 
+
 	/**
 	 * @brief Get forums information (description, thumbnail...).
 	 * Blocking API.

libretroshare/src/retroshare/rsgxsifacehelper.h

@@ -355,7 +355,7 @@ public:
 	{ return mTokenService.requestStatus(token); }
 
 	/// @see RsTokenService::requestServiceStatistic
-	void requestServiceStatistic(uint32_t& token)
+	bool requestServiceStatistic(uint32_t& token)
 	{
         mTokenService.requestServiceStatistic(token);
 
@@ -363,6 +363,7 @@ public:
 		mActiveTokens[token]=TokenRequestType::SERVICE_STATISTICS;
 
 		locked_dumpTokens();
+        return true;
     }
 
 	/// @see RsTokenService::requestGroupStatistic

libretroshare/src/retroshare/rsposted.h

@@ -167,6 +167,8 @@ public:
 
 	virtual bool getBoardStatistics(const RsGxsGroupId& boardId,GxsGroupStatistic& stat) =0;
 
+	virtual bool getBoardsServiceStatistics(GxsServiceStatistic& stat) =0;
+
 	enum RS_DEPRECATED RankType {TopRankType, HotRankType, NewRankType };
 
 	RS_DEPRECATED_FOR(getBoardsInfo)

libretroshare/src/services/p3gxschannels.cc

@@ -1062,6 +1062,15 @@ bool p3GxsChannels::getChannelStatistics(const RsGxsGroupId& channelId,GxsGroupS
     return RsGenExchange::getGroupStatistic(token,stat);
 }
 
+bool p3GxsChannels::getChannelServiceStatistics(GxsServiceStatistic& stat)
+{
+    uint32_t token;
+	if(!RsGxsIfaceHelper::requestServiceStatistic(token) || waitToken(token) != RsTokenService::COMPLETE)
+        return false;
+
+    return RsGenExchange::getServiceStatistic(token,stat);
+}
+
 bool p3GxsChannels::getContentSummaries(
         const RsGxsGroupId& channelId, std::vector<RsMsgMetaData>& summaries )
 {

libretroshare/src/services/p3gxschannels.h

@@ -204,6 +204,9 @@ virtual bool ExtraFileRemove(const RsFileHash &hash);
     /// Implementation of @see RsGxsChannels::getChannelStatistics
     bool getChannelStatistics(const RsGxsGroupId& channelId,GxsGroupStatistic& stat) override;
 
+    /// Iplementation of @see RsGxsChannels::getChannelServiceStatistics
+    bool getChannelServiceStatistics(GxsServiceStatistic& stat) override;
+
 	/// Implementation of @see RsGxsChannels::createChannelV2
 	bool createChannelV2(
 	        const std::string& name, const std::string& description,

libretroshare/src/services/p3gxsforums.cc

@@ -819,6 +819,15 @@ bool p3GxsForums::createGroup(uint32_t &token, RsGxsForumGroup &group)
 	return true;
 }
 
+bool p3GxsForums::getForumServiceStatistics(GxsServiceStatistic& stat)
+{
+    uint32_t token;
+	if(!RsGxsIfaceHelper::requestServiceStatistic(token) || waitToken(token) != RsTokenService::COMPLETE)
+        return false;
+
+    return RsGenExchange::getServiceStatistic(token,stat);
+}
+
 bool p3GxsForums::getForumStatistics(const RsGxsGroupId& ForumId,GxsGroupStatistic& stat)
 {
 	uint32_t token;

libretroshare/src/services/p3gxsforums.h

@@ -97,6 +97,9 @@ public:
     /// Implementation of @see RsGxsForums::getForumStatistics
     bool getForumStatistics(const RsGxsGroupId& ForumId,GxsGroupStatistic& stat) override;
 
+    /// Implementation of @see RsGxsForums::getForumServiceStatistics
+	bool getForumServiceStatistics(GxsServiceStatistic& stat) override;
+
 	/// @see RsGxsForums::getForumMsgMetaData
 	virtual bool getForumMsgMetaData(const RsGxsGroupId& forumId, std::vector<RsMsgMetaData>& msg_metas) ;
 

libretroshare/src/services/p3posted.cc

@@ -364,6 +364,16 @@ bool p3Posted::getBoardsSummaries(std::list<RsGroupMetaData>& boards )
 	return getGroupSummary(token, boards);
 }
 
+bool p3Posted::getBoardsServiceStatistics(GxsServiceStatistic& stat)
+{
+    uint32_t token;
+	if(!RsGxsIfaceHelper::requestServiceStatistic(token) || waitToken(token) != RsTokenService::COMPLETE)
+        return false;
+
+    return RsGenExchange::getServiceStatistic(token,stat);
+}
+
+
 bool p3Posted::getBoardStatistics(const RsGxsGroupId& boardId,GxsGroupStatistic& stat)
 {
 	uint32_t token;

libretroshare/src/services/p3posted.h

@@ -74,6 +74,8 @@ virtual void receiveHelperChanges(std::vector<RsGxsNotify*>& changes)
 
 	bool getBoardStatistics(const RsGxsGroupId& boardId,GxsGroupStatistic& stat) override;
 
+	bool getBoardsServiceStatistics(GxsServiceStatistic& stat) override;
+
 	bool editBoard(RsPostedGroup& board) override;
 
 	bool createBoard(RsPostedGroup& board) override;