From 82146cc800aa12d238a4bf3343303598fe2cc267 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sat, 10 Dec 2011 22:34:36 +0100 Subject: [PATCH] Fixed some more dead references to stats. --- src/comm/ModDevPoll.cc | 3 +-- src/comm/ModPoll.cc | 7 +++---- src/comm/ModSelect.cc | 7 +++---- src/comm/ModSelectWin32.cc | 7 +++---- src/tests/stub_StatHist.cc | 6 ------ 5 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/comm/ModDevPoll.cc b/src/comm/ModDevPoll.cc index 6b926336e6..f750a82f54 100644 --- a/src/comm/ModDevPoll.cc +++ b/src/comm/ModDevPoll.cc @@ -174,10 +174,9 @@ comm_update_fd(int fd, int events) static void commIncomingStats(StoreEntry *sentry) { - StatCounters *f = &statCounter; storeAppendPrintf(sentry, "Total number of devpoll loops: %ld\n", statCounter.select_loops); storeAppendPrintf(sentry, "Histogram of returned filedescriptors\n"); - statHistDump(&f->select_fds_hist, sentry, statHistIntDumper); + statCounter.select_fds_hist.dump(sentry, statHistIntDumper); } diff --git a/src/comm/ModPoll.cc b/src/comm/ModPoll.cc index e57a34c6b9..53f79b358e 100644 --- a/src/comm/ModPoll.cc +++ b/src/comm/ModPoll.cc @@ -642,7 +642,6 @@ Comm::SelectLoopInit(void) static void commIncomingStats(StoreEntry * sentry) { - StatCounters *f = StatCounters::GetCounters(); storeAppendPrintf(sentry, "Current incoming_icp_interval: %d\n", incoming_icp_interval >> INCOMING_FACTOR); storeAppendPrintf(sentry, "Current incoming_dns_interval: %d\n", @@ -652,11 +651,11 @@ commIncomingStats(StoreEntry * sentry) storeAppendPrintf(sentry, "\n"); storeAppendPrintf(sentry, "Histogram of events per incoming socket type\n"); storeAppendPrintf(sentry, "ICP Messages handled per comm_poll_icp_incoming() call:\n"); - f->comm_icp_incoming.dump(sentry, statHistIntDumper); + statCounter.comm_icp_incoming.dump(sentry, statHistIntDumper); storeAppendPrintf(sentry, "DNS Messages handled per comm_poll_dns_incoming() call:\n"); - f->comm_dns_incoming.dump(sentry, statHistIntDumper); + statCounter.comm_dns_incoming.dump(sentry, statHistIntDumper); storeAppendPrintf(sentry, "HTTP Messages handled per comm_poll_http_incoming() call:\n"); - f->comm_http_incoming.dump(sentry, statHistIntDumper); + statCounter.comm_http_incoming.dump(sentry, statHistIntDumper); } /* Called by async-io or diskd to speed up the polling */ diff --git a/src/comm/ModSelect.cc b/src/comm/ModSelect.cc index b3bc1b8350..f8aa8833bb 100644 --- a/src/comm/ModSelect.cc +++ b/src/comm/ModSelect.cc @@ -754,7 +754,6 @@ examine_select(fd_set * readfds, fd_set * writefds) static void commIncomingStats(StoreEntry * sentry) { - StatCounters *f = &statCounter; storeAppendPrintf(sentry, "Current incoming_icp_interval: %d\n", incoming_icp_interval >> INCOMING_FACTOR); storeAppendPrintf(sentry, "Current incoming_dns_interval: %d\n", @@ -764,11 +763,11 @@ commIncomingStats(StoreEntry * sentry) storeAppendPrintf(sentry, "\n"); storeAppendPrintf(sentry, "Histogram of events per incoming socket type\n"); storeAppendPrintf(sentry, "ICP Messages handled per comm_select_icp_incoming() call:\n"); - statHistDump(&f->comm_icp_incoming, sentry, statHistIntDumper); + statCounter.comm_icp_incoming.dump(sentry, statHistIntDumper); storeAppendPrintf(sentry, "DNS Messages handled per comm_select_dns_incoming() call:\n"); - statHistDump(&f->comm_dns_incoming, sentry, statHistIntDumper); + statCounter.comm_dns_incoming.dump(sentry, statHistIntDumper); storeAppendPrintf(sentry, "HTTP Messages handled per comm_select_http_incoming() call:\n"); - statHistDump(&f->comm_http_incoming, sentry, statHistIntDumper); + statCounter.comm_http_incoming.dump(sentry, statHistIntDumper); } void diff --git a/src/comm/ModSelectWin32.cc b/src/comm/ModSelectWin32.cc index 42c05af577..e378dd31a4 100644 --- a/src/comm/ModSelectWin32.cc +++ b/src/comm/ModSelectWin32.cc @@ -776,7 +776,6 @@ examine_select(fd_set * readfds, fd_set * writefds) static void commIncomingStats(StoreEntry * sentry) { - StatCounters *f = &statCounter; storeAppendPrintf(sentry, "Current incoming_icp_interval: %d\n", incoming_icp_interval >> INCOMING_FACTOR); storeAppendPrintf(sentry, "Current incoming_dns_interval: %d\n", @@ -786,11 +785,11 @@ commIncomingStats(StoreEntry * sentry) storeAppendPrintf(sentry, "\n"); storeAppendPrintf(sentry, "Histogram of events per incoming socket type\n"); storeAppendPrintf(sentry, "ICP Messages handled per comm_select_icp_incoming() call:\n"); - statHistDump(&f->comm_icp_incoming, sentry, statHistIntDumper); + statCounter.comm_icp_incoming.dump(sentry, statHistIntDumper); storeAppendPrintf(sentry, "DNS Messages handled per comm_select_dns_incoming() call:\n"); - statHistDump(&f->comm_dns_incoming, sentry, statHistIntDumper); + statCounter.comm_dns_incoming.dump(sentry, statHistIntDumper); storeAppendPrintf(sentry, "HTTP Messages handled per comm_select_http_incoming() call:\n"); - statHistDump(&f->comm_http_incoming, sentry, statHistIntDumper); + statCounter.comm_http_incoming.dump(sentry, statHistIntDumper); } void diff --git a/src/tests/stub_StatHist.cc b/src/tests/stub_StatHist.cc index 9fb64c2525..2c3caab146 100644 --- a/src/tests/stub_StatHist.cc +++ b/src/tests/stub_StatHist.cc @@ -3,12 +3,6 @@ // for StatHist definitions #include "StatHist.h" -void -statHistDump(const StatHist * H, StoreEntry * sentry, StatHistBinDumper * bd) -{ - fatal("statHistDump: Not implemented"); -} - void StatHist::count(double val) { -- 2.47.2