Fixed dtor for threads.

Author: rakshasa

src/data/thread_disk.cc

@@ -23,6 +23,12 @@ ThreadDisk::create_thread() {
   m_thread_disk = new ThreadDisk;
 }
 
+void
+ThreadDisk::destroy_thread() {
+  delete m_thread_disk;
+  m_thread_disk = nullptr;
+}
+
 ThreadDisk*
 ThreadDisk::thread_disk() {
   return m_thread_disk;
@@ -42,8 +48,6 @@ ThreadDisk::init_thread() {
 
 void
 ThreadDisk::cleanup_thread() {
-  m_thread_disk = nullptr;
-
   assert(m_hash_check_queue.empty() && "ThreadDisk::cleanup_thread(): m_hash_check_queue not empty.");
 }
 

src/data/thread_disk.h

@@ -12,6 +12,7 @@ class LIBTORRENT_EXPORT ThreadDisk : public utils::Thread {
   ~ThreadDisk() override;
 
   static void        create_thread();
+  static void        destroy_thread();
   static ThreadDisk* thread_disk();
 
   const char*     name() const override { return "rtorrent disk"; }

src/net/thread_net.cc

@@ -42,6 +42,12 @@ ThreadNet::create_thread() {
   m_thread_net = thread;
 }
 
+void
+ThreadNet::destroy_thread() {
+  delete m_thread_net;
+  m_thread_net = nullptr;
+}
+
 ThreadNet*
 ThreadNet::thread_net() {
   return m_thread_net;
@@ -61,8 +67,6 @@ ThreadNet::init_thread_post_local() {
 
 void
 ThreadNet::cleanup_thread() {
-  m_thread_net = nullptr;
-
   m_http_stack->shutdown();
   m_udns->cleanup();
 }

src/net/thread_net.h

@@ -17,6 +17,7 @@ class LIBTORRENT_EXPORT ThreadNet : public utils::Thread {
   ~ThreadNet() override;
 
   static void         create_thread();
+  static void         destroy_thread();
   static ThreadNet*   thread_net();
 
   const char*         name() const override { return "rtorrent net"; }

src/net/udns_resolver.cc

@@ -141,14 +141,14 @@ UdnsResolver::resolve(void* requester, const std::string& hostname, int family,
     if (query->a6_query == nullptr) {
       LT_LOG("malformed AAAA query : requester:%p name:%s", requester, hostname.c_str());
 
-      if (::dns_status(m_ctx) != DNS_E_BADQUERY)
-        throw new internal_error("dns_submit_a6 failed");
-
       if (query->a4_query != nullptr) {
         ::dns_cancel(m_ctx, query->a4_query);
         query->a4_query = nullptr;
       }
 
+      if (::dns_status(m_ctx) != DNS_E_BADQUERY)
+        throw new internal_error("dns_submit_a6 failed");
+
       query->error_sin = EAI_NONAME;
 
       process_timeouts();
@@ -352,9 +352,11 @@ UdnsResolver::a4_callback_wrapper(struct ::dns_ctx *ctx, ::dns_rr_a4 *result, vo
   }
 
   auto itr = query->parent->find_query(static_cast<UdnsResolver::Query*>(data));
+
   if (itr == query->parent->m_queries.end())
     throw internal_error("UdnsResolver::a4_callback_wrapper called with invalid query");
 
+  // TODO: Verify...
   query->a4_query = nullptr;
 
   if (result == nullptr || result->dnsa4_nrr == 0) {

src/torrent/torrent.cc

@@ -148,10 +148,9 @@ cleanup() {
   thread_disk()->stop_thread_wait();
   net_thread::thread()->stop_thread_wait();
 
-  // TODO: Set these to null.
-  delete thread_tracker();
-  delete thread_disk();
-  delete net_thread::thread();
+  ThreadTracker::destroy_thread();
+  ThreadDisk::destroy_thread();
+  ThreadNet::destroy_thread();
 
   delete manager;
   manager = NULL;

src/torrent/utils/thread.cc

@@ -47,7 +47,7 @@ Thread::start_thread() {
   if (!is_initialized())
     throw internal_error("Called Thread::start_thread on an uninitialized object.");
 
-  if (pthread_create(&m_thread, NULL, &Thread::enter_event_loop, this))
+  if (pthread_create(&m_thread, nullptr, &Thread::enter_event_loop, this))
     throw internal_error("Failed to create thread.");
 
   while (m_state != STATE_ACTIVE)
@@ -60,7 +60,7 @@ Thread::stop_thread_wait() {
   m_flags |= flag_do_shutdown;
   interrupt();
 
-  pthread_join(m_thread, NULL);
+  pthread_join(m_thread, nullptr);
   assert(is_inactive());
 }
 

src/tracker/thread_tracker.cc

@@ -22,6 +22,12 @@ ThreadTracker::create_thread(utils::Thread* main_thread) {
   m_thread_tracker.load()->m_tracker_manager = std::make_unique<tracker::Manager>(main_thread, m_thread_tracker);
 }
 
+void
+ThreadTracker::destroy_thread() {
+  delete m_thread_tracker;
+  m_thread_tracker = nullptr;
+}
+
 ThreadTracker*
 ThreadTracker::thread_tracker() {
   return m_thread_tracker;
@@ -40,8 +46,6 @@ ThreadTracker::init_thread() {
 
 void
 ThreadTracker::cleanup_thread() {
-  m_thread_tracker = nullptr;
-
   m_tracker_manager.reset();
 }
 

src/tracker/thread_tracker.h

@@ -23,6 +23,7 @@ class LIBTORRENT_EXPORT ThreadTracker : public utils::Thread {
   ~ThreadTracker() override;
 
   static void           create_thread(utils::Thread* main_thread);
+  static void           destroy_thread();
   static ThreadTracker* thread_tracker();
 
   const char*           name() const override { return "rtorrent tracker"; }

test/helpers/test_main_thread.cc

@@ -83,7 +83,7 @@ TestFixtureWithMainAndDiskThread::setUp() {
 void
 TestFixtureWithMainAndDiskThread::tearDown() {
   torrent::thread_disk()->stop_thread_wait();
-  delete torrent::thread_disk();
+  torrent::ThreadDisk::destroy_thread();
 
   m_main_thread.reset();
 
@@ -108,7 +108,7 @@ TestFixtureWithMainAndTrackerThread::setUp() {
 void
 TestFixtureWithMainAndTrackerThread::tearDown() {
   torrent::thread_tracker()->stop_thread_wait();
-  delete torrent::thread_tracker();
+  torrent::ThreadTracker::destroy_thread();
 
   m_main_thread.reset();
 
@@ -140,8 +140,8 @@ TestFixtureWithMainNetTrackerThread::tearDown() {
   torrent::thread_tracker()->stop_thread_wait();
   torrent::net_thread::thread()->stop_thread_wait();
 
-  delete torrent::net_thread::thread();
-  delete torrent::thread_tracker();
+  torrent::ThreadTracker::destroy_thread();
+  torrent::ThreadNet::destroy_thread();
 
   m_main_thread.reset();