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

fix DHT size estimation

This commit is contained in:
Arvid Norberg 2010-12-13 09:24:19 +00:00
parent 4fcfceb087
commit fbdf76cf5b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/kademlia/routing_table.cpp
View File

@ -99,14 +99,21 @@ boost::tuple<int, int> routing_table::size() const
size_type routing_table::num_global_nodes() const size_type routing_table::num_global_nodes() const
{ {
int num_nodes = 1; // we are one of the nodes int deepest_bucket = 0;
int deepest_size = 0;
for (table_t::const_iterator i = m_buckets.begin() for (table_t::const_iterator i = m_buckets.begin()
, end(m_buckets.end()); i != end; ++i) , end(m_buckets.end()); i != end; ++i)
{ {
num_nodes += i->live_nodes.size(); deepest_size = i->live_nodes.size(); // + i->replacements.size();
if (deepest_size < m_bucket_size) break;
// this bucket is full
++deepest_bucket;
} }
return (2 << m_buckets.size()) * num_nodes; if (deepest_bucket == 0) return 1 + deepest_size;
if (deepest_size < m_bucket_size / 2) return (1 << deepest_bucket) * m_bucket_size;
else return (2 << deepest_bucket) * deepest_size;
} }
#if (defined TORRENT_DHT_VERBOSE_LOGGING || defined TORRENT_DEBUG) && TORRENT_USE_IOSTREAM #if (defined TORRENT_DHT_VERBOSE_LOGGING || defined TORRENT_DEBUG) && TORRENT_USE_IOSTREAM