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

minor cleanup of debug logging for peer_list

This commit is contained in:
arvidn 2020-01-11 01:13:16 +01:00 committed by Arvid Norberg
parent 7754f8ef1b
commit 7320568c3c
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libtorrent/peer_list.hpp
View File

@ -96,10 +96,8 @@ namespace libtorrent {
struct erase_peer_flags_tag; struct erase_peer_flags_tag;
using erase_peer_flags_t = flags::bitfield_flag<std::uint8_t, erase_peer_flags_tag>; using erase_peer_flags_t = flags::bitfield_flag<std::uint8_t, erase_peer_flags_tag>;
class TORRENT_EXTRA_EXPORT peer_list : single_threaded struct TORRENT_EXTRA_EXPORT peer_list : single_threaded
{ {
public:
explicit peer_list(torrent_peer_allocator_interface& alloc); explicit peer_list(torrent_peer_allocator_interface& alloc);
~peer_list(); ~peer_list();

5
src/peer_list.cpp
View File

@ -96,9 +96,11 @@ namespace libtorrent {
void peer_list::clear() void peer_list::clear()
{ {
INVARIANT_CHECK;
for (auto const p : m_peers) for (auto const p : m_peers)
m_peer_allocator.free_peer_entry(p); m_peer_allocator.free_peer_entry(p);
m_peers.clear(); m_peers.clear();
m_num_connect_candidates = 0;
} }
peer_list::~peer_list() peer_list::~peer_list()
@ -109,6 +111,7 @@ namespace libtorrent {
void peer_list::set_max_failcount(torrent_state* state) void peer_list::set_max_failcount(torrent_state* state)
{ {
INVARIANT_CHECK;
if (state->max_failcount == m_max_failcount) return; if (state->max_failcount == m_max_failcount) return;
recalculate_connect_candidates(state); recalculate_connect_candidates(state);
@ -171,6 +174,7 @@ namespace libtorrent {
void peer_list::clear_peer_prio() void peer_list::clear_peer_prio()
{ {
INVARIANT_CHECK;
for (auto& p : m_peers) for (auto& p : m_peers)
p->peer_rank = 0; p->peer_rank = 0;
} }
@ -405,6 +409,7 @@ namespace libtorrent {
void peer_list::inc_failcount(torrent_peer* p) void peer_list::inc_failcount(torrent_peer* p)
{ {
INVARIANT_CHECK;
// failcount is a 5 bit value // failcount is a 5 bit value
if (p->failcount == 31) return; if (p->failcount == 31) return;

28
src/torrent.cpp
View File

@ -659,7 +659,7 @@ bool is_downloading_state(int const st)
} }
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
if (should_log()) if (should_log() && !p.peers.empty())
{ {
std::string str; std::string str;
for (auto const& peer : p.peers) for (auto const& peer : p.peers)
@ -2071,7 +2071,7 @@ bool is_downloading_state(int const st)
} }
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
if (should_log()) if (should_log() && !m_add_torrent_params->peers.empty())
{ {
error_code ec; error_code ec;
std::string str; std::string str;
@ -2728,7 +2728,7 @@ bool is_downloading_state(int const st)
add_peer(p, peer_info::dht); add_peer(p, peer_info::dht);
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
if (should_log()) if (should_log() && !peers.empty())
{ {
error_code ec; error_code ec;
std::string str; std::string str;
@ -3356,7 +3356,7 @@ bool is_downloading_state(int const st)
} }
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
if (should_log()) if (should_log() && (!resp.peers4.empty() || !resp.peers6.empty()))
{ {
error_code ec; error_code ec;
std::string str; std::string str;
@ -3589,17 +3589,19 @@ bool is_downloading_state(int const st)
} }
if (add_peer(host, peer_info::tracker)) if (add_peer(host, peer_info::tracker))
{
state_updated(); state_updated();
#ifndef TORRENT_DISABLE_LOGGING #ifndef TORRENT_DISABLE_LOGGING
if (should_log()) if (should_log())
{ {
error_code ec; error_code ec;
debug_log("name-lookup add_peer() [ %s ] connect-candidates: %d" debug_log("name-lookup add_peer() [ %s ] connect-candidates: %d"
, host.address().to_string(ec).c_str() , host.address().to_string(ec).c_str()
, m_peer_list ? m_peer_list->num_connect_candidates() : -1); , m_peer_list ? m_peer_list->num_connect_candidates() : -1);
} }
#endif #endif
}
update_want_peers(); update_want_peers();
} }
catch (...) { handle_exception(); } catch (...) { handle_exception(); }
@ -6908,8 +6910,7 @@ bool is_downloading_state(int const st)
return false; return false;
} }
if (!is_downloading_state(m_state) if (!is_downloading_state(m_state) && valid_metadata())
&& valid_metadata())
{ {
p->disconnect(errors::torrent_not_ready, operation_t::bittorrent); p->disconnect(errors::torrent_not_ready, operation_t::bittorrent);
return false; return false;
@ -10661,6 +10662,7 @@ bool is_downloading_state(int const st)
st->list_peers = m_peer_list ? m_peer_list->num_peers() : 0; st->list_peers = m_peer_list ? m_peer_list->num_peers() : 0;
st->list_seeds = m_peer_list ? m_peer_list->num_seeds() : 0; st->list_seeds = m_peer_list ? m_peer_list->num_seeds() : 0;
st->connect_candidates = m_peer_list ? m_peer_list->num_connect_candidates() : 0; st->connect_candidates = m_peer_list ? m_peer_list->num_connect_candidates() : 0;
TORRENT_ASSERT(st->connect_candidates >= 0);
st->seed_rank = seed_rank(settings()); st->seed_rank = seed_rank(settings());
st->all_time_upload = m_total_uploaded; st->all_time_upload = m_total_uploaded;