Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

p2p: fix thread leak

This commit is contained in:
moneromooo-monero 2017-07-28 22:23:05 +01:00
parent ab594cfee9
commit 9a10148c01
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/p2p/net_node.inl
View File

@ -444,11 +444,11 @@ namespace nodetool
std::vector<std::vector<std::string>> dns_results; std::vector<std::vector<std::string>> dns_results;
dns_results.resize(m_seed_nodes_list.size()); dns_results.resize(m_seed_nodes_list.size());
std::list<boost::thread*> dns_threads; std::list<boost::thread> dns_threads;
uint64_t result_index = 0; uint64_t result_index = 0;
for (const std::string& addr_str : m_seed_nodes_list) for (const std::string& addr_str : m_seed_nodes_list)
{ {
boost::thread* th = new boost::thread([=, &dns_results, &addr_str] boost::thread th = boost::thread([=, &dns_results, &addr_str]
{ {
MDEBUG("dns_threads[" << result_index << "] created for: " << addr_str); MDEBUG("dns_threads[" << result_index << "] created for: " << addr_str);
// TODO: care about dnssec avail/valid // TODO: care about dnssec avail/valid
@ -474,19 +474,19 @@ namespace nodetool
dns_results[result_index] = addr_list; dns_results[result_index] = addr_list;
}); });
dns_threads.push_back(th); dns_threads.push_back(std::move(th));
++result_index; ++result_index;
} }
MDEBUG("dns_threads created, now waiting for completion or timeout of " << CRYPTONOTE_DNS_TIMEOUT_MS << "ms"); MDEBUG("dns_threads created, now waiting for completion or timeout of " << CRYPTONOTE_DNS_TIMEOUT_MS << "ms");
boost::chrono::system_clock::time_point deadline = boost::chrono::system_clock::now() + boost::chrono::milliseconds(CRYPTONOTE_DNS_TIMEOUT_MS); boost::chrono::system_clock::time_point deadline = boost::chrono::system_clock::now() + boost::chrono::milliseconds(CRYPTONOTE_DNS_TIMEOUT_MS);
uint64_t i = 0; uint64_t i = 0;
for (boost::thread* th : dns_threads) for (boost::thread& th : dns_threads)
{ {
if (! th->try_join_until(deadline)) if (! th.try_join_until(deadline))
{ {
MWARNING("dns_threads[" << i << "] timed out, sending interrupt"); MWARNING("dns_threads[" << i << "] timed out, sending interrupt");
th->interrupt(); th.interrupt();
} }
++i; ++i;
} }