jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more DHT fixes and simplifications

Browse Source
This commit is contained in:
Arvid Norberg
2009-10-09 02:34:25 +00:00
parent fdb3b355ad
commit 474566fa21
8 changed files with 52 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/client_test.cpp
View File

@@ -1394,9 +1394,10 @@ int main(int argc, char* argv[])
for (std::vector<dht_lookup>::iterator i = sess_stat.active_requests.begin() for (std::vector<dht_lookup>::iterator i = sess_stat.active_requests.begin()
, end(sess_stat.active_requests.end()); i != end; ++i) , end(sess_stat.active_requests.end()); i != end; ++i)
{ {
snprintf(str, sizeof(str), " %s in flight: %d [limit: %d] timeouts %d responses %d\n" snprintf(str, sizeof(str)
, " %s in flight: %d [limit: %d] timeouts %d responses %d left %d\n"
, i->type, i->outstanding_requests, i->branch_factor, i->timeouts , i->type, i->outstanding_requests, i->branch_factor, i->timeouts
, i->responses); , i->responses, i->nodes_left);
out += str; out += str;
} }
} }

5
include/libtorrent/kademlia/find_data.hpp
View File

@@ -78,7 +78,7 @@ public:
protected: protected:
void done(); void done();
virtual bool invoke(node_id const& id, udp::endpoint addr); virtual bool invoke(udp::endpoint addr);
private: private:
@@ -94,8 +94,7 @@ class find_data_observer : public observer
{ {
public: public:
find_data_observer( find_data_observer(
boost::intrusive_ptr<traversal_algorithm> const& algorithm boost::intrusive_ptr<traversal_algorithm> const& algorithm)
, node_id self)
: observer(algorithm) : observer(algorithm)
{} {}
void reply(msg const&); void reply(msg const&);

2
include/libtorrent/kademlia/refresh.hpp
View File

@@ -57,7 +57,7 @@ public:
protected: protected:
virtual bool invoke(node_id const& id, udp::endpoint addr); virtual bool invoke(udp::endpoint addr);
}; };
} } // namespace libtorrent::dht } } // namespace libtorrent::dht

7
include/libtorrent/kademlia/traversal_algorithm.hpp
View File

@@ -117,7 +117,8 @@ public:
no_id = 4, no_id = 4,
short_timeout = 8, short_timeout = 8,
failed = 16, failed = 16,
ipv6_address = 32 ipv6_address = 32,
alive = 64
}; };
unsigned char flags; unsigned char flags;
}; };
@@ -145,9 +146,7 @@ protected:
void init(); void init();
virtual void done() {} virtual void done() {}
virtual bool invoke(node_id const& id, udp::endpoint addr) { return false; } virtual bool invoke(udp::endpoint addr) { return false; }
std::vector<result>::iterator last_iterator();
friend void intrusive_ptr_add_ref(traversal_algorithm* p) friend void intrusive_ptr_add_ref(traversal_algorithm* p)
{ {

1
include/libtorrent/session_status.hpp
View File

@@ -48,6 +48,7 @@ namespace libtorrent
int timeouts; int timeouts;
int responses; int responses;
int branch_factor; int branch_factor;
int nodes_left;
}; };
#endif #endif

18
src/kademlia/find_data.cpp
View File

