remove GXSPROFILING debug messages

Author: jolavillette

src/gxs/rsdataservice.cc

@@ -26,6 +26,8 @@
  * #define RS_DATA_SERVICE_DEBUG_CACHE 1
  ****/
 
+//#define GXSPROFILING
+
 #include <fstream>
 #include <util/rsdir.h>
 #include <algorithm>
@@ -1174,16 +1176,20 @@ int RsDataService::retrieveNxsMsgs(const GxsMsgReq &reqIds, GxsMsgResult &msg,
     int resultCount = 0;
 #endif
 
+#ifdef GXSPROFILING
     // [TRACE] Start the database retrieval timer
-    RsDbg() << "DEBUG [DataService]: START retrieveNxsMsgs for " << reqIds.size() << " groups";
+    RsDbg() << "GXSPROFILING [DataService]: START retrieveNxsMsgs for " << reqIds.size() << " groups";
     auto start_all = std::chrono::steady_clock::now();
+#endif
 
 	for(auto mit = reqIds.begin(); mit != reqIds.end(); ++mit)
     {
         const RsGxsGroupId& grpId = mit->first;
 
+#ifdef GXSPROFILING
         // [TRACE] Start timer for this specific group
         auto start_group = std::chrono::steady_clock::now();
+#endif
 
         // if vector empty then request all messages
         const std::set<RsGxsMessageId>& msgIdV = mit->second;
@@ -1228,11 +1234,13 @@ int RsDataService::retrieveNxsMsgs(const GxsMsgReq &reqIds, GxsMsgResult &msg,
 
         msg[grpId] = msgSet;
 
+#ifdef GXSPROFILING
         // [TRACE] Log time per group to monitor progress
         auto end_group = std::chrono::steady_clock::now();
         auto group_ms = std::chrono::duration_cast<std::chrono::milliseconds>(end_group - start_group).count();
-        RsDbg() << "DEBUG [DataService]: Group " << grpId.toStdString() 
+        RsDbg() << "GXSPROFILING [DataService]: Group " << grpId.toStdString() 
                 << " (Total " << msgSet.size() << " msgs) processed in " << group_ms << "ms";
+#endif
 
         msgSet.clear();
     }
@@ -1241,10 +1249,12 @@ int RsDataService::retrieveNxsMsgs(const GxsMsgReq &reqIds, GxsMsgResult &msg,
     std::cerr << "RsDataService::retrieveNxsMsgs() " << mDbName << ", Requests: " << reqIds.size() << ", Results: " << resultCount << ", Time: " << timer.duration() << std::endl;
 #endif
 
+#ifdef GXSPROFILING
     // [TRACE] Log total database time
     auto end_all = std::chrono::steady_clock::now();
     auto total_ms = std::chrono::duration_cast<std::chrono::milliseconds>(end_all - start_all).count();
-    RsDbg() << "DEBUG [DataService]: END retrieveNxsMsgs total time: " << total_ms << "ms";
+    RsDbg() << "GXSPROFILING [DataService]: END retrieveNxsMsgs total time: " << total_ms << "ms";
+#endif
 
     return 1;
 }

src/gxs/rsgenexchange.cc

@@ -73,6 +73,8 @@ static const uint32_t INTEGRITY_CHECK_PERIOD = 60*31; // 31 minutes
  *  #define GEN_EXCH_DEBUG	1
  */
 
+//#define GXSPROFILING
+
 #if defined(GEN_EXCH_DEBUG)
 static const uint32_t service_to_print  = RS_SERVICE_GXS_TYPE_FORUMS;// use this to allow to this service id only, or 0 for all services
                                                                         // warning. Numbers should be SERVICE IDS (see serialiser/rsserviceids.h. E.g. 0x0215 for forums)
@@ -1537,8 +1539,10 @@ bool RsGenExchange::getGroupData(const uint32_t &token, std::vector<RsGxsGrpItem
 
 bool RsGenExchange::getMsgData(uint32_t token, GxsMsgDataMap &msgItems)
 {
+#ifdef GXSPROFILING
     // [TRACE] Start CPU/Deserialization timer
     auto start_time = std::chrono::steady_clock::now();
+#endif
 	RS_STACK_MUTEX(mGenMtx) ;
 	NxsMsgDataResult msgResult;
 	bool ok = mDataAccess->getMsgData(token, msgResult);
@@ -1598,13 +1602,17 @@ bool RsGenExchange::getMsgData(uint32_t token, GxsMsgDataMap &msgItems)
 			}
 		}
 		// [TRACE] Log the number of items processed
-		RsDbg() << "DEBUG [GenExch]: Deserialized " << count << " items";
+#ifdef GXSPROFILING
+		RsDbg() << "GXSPROFILING [GenExch]: Deserialized " << count << " items";
+#endif
 	}
 
+#ifdef GXSPROFILING
     // [TRACE] End timer and log total processing time
     auto end_time = std::chrono::steady_clock::now();
     auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(end_time - start_time).count();
-    RsDbg() << "DEBUG [GenExch]: getMsgData (Token: " << token << ") total time: " << elapsed << "ms";
+    RsDbg() << "GXSPROFILING [GenExch]: getMsgData (Token: " << token << ") total time: " << elapsed << "ms";
+#endif
 
 	return ok;
 }

