Skip to content

Cleanup: Get rid of afterpoll net stats #8891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masaori335 merged 1 commit into from
Jun 10, 2022
Merged

Cleanup: Get rid of afterpoll net stats #8891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions doc/admin-guide/monitoring/statistics/core/network-io.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ Network I/O
.. ts:stat:: global proxy.process.net.accepts_currently_open integer
:type: counter

.. ts:stat:: global proxy.process.net.calls_to_readfromnet_afterpoll integer
:type: counter
:ungathered:

.. ts:stat:: global proxy.process.net.calls_to_readfromnet integer
:type: counter
:ungathered:
Expand All @@ -49,10 +45,6 @@ Network I/O
:type: counter
:ungathered:

.. ts:stat:: global proxy.process.net.calls_to_writetonet_afterpoll integer
:type: counter
:ungathered:

.. ts:stat:: global proxy.process.net.calls_to_writetonet integer
:type: counter
:ungathered:
Expand Down
4 changes: 0 additions & 4 deletions iocore/net/Net.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,9 @@ register_net_stats()
{"proxy.process.net.calls_to_read", net_calls_to_read_stat},
{"proxy.process.net.calls_to_read_nodata", net_calls_to_read_nodata_stat},
{"proxy.process.net.calls_to_readfromnet", net_calls_to_readfromnet_stat},
{"proxy.process.net.calls_to_readfromnet_afterpoll", net_calls_to_readfromnet_afterpoll_stat},
{"proxy.process.net.calls_to_write", net_calls_to_write_stat},
{"proxy.process.net.calls_to_write_nodata", net_calls_to_write_nodata_stat},
{"proxy.process.net.calls_to_writetonet", net_calls_to_writetonet_stat},
{"proxy.process.net.calls_to_writetonet_afterpoll", net_calls_to_writetonet_afterpoll_stat},
{"proxy.process.net.inactivity_cop_lock_acquire_failure", inactivity_cop_lock_acquire_failure_stat},
{"proxy.process.net.net_handler_run", net_handler_run_stat},
{"proxy.process.net.read_bytes", net_read_bytes_stat},
Expand Down Expand Up @@ -121,11 +119,9 @@ register_net_stats()
NET_CLEAR_DYN_STAT(net_connections_currently_open_stat);
NET_CLEAR_DYN_STAT(net_accepts_currently_open_stat);
NET_CLEAR_DYN_STAT(net_calls_to_readfromnet_stat);
NET_CLEAR_DYN_STAT(net_calls_to_readfromnet_afterpoll_stat);
NET_CLEAR_DYN_STAT(net_calls_to_read_stat);
NET_CLEAR_DYN_STAT(net_calls_to_read_nodata_stat);
NET_CLEAR_DYN_STAT(net_calls_to_writetonet_stat);
NET_CLEAR_DYN_STAT(net_calls_to_writetonet_afterpoll_stat);
NET_CLEAR_DYN_STAT(net_calls_to_write_stat);
NET_CLEAR_DYN_STAT(net_calls_to_write_nodata_stat);
NET_CLEAR_DYN_STAT(socks_connections_currently_open_stat);
Expand Down
2 changes: 0 additions & 2 deletions iocore/net/P_Net.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,9 @@ enum Net_Stats {
net_connections_currently_open_stat,
net_accepts_currently_open_stat,
net_calls_to_readfromnet_stat,
net_calls_to_readfromnet_afterpoll_stat,
net_calls_to_read_stat,
net_calls_to_read_nodata_stat,
net_calls_to_writetonet_stat,
net_calls_to_writetonet_afterpoll_stat,
net_calls_to_write_stat,
net_calls_to_write_nodata_stat,
socks_connections_successful_stat,
Expand Down
1 change: 0 additions & 1 deletion iocore/net/UnixNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ write_to_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
ProxyMutex *mutex = thread->mutex.get();

NET_INCREMENT_DYN_STAT(net_calls_to_writetonet_stat);
NET_INCREMENT_DYN_STAT(net_calls_to_writetonet_afterpoll_stat);

write_to_net_io(nh, vc, thread);
}
Expand Down
11 changes: 2 additions & 9 deletions src/traffic_server/traffic_server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,16 +1384,10 @@ struct ShowStats : public Continuation {
NET_READ_DYN_SUM(net_calls_to_readfromnet_stat, sval);
int64_t d_rb = sval - last_rb;
last_rb += d_rb;
NET_READ_DYN_SUM(net_calls_to_readfromnet_afterpoll_stat, sval);
int64_t d_r = sval - last_r;
last_r += d_r;

NET_READ_DYN_SUM(net_calls_to_writetonet_stat, sval);
int64_t d_wb = sval - last_wb;
last_wb += d_wb;
NET_READ_DYN_SUM(net_calls_to_writetonet_afterpoll_stat, sval);
int64_t d_w = sval - last_w;
last_w += d_w;

NET_READ_DYN_STAT(net_read_bytes_stat, sval, cval);
int64_t d_nrb = sval - last_nrb;
Expand All @@ -1413,9 +1407,8 @@ struct ShowStats : public Continuation {
NET_READ_DYN_STAT(net_handler_run_stat, sval, cval);
int64_t d_p = cval - last_p;
last_p += d_p;
printf("%" PRId64 ":%" PRId64 " %" PRId64 ":%" PRId64 " %" PRId64 ":%" PRId64 " %" PRId64 ":%" PRId64 " %" PRId64 " %" PRId64
"\n",
d_rb, d_r, d_wb, d_w, d_nrb, d_nr, d_nwb, d_nw, d_o, d_p);
printf("%" PRId64 ":%" PRId64 ":%" PRId64 ":%" PRId64 " %" PRId64 ":%" PRId64 " %" PRId64 " %" PRId64 "\n", d_rb, d_wb, d_nrb,
d_nr, d_nwb, d_nw, d_o, d_p);
#ifdef ENABLE_TIME_TRACE
int i;
fprintf(fp, "immediate_events_time_dist\n");
Expand Down