Removed PingInfo::m_currentSpiders

This commit is contained in:
Ivan Skytte Jørgensen
2017-05-01 12:32:26 +02:00
parent 08df3918ef
commit 75d5a0b80e
5 changed files with 6 additions and 18 deletions

@ -1442,7 +1442,7 @@ void Hostdb::updatePingInfo(Host *h, const PingInfo &pi) {
//h->m_pingInfo.m_etryagains = pi.m_etryagains;
h->m_pingInfo.m_unused12 = 0;
h->m_pingInfo.m_unused13 = 0;
h->m_pingInfo.m_currentSpiders = pi.m_currentSpiders;
h->m_pingInfo.m_unused14 = 0;
h->m_pingInfo.m_dailyMergeCollnum = pi.m_dailyMergeCollnum;
memcpy(h->m_pingInfo.m_gbVersionStr,pi.m_gbVersionStr,sizeof(pi.m_gbVersionStr));
h->m_pingInfo.m_repairMode = pi.m_repairMode;

@ -60,7 +60,7 @@ public:
int32_t m_unused12;
int32_t m_unused13;
int16_t m_currentSpiders;
int16_t m_unused14;
collnum_t m_dailyMergeCollnum;
char m_gbVersionStr[21];

@ -345,11 +345,7 @@ skipReplaceHost:
// if it has spiders going on say "S" with # as the superscript
if ((flags & PFLAG_HASSPIDERS) && format == FORMAT_HTML )
fb.safePrintf ( "<span title=\"Spidering\">S"
"<sup>%" PRId32"</sup>"
"</span>"
,h->m_pingInfo.m_currentSpiders
);
fb.safePrintf ( "<span title=\"Spidering\">S</span>");
if ((flags & PFLAG_HASSPIDERS) && format != FORMAT_HTML )
fb.safePrintf ( "Spidering");
@ -444,11 +440,6 @@ skipReplaceHost:
h->m_dgramsFrom);
*/
sb.safePrintf("\t\t<numOutstandingSpiders>%" PRId32
"</numOutstandingSpiders>\n"
,h->m_pingInfo.m_currentSpiders );
sb.safePrintf("\t\t<splitTime>%" PRId32"</splitTime>\n",
splitTime);
sb.safePrintf("\t\t<splitsDone>%" PRId32"</splitsDone>\n",
@ -531,11 +522,6 @@ skipReplaceHost:
*/
sb.safePrintf("\t\t\t\t\"numOutstandingSpiders\":%" PRId32
",\n"
,h->m_pingInfo.m_currentSpiders );
sb.safePrintf("\t\t\t\t\"splitTime\":%" PRId32",\n",
splitTime);
sb.safePrintf("\t\t\t\t\"splitsDone\":%" PRId32",\n",

@ -205,7 +205,7 @@ void PingServer::pingHost ( Host *h , uint32_t ip , uint16_t port ) {
newPingInfo.m_unused9 = 0;
newPingInfo.m_unused3 = 0;
newPingInfo.m_unused11 = 0;
newPingInfo.m_currentSpiders = g_spiderLoop.getNumSpidersOut();
newPingInfo.m_unused14 = 0;
// let the receiver know our repair mode
newPingInfo.m_repairMode = g_repairMode;

@ -8,6 +8,7 @@
#include "UdpServer.h" //g_udpServer.getNumUsedSlotsIncoming()
#include "HttpServer.h" //g_httpServer.m_tcp.m_numUsed
#include "Msg5.h" //g_numCorrupt
#include "SpiderLoop.h"
#include "RdbCache.h"
#include "Rdb.h"
#include "GbMutex.h"
@ -386,6 +387,7 @@ static void dump_assorted_statistics(FILE *fp) {
fprintf(fp,"socket:slots_incoming:%d\n",g_udpServer.getNumUsedSlotsIncoming());
fprintf(fp,"socket:tcp_in_use:%d\n",g_httpServer.m_tcp.m_numUsed);
fprintf(fp,"misc::corrupt_list_reads:%d\n",g_numCorrupt);
fprintf(fp,"spider:current_spiders:%d\n",g_spiderLoop.getNumSpidersOut());
}