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

optimistic unchoke fix

This commit is contained in:
Arvid Norberg 2010-10-04 04:06:14 +00:00
parent e1948fa203
commit 440abdfaf2
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/torrent.hpp
View File

@ -407,7 +407,7 @@ namespace libtorrent
{ return m_num_uploads < m_max_uploads; }
bool choke_peer(peer_connection& c);
bool unchoke_peer(peer_connection& c);
bool unchoke_peer(peer_connection& c, bool optimistic = false);
// used by peer_connection to attach itself to a torrent
// since incoming connections don't know what torrent

16
src/session_impl.cpp
View File

@ -2807,11 +2807,19 @@ namespace aux {
if (!pi->optimistically_unchoked)
{
torrent* t = pi->connection->associated_torrent().lock().get();
bool ret = t->unchoke_peer(*pi->connection);
bool ret = t->unchoke_peer(*pi->connection, true);
TORRENT_ASSERT(ret);
pi->optimistically_unchoked = true;
++m_num_unchoked;
pi->last_optimistically_unchoked = session_time();
if (ret)
{
pi->optimistically_unchoked = true;
++m_num_unchoked;
pi->last_optimistically_unchoked = session_time();
}
else
{
// we failed to unchoke it, increment the count again
++num_opt_unchoke;
}
}
}
else

7
src/torrent.cpp
View File

@ -3220,13 +3220,16 @@ namespace libtorrent
return true;
}
bool torrent::unchoke_peer(peer_connection& c)
bool torrent::unchoke_peer(peer_connection& c, bool optimistic)
{
INVARIANT_CHECK;
TORRENT_ASSERT(c.is_choked());
TORRENT_ASSERT(!c.ignore_unchoke_slots());
if (m_num_uploads >= m_max_uploads) return false;
// when we're unchoking the optimistic slots, we might
// exceed the limit temporarily while we're iterating
// over the peers
if (m_num_uploads >= m_max_uploads && !optimistic) return false;
if (!c.send_unchoke()) return false;
++m_num_uploads;
return true;