wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

improve tracker debug logging

This commit is contained in:
arvidn 2020-02-02 20:09:27 +01:00 committed by Arvid Norberg
parent 6d865f0c60
commit f099f356c6
1 changed files with 70 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/torrent.cpp
View File

@ -2909,8 +2909,22 @@ bool is_downloading_state(int const st)
// so that each one should get at least one announce // so that each one should get at least one announce
std::vector<announce_state> listen_socket_states; std::vector<announce_state> listen_socket_states;
#ifndef TORRENT_DISABLE_LOGGING
int idx = -1;
if (should_log())
{
debug_log("*** announce: "
"[ announce_to_all_tiers: %d announce_to_all_trackers: %d num_trackers: %d ]"
, settings().get_bool(settings_pack::announce_to_all_tiers)
, settings().get_bool(settings_pack::announce_to_all_trackers)
, int(m_trackers.size()));
}
#endif
for (auto& ae : m_trackers) for (auto& ae : m_trackers)
{ {
#ifndef TORRENT_DISABLE_LOGGING
++idx;
#endif
// update the endpoint list by adding entries for new listen sockets // update the endpoint list by adding entries for new listen sockets
// and removing entries for non-existent ones // and removing entries for non-existent ones
std::size_t valid_endpoints = 0; std::size_t valid_endpoints = 0;
@ -2964,15 +2978,11 @@ bool is_downloading_state(int const st)
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
if (should_log()) if (should_log())
{ {
debug_log("*** tracker: \"%s\" " debug_log("*** tracker: (%d) [ep: %s ] \"%s\" [ i->tier: %d tier: %d"
"[ tiers: %d trackers: %d" " working: %d limit: %d can: %d sent: %d ]"
" i->tier: %d tier: %d" , idx, print_endpoint(aep.local_endpoint).c_str()
" working: %d limit: %d" , ae.url.c_str(), ae.tier, state.tier, aep.is_working()
" can: %d sent: %d ]" , ae.fail_limit, aep.can_announce(now, is_seed(), ae.fail_limit), state.sent_announce);
, ae.url.c_str(), settings().get_bool(settings_pack::announce_to_all_tiers)
, settings().get_bool(settings_pack::announce_to_all_trackers)
, ae.tier, state.tier, aep.is_working(), ae.fail_limit
, aep.can_announce(now, is_seed(), ae.fail_limit), state.sent_announce);
} }
#endif #endif
@ -3026,7 +3036,7 @@ bool is_downloading_state(int const st)
if (should_log()) if (should_log())
{ {
debug_log("==> TRACKER REQUEST \"%s\" event: %s abort: %d ssl: %p " debug_log("==> TRACKER REQUEST \"%s\" event: %s abort: %d ssl: %p "
"port: %d ssl-port: %d fails: %d upd: %d" "port: %d ssl-port: %d fails: %d upd: %d ep: %s"
, req.url.c_str() , req.url.c_str()
, (req.event == tracker_request::stopped ? "stopped" , (req.event == tracker_request::stopped ? "stopped"
: req.event == tracker_request::started ? "started" : "") : req.event == tracker_request::started ? "started" : "")
@ -3039,7 +3049,8 @@ bool is_downloading_state(int const st)
, m_ses.listen_port() , m_ses.listen_port()
, m_ses.ssl_listen_port() , m_ses.ssl_listen_port()
, aep.fails , aep.fails
, aep.updating); , aep.updating
, print_endpoint(aep.local_endpoint).c_str());
} }
// if we're not logging session logs, don't bother creating an // if we're not logging session logs, don't bother creating an
@ -8848,8 +8859,22 @@ bool is_downloading_state(int const st)
std::vector<timer_state> listen_socket_states; std::vector<timer_state> listen_socket_states;
#ifndef TORRENT_DISABLE_LOGGING
int idx = -1;
if (should_log())
{
debug_log("*** update_tracker_timer: "
"[ announce_to_all_tiers: %d announce_to_all_trackers: %d num_trackers: %d ]"
, settings().get_bool(settings_pack::announce_to_all_tiers)
, settings().get_bool(settings_pack::announce_to_all_trackers)
, int(m_trackers.size()));
}
#endif
for (auto const& t : m_trackers) for (auto const& t : m_trackers)
{ {
#ifndef TORRENT_DISABLE_LOGGING
++idx;
#endif
for (auto const& aep : t.endpoints) for (auto const& aep : t.endpoints)
{ {
auto aep_state_iter = std::find_if(listen_socket_states.begin(), listen_socket_states.end() auto aep_state_iter = std::find_if(listen_socket_states.begin(), listen_socket_states.end()
@ -8863,41 +8888,39 @@ bool is_downloading_state(int const st)
if (state.done) continue; if (state.done) continue;
if (settings().get_bool(settings_pack::announce_to_all_tiers)
&& state.found_working
&& t.tier <= state.tier
&& state.tier != INT_MAX)
continue;
if (t.tier > state.tier && !settings().get_bool(settings_pack::announce_to_all_tiers)) break;
if (aep.is_working()) { state.tier = t.tier; state.found_working = false; }
if (aep.fails >= t.fail_limit && t.fail_limit != 0) continue;
if (!aep.enabled) continue;
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
if (should_log()) if (should_log())
{ {
debug_log("*** tracker: \"%s\" " debug_log("*** tracker: (%d) [ep: %s ] \"%s\" [ found: %d i->tier: %d tier: %d"
"[ tiers: %d trackers: %d" " working: %d fails: %d limit: %d upd: %d ]"
" found: %d i->tier: %d tier: %d" , idx, print_endpoint(aep.local_endpoint).c_str(), t.url.c_str()
" working: %d fails: %d limit: %d upd: %d ]" , state.found_working, t.tier, state.tier, aep.is_working()
, t.url.c_str(), settings().get_bool(settings_pack::announce_to_all_tiers) , aep.fails, t.fail_limit, aep.updating);
, settings().get_bool(settings_pack::announce_to_all_trackers), state.found_working }
, t.tier, state.tier, aep.is_working(), aep.fails, t.fail_limit
, aep.updating);
}
#endif #endif
if (settings().get_bool(settings_pack::announce_to_all_tiers) if (aep.updating)
&& state.found_working {
&& t.tier <= state.tier state.found_working = true;
&& state.tier != INT_MAX) }
continue; else
{
if (t.tier > state.tier && !settings().get_bool(settings_pack::announce_to_all_tiers)) break; time_point32 const next_tracker_announce = std::max(aep.next_announce, aep.min_announce);
if (aep.is_working()) { state.tier = t.tier; state.found_working = false; } if (next_tracker_announce < next_announce
if (aep.fails >= t.fail_limit && t.fail_limit != 0) continue; && (!state.found_working || aep.is_working()))
if (!aep.enabled) continue; next_announce = next_tracker_announce;
if (aep.updating) }
{
state.found_working = true;
}
else
{
time_point32 const next_tracker_announce = std::max(aep.next_announce, aep.min_announce);
if (next_tracker_announce < next_announce
&& (!state.found_working || aep.is_working()))
next_announce = next_tracker_announce;
}
if (aep.is_working()) state.found_working = true; if (aep.is_working()) state.found_working = true;
if (state.found_working if (state.found_working
&& !settings().get_bool(settings_pack::announce_to_all_trackers) && !settings().get_bool(settings_pack::announce_to_all_trackers)
@ -8916,7 +8939,7 @@ bool is_downloading_state(int const st)
debug_log("*** update tracker timer: next_announce < now %d" debug_log("*** update tracker timer: next_announce < now %d"
" m_waiting_tracker: %d next_announce_in: %d" " m_waiting_tracker: %d next_announce_in: %d"
, next_announce <= now, m_waiting_tracker , next_announce <= now, m_waiting_tracker
, int(total_seconds(now - next_announce))); , int(total_seconds(next_announce - now)));
#endif #endif
// don't re-issue the timer if it's the same expiration time as last time // don't re-issue the timer if it's the same expiration time as last time
@ -10997,7 +11020,8 @@ bool is_downloading_state(int const st)
aep->message = msg; aep->message = msg;
fails = aep->fails; fails = aep->fails;
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
debug_log("*** increment tracker fail count [%d]", aep->fails); debug_log("*** increment tracker fail count [ep: %s url: %s %d]"
, print_endpoint(aep->local_endpoint).c_str(), r.url.c_str(), aep->fails);
#endif #endif
// don't try to announce from this endpoint again // don't try to announce from this endpoint again
if (ec == boost::system::errc::address_family_not_supported if (ec == boost::system::errc::address_family_not_supported
@ -11005,7 +11029,7 @@ bool is_downloading_state(int const st)
{ {
aep->enabled = false; aep->enabled = false;
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
debug_log("*** disabling endpoint [%s] for tracker \"%s\"" debug_log("*** disabling endpoint [ep: %s url: %s ]"
, print_endpoint(aep->local_endpoint).c_str(), r.url.c_str()); , print_endpoint(aep->local_endpoint).c_str(), r.url.c_str());
#endif #endif
} }