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

added output to GxsRequest for debug purposes

Browse source
This commit is contained in:
csoler 2020-04-07 16:56:28 +02:00
parent bddd90df43
commit 7c77e82b1e
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
2 changed files with 124 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

102
libretroshare/src/gxs/rsgxsrequesttypes.cc
View file

@ -23,6 +23,103 @@
#include "rsgxsrequesttypes.h" #include "rsgxsrequesttypes.h"
#include "util/rsstd.h" #include "util/rsstd.h"
std::ostream& operator<<(std::ostream& o,const GxsRequest& g)
{
return g.print(o);
}
std::ostream& GroupMetaReq::print(std::ostream& o) const
{
o << "[Request type=GroupMeta groupIds (size=" << mGroupIds.size() << "): " << *mGroupIds.begin() ;
if(mGroupIds.size() > 1)
o << " ..." ;
o << "]" ;
return o;
}
std::ostream& GroupIdReq::print(std::ostream& o) const
{
return o << "[Request type=GroupIdReq" << "]" ;
}
std::ostream& GroupSerializedDataReq::print(std::ostream& o) const
{
return o << "[Request type=GroupSerializedData" << "]" ;
}
std::ostream& GroupDataReq::print(std::ostream& o) const
{
o << "[Request type=GroupDataReq groupIds (size=" << mGroupIds.size() << "): " << *mGroupIds.begin() ;
if(mGroupIds.size() > 1)
o << " ..." ;
o << "]" ;
return o;
}
std::ostream& MsgIdReq::print(std::ostream& o) const
{
return o << "[Request type=MsgId" << "]" ;
}
std::ostream& MsgMetaReq::print(std::ostream& o) const
{
o << "[Request type=MsgMetaReq groups (size=" << mMsgIds.size() << "): " << mMsgIds.begin()->first << " (" << mMsgIds.begin()->second.size() << " messages)";
if(mMsgIds.size() > 1)
o << " ..." ;
o << "]" ;
return o;
}
std::ostream& MsgDataReq::print(std::ostream& o) const
{
o << "[Request type=MsgDataReq groups (size=" << mMsgIds.size() << "): " << mMsgIds.begin()->first << " (" << mMsgIds.begin()->second.size() << " messages)";
if(mMsgIds.size() > 1)
o << " ..." ;
o << "]" ;
return o;
}
std::ostream& MsgRelatedInfoReq::print(std::ostream& o) const
{
o << "[Request type=MsgRelatedInfo msgIds (size=" << mMsgIds.size() << "): " << mMsgIds.begin()->first ;
if(mMsgIds.size() > 1)
o << " ..." ;
o << "]" ;
return o;
}
std::ostream& GroupSetFlagReq::print(std::ostream& o) const
{
return o << "[Request type=GroupFlagSet" << "]" ;
}
std::ostream& ServiceStatisticRequest::print(std::ostream& o) const
{
return o << "[Request type=ServiceStatistics" << "]" ;
}
std::ostream& GroupStatisticRequest::print(std::ostream& o) const
{
return o << "[Request type=GroupStatistics" << "]" ;
}
GroupMetaReq::~GroupMetaReq() GroupMetaReq::~GroupMetaReq()
{ {
//rsstd::delete_all(mGroupMetaData.begin(), mGroupMetaData.end()); // now memory ownership is kept by the cache. //rsstd::delete_all(mGroupMetaData.begin(), mGroupMetaData.end()); // now memory ownership is kept by the cache.
@ -57,3 +154,8 @@ MsgRelatedInfoReq::~MsgRelatedInfoReq()
rsstd::delete_all(dataIt->second.begin(), dataIt->second.end()); rsstd::delete_all(dataIt->second.begin(), dataIt->second.end());
} }
} }
std::ostream& MessageSetFlagReq::print(std::ostream& o) const
{
return o << "[Request type=MsgFlagSet" << "]" ;
}

22
libretroshare/src/gxs/rsgxsrequesttypes.h
View file

