From a6745558e7067df805b7d5a8d960bc55d2208224 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Fri, 18 Mar 2011 05:49:31 +0000 Subject: [PATCH] log max queue size and low watermark --- parse_session_stats.py | 2 +- src/session_impl.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/parse_session_stats.py b/parse_session_stats.py index 1dcad3112..1eb4b766b 100755 --- a/parse_session_stats.py +++ b/parse_session_stats.py @@ -54,7 +54,7 @@ gen_report('peer_dl_rates', ['peers down 0', 'peers down 0-2', 'peers down 2-5', gen_report('peer_dl_rates2', ['peers down 0-2', 'peers down 2-5', 'peers down 5-10', 'peers down 50-100', 'peers down 100-']) gen_report('peer_ul_rates', ['peers up 0', 'peers up 0-2', 'peers up 2-5', 'peers up 5-10', 'peers up 50-100', 'peers up 100-']) gen_report('peer_ul_rates2', ['peers up 0-2', 'peers up 2-5', 'peers up 5-10', 'peers up 50-100', 'peers up 100-']) -gen_report('disk', ['disk write queued bytes', 'disk block buffers']) +gen_report('disk', ['disk write queued bytes', 'disk queue limit', 'disk queue low watermark']) gen_report('peers_upload', ['peers up interested', 'peers up unchoked', 'peers up requests', 'peers disk-up', 'peers bw-up']) gen_report('peers_download', ['peers down interesting', 'peers down unchoked', 'peers down requests', 'peers disk-down', 'peers bw-down']) gen_report('peer_errors', ['error peers', 'peer disconnects', 'peers eof', 'peers connection reset', 'connect timeouts', 'uninteresting peers disconnect', 'banned for hash failure']) diff --git a/src/session_impl.cpp b/src/session_impl.cpp index 9ac742f0e..60da8841a 100644 --- a/src/session_impl.cpp +++ b/src/session_impl.cpp @@ -957,6 +957,8 @@ namespace aux { ":cache size" ":max connections" ":connect candidates" + ":disk queue limit" + ":disk queue low watermark" "\n\n", m_stats_logger); } #endif @@ -2731,7 +2733,7 @@ namespace aux { "%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" "%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\n" + "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n" , total_milliseconds(now - m_last_log_rotation) / 1000.f , int(m_stat.total_upload() - m_last_uploaded) , int(m_stat.total_download() - m_last_downloaded) @@ -2818,6 +2820,8 @@ namespace aux { , m_settings.cache_size , m_settings.connections_limit , connect_candidates + , int(m_settings.max_queued_disk_bytes) + , int(m_settings.max_queued_disk_bytes_low_watermark) ); m_last_cache_status = cs; m_last_failed = m_total_failed_bytes;