twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-09 14:28:22 +00:00
Code Issues Projects Releases Wiki Activity

dht storage refresh is spread over time to avoid bursts of putData

Browse Source
This commit is contained in:
Miguel Freitas 2013-11-04 15:56:29 -02:00
parent 22161a71ed
commit 5a9613297a
2 changed files with 47 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libtorrent/include/libtorrent/kademlia/node.hpp
View File

@ -293,7 +293,8 @@ private:
dht_storage_table_t m_storage_table; dht_storage_table_t m_storage_table;
ptime m_last_tracker_tick; ptime m_last_tracker_tick;
ptime m_last_storage_refresh; ptime m_next_storage_refresh;
node_id m_last_refreshed_item;
// secret random numbers used to create write tokens // secret random numbers used to create write tokens
int m_secret[2]; int m_secret[2];

41
libtorrent/src/kademlia/node.cpp
View File

@ -105,7 +105,8 @@ node_impl::node_impl(alert_dispatcher* alert_disp
, m_table(m_id, 8, settings) , m_table(m_id, 8, settings)
, m_rpc(m_id, m_table, sock, observer) , m_rpc(m_id, m_table, sock, observer)
, m_last_tracker_tick(time_now()) , m_last_tracker_tick(time_now())
, m_last_storage_refresh(time_now()) , m_next_storage_refresh(time_now())
, m_last_refreshed_item()
, m_post_alert(alert_disp) , m_post_alert(alert_disp)
, m_sock(sock) , m_sock(sock)
{ {
@ -482,23 +483,25 @@ void node_impl::tick()
refresh(target, boost::bind(&nop)); refresh(target, boost::bind(&nop));
ptime now = time_now(); ptime now = time_now();
if (now - m_last_storage_refresh > minutes(60)) { if (now > m_next_storage_refresh ) {
m_last_storage_refresh = now;
refresh_storage(); refresh_storage();
} }
} }
bool node_impl::refresh_storage() { bool node_impl::refresh_storage() {
bool did_something = false; bool did_something = false;
bool refresh_next_item = false;
if( m_storage_table.size() == 0 ) int num_refreshable = 0;
return did_something;
printf("node dht: refreshing storage...\n");
for (dht_storage_table_t::const_iterator i = m_storage_table.begin(), for (dht_storage_table_t::const_iterator i = m_storage_table.begin(),
end(m_storage_table.end()); i != end; ++i ) end(m_storage_table.end()); i != end; ++i )
{ {
if( i->first == m_last_refreshed_item ) {
refresh_next_item = true;
num_refreshable++;
continue;
}
dht_storage_list_t const& lsto = i->second; dht_storage_list_t const& lsto = i->second;
if( lsto.size() == 1 ) { if( lsto.size() == 1 ) {
dht_storage_item const& item = lsto.front(); dht_storage_item const& item = lsto.front();
@ -522,7 +525,13 @@ bool node_impl::refresh_storage() {
// refresh only signed single posts // refresh only signed single posts
if( !multi ) { if( !multi ) {
printf("refresh dht storage: [%s,%s,%s]\n", num_refreshable++;
if( refresh_next_item ) {
refresh_next_item = false;
m_last_refreshed_item = i->first;
printf("node dht: refreshing storage: [%s,%s,%s]\n",
username.c_str(), username.c_str(),
resource.c_str(), resource.c_str(),
target->dict_find_string_value("t").c_str()); target->dict_find_string_value("t").c_str());
@ -541,6 +550,20 @@ bool node_impl::refresh_storage() {
} }
} }
} }
}
if( !did_something && m_storage_table.size() ) {
m_last_refreshed_item = m_storage_table.begin()->first;
}
if( num_refreshable ) {
m_next_storage_refresh = minutes(60) / num_refreshable + time_now();
} else {
m_next_storage_refresh = minutes(1) + time_now();
}
printf("node dht: next storage refresh in %d seconds\n", (m_next_storage_refresh - time_now())/1000000 );
return did_something; return did_something;
} }