@ -50,13 +50,18 @@ struct GxsRequest
RsTokReqOptions Options; RsTokReqOptions Options;
RsTokenService::GxsRequestStatus status; RsTokenService::GxsRequestStatus status;
virtual std::ostream& print(std::ostream& o) const = 0;
}; };
std::ostream& operator<<(std::ostream& o,const GxsRequest& g);
class GroupMetaReq : public GxsRequest class GroupMetaReq : public GxsRequest
{ {
public: public:
virtual ~GroupMetaReq(); virtual ~GroupMetaReq();
virtual std::ostream& print(std::ostream& o) const override;
public: public:
std::list<RsGxsGroupId> mGroupIds; std::list<RsGxsGroupId> mGroupIds;
std::list<const RsGxsGrpMetaData*> mGroupMetaData; std::list<const RsGxsGrpMetaData*> mGroupMetaData;
@ -65,12 +70,16 @@ public:
class GroupIdReq : public GxsRequest class GroupIdReq : public GxsRequest
{ {
public: public:
virtual std::ostream& print(std::ostream& o) const override ;
std::list<RsGxsGroupId> mGroupIds; std::list<RsGxsGroupId> mGroupIds;
std::list<RsGxsGroupId> mGroupIdResult; std::list<RsGxsGroupId> mGroupIdResult;
}; };
class GroupSerializedDataReq : public GxsRequest class GroupSerializedDataReq : public GxsRequest
{ {
public: public:
virtual std::ostream& print(std::ostream& o) const override ;
std::list<RsGxsGroupId> mGroupIds; std::list<RsGxsGroupId> mGroupIds;
std::list<RsNxsGrp*> mGroupData; std::list<RsNxsGrp*> mGroupData;
}; };
@ -80,6 +89,7 @@ class GroupDataReq : public GxsRequest
public: public:
virtual ~GroupDataReq(); virtual ~GroupDataReq();
virtual std::ostream& print(std::ostream& o) const override;
public: public:
std::list<RsGxsGroupId> mGroupIds; std::list<RsGxsGroupId> mGroupIds;
std::list<RsNxsGrp*> mGroupData; std::list<RsNxsGrp*> mGroupData;
@ -88,6 +98,8 @@ public:
class MsgIdReq : public GxsRequest class MsgIdReq : public GxsRequest
{ {
public: public:
virtual std::ostream& print(std::ostream& o) const override ;
GxsMsgReq mMsgIds; GxsMsgReq mMsgIds;
GxsMsgIdResult mMsgIdResult; GxsMsgIdResult mMsgIdResult;
}; };
@ -97,6 +109,8 @@ class MsgMetaReq : public GxsRequest
public: public:
virtual ~MsgMetaReq(); virtual ~MsgMetaReq();
virtual std::ostream& print(std::ostream& o) const override;
public: public:
GxsMsgReq mMsgIds; GxsMsgReq mMsgIds;
GxsMsgMetaResult mMsgMetaData; GxsMsgMetaResult mMsgMetaData;
@ -107,6 +121,7 @@ class MsgDataReq : public GxsRequest
public: public:
virtual ~MsgDataReq(); virtual ~MsgDataReq();
virtual std::ostream& print(std::ostream& o) const override;
public: public:
GxsMsgReq mMsgIds; GxsMsgReq mMsgIds;
NxsMsgDataResult mMsgData; NxsMsgDataResult mMsgData;
@ -115,12 +130,15 @@ public:
class ServiceStatisticRequest: public GxsRequest class ServiceStatisticRequest: public GxsRequest
{ {
public: public:
virtual std::ostream& print(std::ostream& o) const override ;
GxsServiceStatistic mServiceStatistic; GxsServiceStatistic mServiceStatistic;
}; };
struct GroupStatisticRequest: public GxsRequest struct GroupStatisticRequest: public GxsRequest
{ {
public: public:
virtual std::ostream& print(std::ostream& o) const override ;
RsGxsGroupId mGrpId; RsGxsGroupId mGrpId;
GxsGroupStatistic mGroupStatistic; GxsGroupStatistic mGroupStatistic;
}; };
@ -130,6 +148,7 @@ class MsgRelatedInfoReq : public GxsRequest
public: public:
virtual ~MsgRelatedInfoReq(); virtual ~MsgRelatedInfoReq();
std::ostream& print(std::ostream& o) const override;
public: public:
std::vector<RsGxsGrpMsgIdPair> mMsgIds; std::vector<RsGxsGrpMsgIdPair> mMsgIds;
MsgRelatedIdResult mMsgIdResult; MsgRelatedIdResult mMsgIdResult;
@ -140,6 +159,8 @@ public:
class GroupSetFlagReq : public GxsRequest class GroupSetFlagReq : public GxsRequest
{ {
public: public:
virtual std::ostream& print(std::ostream& o) const override ;
const static uint32_t FLAG_SUBSCRIBE; const static uint32_t FLAG_SUBSCRIBE;
const static uint32_t FLAG_STATUS; const static uint32_t FLAG_STATUS;
@ -154,6 +175,7 @@ class MessageSetFlagReq : public GxsRequest
public: public:
const static uint32_t FLAG_STATUS; const static uint32_t FLAG_STATUS;
virtual std::ostream& print(std::ostream& o) const override ;
uint8_t type; uint8_t type;
uint32_t flag; uint32_t flag;
uint32_t flagMask; uint32_t flagMask;