cleanup and make session_stats a bit more efficient
This commit is contained in:
Arvid Norberg
parent
02f3e48eaa
commit
f0be98ce53
|
|
@ -296,6 +296,8 @@ namespace libtorrent
|
||||||
num_stats_counters
|
num_stats_counters
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// it is important that all gauges have a higher index than counters.
|
||||||
|
// This assumption is relied upon in other parts of the code
|
||||||
enum stats_gauges_t
|
enum stats_gauges_t
|
||||||
{
|
{
|
||||||
num_checking_torrents = num_stats_counters,
|
num_checking_torrents = num_stats_counters,
|
||||||
|
|
|
||||||
|
|
@ -133,12 +133,10 @@ namespace libtorrent
|
||||||
#error TORRENT_CFG is not defined!
|
#error TORRENT_CFG is not defined!
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// given a vector if stats_metric objects (as returned by
|
// given a name of a metric, this function returns the counter index of it,
|
||||||
// session_stats_metrics()) and a name of a metric, this function returns
|
// or -1 if it could not be found. The counter index is the index into the
|
||||||
// the counter index of it, or -1 if it could not be found. The counter
|
// values array returned by session_stats_alert.
|
||||||
// index is the index into the values array returned by session_stats_alert.
|
TORRENT_EXPORT int find_metric_idx(char const* name);
|
||||||
TORRENT_EXPORT int find_metric_idx(std::vector<stats_metric> const& metrics
|
|
||||||
, char const* name);
|
|
||||||
|
|
||||||
void TORRENT_EXPORT TORRENT_CFG();
|
void TORRENT_EXPORT TORRENT_CFG();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,104 +38,98 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
namespace libtorrent
|
namespace libtorrent
|
||||||
{
|
{
|
||||||
|
|
||||||
// TODO: 3 this function could just use the static metrics array
|
struct TORRENT_EXPORT stats_metric_impl
|
||||||
// instead of taking it as an argument. Also, document it
|
|
||||||
int find_metric_idx(std::vector<stats_metric> const& metrics
|
|
||||||
, char const* name)
|
|
||||||
{
|
{
|
||||||
std::vector<stats_metric>::const_iterator i = std::find_if(metrics.begin()
|
char const* name;
|
||||||
, metrics.end(), boost::bind(&strcmp
|
int value_index;
|
||||||
, boost::bind(&stats_metric::name, _1), name) == 0);
|
};
|
||||||
if (i == metrics.end()) return -1;
|
|
||||||
return i->value_index;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: 3 the type of counter does not need to be stored in this array.
|
// TODO: 3 the type of counter does not need to be stored in this array.
|
||||||
// when the user asks for the list of counters, that field could be
|
// when the user asks for the list of counters, that field could be
|
||||||
// generated based on the range of the counter index.
|
// generated based on the range of the counter index.
|
||||||
#define METRIC(category, name, type) { #category "." #name, counters:: name, stats_metric:: type},
|
#define METRIC(category, name) { #category "." #name, counters:: name },
|
||||||
const static stats_metric metrics[] =
|
const static stats_metric_impl metrics[] =
|
||||||
{
|
{
|
||||||
// ``error_peers`` is the total number of peer disconnects
|
// ``error_peers`` is the total number of peer disconnects
|
||||||
// caused by an error (not initiated by this client) and
|
// caused by an error (not initiated by this client) and
|
||||||
// disconnected initiated by this client (``disconnected_peers``).
|
// disconnected initiated by this client (``disconnected_peers``).
|
||||||
METRIC(peer, error_peers, type_counter)
|
METRIC(peer, error_peers)
|
||||||
METRIC(peer, disconnected_peers, type_counter)
|
METRIC(peer, disconnected_peers)
|
||||||
|
|
||||||
// these counters break down the peer errors into more specific
|
// these counters break down the peer errors into more specific
|
||||||
// categories. These errors are what the underlying transport
|
// categories. These errors are what the underlying transport
|
||||||
// reported (i.e. TCP or uTP)
|
// reported (i.e. TCP or uTP)
|
||||||
METRIC(peer, eof_peers, type_counter)
|
METRIC(peer, eof_peers)
|
||||||
METRIC(peer, connreset_peers, type_counter)
|
METRIC(peer, connreset_peers)
|
||||||
METRIC(peer, connrefused_peers, type_counter)
|
METRIC(peer, connrefused_peers)
|
||||||
METRIC(peer, connaborted_peers, type_counter)
|
METRIC(peer, connaborted_peers)
|
||||||
METRIC(peer, perm_peers, type_counter)
|
METRIC(peer, perm_peers)
|
||||||
METRIC(peer, buffer_peers, type_counter)
|
METRIC(peer, buffer_peers)
|
||||||
METRIC(peer, unreachable_peers, type_counter)
|
METRIC(peer, unreachable_peers)
|
||||||
METRIC(peer, broken_pipe_peers, type_counter)
|
METRIC(peer, broken_pipe_peers)
|
||||||
METRIC(peer, addrinuse_peers, type_counter)
|
METRIC(peer, addrinuse_peers)
|
||||||
METRIC(peer, no_access_peers, type_counter)
|
METRIC(peer, no_access_peers)
|
||||||
METRIC(peer, invalid_arg_peers, type_counter)
|
METRIC(peer, invalid_arg_peers)
|
||||||
METRIC(peer, aborted_peers, type_counter)
|
METRIC(peer, aborted_peers)
|
||||||
|
|
||||||
// these counters break down the peer errors into
|
// these counters break down the peer errors into
|
||||||
// whether they happen on incoming or outgoing peers.
|
// whether they happen on incoming or outgoing peers.
|
||||||
METRIC(peer, error_incoming_peers, type_counter)
|
METRIC(peer, error_incoming_peers)
|
||||||
METRIC(peer, error_outgoing_peers, type_counter)
|
METRIC(peer, error_outgoing_peers)
|
||||||
|
|
||||||
// these counters break down the peer errors into
|
// these counters break down the peer errors into
|
||||||
// whether they happen on encrypted peers (just
|
// whether they happen on encrypted peers (just
|
||||||
// encrypted handshake) and rc4 peers (full stream
|
// encrypted handshake) and rc4 peers (full stream
|
||||||
// encryption). These can indicate whether encrypted
|
// encryption). These can indicate whether encrypted
|
||||||
// peers are more or less likely to fail
|
// peers are more or less likely to fail
|
||||||
METRIC(peer, error_rc4_peers, type_counter)
|
METRIC(peer, error_rc4_peers)
|
||||||
METRIC(peer, error_encrypted_peers, type_counter)
|
METRIC(peer, error_encrypted_peers)
|
||||||
|
|
||||||
// these counters break down the peer errors into
|
// these counters break down the peer errors into
|
||||||
// whether they happen on uTP peers or TCP peers.
|
// whether they happen on uTP peers or TCP peers.
|
||||||
// these may indicate whether one protocol is
|
// these may indicate whether one protocol is
|
||||||
// more error prone
|
// more error prone
|
||||||
METRIC(peer, error_tcp_peers, type_counter)
|
METRIC(peer, error_tcp_peers)
|
||||||
METRIC(peer, error_utp_peers, type_counter)
|
METRIC(peer, error_utp_peers)
|
||||||
|
|
||||||
// these counters break down the reasons to
|
// these counters break down the reasons to
|
||||||
// disconnect peers.
|
// disconnect peers.
|
||||||
METRIC(peer, connect_timeouts, type_counter)
|
METRIC(peer, connect_timeouts)
|
||||||
METRIC(peer, uninteresting_peers, type_counter)
|
METRIC(peer, uninteresting_peers)
|
||||||
METRIC(peer, timeout_peers, type_counter)
|
METRIC(peer, timeout_peers)
|
||||||
METRIC(peer, no_memory_peers, type_counter)
|
METRIC(peer, no_memory_peers)
|
||||||
METRIC(peer, too_many_peers, type_counter)
|
METRIC(peer, too_many_peers)
|
||||||
METRIC(peer, transport_timeout_peers, type_counter)
|
METRIC(peer, transport_timeout_peers)
|
||||||
METRIC(peer, num_banned_peers, type_counter)
|
METRIC(peer, num_banned_peers)
|
||||||
METRIC(peer, banned_for_hash_failure, type_counter)
|
METRIC(peer, banned_for_hash_failure)
|
||||||
|
|
||||||
METRIC(peer, connection_attempts, type_counter)
|
METRIC(peer, connection_attempts)
|
||||||
METRIC(peer, connection_attempt_loops, type_counter)
|
METRIC(peer, connection_attempt_loops)
|
||||||
METRIC(peer, incoming_connections, type_counter)
|
METRIC(peer, incoming_connections)
|
||||||
|
|
||||||
// the number of peer connections for each kind of socket.
|
// the number of peer connections for each kind of socket.
|
||||||
// these counts include half-open (connecting) peers.
|
// these counts include half-open (connecting) peers.
|
||||||
METRIC(peer, num_tcp_peers, type_gauge)
|
METRIC(peer, num_tcp_peers)
|
||||||
METRIC(peer, num_socks5_peers, type_gauge)
|
METRIC(peer, num_socks5_peers)
|
||||||
METRIC(peer, num_http_proxy_peers, type_gauge)
|
METRIC(peer, num_http_proxy_peers)
|
||||||
METRIC(peer, num_utp_peers, type_gauge)
|
METRIC(peer, num_utp_peers)
|
||||||
METRIC(peer, num_i2p_peers, type_gauge)
|
METRIC(peer, num_i2p_peers)
|
||||||
METRIC(peer, num_ssl_peers, type_gauge)
|
METRIC(peer, num_ssl_peers)
|
||||||
METRIC(peer, num_ssl_socks5_peers, type_gauge)
|
METRIC(peer, num_ssl_socks5_peers)
|
||||||
METRIC(peer, num_ssl_http_proxy_peers, type_gauge)
|
METRIC(peer, num_ssl_http_proxy_peers)
|
||||||
METRIC(peer, num_ssl_utp_peers, type_gauge)
|
METRIC(peer, num_ssl_utp_peers)
|
||||||
|
|
||||||
METRIC(peer, num_peers_half_open, type_gauge)
|
METRIC(peer, num_peers_half_open)
|
||||||
METRIC(peer, num_peers_connected, type_gauge)
|
METRIC(peer, num_peers_connected)
|
||||||
METRIC(peer, num_peers_up_interested, type_gauge)
|
METRIC(peer, num_peers_up_interested)
|
||||||
METRIC(peer, num_peers_down_interested, type_gauge)
|
METRIC(peer, num_peers_down_interested)
|
||||||
METRIC(peer, num_peers_up_unchoked, type_gauge)
|
METRIC(peer, num_peers_up_unchoked)
|
||||||
METRIC(peer, num_peers_down_unchoked, type_gauge)
|
METRIC(peer, num_peers_down_unchoked)
|
||||||
METRIC(peer, num_peers_up_requests, type_gauge)
|
METRIC(peer, num_peers_up_requests)
|
||||||
METRIC(peer, num_peers_down_requests, type_gauge)
|
METRIC(peer, num_peers_down_requests)
|
||||||
METRIC(peer, num_peers_end_game, type_gauge)
|
METRIC(peer, num_peers_end_game)
|
||||||
METRIC(peer, num_peers_up_disk, type_gauge)
|
METRIC(peer, num_peers_up_disk)
|
||||||
METRIC(peer, num_peers_down_disk, type_gauge)
|
METRIC(peer, num_peers_down_disk)
|
||||||
|
|
||||||
// These counters count the number of times the
|
// These counters count the number of times the
|
||||||
// network thread wakes up for each respective
|
// network thread wakes up for each respective
|
||||||
|
|
@ -145,48 +139,48 @@ namespace libtorrent
|
||||||
// mitigate it by increasing buffers and limits
|
// mitigate it by increasing buffers and limits
|
||||||
// for the specific trigger that wakes up the
|
// for the specific trigger that wakes up the
|
||||||
// thread.
|
// thread.
|
||||||
METRIC(net, on_read_counter, type_counter)
|
METRIC(net, on_read_counter)
|
||||||
METRIC(net, on_write_counter, type_counter)
|
METRIC(net, on_write_counter)
|
||||||
METRIC(net, on_tick_counter, type_counter)
|
METRIC(net, on_tick_counter)
|
||||||
METRIC(net, on_lsd_counter, type_counter)
|
METRIC(net, on_lsd_counter)
|
||||||
METRIC(net, on_lsd_peer_counter, type_counter)
|
METRIC(net, on_lsd_peer_counter)
|
||||||
METRIC(net, on_udp_counter, type_counter)
|
METRIC(net, on_udp_counter)
|
||||||
METRIC(net, on_accept_counter, type_counter)
|
METRIC(net, on_accept_counter)
|
||||||
METRIC(net, on_disk_counter, type_counter)
|
METRIC(net, on_disk_counter)
|
||||||
|
|
||||||
// total number of bytes sent and received by the session
|
// total number of bytes sent and received by the session
|
||||||
METRIC(net, sent_payload_bytes, type_counter)
|
METRIC(net, sent_payload_bytes)
|
||||||
METRIC(net, sent_bytes, type_counter)
|
METRIC(net, sent_bytes)
|
||||||
METRIC(net, sent_ip_overhead_bytes, type_counter)
|
METRIC(net, sent_ip_overhead_bytes)
|
||||||
METRIC(net, sent_tracker_bytes, type_counter)
|
METRIC(net, sent_tracker_bytes)
|
||||||
METRIC(net, recv_payload_bytes, type_counter)
|
METRIC(net, recv_payload_bytes)
|
||||||
METRIC(net, recv_bytes, type_counter)
|
METRIC(net, recv_bytes)
|
||||||
METRIC(net, recv_ip_overhead_bytes, type_counter)
|
METRIC(net, recv_ip_overhead_bytes)
|
||||||
METRIC(net, recv_tracker_bytes, type_counter)
|
METRIC(net, recv_tracker_bytes)
|
||||||
|
|
||||||
// the number of sockets currently waiting for upload and download
|
// the number of sockets currently waiting for upload and download
|
||||||
// bandwidht from the rate limiter.
|
// bandwidht from the rate limiter.
|
||||||
METRIC(net, limiter_up_queue, type_gauge)
|
METRIC(net, limiter_up_queue)
|
||||||
METRIC(net, limiter_down_queue, type_gauge)
|
METRIC(net, limiter_down_queue)
|
||||||
|
|
||||||
// the number of upload and download bytes waiting to be handed out from
|
// the number of upload and download bytes waiting to be handed out from
|
||||||
// the rate limiter.
|
// the rate limiter.
|
||||||
METRIC(net, limiter_up_bytes, type_gauge)
|
METRIC(net, limiter_up_bytes)
|
||||||
METRIC(net, limiter_down_bytes, type_gauge)
|
METRIC(net, limiter_down_bytes)
|
||||||
|
|
||||||
// the number of bytes downloaded that had to be discarded because they
|
// the number of bytes downloaded that had to be discarded because they
|
||||||
// failed the hash check
|
// failed the hash check
|
||||||
METRIC(net, recv_failed_bytes, type_counter)
|
METRIC(net, recv_failed_bytes)
|
||||||
|
|
||||||
// the number of downloaded bytes that were discarded because they
|
// the number of downloaded bytes that were discarded because they
|
||||||
// were downloaded multiple times (from different peers)
|
// were downloaded multiple times (from different peers)
|
||||||
METRIC(net, recv_redundant_bytes, type_counter)
|
METRIC(net, recv_redundant_bytes)
|
||||||
|
|
||||||
// is false by default and set to true when
|
// is false by default and set to true when
|
||||||
// the first incoming connection is established
|
// the first incoming connection is established
|
||||||
// this is used to know if the client is behind
|
// this is used to know if the client is behind
|
||||||
// NAT or not.
|
// NAT or not.
|
||||||
METRIC(net, has_incoming_connections, type_gauge)
|
METRIC(net, has_incoming_connections)
|
||||||
|
|
||||||
// these gauges count the number of torrents in
|
// these gauges count the number of torrents in
|
||||||
// different states. Each torrent only belongs to
|
// different states. Each torrent only belongs to
|
||||||
|
|
@ -195,118 +189,118 @@ namespace libtorrent
|
||||||
// in picked. For instance, a torrent with an error
|
// in picked. For instance, a torrent with an error
|
||||||
// counts as an error-torrent, regardless of its other
|
// counts as an error-torrent, regardless of its other
|
||||||
// state.
|
// state.
|
||||||
METRIC(ses, num_checking_torrents, type_gauge)
|
METRIC(ses, num_checking_torrents)
|
||||||
METRIC(ses, num_stopped_torrents, type_gauge)
|
METRIC(ses, num_stopped_torrents)
|
||||||
METRIC(ses, num_upload_only_torrents, type_gauge)
|
METRIC(ses, num_upload_only_torrents)
|
||||||
METRIC(ses, num_downloading_torrents, type_gauge)
|
METRIC(ses, num_downloading_torrents)
|
||||||
METRIC(ses, num_seeding_torrents, type_gauge)
|
METRIC(ses, num_seeding_torrents)
|
||||||
METRIC(ses, num_queued_seeding_torrents, type_gauge)
|
METRIC(ses, num_queued_seeding_torrents)
|
||||||
METRIC(ses, num_queued_download_torrents, type_gauge)
|
METRIC(ses, num_queued_download_torrents)
|
||||||
METRIC(ses, num_error_torrents, type_gauge)
|
METRIC(ses, num_error_torrents)
|
||||||
|
|
||||||
// the number of torrents that are currently loaded
|
// the number of torrents that are currently loaded
|
||||||
METRIC(ses, num_loaded_torrents, type_gauge)
|
METRIC(ses, num_loaded_torrents)
|
||||||
METRIC(ses, num_pinned_torrents, type_gauge)
|
METRIC(ses, num_pinned_torrents)
|
||||||
|
|
||||||
// these count the number of times a piece has passed the
|
// these count the number of times a piece has passed the
|
||||||
// hash check, the number of times a piece was successfully
|
// hash check, the number of times a piece was successfully
|
||||||
// written to disk and the number of total possible pieces
|
// written to disk and the number of total possible pieces
|
||||||
// added by adding torrents. e.g. when adding a torrent with
|
// added by adding torrents. e.g. when adding a torrent with
|
||||||
// 1000 piece, num_total_pieces_added is incremented by 1000.
|
// 1000 piece, num_total_pieces_added is incremented by 1000.
|
||||||
METRIC(ses, num_piece_passed, type_counter)
|
METRIC(ses, num_piece_passed)
|
||||||
METRIC(ses, num_piece_failed, type_counter)
|
METRIC(ses, num_piece_failed)
|
||||||
|
|
||||||
METRIC(ses, num_have_pieces, type_counter)
|
METRIC(ses, num_have_pieces)
|
||||||
METRIC(ses, num_total_pieces_added, type_counter)
|
METRIC(ses, num_total_pieces_added)
|
||||||
|
|
||||||
// this counts the number of times a torrent has been
|
// this counts the number of times a torrent has been
|
||||||
// evicted (only applies when `dynamic loading of torrent files`_
|
// evicted (only applies when `dynamic loading of torrent files`_
|
||||||
// is enabled).
|
// is enabled).
|
||||||
METRIC(ses, torrent_evicted_counter, type_counter)
|
METRIC(ses, torrent_evicted_counter)
|
||||||
|
|
||||||
// the number of allowed unchoked peers
|
// the number of allowed unchoked peers
|
||||||
METRIC(ses, num_unchoke_slots, type_gauge)
|
METRIC(ses, num_unchoke_slots)
|
||||||
|
|
||||||
// bittorrent message counters. These counters are incremented
|
// bittorrent message counters. These counters are incremented
|
||||||
// every time a message of the corresponding type is received from
|
// every time a message of the corresponding type is received from
|
||||||
// or sent to a bittorrent peer.
|
// or sent to a bittorrent peer.
|
||||||
METRIC(ses, num_incoming_choke, type_counter)
|
METRIC(ses, num_incoming_choke)
|
||||||
METRIC(ses, num_incoming_unchoke, type_counter)
|
METRIC(ses, num_incoming_unchoke)
|
||||||
METRIC(ses, num_incoming_interested, type_counter)
|
METRIC(ses, num_incoming_interested)
|
||||||
METRIC(ses, num_incoming_not_interested, type_counter)
|
METRIC(ses, num_incoming_not_interested)
|
||||||
METRIC(ses, num_incoming_have, type_counter)
|
METRIC(ses, num_incoming_have)
|
||||||
METRIC(ses, num_incoming_bitfield, type_counter)
|
METRIC(ses, num_incoming_bitfield)
|
||||||
METRIC(ses, num_incoming_request, type_counter)
|
METRIC(ses, num_incoming_request)
|
||||||
METRIC(ses, num_incoming_piece, type_counter)
|
METRIC(ses, num_incoming_piece)
|
||||||
METRIC(ses, num_incoming_cancel, type_counter)
|
METRIC(ses, num_incoming_cancel)
|
||||||
METRIC(ses, num_incoming_dht_port, type_counter)
|
METRIC(ses, num_incoming_dht_port)
|
||||||
METRIC(ses, num_incoming_suggest, type_counter)
|
METRIC(ses, num_incoming_suggest)
|
||||||
METRIC(ses, num_incoming_have_all, type_counter)
|
METRIC(ses, num_incoming_have_all)
|
||||||
METRIC(ses, num_incoming_have_none, type_counter)
|
METRIC(ses, num_incoming_have_none)
|
||||||
METRIC(ses, num_incoming_reject, type_counter)
|
METRIC(ses, num_incoming_reject)
|
||||||
METRIC(ses, num_incoming_allowed_fast, type_counter)
|
METRIC(ses, num_incoming_allowed_fast)
|
||||||
METRIC(ses, num_incoming_ext_handshake, type_counter)
|
METRIC(ses, num_incoming_ext_handshake)
|
||||||
METRIC(ses, num_incoming_pex, type_counter)
|
METRIC(ses, num_incoming_pex)
|
||||||
METRIC(ses, num_incoming_metadata, type_counter)
|
METRIC(ses, num_incoming_metadata)
|
||||||
METRIC(ses, num_incoming_extended, type_counter)
|
METRIC(ses, num_incoming_extended)
|
||||||
|
|
||||||
METRIC(ses, num_outgoing_choke, type_counter)
|
METRIC(ses, num_outgoing_choke)
|
||||||
METRIC(ses, num_outgoing_unchoke, type_counter)
|
METRIC(ses, num_outgoing_unchoke)
|
||||||
METRIC(ses, num_outgoing_interested, type_counter)
|
METRIC(ses, num_outgoing_interested)
|
||||||
METRIC(ses, num_outgoing_not_interested, type_counter)
|
METRIC(ses, num_outgoing_not_interested)
|
||||||
METRIC(ses, num_outgoing_have, type_counter)
|
METRIC(ses, num_outgoing_have)
|
||||||
METRIC(ses, num_outgoing_bitfield, type_counter)
|
METRIC(ses, num_outgoing_bitfield)
|
||||||
METRIC(ses, num_outgoing_request, type_counter)
|
METRIC(ses, num_outgoing_request)
|
||||||
METRIC(ses, num_outgoing_piece, type_counter)
|
METRIC(ses, num_outgoing_piece)
|
||||||
METRIC(ses, num_outgoing_cancel, type_counter)
|
METRIC(ses, num_outgoing_cancel)
|
||||||
METRIC(ses, num_outgoing_dht_port, type_counter)
|
METRIC(ses, num_outgoing_dht_port)
|
||||||
METRIC(ses, num_outgoing_suggest, type_counter)
|
METRIC(ses, num_outgoing_suggest)
|
||||||
METRIC(ses, num_outgoing_have_all, type_counter)
|
METRIC(ses, num_outgoing_have_all)
|
||||||
METRIC(ses, num_outgoing_have_none, type_counter)
|
METRIC(ses, num_outgoing_have_none)
|
||||||
METRIC(ses, num_outgoing_reject, type_counter)
|
METRIC(ses, num_outgoing_reject)
|
||||||
METRIC(ses, num_outgoing_allowed_fast, type_counter)
|
METRIC(ses, num_outgoing_allowed_fast)
|
||||||
METRIC(ses, num_outgoing_ext_handshake, type_counter)
|
METRIC(ses, num_outgoing_ext_handshake)
|
||||||
METRIC(ses, num_outgoing_pex, type_counter)
|
METRIC(ses, num_outgoing_pex)
|
||||||
METRIC(ses, num_outgoing_metadata, type_counter)
|
METRIC(ses, num_outgoing_metadata)
|
||||||
METRIC(ses, num_outgoing_extended, type_counter)
|
METRIC(ses, num_outgoing_extended)
|
||||||
|
|
||||||
// the number of pieces considered while picking pieces
|
// the number of pieces considered while picking pieces
|
||||||
METRIC(picker, piece_picker_partial_loops, type_counter)
|
METRIC(picker, piece_picker_partial_loops)
|
||||||
METRIC(picker, piece_picker_suggest_loops, type_counter)
|
METRIC(picker, piece_picker_suggest_loops)
|
||||||
METRIC(picker, piece_picker_sequential_loops, type_counter)
|
METRIC(picker, piece_picker_sequential_loops)
|
||||||
METRIC(picker, piece_picker_reverse_rare_loops, type_counter)
|
METRIC(picker, piece_picker_reverse_rare_loops)
|
||||||
METRIC(picker, piece_picker_rare_loops, type_counter)
|
METRIC(picker, piece_picker_rare_loops)
|
||||||
METRIC(picker, piece_picker_rand_start_loops, type_counter)
|
METRIC(picker, piece_picker_rand_start_loops)
|
||||||
METRIC(picker, piece_picker_rand_loops, type_counter)
|
METRIC(picker, piece_picker_rand_loops)
|
||||||
METRIC(picker, piece_picker_busy_loops, type_counter)
|
METRIC(picker, piece_picker_busy_loops)
|
||||||
|
|
||||||
// This breaks down the piece picks into the event that
|
// This breaks down the piece picks into the event that
|
||||||
// triggered it
|
// triggered it
|
||||||
METRIC(picker, reject_piece_picks, type_counter)
|
METRIC(picker, reject_piece_picks)
|
||||||
METRIC(picker, unchoke_piece_picks, type_counter)
|
METRIC(picker, unchoke_piece_picks)
|
||||||
METRIC(picker, incoming_redundant_piece_picks, type_counter)
|
METRIC(picker, incoming_redundant_piece_picks)
|
||||||
METRIC(picker, incoming_piece_picks, type_counter)
|
METRIC(picker, incoming_piece_picks)
|
||||||
METRIC(picker, end_game_piece_picks, type_counter)
|
METRIC(picker, end_game_piece_picks)
|
||||||
METRIC(picker, snubbed_piece_picks, type_counter)
|
METRIC(picker, snubbed_piece_picks)
|
||||||
METRIC(picker, interesting_piece_picks, type_counter)
|
METRIC(picker, interesting_piece_picks)
|
||||||
METRIC(picker, hash_fail_piece_picks, type_counter)
|
METRIC(picker, hash_fail_piece_picks)
|
||||||
|
|
||||||
METRIC(disk, write_cache_blocks, type_gauge)
|
METRIC(disk, write_cache_blocks)
|
||||||
METRIC(disk, read_cache_blocks, type_gauge)
|
METRIC(disk, read_cache_blocks)
|
||||||
|
|
||||||
// the number of microseconds it takes from receiving a request from a
|
// the number of microseconds it takes from receiving a request from a
|
||||||
// peer until we're sending the response back on the socket.
|
// peer until we're sending the response back on the socket.
|
||||||
METRIC(disk, request_latency, type_gauge)
|
METRIC(disk, request_latency)
|
||||||
|
|
||||||
METRIC(disk, pinned_blocks, type_gauge)
|
METRIC(disk, pinned_blocks)
|
||||||
METRIC(disk, disk_blocks_in_use, type_gauge)
|
METRIC(disk, disk_blocks_in_use)
|
||||||
METRIC(disk, queued_disk_jobs, type_gauge)
|
METRIC(disk, queued_disk_jobs)
|
||||||
METRIC(disk, num_read_jobs, type_gauge)
|
METRIC(disk, num_read_jobs)
|
||||||
METRIC(disk, num_write_jobs, type_gauge)
|
METRIC(disk, num_write_jobs)
|
||||||
METRIC(disk, num_jobs, type_gauge)
|
METRIC(disk, num_jobs)
|
||||||
METRIC(disk, num_writing_threads, type_gauge)
|
METRIC(disk, num_writing_threads)
|
||||||
METRIC(disk, num_running_threads, type_gauge)
|
METRIC(disk, num_running_threads)
|
||||||
METRIC(disk, blocked_disk_jobs, type_gauge)
|
METRIC(disk, blocked_disk_jobs)
|
||||||
|
|
||||||
// the number of bytes we have sent to the disk I/O
|
// the number of bytes we have sent to the disk I/O
|
||||||
// thread for writing. Every time we hear back from
|
// thread for writing. Every time we hear back from
|
||||||
|
|
@ -314,97 +308,97 @@ namespace libtorrent
|
||||||
// is updated to the number of bytes the disk I/O thread
|
// is updated to the number of bytes the disk I/O thread
|
||||||
// is actually waiting for to be written (as opposed to
|
// is actually waiting for to be written (as opposed to
|
||||||
// bytes just hanging out in the cache)
|
// bytes just hanging out in the cache)
|
||||||
METRIC(disk, queued_write_bytes, type_gauge)
|
METRIC(disk, queued_write_bytes)
|
||||||
METRIC(disk, arc_mru_size, type_gauge)
|
METRIC(disk, arc_mru_size)
|
||||||
METRIC(disk, arc_mru_ghost_size, type_gauge)
|
METRIC(disk, arc_mru_ghost_size)
|
||||||
METRIC(disk, arc_mfu_size, type_gauge)
|
METRIC(disk, arc_mfu_size)
|
||||||
METRIC(disk, arc_mfu_ghost_size, type_gauge)
|
METRIC(disk, arc_mfu_ghost_size)
|
||||||
METRIC(disk, arc_write_size, type_gauge)
|
METRIC(disk, arc_write_size)
|
||||||
METRIC(disk, arc_volatile_size, type_gauge)
|
METRIC(disk, arc_volatile_size)
|
||||||
|
|
||||||
METRIC(disk, num_blocks_written, type_counter)
|
METRIC(disk, num_blocks_written)
|
||||||
METRIC(disk, num_blocks_read, type_counter)
|
METRIC(disk, num_blocks_read)
|
||||||
METRIC(disk, num_blocks_cache_hits, type_counter)
|
METRIC(disk, num_blocks_cache_hits)
|
||||||
METRIC(disk, num_write_ops, type_counter)
|
METRIC(disk, num_write_ops)
|
||||||
METRIC(disk, num_read_ops, type_counter)
|
METRIC(disk, num_read_ops)
|
||||||
|
|
||||||
// cumulative time spent in various disk jobs, as well
|
// cumulative time spent in various disk jobs, as well
|
||||||
// as total for all disk jobs. Measured in microseconds
|
// as total for all disk jobs. Measured in microseconds
|
||||||
METRIC(disk, disk_read_time, type_counter)
|
METRIC(disk, disk_read_time)
|
||||||
METRIC(disk, disk_write_time, type_counter)
|
METRIC(disk, disk_write_time)
|
||||||
METRIC(disk, disk_hash_time, type_counter)
|
METRIC(disk, disk_hash_time)
|
||||||
METRIC(disk, disk_job_time, type_counter)
|
METRIC(disk, disk_job_time)
|
||||||
|
|
||||||
// the number of wasted downloaded bytes by reason of the bytes being
|
// the number of wasted downloaded bytes by reason of the bytes being
|
||||||
// wasted.
|
// wasted.
|
||||||
METRIC(ses, waste_piece_timed_out, type_counter)
|
METRIC(ses, waste_piece_timed_out)
|
||||||
METRIC(ses, waste_piece_cancelled, type_counter)
|
METRIC(ses, waste_piece_cancelled)
|
||||||
METRIC(ses, waste_piece_unknown, type_counter)
|
METRIC(ses, waste_piece_unknown)
|
||||||
METRIC(ses, waste_piece_seed, type_counter)
|
METRIC(ses, waste_piece_seed)
|
||||||
METRIC(ses, waste_piece_end_game, type_counter)
|
METRIC(ses, waste_piece_end_game)
|
||||||
METRIC(ses, waste_piece_closing, type_counter)
|
METRIC(ses, waste_piece_closing)
|
||||||
|
|
||||||
// The number of nodes in the DHT routing table
|
// The number of nodes in the DHT routing table
|
||||||
METRIC(dht, dht_nodes, type_gauge)
|
METRIC(dht, dht_nodes)
|
||||||
|
|
||||||
// The number of replacement nodes in the DHT routing table
|
// The number of replacement nodes in the DHT routing table
|
||||||
METRIC(dht, dht_node_cache, type_gauge)
|
METRIC(dht, dht_node_cache)
|
||||||
|
|
||||||
// the number of torrents currently tracked by our DHT node
|
// the number of torrents currently tracked by our DHT node
|
||||||
METRIC(dht, dht_torrents, type_gauge)
|
METRIC(dht, dht_torrents)
|
||||||
|
|
||||||
// the number of peers currently tracked by our DHT node
|
// the number of peers currently tracked by our DHT node
|
||||||
METRIC(dht, dht_peers, type_gauge)
|
METRIC(dht, dht_peers)
|
||||||
|
|
||||||
// the number of immutable data items tracked by our DHT node
|
// the number of immutable data items tracked by our DHT node
|
||||||
METRIC(dht, dht_immutable_data, type_gauge)
|
METRIC(dht, dht_immutable_data)
|
||||||
|
|
||||||
// the number of mutable data items tracked by our DHT node
|
// the number of mutable data items tracked by our DHT node
|
||||||
METRIC(dht, dht_mutable_data, type_gauge)
|
METRIC(dht, dht_mutable_data)
|
||||||
|
|
||||||
// the number of RPC observers currently allocated
|
// the number of RPC observers currently allocated
|
||||||
METRIC(dht, dht_allocated_observers, type_gauge)
|
METRIC(dht, dht_allocated_observers)
|
||||||
|
|
||||||
// the total number of DHT messages sent and received
|
// the total number of DHT messages sent and received
|
||||||
METRIC(dht, dht_messages_in, type_counter)
|
METRIC(dht, dht_messages_in)
|
||||||
METRIC(dht, dht_messages_out, type_counter)
|
METRIC(dht, dht_messages_out)
|
||||||
|
|
||||||
// the number of outgoing messages that failed to be
|
// the number of outgoing messages that failed to be
|
||||||
// sent
|
// sent
|
||||||
METRIC(dht, dht_messages_out_dropped, type_counter)
|
METRIC(dht, dht_messages_out_dropped)
|
||||||
|
|
||||||
// the total number of bytes sent and received by the DHT
|
// the total number of bytes sent and received by the DHT
|
||||||
METRIC(dht, dht_bytes_in, type_counter)
|
METRIC(dht, dht_bytes_in)
|
||||||
METRIC(dht, dht_bytes_out, type_counter)
|
METRIC(dht, dht_bytes_out)
|
||||||
|
|
||||||
// the number of DHT messages we've sent and received
|
// the number of DHT messages we've sent and received
|
||||||
// by kind.
|
// by kind.
|
||||||
METRIC(dht, dht_ping_in, type_counter)
|
METRIC(dht, dht_ping_in)
|
||||||
METRIC(dht, dht_ping_out, type_counter)
|
METRIC(dht, dht_ping_out)
|
||||||
METRIC(dht, dht_find_node_in, type_counter)
|
METRIC(dht, dht_find_node_in)
|
||||||
METRIC(dht, dht_find_node_out, type_counter)
|
METRIC(dht, dht_find_node_out)
|
||||||
METRIC(dht, dht_get_peers_in, type_counter)
|
METRIC(dht, dht_get_peers_in)
|
||||||
METRIC(dht, dht_get_peers_out, type_counter)
|
METRIC(dht, dht_get_peers_out)
|
||||||
METRIC(dht, dht_announce_peer_in, type_counter)
|
METRIC(dht, dht_announce_peer_in)
|
||||||
METRIC(dht, dht_announce_peer_out, type_counter)
|
METRIC(dht, dht_announce_peer_out)
|
||||||
METRIC(dht, dht_get_in, type_counter)
|
METRIC(dht, dht_get_in)
|
||||||
METRIC(dht, dht_get_out, type_counter)
|
METRIC(dht, dht_get_out)
|
||||||
METRIC(dht, dht_put_in, type_counter)
|
METRIC(dht, dht_put_in)
|
||||||
METRIC(dht, dht_put_out, type_counter)
|
METRIC(dht, dht_put_out)
|
||||||
|
|
||||||
// uTP counters
|
// uTP counters
|
||||||
METRIC(utp, utp_packet_loss, type_counter)
|
METRIC(utp, utp_packet_loss)
|
||||||
METRIC(utp, utp_timeout, type_counter)
|
METRIC(utp, utp_timeout)
|
||||||
METRIC(utp, utp_packets_in, type_counter)
|
METRIC(utp, utp_packets_in)
|
||||||
METRIC(utp, utp_packets_out, type_counter)
|
METRIC(utp, utp_packets_out)
|
||||||
METRIC(utp, utp_fast_retransmit, type_counter)
|
METRIC(utp, utp_fast_retransmit)
|
||||||
METRIC(utp, utp_packet_resend, type_counter)
|
METRIC(utp, utp_packet_resend)
|
||||||
METRIC(utp, utp_samples_above_target, type_counter)
|
METRIC(utp, utp_samples_above_target)
|
||||||
METRIC(utp, utp_samples_below_target, type_counter)
|
METRIC(utp, utp_samples_below_target)
|
||||||
METRIC(utp, utp_payload_pkts_in, type_counter)
|
METRIC(utp, utp_payload_pkts_in)
|
||||||
METRIC(utp, utp_payload_pkts_out, type_counter)
|
METRIC(utp, utp_payload_pkts_out)
|
||||||
METRIC(utp, utp_invalid_pkts_in, type_counter)
|
METRIC(utp, utp_invalid_pkts_in)
|
||||||
METRIC(utp, utp_redundant_pkts_in, type_counter)
|
METRIC(utp, utp_redundant_pkts_in)
|
||||||
|
|
||||||
// the buffer sizes accepted by
|
// the buffer sizes accepted by
|
||||||
// socket send and receive calls respectively.
|
// socket send and receive calls respectively.
|
||||||
|
|
@ -415,42 +409,42 @@ namespace libtorrent
|
||||||
// 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192,
|
// 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192,
|
||||||
// 16384, 32768, 65536, 131072, 262144, 524288, 1048576
|
// 16384, 32768, 65536, 131072, 262144, 524288, 1048576
|
||||||
// bytes
|
// bytes
|
||||||
METRIC(sock_bufs, socket_send_size3, type_counter)
|
METRIC(sock_bufs, socket_send_size3)
|
||||||
METRIC(sock_bufs, socket_send_size4, type_counter)
|
METRIC(sock_bufs, socket_send_size4)
|
||||||
METRIC(sock_bufs, socket_send_size5, type_counter)
|
METRIC(sock_bufs, socket_send_size5)
|
||||||
METRIC(sock_bufs, socket_send_size6, type_counter)
|
METRIC(sock_bufs, socket_send_size6)
|
||||||
METRIC(sock_bufs, socket_send_size7, type_counter)
|
METRIC(sock_bufs, socket_send_size7)
|
||||||
METRIC(sock_bufs, socket_send_size8, type_counter)
|
METRIC(sock_bufs, socket_send_size8)
|
||||||
METRIC(sock_bufs, socket_send_size9, type_counter)
|
METRIC(sock_bufs, socket_send_size9)
|
||||||
METRIC(sock_bufs, socket_send_size10, type_counter)
|
METRIC(sock_bufs, socket_send_size10)
|
||||||
METRIC(sock_bufs, socket_send_size11, type_counter)
|
METRIC(sock_bufs, socket_send_size11)
|
||||||
METRIC(sock_bufs, socket_send_size12, type_counter)
|
METRIC(sock_bufs, socket_send_size12)
|
||||||
METRIC(sock_bufs, socket_send_size13, type_counter)
|
METRIC(sock_bufs, socket_send_size13)
|
||||||
METRIC(sock_bufs, socket_send_size14, type_counter)
|
METRIC(sock_bufs, socket_send_size14)
|
||||||
METRIC(sock_bufs, socket_send_size15, type_counter)
|
METRIC(sock_bufs, socket_send_size15)
|
||||||
METRIC(sock_bufs, socket_send_size16, type_counter)
|
METRIC(sock_bufs, socket_send_size16)
|
||||||
METRIC(sock_bufs, socket_send_size17, type_counter)
|
METRIC(sock_bufs, socket_send_size17)
|
||||||
METRIC(sock_bufs, socket_send_size18, type_counter)
|
METRIC(sock_bufs, socket_send_size18)
|
||||||
METRIC(sock_bufs, socket_send_size19, type_counter)
|
METRIC(sock_bufs, socket_send_size19)
|
||||||
METRIC(sock_bufs, socket_send_size20, type_counter)
|
METRIC(sock_bufs, socket_send_size20)
|
||||||
METRIC(sock_bufs, socket_recv_size3, type_counter)
|
METRIC(sock_bufs, socket_recv_size3)
|
||||||
METRIC(sock_bufs, socket_recv_size4, type_counter)
|
METRIC(sock_bufs, socket_recv_size4)
|
||||||
METRIC(sock_bufs, socket_recv_size5, type_counter)
|
METRIC(sock_bufs, socket_recv_size5)
|
||||||
METRIC(sock_bufs, socket_recv_size6, type_counter)
|
METRIC(sock_bufs, socket_recv_size6)
|
||||||
METRIC(sock_bufs, socket_recv_size7, type_counter)
|
METRIC(sock_bufs, socket_recv_size7)
|
||||||
METRIC(sock_bufs, socket_recv_size8, type_counter)
|
METRIC(sock_bufs, socket_recv_size8)
|
||||||
METRIC(sock_bufs, socket_recv_size9, type_counter)
|
METRIC(sock_bufs, socket_recv_size9)
|
||||||
METRIC(sock_bufs, socket_recv_size10, type_counter)
|
METRIC(sock_bufs, socket_recv_size10)
|
||||||
METRIC(sock_bufs, socket_recv_size11, type_counter)
|
METRIC(sock_bufs, socket_recv_size11)
|
||||||
METRIC(sock_bufs, socket_recv_size12, type_counter)
|
METRIC(sock_bufs, socket_recv_size12)
|
||||||
METRIC(sock_bufs, socket_recv_size13, type_counter)
|
METRIC(sock_bufs, socket_recv_size13)
|
||||||
METRIC(sock_bufs, socket_recv_size14, type_counter)
|
METRIC(sock_bufs, socket_recv_size14)
|
||||||
METRIC(sock_bufs, socket_recv_size15, type_counter)
|
METRIC(sock_bufs, socket_recv_size15)
|
||||||
METRIC(sock_bufs, socket_recv_size16, type_counter)
|
METRIC(sock_bufs, socket_recv_size16)
|
||||||
METRIC(sock_bufs, socket_recv_size17, type_counter)
|
METRIC(sock_bufs, socket_recv_size17)
|
||||||
METRIC(sock_bufs, socket_recv_size18, type_counter)
|
METRIC(sock_bufs, socket_recv_size18)
|
||||||
METRIC(sock_bufs, socket_recv_size19, type_counter)
|
METRIC(sock_bufs, socket_recv_size19)
|
||||||
METRIC(sock_bufs, socket_recv_size20, type_counter)
|
METRIC(sock_bufs, socket_recv_size20)
|
||||||
|
|
||||||
// ... more
|
// ... more
|
||||||
};
|
};
|
||||||
|
|
@ -458,8 +452,25 @@ namespace libtorrent
|
||||||
|
|
||||||
void get_stats_metric_map(std::vector<stats_metric>& stats)
|
void get_stats_metric_map(std::vector<stats_metric>& stats)
|
||||||
{
|
{
|
||||||
stats.resize(sizeof(metrics)/sizeof(metrics[0]));
|
const int num = sizeof(metrics)/sizeof(metrics[0]);
|
||||||
memcpy(&stats[0], metrics, sizeof(metrics));
|
stats.resize(num);
|
||||||
|
for (int i = 0; i < num; ++i)
|
||||||
|
{
|
||||||
|
stats[i].name = metrics[i].name;
|
||||||
|
stats[i].value_index = metrics[i].value_index;
|
||||||
|
stats[i].type = metrics[i].value_index >= counters::num_stats_counters
|
||||||
|
? stats_metric::type_gauge : stats_metric::type_counter;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int find_metric_idx(char const* name)
|
||||||
|
{
|
||||||
|
stats_metric_impl const* end = metrics + sizeof(metrics)/sizeof(metrics);
|
||||||
|
stats_metric_impl const* i = std::find_if(metrics, end , boost::bind(&strcmp
|
||||||
|
, boost::bind(&stats_metric_impl::name, _1), name) == 0);
|
||||||
|
if (i == end) return -1;
|
||||||
|
return i->value_index;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue