premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

log failed and redundant bytes

This commit is contained in:
Arvid Norberg 2011-03-13 04:34:57 +00:00
parent ca4a053d1a
commit c21100a9a5
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libtorrent/aux_/session_impl.hpp
View File

@ -893,6 +893,10 @@ namespace libtorrent
int m_uninteresting_peers; int m_uninteresting_peers;
int m_timeout_peers; int m_timeout_peers;
cache_status m_last_cache_status; cache_status m_last_cache_status;
size_type m_last_failed;
size_type m_last_redundant;
size_type m_last_uploaded;
size_type m_last_downloaded;
#endif #endif
// each second tick the timer takes a little // each second tick the timer takes a little

1
parse_session_stats.py
View File

@ -62,4 +62,5 @@ gen_report('bandwidth', ['% failed payload bytes', '% wasted payload bytes', '%
gen_report('disk_time', ['disk read time', 'disk write time', 'disk queue time']) gen_report('disk_time', ['disk read time', 'disk write time', 'disk queue time'])
gen_report('disk_cache', ['disk block read', 'read cache hits', 'disk block written']) gen_report('disk_cache', ['disk block read', 'read cache hits', 'disk block written'])
gen_report('disk_queue', ['disk queue size', 'disk queued bytes']) gen_report('disk_queue', ['disk queue size', 'disk queued bytes'])
gen_report('waste', ['failed bytes', 'redundant bytes', 'download rate'])

26
src/session_impl.cpp
View File

@ -812,6 +812,10 @@ namespace aux {
m_connect_timeouts = 0; m_connect_timeouts = 0;
m_uninteresting_peers = 0; m_uninteresting_peers = 0;
m_timeout_peers = 0; m_timeout_peers = 0;
m_last_failed = 0;
m_last_redundant = 0;
m_last_uploaded = 0;
m_last_downloaded = 0;
rotate_stats_log(); rotate_stats_log();
#endif #endif
#ifdef TORRENT_DISK_STATS #ifdef TORRENT_DISK_STATS
@ -929,6 +933,8 @@ namespace aux {
":read cache hits" ":read cache hits"
":disk block read" ":disk block read"
":disk block written" ":disk block written"
":failed bytes"
":redundant bytes"
"\n\n", m_stats_logger); "\n\n", m_stats_logger);
} }
#endif #endif
@ -2582,12 +2588,6 @@ namespace aux {
int checking_torrents = 0; int checking_torrents = 0;
int stopped_torrents = 0; int stopped_torrents = 0;
int upload_only_torrents = 0; int upload_only_torrents = 0;
static size_type downloaded = 0;
static size_type uploaded = 0;
size_type download_rate = (m_stat.total_download() - downloaded) * 1000 / tick_interval_ms;
size_type upload_rate = (m_stat.total_upload() - uploaded) * 1000 / tick_interval_ms;
downloaded = m_stat.total_download();
uploaded = m_stat.total_upload();
int num_peers = 0; int num_peers = 0;
int peer_dl_rate_buckets[7]; int peer_dl_rate_buckets[7];
int peer_ul_rate_buckets[7]; int peer_ul_rate_buckets[7];
@ -2698,10 +2698,10 @@ namespace aux {
"%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t" "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t"
"%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t" "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t"
"%f\t%f\t%f\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t" "%f\t%f\t%f\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t"
"%d\n" "%d\t%d\t%d\n"
, total_milliseconds(now - m_last_log_rotation) / 1000.f , total_milliseconds(now - m_last_log_rotation) / 1000.f
, int(upload_rate) , int(m_stat.total_upload() - m_last_uploaded)
, int(download_rate) , int(m_stat.total_download() - m_last_downloaded)
, downloading_torrents , downloading_torrents
, seeding_torrents , seeding_torrents
, num_complete_connections , num_complete_connections
@ -2760,7 +2760,7 @@ namespace aux {
, m_uninteresting_peers , m_uninteresting_peers
, m_timeout_peers , m_timeout_peers
, (float(m_total_failed_bytes) * 100.f / m_stat.total_payload_download()) , (float(m_total_failed_bytes) * 100.f / m_stat.total_payload_download())
, (float(m_total_redundant_bytes) * 100.f / m_stat.total_payload_download()) , (float(m_total_redundant_bytes) * 100.f / m_stat.total_payload_download())
, (float(m_stat.total_protocol_download()) * 100.f / m_stat.total_download()) , (float(m_stat.total_protocol_download()) * 100.f / m_stat.total_download())
, int(cs.average_read_time) , int(cs.average_read_time)
, int(cs.average_write_time) , int(cs.average_write_time)
@ -2770,8 +2770,14 @@ namespace aux {
, int(cs.blocks_read_hit - m_last_cache_status.blocks_read_hit) , int(cs.blocks_read_hit - m_last_cache_status.blocks_read_hit)
, int(cs.blocks_read - m_last_cache_status.blocks_read) , int(cs.blocks_read - m_last_cache_status.blocks_read)
, int(cs.blocks_written - m_last_cache_status.blocks_written) , int(cs.blocks_written - m_last_cache_status.blocks_written)
, int(m_total_failed_bytes - m_last_failed)
, int(m_total_redundant_bytes - m_last_redundant)
); );
m_last_cache_status = cs; m_last_cache_status = cs;
m_last_failed = m_total_failed_bytes;
m_last_redundant = m_total_redundant_bytes;
m_last_uploaded = m_stat.total_upload();
m_last_downloaded = m_stat.total_download();
} }
m_error_peers = 0; m_error_peers = 0;