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

deprecate old state saving functions, merge dht state with session state

Browse Source
This commit is contained in:
Arvid Norberg
2010-03-04 16:42:39 +00:00
parent 9edb348093
commit 281b6368f7
9 changed files with 149 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/session_impl.cpp
View File

@@ -647,7 +647,7 @@ namespace aux {
m_thread.reset(new thread(boost::bind(&session_impl::main_thread, this)));
}
void session_impl::save_state(entry& e) const
void session_impl::save_state(entry& e, mutex::scoped_lock& l) const
{
save_struct(e["settings"], &m_settings, session_settings_map
, sizeof(session_settings_map)/sizeof(session_settings_map[0]));
@@ -656,6 +656,17 @@ namespace aux {
, sizeof(dht_settings_map)/sizeof(dht_settings_map[0]));
save_struct(e["dht proxy"], &m_dht_proxy, proxy_settings_map
, sizeof(proxy_settings_map)/sizeof(proxy_settings_map[0]));
if (m_dht)
{
condition cond;
entry& state = e["dht state"];
bool done = false;
m_io_service.post(boost::bind(&session_impl::on_dht_state_callback
, this, boost::ref(cond), boost::ref(state), boost::ref(done)));
while (!done) cond.wait(l);
}
#endif
#if TORRENT_USE_I2P
save_struct(e["i2p"], &i2p_proxy(), proxy_settings_map
@@ -672,12 +683,27 @@ namespace aux {
, sizeof(proxy_settings_map)/sizeof(proxy_settings_map[0]));
save_struct(e["tracker proxy"], &m_tracker_proxy, proxy_settings_map
, sizeof(proxy_settings_map)/sizeof(proxy_settings_map[0]));
#ifndef TORRENT_DISABLE_GEO_IP
entry::dictionary_type& as_map = e["AS map"].dict();
char buf[10];
for (std::map<int, int>::const_iterator i = m_as_peak.begin()
, end(m_as_peak.end()); i != end; ++i)
{
if (i->second == 0) continue;
sprintf(buf, "%05d", i->first);
as_map[buf] = i->second;
}
#endif
}
void session_impl::load_state(lazy_entry const& e)
{
lazy_entry const* settings;
if (e.type() != lazy_entry::dict_t) return;
settings = e.dict_find_dict("settings");
if (settings)
{
@@ -705,6 +731,13 @@ namespace aux {
, sizeof(proxy_settings_map)/sizeof(proxy_settings_map[0]));
set_dht_proxy(s);
}
settings = e.dict_find_dict("dht state");
if (settings)
{
m_dht_state = *settings;
}
#endif
#if TORRENT_USE_I2P
@@ -755,6 +788,21 @@ namespace aux {
, sizeof(proxy_settings_map)/sizeof(proxy_settings_map[0]));
set_tracker_proxy(s);
}
#ifndef TORRENT_DISABLE_GEO_IP
settings = e.dict_find_dict("AS map");
if (settings)
{
for (int i = 0; i < settings->dict_size(); ++i)
{
std::pair<std::string, lazy_entry const*> item = settings->dict_at(i);
int as_num = atoi(item.firstc_str());
if (item.second.type() != lazy_entry::int_t || item.second.int_value() == 0) continue;
int& peak = m_as_peak[as_num];
if (peak < item.second.integer()) peak = item.second.integer();
}
}
#endif
}
#ifndef TORRENT_DISABLE_GEO_IP
@@ -843,43 +891,6 @@ namespace aux {
#endif // TORRENT_DISABLE_GEO_IP
void session_impl::load_state(entry const& ses_state)
{
if (ses_state.type() != entry::dictionary_t) return;
#ifndef TORRENT_DISABLE_GEO_IP
entry const* as_map = ses_state.find_key("AS map");
if (as_map && as_map->type() == entry::dictionary_t)
{
entry::dictionary_type const& as_peak = as_map->dict();
for (entry::dictionary_type::const_iterator i = as_peak.begin()
, end(as_peak.end()); i != end; ++i)
{
int as_num = atoi(i->first.c_str());
if (i->second.type() != entry::int_t || i->second.integer() == 0) continue;
int& peak = m_as_peak[as_num];
if (peak < i->second.integer()) peak = i->second.integer();
}
}
#endif
}
entry session_impl::state() const
{
entry ret;
#ifndef TORRENT_DISABLE_GEO_IP
entry::dictionary_type& as_map = ret["AS map"].dict();
char buf[10];
for (std::map<int, int>::const_iterator i = m_as_peak.begin()
, end(m_as_peak.end()); i != end; ++i)
{
if (i->second == 0) continue;
sprintf(buf, "%05d", i->first);
as_map[buf] = i->second;
}
#endif
return ret;
}
#ifndef TORRENT_DISABLE_EXTENSIONS
void session_impl::add_extension(
boost::function<boost::shared_ptr<torrent_plugin>(torrent*, void*)> ext)
@@ -3241,6 +3252,9 @@ namespace aux {
#ifndef TORRENT_DISABLE_DHT
void session_impl::start_dht()
{ start_dht(m_dht_state); }
void session_impl::start_dht(entry const& startup_state)
{
INVARIANT_CHECK;
@@ -3365,6 +3379,7 @@ namespace aux {
c.signal(l);
}
#ifndef TORRENT_NO_DEPRECATE
entry session_impl::dht_state(mutex::scoped_lock& l) const
{
condition cond;
@@ -3376,6 +3391,7 @@ namespace aux {
while (!done) cond.wait(l);
return e;
}
#endif
void session_impl::add_dht_node(std::pair<std::string, int> const& node)
{