@@ -45,7 +45,7 @@ namespace libtorrent { namespace dht
{ {
#ifdef TORRENT_DHT_VERBOSE_LOGGING #ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_DECLARE_LOG(dht_tracker); TORRENT_DECLARE_LOG(traversal);
#endif #endif
using detail::read_v4_endpoint; using detail::read_v4_endpoint;
@@ -63,7 +63,7 @@ void find_data_observer::reply(msg const& m)
if (!r) if (!r)
{ {
#ifdef TORRENT_DHT_VERBOSE_LOGGING #ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_LOG(dht_tracker) << "[" << m_algorithm.get() << "] missing response dict"; TORRENT_LOG(traversal) << "[" << m_algorithm.get() << "] missing response dict";
#endif #endif
return; return;
} }
@@ -72,7 +72,7 @@ void find_data_observer::reply(msg const& m)
if (!id || id->string_length() != 20) if (!id || id->string_length() != 20)
{ {
#ifdef TORRENT_DHT_VERBOSE_LOGGING #ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_LOG(dht_tracker) << "[" << m_algorithm.get() << "] invalid id in response"; TORRENT_LOG(traversal) << "[" << m_algorithm.get() << "] invalid id in response";
#endif #endif
return; return;
} }
@@ -162,7 +162,7 @@ void find_data_observer::reply(msg const& m)
} }
#ifdef TORRENT_DHT_VERBOSE_LOGGING #ifdef TORRENT_DHT_VERBOSE_LOGGING
log_line << " ]"; log_line << " ]";
TORRENT_LOG(dht_tracker) << log_line.str(); TORRENT_LOG(traversal) << log_line.str();
#endif #endif
done(); done();
} }
@@ -186,7 +186,7 @@ find_data::find_data(
} }
} }
bool find_data::invoke(node_id const& id, udp::endpoint addr) bool find_data::invoke(udp::endpoint addr)
{ {
if (m_done) if (m_done)
{ {
@@ -198,11 +198,15 @@ bool find_data::invoke(node_id const& id, udp::endpoint addr)
void* ptr = m_node.m_rpc.allocator().malloc(); void* ptr = m_node.m_rpc.allocator().malloc();
if (ptr == 0) if (ptr == 0)
{ {
#ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_LOG(traversal) << "[" << this << "] failed to "
"allocate memory for observer. aborting!";
#endif
done(); done();
return false; return false;
} }
m_node.m_rpc.allocator().set_next_size(10); m_node.m_rpc.allocator().set_next_size(10);
observer_ptr o(new (ptr) find_data_observer(this, id)); observer_ptr o(new (ptr) find_data_observer(this));
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
o->m_in_constructor = false; o->m_in_constructor = false;
#endif #endif
@@ -210,7 +214,7 @@ bool find_data::invoke(node_id const& id, udp::endpoint addr)
e["y"] = "q"; e["y"] = "q";
e["q"] = "get_peers"; e["q"] = "get_peers";
entry& a = e["a"]; entry& a = e["a"];
a["info_hash"] = id.to_string(); a["info_hash"] = m_target.to_string();
return m_node.m_rpc.invoke(e, addr, o); return m_node.m_rpc.invoke(e, addr, o);
} }

12
src/kademlia/refresh.cpp
View File

@@ -41,6 +41,10 @@ POSSIBILITY OF SUCH DAMAGE.
namespace libtorrent { namespace dht namespace libtorrent { namespace dht
{ {
#ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_DECLARE_LOG(traversal);
#endif
refresh::refresh( refresh::refresh(
node_impl& node node_impl& node
, node_id target , node_id target
@@ -54,17 +58,21 @@ char const* refresh::name() const
return "refresh"; return "refresh";
} }
bool refresh::invoke(node_id const& nid, udp::endpoint addr) bool refresh::invoke(udp::endpoint addr)
{ {
TORRENT_ASSERT(m_node.m_rpc.allocation_size() >= sizeof(find_data_observer)); TORRENT_ASSERT(m_node.m_rpc.allocation_size() >= sizeof(find_data_observer));
void* ptr = m_node.m_rpc.allocator().malloc(); void* ptr = m_node.m_rpc.allocator().malloc();
if (ptr == 0) if (ptr == 0)
{ {
#ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_LOG(traversal) << "[" << this << "] failed to "
"allocate memory for observer. aborting!";
#endif
done(); done();
return false; return false;
} }
m_node.m_rpc.allocator().set_next_size(10); m_node.m_rpc.allocator().set_next_size(10);
observer_ptr o(new (ptr) find_data_observer(this, nid)); observer_ptr o(new (ptr) find_data_observer(this));
#ifdef TORRENT_DEBUG #ifdef TORRENT_DEBUG
o->m_in_constructor = false; o->m_in_constructor = false;
#endif #endif

45
src/kademlia/traversal_algorithm.cpp
View File

@@ -126,6 +126,8 @@ void traversal_algorithm::finished(udp::endpoint const& ep)
--m_branch_factor; --m_branch_factor;
} }
i->flags |= result::alive;
++m_responses; ++m_responses;
--m_invoke_count; --m_invoke_count;
TORRENT_ASSERT(m_invoke_count >= 0); TORRENT_ASSERT(m_invoke_count >= 0);
@@ -210,27 +212,22 @@ namespace
void traversal_algorithm::add_requests() void traversal_algorithm::add_requests()
{ {
while (m_invoke_count < m_branch_factor) int results_target = m_node.m_table.bucket_size();
{
// Find the first node that hasn't already been queried. // Find the first node that hasn't already been queried.
// TODO: Better heuristic for (std::vector<result>::iterator i = m_results.begin()
std::vector<result>::iterator i = std::find_if( , end(m_results.end()); i != end
m_results.begin() && results_target > 0 && m_invoke_count < m_branch_factor; ++i)
, last_iterator() {
, bind( if (i->flags & result::alive) --results_target;
&bitwise_nand if (i->flags & result::queried) continue;
, bind(&result::flags, _1)
, (unsigned char)result::queried
)
);
#ifdef TORRENT_DHT_VERBOSE_LOGGING #ifdef TORRENT_DHT_VERBOSE_LOGGING
TORRENT_LOG(traversal) << " [" << this << "] nodes left (" TORRENT_LOG(traversal) << " [" << this << "] nodes left: "
<< this << "): " << (last_iterator() - i); << (m_results.end() - i);
#endif #endif
if (i == last_iterator()) break; if (invoke(i->endpoint()))
if (invoke(i->id, i->endpoint()))
{ {
TORRENT_ASSERT(m_invoke_count >= 0); TORRENT_ASSERT(m_invoke_count >= 0);
++m_invoke_count; ++m_invoke_count;
@@ -266,13 +263,13 @@ void traversal_algorithm::status(dht_lookup& l)
l.outstanding_requests = m_invoke_count; l.outstanding_requests = m_invoke_count;
l.branch_factor = m_branch_factor; l.branch_factor = m_branch_factor;
l.type = name(); l.type = name();
} l.nodes_left = 0;
for (std::vector<result>::iterator i = m_results.begin()
std::vector<traversal_algorithm::result>::iterator traversal_algorithm::last_iterator() , end(m_results.end()); i != end; ++i)
{ {
int max_results = m_node.m_table.bucket_size(); if (i->flags & result::queried) continue;
return (int)m_results.size() >= max_results ? ++l.nodes_left;
m_results.begin() + max_results : m_results.end(); }
} }
} } // namespace libtorrent::dht } } // namespace libtorrent::dht