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

add an invariant check for num_connect_candidate in policy

This commit is contained in:
Arvid Norberg 2009-05-03 03:41:33 +00:00
parent 807c1fc397
commit 7439ca3277
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/policy.cpp
View File

@ -402,8 +402,7 @@ namespace libtorrent
policy::iterator policy::find_connect_candidate(int session_time)
{
// too expensive
// INVARIANT_CHECK;
INVARIANT_CHECK;
iterator candidate = m_peers.end();
@ -537,7 +536,7 @@ namespace libtorrent
{
TORRENT_ASSERT(!c.is_local());
// INVARIANT_CHECK;
INVARIANT_CHECK;
// if the connection comes from the tracker,
// it's probably just a NAT-check. Ignore the
@ -736,8 +735,7 @@ namespace libtorrent
policy::peer* policy::peer_from_tracker(tcp::endpoint const& remote, peer_id const& pid
, int src, char flags)
{
// way too expensive
//INVARIANT_CHECK;
INVARIANT_CHECK;
// just ignore the obviously invalid entries
if (remote.address() == address() || remote.port() == 0)
@ -867,7 +865,7 @@ namespace libtorrent
// data from now on
void policy::unchoked(peer_connection& c)
{
// INVARIANT_CHECK;
INVARIANT_CHECK;
if (c.is_interesting())
{
request_a_block(*m_torrent, c);
@ -878,7 +876,7 @@ namespace libtorrent
// called when a peer is interested in us
void policy::interested(peer_connection& c)
{
// INVARIANT_CHECK;
INVARIANT_CHECK;
TORRENT_ASSERT(std::find_if(m_peers.begin(), m_peers.end()
, bind(&peer::connection, _1) == &c) != m_peers.end());
@ -982,7 +980,7 @@ namespace libtorrent
*/
bool policy::connect_one_peer(int session_time)
{
// INVARIANT_CHECK;
INVARIANT_CHECK;
TORRENT_ASSERT(m_torrent->want_more_peers());
@ -1010,8 +1008,7 @@ namespace libtorrent
// this is called whenever a peer connection is closed
void policy::connection_closed(const peer_connection& c, int session_time)
{
// too expensive
// INVARIANT_CHECK;
INVARIANT_CHECK;
peer* p = c.peer_info_struct();
@ -1061,7 +1058,7 @@ namespace libtorrent
void policy::peer_is_interesting(peer_connection& c)
{
// INVARIANT_CHECK;
INVARIANT_CHECK;
if (c.in_handshake()) return;
c.send_interested();
@ -1075,8 +1072,7 @@ namespace libtorrent
#ifdef TORRENT_DEBUG
bool policy::has_connection(const peer_connection* c)
{
// too expensive
// INVARIANT_CHECK;
INVARIANT_CHECK;
TORRENT_ASSERT(c);
error_code ec;
@ -1091,8 +1087,10 @@ namespace libtorrent
void policy::check_invariant() const
{
TORRENT_ASSERT(m_num_connect_candidates >= 0);
TORRENT_ASSERT(m_num_connect_candidates <= m_peers.size());
if (m_torrent->is_aborted()) return;
#ifdef TORRENT_EXPENSIVE_INVARIANT_CHECKS
int connected_peers = 0;
int total_connections = 0;
@ -1171,6 +1169,7 @@ namespace libtorrent
, match_peer_connection(*p->connection)) != m_peers.end());
}
}
#endif
// this invariant is a bit complicated.
// the usual case should be that connected_peers