You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2016/01/24 01:35:50 UTC
trafficserver git commit: Remove some dead stats code.
Repository: trafficserver
Updated Branches:
refs/heads/master 0c7bff91f -> b67100264
Remove some dead stats code.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b6710026
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b6710026
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b6710026
Branch: refs/heads/master
Commit: b6710026472dc06acacd4d6ea54ca1286e88fbeb
Parents: 0c7bff9
Author: James Peach <jp...@apache.org>
Authored: Sat Jan 23 16:35:46 2016 -0800
Committer: James Peach <jp...@apache.org>
Committed: Sat Jan 23 16:35:46 2016 -0800
----------------------------------------------------------------------
proxy/StatSystem.cc | 263 -----------------------------------------------
proxy/StatSystem.h | 22 ----
2 files changed, 285 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b6710026/proxy/StatSystem.cc
----------------------------------------------------------------------
diff --git a/proxy/StatSystem.cc b/proxy/StatSystem.cc
index a743774..b237a5e 100644
--- a/proxy/StatSystem.cc
+++ b/proxy/StatSystem.cc
@@ -468,266 +468,3 @@ initialize_all_global_stats()
clear_http_handler_times();
}
-
-// void *
-// tmp_stats_lock_function(UpdateLockAction action)
-//{
-// stats_lock_function((void *) (&global_http_trans_stat_lock), action);
-//
-// return NULL;
-//}
-
-// void *
-// stats_lock_function(void *data, UpdateLockAction action)
-//{
-// if (action == UPDATE_LOCK_ACQUIRE) {
-// STAT_LOCK_ACQUIRE((ink_stat_lock_t *) data);
-// } else {
-// STAT_LOCK_RELEASE((ink_stat_lock_t *) data);
-// }
-//
-// return NULL;
-//}
-
-void *
-dyn_stats_int_msecs_to_float_seconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_DYN_STAT((long)data, count, sum);
-
- float r;
- if (count == 0) {
- r = 0.0;
- } else {
- r = ((float)sum) / 1000.0;
- }
- *(float *)res = r;
- return res;
-}
-
-void *
-dyn_stats_count_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_DYN_STAT((long)data, count, sum);
- (void)sum;
- ink_atomic_swap((ink_statval_t *)res, count);
- return res;
-}
-
-void *
-dyn_stats_sum_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_DYN_STAT((long)data, count, sum);
- (void)count;
- ink_atomic_swap((ink_statval_t *)res, sum);
- return res;
-}
-
-void *
-dyn_stats_avg_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_DYN_STAT((long)data, count, sum);
- if (count == 0) {
- *(float *)res = 0.0;
- } else {
- *(float *)res = (float)sum / (float)count;
- }
- return res;
-}
-
-void *
-dyn_stats_fsum_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_DYN_STAT((long)data, count, sum);
- (void)count;
- *(float *)res = (double)sum;
- return res;
-}
-
-void *
-dyn_stats_favg_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_DYN_STAT((long)data, count, sum);
- if (count == 0) {
- *(float *)res = 0.0;
- } else {
- *(float *)res = (double)sum / (double)count;
- }
- return res;
-}
-
-void *
-dyn_stats_time_seconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- float r;
- READ_DYN_STAT((long)data, count, sum);
- if (count == 0) {
- r = 0.0;
- } else {
- r = (float)sum / (float)count;
- r = r / (float)HRTIME_SECOND;
- }
- *(float *)res = r;
- return res;
-}
-
-void *
-dyn_stats_time_mseconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- float r;
- READ_DYN_STAT((long)data, count, sum);
- if (count == 0) {
- r = 0.0;
- } else {
- r = (float)sum / (float)count;
- r = r / (float)HRTIME_MSECOND;
- }
- *(float *)res = r;
- return res;
-}
-
-void *
-dyn_stats_time_useconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- float r;
- READ_DYN_STAT((long)data, count, sum);
- if (count == 0) {
- r = 0.0;
- } else {
- r = (float)sum / (float)count;
- r = r / (float)HRTIME_USECOND;
- }
- *(float *)res = r;
- return res;
-}
-
-// http trans stat functions
-// there is the implicit assumption that the lock has
-// been acquired.
-void *
-http_trans_stats_int_msecs_to_float_seconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_HTTP_TRANS_STAT((long)data, count, sum);
-
- float r;
- if (count == 0) {
- r = 0.0;
- } else {
- r = ((float)sum) / 1000.0;
- }
- *(float *)res = r;
- return res;
-}
-
-void *
-http_trans_stats_count_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_HTTP_TRANS_STAT((long)data, count, sum);
- (void)sum;
- ink_atomic_swap((ink_statval_t *)res, count);
- return res;
-}
-
-void *
-http_trans_stats_sum_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_HTTP_TRANS_STAT((long)data, count, sum);
- (void)count;
- ink_atomic_swap((ink_statval_t *)res, sum);
- return res;
-}
-
-void *
-http_trans_stats_avg_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_HTTP_TRANS_STAT((long)data, count, sum);
- if (count == 0) {
- *(float *)res = 0.0;
- } else {
- *(float *)res = (float)sum / (float)count;
- }
- return res;
-}
-
-void *
-http_trans_stats_fsum_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_HTTP_TRANS_STAT((long)data, count, sum);
- (void)count;
- *(float *)res = (double)sum;
- return res;
-}
-
-void *
-http_trans_stats_favg_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- READ_HTTP_TRANS_STAT((long)data, count, sum);
- if (count == 0) {
- *(float *)res = 0.0;
- } else {
- *(float *)res = (double)sum / (double)count;
- }
- return res;
-}
-
-void *
-http_trans_stats_time_seconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- float r;
- READ_HTTP_TRANS_STAT((long)data, count, sum);
- if (count == 0) {
- r = 0.0;
- } else {
- r = (float)sum / (float)count;
- r = r / (float)HRTIME_SECOND;
- }
- *(float *)res = r;
- return res;
-}
-
-void *
-http_trans_stats_time_mseconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- float r;
- READ_HTTP_TRANS_STAT((long)data, count, sum);
- if (count == 0) {
- r = 0.0;
- } else {
- r = (float)sum / (float)count;
- r = r / (float)HRTIME_MSECOND;
- }
- *(float *)res = r;
- return res;
-}
-
-void *
-http_trans_stats_time_useconds_cb(void *data, void *res)
-{
- ink_statval_t count, sum;
- float r;
- READ_HTTP_TRANS_STAT((long)data, count, sum);
- if (count == 0) {
- r = 0.0;
- } else {
- r = (float)sum / (float)count;
- r = r / (float)HRTIME_USECOND;
- }
- *(float *)res = r;
- return res;
-}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b6710026/proxy/StatSystem.h
----------------------------------------------------------------------
diff --git a/proxy/StatSystem.h b/proxy/StatSystem.h
index b23a1bb..16a3248 100644
--- a/proxy/StatSystem.h
+++ b/proxy/StatSystem.h
@@ -558,28 +558,6 @@ struct ink_unprot_global_stat_t {
extern void start_stats_snap(void);
void initialize_all_global_stats();
-// TODO: I don't think these are necessary any more, but double check.
-// void *tmp_stats_lock_function(UpdateLockAction action);
-// void *stats_lock_function(void *data, UpdateLockAction action);
-
-void *http_trans_stats_count_cb(void *data, void *res);
-void *http_trans_stats_sum_cb(void *data, void *res);
-void *http_trans_stats_avg_cb(void *data, void *res);
-void *http_trans_stats_fsum_cb(void *data, void *res);
-void *http_trans_stats_favg_cb(void *data, void *res);
-void *http_trans_stats_time_seconds_cb(void *data, void *res);
-void *http_trans_stats_time_mseconds_cb(void *data, void *res);
-void *http_trans_stats_time_useconds_cb(void *data, void *res);
-
-void *dyn_stats_count_cb(void *data, void *res);
-inkcoreapi void *dyn_stats_sum_cb(void *data, void *res);
-void *dyn_stats_avg_cb(void *data, void *res);
-void *dyn_stats_fsum_cb(void *data, void *res);
-void *dyn_stats_favg_cb(void *data, void *res);
-void *dyn_stats_time_seconds_cb(void *data, void *res);
-void *dyn_stats_time_mseconds_cb(void *data, void *res);
-void *dyn_stats_time_useconds_cb(void *data, void *res);
-void *dyn_stats_int_msecs_to_float_seconds_cb(void *data, void *res);
//---------------------------------------------------------------------//
// Global variables declaration. //
//---------------------------------------------------------------------//