#168: 9da07e1: adjusted finalization

of global objects

daemon/connect/Connection.cpp

@@ -35,6 +35,17 @@ std::unique_ptr<Mutex> Connection::m_getHostByNameMutex;
 #endif
 #endif
 
+class ConnectionFinalizer
+{
+public:
+	~ConnectionFinalizer()
+	{
+		Connection::Final();
+	}
+};
+
+std::unique_ptr<ConnectionFinalizer> m_connectionFinalizer;
+
 void closesocket_gracefully(SOCKET socket)
 {
 	char buf[1024];
@@ -93,34 +104,20 @@ void Connection::Init()
 	}
 #endif
 
-#ifndef DISABLE_TLS
-	TlsSocket::Init();
-#endif
-
 #ifndef HAVE_GETADDRINFO
 #ifndef HAVE_GETHOSTBYNAME_R
 	m_getHostByNameMutex = std::make_unique<Mutex>();
 #endif
 #endif
+
+	m_connectionFinalizer = std::make_unique<ConnectionFinalizer>();
 }
 
 void Connection::Final()
 {
-	debug("Finalizing global connection data");
-
 #ifdef WIN32
 	WSACleanup();
 #endif
-
-#ifndef DISABLE_TLS
-	TlsSocket::Final();
-#endif
-
-#ifndef HAVE_GETADDRINFO
-#ifndef HAVE_GETHOSTBYNAME_R
-	m_getHostByNameMutex.reset();
-#endif
-#endif
 }
 
 Connection::Connection(const char* host, int port, bool tls)

daemon/connect/Connection.h

@@ -40,6 +40,10 @@
 
 class Connection
 {
+private:
+	static void			Final();
+	friend class ConnectionFinalizer;
+
 public:
 	enum EStatus
 	{
@@ -117,7 +121,6 @@ class Connection
 						Connection(SOCKET socket, bool tls);
 	virtual 			~Connection();
 	static void			Init();
-	static void			Final();
 	virtual bool 		Connect();
 	virtual bool		Disconnect();
 	bool				Bind();

daemon/connect/TlsSocket.cpp

@@ -31,6 +31,16 @@
 #include "Thread.h"
 #include "Log.h"
 
+class TlsSocketFinalizer
+{
+public:
+	~TlsSocketFinalizer()
+	{
+		TlsSocket::Final();
+	}
+};
+
+std::unique_ptr<TlsSocketFinalizer> m_tlsSocketFinalizer;
 
 #ifdef HAVE_LIBGNUTLS
 #ifdef NEED_GCRYPT_LOCKING
@@ -188,12 +198,12 @@ void TlsSocket::Init()
 	CRYPTO_set_dynlock_lock_callback(openssl_dynlock_lock);
 
 #endif /* HAVE_OPENSSL */
+
+	m_tlsSocketFinalizer = std::make_unique<TlsSocketFinalizer>();
 }
 
 void TlsSocket::Final()
 {
-	debug("Finalizing TLS library");
-
 #ifdef HAVE_LIBGNUTLS
 	gnutls_global_deinit();
 

daemon/connect/TlsSocket.h

@@ -48,14 +48,16 @@ class TlsSocket
 
 	void				ReportError(const char* errMsg);
 
+	static void			Final();
+	friend class TlsSocketFinalizer;
+
 protected:
 	virtual void		PrintError(const char* errMsg);
 
 public:
 						TlsSocket(SOCKET socket, bool isClient, const char* certFile, const char* keyFile, const char* cipher);
 	virtual				~TlsSocket();
 	static void			Init();
-	static void			Final();
 	bool				Start();
 	void				Close();
 	int					Send(const char* buffer, int size);

daemon/main/nzbget.cpp

@@ -246,6 +246,9 @@ void NZBGet::Init()
 	{
 		Thread::Init();
 		Connection::Init();
+#ifndef DISABLE_TLS
+		TlsSocket::Init();
+#endif
 	}
 
 	CreateGlobals();
@@ -409,12 +412,6 @@ void NZBGet::Cleanup()
 		FileSystem::DeleteFile(m_options->GetLockFile());
 	}
 
-	if (!m_reloading)
-	{
-		Connection::Final();
-		Thread::Final();
-	}
-
 	g_UrlCoordinator = nullptr;
 	g_PrePostProcessor = nullptr;
 	g_Scanner = nullptr;

daemon/util/Thread.cpp

@@ -86,13 +86,6 @@ void Thread::Init()
 	m_threadMutex = std::make_unique<Mutex>();
 }
 
-void Thread::Final()
-{
-	debug("Finalizing global thread data");
-
-	m_threadMutex.reset();
-}
-
 Thread::Thread()
 {
 	debug("Creating Thread");

daemon/util/Thread.h

@@ -59,7 +59,6 @@ class Thread
 							Thread();
 	virtual 				~Thread();
 	static void				Init();
-	static void				Final();
 
 	virtual void 			Start();
 	virtual void 			Stop();

tests/suite/TestMain.cpp

@@ -62,7 +62,6 @@ int TestMain(int argc, char * argv[])
 	int ret = Catch::Session().run(argc, testsargv);
 
 	free(testsargv);
-	Thread::Final();
 	TestUtil::Final();
 
 	return ret;