src/gxs/rsgxsnetservice.cc

@@ -288,6 +288,8 @@
 
 //#define NXS_FRAG
 
+//#define GXSPROFILING
+
 // The constant below have a direct influence on how fast forums/channels/posted/identity groups propagate and on the overloading of queues:
 //
 // Channels/forums will update at a rate of SYNC_PERIOD*MAX_REQLIST_SIZE/60 messages per minute.
@@ -3515,8 +3517,10 @@ void RsGxsNetService::runVetting()
 
 void RsGxsNetService::locked_genSendMsgsTransaction(NxsTransaction* tr)
 {
+#ifdef GXSPROFILING
     // [TRACE] Start global timer for the network transaction
     auto start_net = std::chrono::steady_clock::now();
+#endif
 
 #ifdef NXS_NET_DEBUG_0
     GXSNETDEBUG_P_(tr->mTransaction->PeerId()) << "locked_genSendMsgsTransaction() Generating Msg data send fron TransN: " << tr->mTransaction->transactionNumber << std::endl;
@@ -3705,10 +3709,12 @@ void RsGxsNetService::locked_genSendMsgsTransaction(NxsTransaction* tr)
 	    delete newTr;
     }
 
+#ifdef GXSPROFILING
     // [TRACE] End global timer and log with the exact same format as V3
     auto end_net = std::chrono::steady_clock::now();
     auto net_ms = std::chrono::duration_cast<std::chrono::milliseconds>(end_net - start_net).count();
-    RsDbg() << "DEBUG [NetService]: TOTAL locked_genSendMsgsTransaction for " << tr->mItems.size() << " items took " << net_ms << "ms";
+    RsDbg() << "GXSPROFILING [NetService]: TOTAL locked_genSendMsgsTransaction for " << tr->mItems.size() << " items took " << net_ms << "ms";
+#endif
 
     return;
 }

src/util/retrodb.cc

@@ -35,6 +35,8 @@
 
 //#define RETRODB_DEBUG
 
+//#define GXSPROFILING
+
 const int RetroDb::OPEN_READONLY = SQLITE_OPEN_READONLY;
 const int RetroDb::OPEN_READWRITE = SQLITE_OPEN_READWRITE;
 const int RetroDb::OPEN_READWRITE_CREATE = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
@@ -241,8 +243,10 @@ bool RetroDb::execSQL(const std::string &query){
 RetroCursor* RetroDb::sqlQuery(const std::string& tableName, const std::list<std::string>& columns,
                                const std::string& selection, const std::string& orderBy){
 
+#ifdef GXSPROFILING
     // [TRACE] Start individual query timer
     auto start_sql = std::chrono::steady_clock::now();
+#endif
 
     if(tableName.empty() || columns.empty()){
         std::cerr << "RetroDb::sqlQuery(): No table or columns given" << std::endl;
@@ -284,11 +288,13 @@ RetroCursor* RetroDb::sqlQuery(const std::string& tableName, const std::list<std
     sqlite3_prepare_v2(mDb, sqlQuery.c_str(), sqlQuery.length(), &stmt, NULL);
     RetroCursor* cursor = new RetroCursor(stmt);
 
+#ifdef GXSPROFILING
     // [TRACE] End timer and log using the same "Batch SQL" tag for direct comparison
     auto end_sql = std::chrono::steady_clock::now();
     auto sql_ms = std::chrono::duration_cast<std::chrono::milliseconds>(end_sql - start_sql).count();
 
-    //RsDbg() << "DEBUG [RetroDb]: Batch SQL for group individual_query took " << sql_ms << "ms";
+    RsDbg() << "GXSPROFILING [RetroDb]: Batch SQL for group individual_query took " << sql_ms << "ms";
+#endif
 
     return cursor;
 }