diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp index 417b5b4ac..d1c59fab7 100644 --- a/src/common/dns_utils.cpp +++ b/src/common/dns_utils.cpp @@ -32,9 +32,9 @@ #include #include "include_base_utils.h" +#include "common/threadpool.h" #include #include -#include #include #include using namespace epee; @@ -496,16 +496,16 @@ bool load_txt_records_from_dns(std::vector &good_records, const std size_t first_index = dis(gen); // send all requests in parallel - std::vector threads(dns_urls.size()); std::deque avail(dns_urls.size(), false), valid(dns_urls.size(), false); + tools::threadpool& tpool = tools::threadpool::getInstance(); + tools::threadpool::waiter waiter; for (size_t n = 0; n < dns_urls.size(); ++n) { - threads[n] = boost::thread([n, dns_urls, &records, &avail, &valid](){ + tpool.submit(&waiter,[n, dns_urls, &records, &avail, &valid](){ records[n] = tools::DNSResolver::instance().get_txt_record(dns_urls[n], avail[n], valid[n]); }); } - for (size_t n = 0; n < dns_urls.size(); ++n) - threads[n].join(); + waiter.wait(&tpool); size_t cur_index = first_index; do