From 2cc44facfdcdbe7d5ac97516582cd872f60bdcfd Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 26 Mar 2020 23:19:34 +0100 Subject: [PATCH] added some more debug info and proper error output to GxsDb --- src/gxs/rsdataservice.cc | 14 +++++++++----- src/gxs/rsgenexchange.h | 2 +- src/gxs/rsgxsdataaccess.cc | 2 ++ src/retroshare/rsgxsiface.h | 6 ++++++ src/retroshare/rsgxsifacehelper.h | 17 ++++++++++++++--- 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/gxs/rsdataservice.cc b/src/gxs/rsdataservice.cc index 3dc99a85f..cc215dc14 100644 --- a/src/gxs/rsdataservice.cc +++ b/src/gxs/rsdataservice.cc @@ -26,6 +26,10 @@ * #define RS_DATA_SERVICE_DEBUG_CACHE 1 ****/ +#define RS_DATA_SERVICE_DEBUG 1 +#define RS_DATA_SERVICE_DEBUG_TIME 1 +#define RS_DATA_SERVICE_DEBUG_CACHE 1 + #include #include #include @@ -1312,7 +1316,7 @@ int RsDataService::retrieveGxsMsgMetaData(const GxsMsgReq& reqIds, GxsMsgMetaRes { locked_retrieveMsgMeta(c, metaSet); #ifdef RS_DATA_SERVICE_DEBUG_CACHE - std::cerr << "Retrieving (all) Msg metadata grpId=" << grpId << ", " << std::dec << metaSet.size() << " messages" << std::endl; + std::cerr << mDbName << ": Retrieving (all) Msg metadata grpId=" << grpId << ", " << std::dec << metaSet.size() << " messages" << std::endl; #endif } }else{ @@ -1329,7 +1333,7 @@ int RsDataService::retrieveGxsMsgMetaData(const GxsMsgReq& reqIds, GxsMsgMetaRes { locked_retrieveMsgMeta(c, metaSet); #ifdef RS_DATA_SERVICE_DEBUG_CACHE - std::cerr << "Retrieving Msg metadata grpId=" << grpId << ", " << std::dec << metaSet.size() << " messages" << std::endl; + std::cerr << mDbName << ": Retrieving Msg metadata grpId=" << grpId << ", " << std::dec << metaSet.size() << " messages" << std::endl; #endif } } @@ -1414,7 +1418,7 @@ int RsDataService::retrieveGxsGrpMetaData(RsGxsGrpMetaTemporaryMap& grp) { grp[g->mGroupId] = g; #ifdef RS_DATA_SERVICE_DEBUG_CACHE - std::cerr << (void *)this << ": Retrieving (all) Grp metadata grpId=" << g->mGroupId << std::endl; + std::cerr << (void *)this << " " << mDbName << ": Retrieving (all) Grp metadata grpId=" << g->mGroupId << std::endl; #endif } valid = c->moveToNext(); @@ -1441,14 +1445,14 @@ int RsDataService::retrieveGxsGrpMetaData(RsGxsGrpMetaTemporaryMap& grp) if(itt != mGrpMetaDataCache.end()) { #ifdef RS_DATA_SERVICE_DEBUG_CACHE - std::cerr << "Retrieving Grp metadata grpId=" << mit->first << " from cache!" << std::endl; + std::cerr << mDbName << ": Retrieving Grp metadata grpId=" << mit->first << " from cache!" << std::endl; #endif grp[mit->first] = itt->second ; } else { #ifdef RS_DATA_SERVICE_DEBUG_CACHE - std::cerr << "Retrieving Grp metadata grpId=" << mit->first ; + std::cerr << mDbName << ": Retrieving Grp metadata grpId=" << mit->first ; #endif const RsGxsGroupId& grpId = mit->first; diff --git a/src/gxs/rsgenexchange.h b/src/gxs/rsgenexchange.h index 49fd8b2e2..840dc97b3 100644 --- a/src/gxs/rsgenexchange.h +++ b/src/gxs/rsgenexchange.h @@ -726,7 +726,7 @@ public: virtual void setSyncPeriod(const RsGxsGroupId& grpId,uint32_t age_in_secs) ; virtual bool getGroupNetworkStats(const RsGxsGroupId& grpId,RsGroupNetworkStats& stats); - uint16_t serviceType() const { return mServType ; } + uint16_t serviceType() const override { return mServType ; } uint32_t serviceFullType() const { return RsServiceInfo::RsServiceInfoUIn16ToFullServiceId(mServType); } virtual RsReputationLevel minReputationForForwardingMessages( diff --git a/src/gxs/rsgxsdataaccess.cc b/src/gxs/rsgxsdataaccess.cc index 59c828e60..373d9a872 100644 --- a/src/gxs/rsgxsdataaccess.cc +++ b/src/gxs/rsgxsdataaccess.cc @@ -30,6 +30,8 @@ * #define DATA_DEBUG 1 **********/ +#define DATA_DEBUG 1 + RsGxsDataAccess::RsGxsDataAccess(RsGeneralDataService* ds) : mDataStore(ds), mDataMutex("RsGxsDataAccess"), mNextToken(0) {} diff --git a/src/retroshare/rsgxsiface.h b/src/retroshare/rsgxsiface.h index 54a27656d..7bb6bba28 100644 --- a/src/retroshare/rsgxsiface.h +++ b/src/retroshare/rsgxsiface.h @@ -110,6 +110,12 @@ struct RsGxsChanges : RsEvent */ struct RsGxsIface { + /*! + * \brief serviceType + * \return The 16-bits service type. See @serialiser/rsserviceids.h + */ + virtual uint16_t serviceType() const =0; + /*! * Gxs services should call this for automatic handling of * changes, send diff --git a/src/retroshare/rsgxsifacehelper.h b/src/retroshare/rsgxsifacehelper.h index 0d9965c6c..2a9b5bba3 100644 --- a/src/retroshare/rsgxsifacehelper.h +++ b/src/retroshare/rsgxsifacehelper.h @@ -26,6 +26,7 @@ #include #include "retroshare/rsgxsiface.h" +#include "retroshare/rsservicecontrol.h" #include "retroshare/rsreputations.h" #include "rsgxsflags.h" #include "util/rsdeprecate.h" @@ -454,9 +455,19 @@ private: void locked_dumpTokens() { - std::cerr << "Active tokens (this=" << (void*)this << "): " ; - for(auto it: mActiveTokens) - std::cerr << std::dec << it.first << " (" << static_cast(it.second) << ") " ; + uint16_t service_id = mGxs.serviceType(); + + uint32_t count[7] = {0}; + + std::cerr << "Service 0x0" << std::hex << service_id + << " (" << rsServiceControl->getServiceName(RsServiceInfo::RsServiceInfoUIn16ToFullServiceId(service_id)) + << ") this=0x" << (void*)this << ") Active tokens (per type): " ; + + for(auto& it: mActiveTokens) // let's count how many token of each type we've got. + ++count[static_cast(it.second)]; + + for(uint32_t i=0;i<7;++i) + std::cerr /* << i << ":" */ << count[i] << " "; std::cerr << std::endl; } };