You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/03/19 21:41:12 UTC
[1/2] git commit: TS-1758 Remove unused overviewPage aggregation
functions.
TS-1758 Remove unused overviewPage aggregation functions.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3ceb8a20
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3ceb8a20
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3ceb8a20
Branch: refs/heads/master
Commit: 3ceb8a20b965c137bb1da95fd181bd76b3ae352f
Parents: 11bfc1e
Author: Yunkai Zhang <yu...@gmail.com>
Authored: Tue Mar 19 14:15:04 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Mar 19 14:15:04 2013 -0600
----------------------------------------------------------------------
mgmt/web2/WebOverview.cc | 581 -----------------------------------------
mgmt/web2/WebOverview.h | 15 -
2 files changed, 0 insertions(+), 596 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3ceb8a20/mgmt/web2/WebOverview.cc
----------------------------------------------------------------------
diff --git a/mgmt/web2/WebOverview.cc b/mgmt/web2/WebOverview.cc
index 792a896..83493f3 100644
--- a/mgmt/web2/WebOverview.cc
+++ b/mgmt/web2/WebOverview.cc
@@ -720,543 +720,6 @@ overviewPage::readFloat(const char *nodeName, const char *name, bool * found)
return r;
}
-// void overviewPage::agCachePercentFree()
-//
-// Updates proxy.cluster.cache.percent_free
-//
-void
-overviewPage::agCachePercentFree()
-{
- MgmtInt bTotal;
- MgmtInt bFree;
- MgmtFloat pFree;
-
- clusterSumInt("proxy.node.cache.bytes_total", &bTotal);
- clusterSumInt("proxy.node.cache.bytes_free", &bFree);
-
- if (bTotal <= 0) {
- pFree = 0.0;
- } else {
- pFree = (MgmtFloat) ((double) bFree / (double) bTotal);
- }
-
- ink_assert(varSetFloat("proxy.cluster.cache.percent_free", pFree));
-}
-
-// void overviewPage::agCacheHitRate()
-//
-void
-overviewPage::agCacheHitRate()
-{
- static ink_hrtime last_set_time = 0;
- const ink_hrtime window = 10 * HRTIME_SECOND; // update every 10 seconds
- static StatTwoIntSamples cluster_hit_count = { "proxy.node.cache_total_hits", 0, 0, 0, 0 };
- static StatTwoIntSamples cluster_hit_mem_count = { "proxy.node.cache_total_hits_mem", 0, 0, 0, 0 };
- static StatTwoIntSamples cluster_miss_count = { "proxy.node.cache_total_misses", 0, 0, 0, 0 };
- static const char *cluster_hit_count_name = "proxy.cluster.cache_total_hits_avg_10s";
- static const char *cluster_hit_mem_count_name = "proxy.cluster.cache_total_hits_mem_avg_10s";
- static const char *cluster_miss_count_name = "proxy.cluster.cache_total_misses_avg_10s";
-
- MgmtIntCounter totalHits = 0;
- MgmtIntCounter totalMemHits = 0;
- MgmtIntCounter totalMisses = 0;
- MgmtIntCounter totalAccess = 0;
- MgmtFloat hitRate = 0.00;
- MgmtFloat hitMemRate = 0.00;
-
- // get current time and delta to work with
- ink_hrtime current_time = ink_get_hrtime();
- // ink_hrtime delta = current_time - last_set_time;
-
- ///////////////////////////////////////////////////////////////
- // if enough time expired, or first time, or wrapped around: //
- // (1) scroll current value into previous value //
- // (2) calculate new current values //
- // (3) only if proper time expired, set derived values //
- ///////////////////////////////////////////////////////////////
- if (((current_time - last_set_time) > window) || // sufficient elapsed time
- (last_set_time == 0) || // first time
- (last_set_time > current_time)) // wrapped around
- {
- ////////////////////////////////////////
- // scroll values for cluster Hit/Miss //
- ///////////////////////////////////////
- cluster_hit_count.previous_time = cluster_hit_count.current_time;
- cluster_hit_count.previous_value = cluster_hit_count.current_value;
-
- cluster_miss_count.previous_time = cluster_miss_count.current_time;
- cluster_miss_count.previous_value = cluster_miss_count.current_value;
-
- //////////////////////////
- // calculate new values //
- //////////////////////////
- cluster_hit_count.current_value = -10000;
- cluster_hit_count.current_time = ink_get_hrtime();
- // TODO: Should we check return value?
- clusterSumInt(cluster_hit_count.lm_record_name, &(cluster_hit_count.current_value));
-
- cluster_miss_count.current_value = -10000;
- cluster_miss_count.current_time = ink_get_hrtime();
- // TODO: Should we check return value?
- clusterSumInt(cluster_miss_count.lm_record_name, &(cluster_miss_count.current_value));
-
- ////////////////////////////////////////////////
- // if not initial or wrap, set derived values //
- ////////////////////////////////////////////////
- if ((current_time - last_set_time) > window) {
- RecInt num_hits = 0;
- RecInt num_hits_mem = 0;
- RecInt num_misses = 0;
- RecInt diff = 0;
- RecInt total = 0;
- // generate time window deltas and sum
- diff = cluster_hit_count.diff_value();
- varSetInt(cluster_hit_count_name, diff);
- num_hits = diff;
-
- diff = cluster_hit_mem_count.diff_value();
- varSetInt(cluster_hit_mem_count_name, diff);
- num_hits_mem = diff;
-
- diff = cluster_miss_count.diff_value();
- varSetInt(cluster_miss_count_name, diff);
- num_misses = diff;
-
- total = num_hits + num_misses;
- if (total == 0)
- hitRate = 0.00;
- else {
- hitRate = (MgmtFloat) ((double) num_hits / (double) total);
- hitMemRate = (MgmtFloat) ((double) num_hits_mem / (double) total);
- }
-
- // Check if more than one cluster node
- MgmtInt num_nodes;
- varIntFromName("proxy.process.cluster.nodes", &num_nodes);
- if (1 == num_nodes) {
- // Only one node , so grab local value
- varFloatFromName("proxy.node.cache_hit_ratio_avg_10s", &hitRate);
- varFloatFromName("proxy.node.cache_hit_mem_ratio_avg_10s", &hitMemRate);
- }
- // new stat
- varSetFloat("proxy.cluster.cache_hit_ratio_avg_10s", hitRate);
- varSetFloat("proxy.cluster.cache_hit_mem_ratio_avg_10s", hitMemRate);
- }
- /////////////////////////////////////////////////
- // done with a cycle, update the last_set_time //
- /////////////////////////////////////////////////
- last_set_time = current_time;
- }
- // Deal with Lifetime stats
- clusterSumInt("proxy.node.cache_total_hits", &totalHits);
- clusterSumInt("proxy.node.cache_total_hits_mem", &totalMemHits);
- clusterSumInt("proxy.node.cache_total_misses", &totalMisses);
- totalAccess = totalHits + totalMisses;
-
- if (totalAccess != 0) {
- hitRate = (MgmtFloat) ((double) totalHits / (double) totalAccess);
- hitMemRate = (MgmtFloat) ((double) totalMemHits / (double) totalAccess);
- }
- // new stats
- ink_assert(varSetFloat("proxy.cluster.cache_hit_ratio", hitRate));
- ink_assert(varSetFloat("proxy.cluster.cache_hit_mem_ratio", hitMemRate));
- ink_assert(varSetInt("proxy.cluster.cache_total_hits", totalHits));
- ink_assert(varSetInt("proxy.cluster.cache_total_hits_mem", totalMemHits));
- ink_assert(varSetInt("proxy.cluster.cache_total_misses", totalMisses));
-}
-
-// void overviewPage::agHostDBHitRate()
-//
-// Updates proxy.cluster.hostdb.hit_ratio
-//
-void
-overviewPage::agHostdbHitRate()
-{
- static ink_hrtime last_set_time = 0;
- const ink_hrtime window = 10 * HRTIME_SECOND; // update every 10 seconds
- static StatTwoIntSamples cluster_hostdb_total_lookups = { "proxy.node.hostdb.total_lookups", 0, 0, 0, 0 };
- static StatTwoIntSamples cluster_hostdb_hits = { "proxy.node.hostdb.total_hits", 0, 0, 0, 0 };
- static const char *cluster_hostdb_total_lookups_name = "proxy.cluster.hostdb.total_lookups_avg_10s";
- static const char *cluster_hostdb_hits_name = "proxy.cluster.hostdb.total_hits_avg_10s";
-
- RecInt hostDBtotal = 0;
- RecInt hostDBhits = 0;
- // RecInt hostDBmisses = 0;
- RecInt dnsTotal = 0;
- RecFloat hitRate = 0.00;
-
- // get current time and delta to work with
- ink_hrtime current_time = ink_get_hrtime();
- // ink_hrtime delta = current_time - last_set_time;
-
- ///////////////////////////////////////////////////////////////
- // if enough time expired, or first time, or wrapped around: //
- // (1) scroll current value into previous value //
- // (2) calculate new current values //
- // (3) only if proper time expired, set derived values //
- ///////////////////////////////////////////////////////////////
- if (((current_time - last_set_time) > window) || // sufficient elapsed time
- (last_set_time == 0) || // first time
- (last_set_time > current_time)) // wrapped around
- {
- ////////////////////////////////////////
- // scroll values for cluster DNS //
- ///////////////////////////////////////
- cluster_hostdb_total_lookups.previous_time = cluster_hostdb_total_lookups.current_time;
- cluster_hostdb_total_lookups.previous_value = cluster_hostdb_total_lookups.current_value;
-
- cluster_hostdb_hits.previous_time = cluster_hostdb_hits.current_time;
- cluster_hostdb_hits.previous_value = cluster_hostdb_hits.current_value;
-
- //////////////////////////
- // calculate new values //
- //////////////////////////
- cluster_hostdb_total_lookups.current_value = -10000;
- cluster_hostdb_total_lookups.current_time = ink_get_hrtime();
- // TODO: Should we check return value?
- clusterSumInt(cluster_hostdb_total_lookups.lm_record_name, &(cluster_hostdb_total_lookups.current_value));
-
- cluster_hostdb_hits.current_value = -10000;
- cluster_hostdb_hits.current_time = ink_get_hrtime();
- // TODO: Should we check return value?
- clusterSumInt(cluster_hostdb_hits.lm_record_name, &(cluster_hostdb_hits.current_value));
-
- ////////////////////////////////////////////////
- // if not initial or wrap, set derived values //
- ////////////////////////////////////////////////
- if ((current_time - last_set_time) > window) {
- MgmtInt num_total_lookups = 0;
- MgmtInt num_hits = 0;
- MgmtInt diff = 0;
-
- // generate time window deltas and sum
- diff = cluster_hostdb_total_lookups.diff_value();
- varSetInt(cluster_hostdb_total_lookups_name, diff);
- num_total_lookups = diff;
-
- diff = cluster_hostdb_hits.diff_value();
- varSetInt(cluster_hostdb_hits_name, diff);
- num_hits = diff;
-
- if (num_total_lookups == 0)
- hitRate = 0.00;
- else
- hitRate = (MgmtFloat) ((double) num_hits / (double) num_total_lookups);
-
- // Check if more than one cluster node
- MgmtInt num_nodes;
- varIntFromName("proxy.process.cluster.nodes", &num_nodes);
- if (1 == num_nodes) {
- // Only one node , so grab local value
- varFloatFromName("proxy.node.hostdb.hit_ratio_avg_10s", &hitRate);
- }
- // new stat
- varSetFloat("proxy.cluster.hostdb.hit_ratio_avg_10s", hitRate);
- }
- /////////////////////////////////////////////////
- // done with a cycle, update the last_set_time //
- /////////////////////////////////////////////////
- last_set_time = current_time;
- }
-
- // Deal with Lifetime stats
- clusterSumInt("proxy.node.hostdb.total_lookups", &hostDBtotal);
- clusterSumInt("proxy.node.dns.total_dns_lookups", &dnsTotal);
- clusterSumInt("proxy.node.hostdb.total_hits", &hostDBhits);
-
- if (hostDBtotal != 0) {
- if (hostDBhits < 0) {
- hostDBhits = 0;
- mgmt_log(stderr, "truncating hit_ratio from %d to 0\n", hostDBhits);
- }
- hitRate = (MgmtFloat) ((double) hostDBhits / (double) hostDBtotal);
- } else {
- hitRate = 0.0;
- }
-
- ink_assert(hitRate >= 0.0);
- ink_assert(varSetFloat("proxy.cluster.hostdb.hit_ratio", hitRate));
-}
-
-// void overviewPage::agBandwidthHitRate()
-//
-void
-overviewPage::agBandwidthHitRate()
-{
- static ink_hrtime last_set_time = 0;
- const ink_hrtime window = 10 * HRTIME_SECOND; // update every 10 seconds
- static StatTwoIntSamples cluster_ua_total_bytes = { "proxy.node.user_agent_total_bytes", 0, 0, 0, 0 };
- static StatTwoIntSamples cluster_os_total_bytes = { "proxy.node.origin_server_total_bytes", 0, 0, 0, 0 };
- static const char *cluster_ua_total_bytes_name = "proxy.cluster.user_agent_total_bytes_avg_10s";
- static const char *cluster_os_total_bytes_name = "proxy.cluster.origin_server_total_bytes_avg_10s";
-
- MgmtInt bytes;
- MgmtInt UA_total = 0; // User Agent total
- MgmtInt OSPP_total = 0; // Origin Server and Parent Proxy(?)
- MgmtFloat hitRate;
- MgmtInt totalHits = 0;
- MgmtInt cacheOn = 1; // on by default
- MgmtInt httpCacheOn;
-
- // See if cache is on
- ink_assert(varIntFromName("proxy.config.http.cache.http", &httpCacheOn));
- cacheOn = httpCacheOn;
-
- // Get total cluster hits first, only calculate bandwith if > 0
- varIntFromName("proxy.cluster.cache_total_hits", &totalHits);
-
- // User Agent
-
- // HTTP
- varIntFromName("proxy.cluster.http.user_agent_total_request_bytes", &bytes);
- UA_total += bytes;
- varIntFromName("proxy.cluster.http.user_agent_total_response_bytes", &bytes);
- UA_total += bytes;
-
- // HTTP
- varIntFromName("proxy.cluster.http.origin_server_total_request_bytes", &bytes);
- OSPP_total += bytes;
- varIntFromName("proxy.cluster.http.origin_server_total_response_bytes", &bytes);
- OSPP_total += bytes;
- varIntFromName("proxy.cluster.http.parent_proxy_total_request_bytes", &bytes);
- OSPP_total += bytes;
- varIntFromName("proxy.cluster.http.parent_proxy_total_response_bytes", &bytes);
- OSPP_total += bytes;
-
- // Special negative bandwidth scenario is treated here
- // See (Bug INKqa03094) and Ag_Bytes() in 'StatAggregation.cc'
- bool setBW = true;
- if (UA_total != 0 && totalHits && cacheOn) {
- hitRate = ((double) UA_total - (double) OSPP_total) / (double) UA_total;
- if (hitRate < 0.0)
- setBW = false; // negative bandwidth scenario....
- } else {
- hitRate = 0.0;
- }
-
- if (setBW) {
- ink_assert(varSetFloat("proxy.cluster.bandwidth_hit_ratio", hitRate));
- }
- // get current time and delta to work with
- ink_hrtime current_time = ink_get_hrtime();
- // ink_hrtime delta = current_time - last_set_time;
-
- ///////////////////////////////////////////////////////////////
- // if enough time expired, or first time, or wrapped around: //
- // (1) scroll current value into previous value //
- // (2) calculate new current values //
- // (3) only if proper time expired, set derived values //
- ///////////////////////////////////////////////////////////////
- if (((current_time - last_set_time) > window) || // sufficient elapsed time
- (last_set_time == 0) || // first time
- (last_set_time > current_time)) // wrapped around
- {
- ////////////////////////////////////////
- // scroll values for node UA/OS bytes //
- ///////////////////////////////////////
- cluster_ua_total_bytes.previous_time = cluster_ua_total_bytes.current_time;
- cluster_ua_total_bytes.previous_value = cluster_ua_total_bytes.current_value;
-
- cluster_os_total_bytes.previous_time = cluster_os_total_bytes.current_time;
- cluster_os_total_bytes.previous_value = cluster_os_total_bytes.current_value;
-
- //////////////////////////
- // calculate new values //
- //////////////////////////
- cluster_ua_total_bytes.current_value = -10000;
- cluster_ua_total_bytes.current_time = ink_get_hrtime();
- // TODO: Should we check return value?
- clusterSumInt(cluster_ua_total_bytes.lm_record_name, &(cluster_ua_total_bytes.current_value));
-
- cluster_os_total_bytes.current_value = -10000;
- cluster_os_total_bytes.current_time = ink_get_hrtime();
- // TODO: Should we check return value?
- clusterSumInt(cluster_os_total_bytes.lm_record_name, &(cluster_os_total_bytes.current_value));
-
- ////////////////////////////////////////////////
- // if not initial or wrap, set derived values //
- ////////////////////////////////////////////////
- if ((current_time - last_set_time) > window) {
- RecInt num_ua_total = 0;
- RecInt num_os_total = 0;
- RecInt diff = 0;
-
- // generate time window deltas and sum
- diff = cluster_ua_total_bytes.diff_value();
- varSetInt(cluster_ua_total_bytes_name, diff);
- num_ua_total = diff;
-
- diff = cluster_os_total_bytes.diff_value();
- varSetInt(cluster_os_total_bytes_name, diff);
- num_os_total = diff;
-
- if (num_ua_total == 0 || (num_ua_total < num_os_total))
- hitRate = 0.00;
- else
- hitRate = (MgmtFloat) (((double) num_ua_total - (double) num_os_total) / (double) num_ua_total);
-
- // Check if more than one cluster node
- MgmtInt num_nodes;
- varIntFromName("proxy.process.cluster.nodes", &num_nodes);
- if (1 == num_nodes) {
- // Only one node , so grab local value
- varFloatFromName("proxy.node.bandwidth_hit_ratio_avg_10s", &hitRate);
- }
- // new stat
- varSetFloat("proxy.cluster.bandwidth_hit_ratio_avg_10s", hitRate);
- }
- /////////////////////////////////////////////////
- // done with a cycle, update the last_set_time //
- /////////////////////////////////////////////////
- last_set_time = current_time;
- }
-
-} // end overviewPage::agBandwidthHitRate()
-
-// int overviewPage::clusterSumInt(char* nodeVar, MgmtInt* sum)
-//
-// Sums nodeVar for every up node in the cluster and stores the
-// sum in *sum. Returns the number of nodes summed over
-//
-// CALLEE MUST HOLD this->accessLock
-//
-int
-overviewPage::clusterSumInt(const char *nodeVar, RecInt * sum)
-{
- int numUsed = 0;
- int numHosts_local = sortRecords.getNumEntries();
- overviewRecord *current;
- bool found;
-
- ink_assert(sum != NULL);
- *sum = 0;
-
- for (int i = 0; i < numHosts_local; i++) {
- current = (overviewRecord *) sortRecords[i];
- if (current->up == true) {
- numUsed++;
- *sum += current->readInteger(nodeVar, &found);
- if (found == false) {
- }
- }
- }
-
- return numUsed;
-}
-
-//
-// Updates proxy.cluster.current_client_connections
-// Updates proxy.cluster.current_server_connections
-// Updates proxy.cluster.current_cache_connections
-//
-void
-overviewPage::agConnections()
-{
- MgmtInt client_conn = 0;
- MgmtInt server_conn = 0;
- MgmtInt cache_conn = 0;
-
- clusterSumInt("proxy.node.current_client_connections", &client_conn);
- clusterSumInt("proxy.node.current_server_connections", &server_conn);
- clusterSumInt("proxy.node.current_cache_connections", &cache_conn);
-
- ink_assert(varSetInt("proxy.cluster.current_client_connections", client_conn));
- ink_assert(varSetInt("proxy.cluster.current_server_connections", server_conn));
- ink_assert(varSetInt("proxy.cluster.current_cache_connections", cache_conn));
-}
-
-// void overviewPage::clusterAgInt(const char* clusterVar, const char* nodeVar)
-//
-// Updates clusterVar with the sum of nodeVar for every node in the
-// cluster
-// CALLEE MUST HOLD this->accessLock
-//
-void
-overviewPage::clusterAgInt(const char *clusterVar, const char *nodeVar)
-{
- int numUsed = 0;
- MgmtInt sum = 0;
-
- numUsed = clusterSumInt(nodeVar, &sum);
- if (numUsed > 0) {
- ink_assert(varSetInt(clusterVar, sum));
- }
-}
-
-void
-overviewPage::clusterAgIntScale(const char *clusterVar, const char *nodeVar, double factor)
-{
- int numUsed = 0;
- RecInt sum = 0;
-
- numUsed = clusterSumInt(nodeVar, &sum);
- if (numUsed > 0) {
- sum = (int) (sum * factor);
- ink_assert(varSetInt(clusterVar, sum));
- }
-}
-
-// int overviewPage::clusterSumCounter(char* nodeVar, MgmtIntCounter* sum)
-//
-// Sums nodeVar for every up node in the cluster and stores the
-// sum in *sum. Returns the number of nodes summed over
-//
-// CALLEE MUST HOLD this->accessLock
-//
-int
-overviewPage::clusterSumCounter(char *nodeVar, RecInt * sum)
-{
- int numUsed = 0;
- int numHosts_local = sortRecords.getNumEntries();
- overviewRecord *current;
- bool found;
-
- ink_assert(sum != NULL);
- *sum = 0;
-
- for (int i = 0; i < numHosts_local; i++) {
- current = (overviewRecord *) sortRecords[i];
- if (current->up == true) {
- numUsed++;
- *sum += current->readCounter(nodeVar, &found);
- if (found == false) {
- }
- }
- }
-
- return numUsed;
-}
-
-// int overviewPage::clusterSumFloat(char* nodeVar, MgmtFloat* sum)
-//
-// Sums nodeVar for every up node in the cluster and stores the
-// sum in *sum. Returns the number of nodes summed over
-//
-// CALLEE MUST HOLD this->accessLock
-//
-int
-overviewPage::clusterSumFloat(const char *nodeVar, RecFloat * sum)
-{
- int numUsed = 0;
- int numHosts_local = sortRecords.getNumEntries();
- overviewRecord *current;
- bool found;
-
- ink_assert(sum != NULL);
- *sum = 0.00;
-
- for (int i = 0; i < numHosts_local; i++) {
- current = (overviewRecord *) sortRecords[i];
- if (current->up == true) {
- numUsed++;
- *sum += current->readFloat(nodeVar, &found);
- if (found == false) {
- }
- }
- }
- return numUsed;
-}
-
// int overviewPage::clusterSumData(RecDataT varType, const char* nodeVar,
// RecData* sum)
//
@@ -1291,50 +754,6 @@ overviewPage::clusterSumData(RecDataT varType, const char *nodeVar,
return numUsed;
}
-// void overviewPage::clusterAgFloat(const char* clusterVar, const char* nodeVar)
-//
-//
-// Sums nodeVar for every up node in the cluster and stores the
-// sum in sumVar
-//
-// CALLEE MUST HOLD this->accessLock
-//
-void
-overviewPage::clusterAgFloat(const char *clusterVar, const char *nodeVar)
-{
- int numUsed = 0;
- MgmtFloat sum = 0;
-
- numUsed = clusterSumFloat(nodeVar, &sum);
-
- if (numUsed > 0) {
- ink_assert(varSetFloat(clusterVar, sum));
- }
-}
-
-int
-overviewPage::varClusterFloatFromName(char *nodeVar, RecFloat * sum)
-{
- ink_mutex_acquire(&accessLock);
- int status = 0;
- RecDataT varDataType;
- RecInt tempInt = 0;
- RecFloat tempFloat = 0.0;
-
- RecGetRecordDataType(nodeVar, &varDataType);
-
- if (varDataType == RECD_INT) {
- status = clusterSumInt(nodeVar, &tempInt);
- tempFloat = (RecFloat) tempInt;
- } else if (varDataType == RECD_FLOAT) {
- status = clusterSumFloat(nodeVar, &tempFloat);
- }
-
- *sum = tempFloat;
- ink_mutex_release(&accessLock);
- return (status);
-}
-
int
overviewPage::varClusterDataFromName(RecDataT varType, char *nodeVar,
RecData *sum)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3ceb8a20/mgmt/web2/WebOverview.h
----------------------------------------------------------------------
diff --git a/mgmt/web2/WebOverview.h b/mgmt/web2/WebOverview.h
index 94b48a2..5992755 100644
--- a/mgmt/web2/WebOverview.h
+++ b/mgmt/web2/WebOverview.h
@@ -119,7 +119,6 @@ public:
MgmtString readString(const char *nodeName, const char *name, bool * found = NULL);
void addSelfRecord();
- int varClusterFloatFromName(char *, MgmtFloat *);
int varClusterDataFromName(RecDataT varType, char *nodeVar, RecData *sum);
private:
@@ -141,21 +140,7 @@ private:
ExpandingArray sortRecords; // A second, sorted container for nodeRecords
int numHosts; // number of peers we know about including ourself
- // Functions to do cluster aggregation
- //
- void clusterAgInt(const char *clustVar, const char *nodeVar);
- void clusterAgIntScale(const char *clustVar, const char *nodeVar, double factor);
-#define MB_SCALE (1/(1024*1024.0))
- int clusterSumInt(const char *nodeVar, MgmtInt * sum);
- int clusterSumCounter(char *nodeVar, MgmtInt * sum);
- void clusterAgFloat(const char *clusterVar, const char *nodeVar);
- int clusterSumFloat(const char *nodeVar, MgmtFloat * sum);
int clusterSumData(RecDataT varType, const char *nodeVar, RecData *sum);
- void agHostdbHitRate();
- void agCacheHitRate();
- void agCachePercentFree();
- void agBandwidthHitRate();
- void agConnections();
};
extern overviewPage *overviewGenerator; // global handle to overiewPage?