Prevent deadlock on process exit

src/main/cpp/aprinitializer.cpp

@@ -103,21 +103,21 @@ APRInitializer::~APRInitializer()
 #endif
 }
 
-void APRInitializer::stopWatchDogs()
+void APRInitializer::deleteWatchDogs()
 {
 	std::lock_guard<std::mutex> lock(m_priv->mutex);
 
 	while (!m_priv->watchdogs.empty())
 	{
-		m_priv->watchdogs.back()->stop();
 		delete m_priv->watchdogs.back();
 		m_priv->watchdogs.pop_back();
 	}
 }
 
 void APRInitializer::unregisterAll()
 {
-	getInstance().stopWatchDogs();
+	FileWatchdog::stopAll();
+	getInstance().deleteWatchDogs();
 }
 
 APRInitializer& APRInitializer::getInstance()

src/main/cpp/filewatchdog.cpp

@@ -35,7 +35,8 @@ long FileWatchdog::DEFAULT_DELAY = 60000;
 struct FileWatchdog::FileWatchdogPrivate{
 	FileWatchdogPrivate(const File& file1) :
 		file(file1), delay(DEFAULT_DELAY), lastModif(0),
-		warnedAlready(false)
+		warnedAlready(false),
+		taskName{LOG4CXX_STR("WatchDog_") + file1.getName()}
 	{ }
 
 
@@ -57,7 +58,7 @@ struct FileWatchdog::FileWatchdogPrivate{
 	std::condition_variable interrupt;
 	std::mutex interrupt_mutex;
 #endif
-	LogString taskName{LOG4CXX_STR("FileWatchdog")};
+	LogString taskName;
 };
 
 FileWatchdog::FileWatchdog(const File& file1)
@@ -67,7 +68,6 @@ FileWatchdog::FileWatchdog(const File& file1)
 
 FileWatchdog::~FileWatchdog()
 {
-	stop();
 }
 
 
@@ -85,6 +85,14 @@ void FileWatchdog::stop()
 	}
 }
 
+/**
+Stop all tasks that periodically checks for a file change.
+*/
+void FileWatchdog::stopAll()
+{
+	ThreadUtility::instance()->removePeriodicTasksMatching(LOG4CXX_STR("WatchDog_"));
+}
+
 const File& FileWatchdog::file()
 {
 	return m_priv->file;

src/main/cpp/threadutility.cpp

@@ -51,7 +51,7 @@ struct ThreadUtility::priv_data
 {
 	priv_data()
 #if LOG4CXX_EVENTS_AT_EXIT
-		: atExitRegistryRaii{ []{ stopThread(); } }
+		: atExitRegistryRaii{ [this]{ stopThread(); } }
 #endif
 	{
 	}
@@ -298,6 +298,24 @@ void ThreadUtility::removePeriodicTask(const LogString& name)
 		m_priv->jobs.erase(pItem);
 }
 
+/**
+ * Remove any periodic task matching \c namePrefix
+ */
+void ThreadUtility::removePeriodicTasksMatching(const LogString& namePrefix)
+{
+	while (1)
+	{
+		std::lock_guard<std::mutex> lock(m_priv->job_mutex);
+		auto pItem = std::find_if(m_priv->jobs.begin(), m_priv->jobs.end()
+			, [&namePrefix](const priv_data::NamedPeriodicFunction& item)
+			{ return namePrefix.size() <= item.name.size() && item.name.substr(0, namePrefix.size()) == namePrefix; }
+			);
+		if (m_priv->jobs.end() == pItem)
+			break;
+		m_priv->jobs.erase(pItem);
+	}
+}
+
 // Run ready tasks
 void ThreadUtility::priv_data::doPeriodicTasks()
 {

src/main/include/log4cxx/helpers/aprinitializer.h

@@ -84,7 +84,7 @@ class APRInitializer
 	private: // Modifiers
 		void addObject(size_t key, const ObjectPtr& pObject);
 		const ObjectPtr& findOrAddObject(size_t key, std::function<ObjectPtr()> creator);
-		void stopWatchDogs();
+		void deleteWatchDogs();
 	private: // Attributes
 		LOG4CXX_DECLARE_PRIVATE_MEMBER_PTR(APRInitializerPrivate, m_priv)
 	private: // Class methods

src/main/include/log4cxx/helpers/filewatchdog.h

@@ -54,20 +54,24 @@ class LOG4CXX_EXPORT FileWatchdog
 		void setDelay(long delay);
 
 		/**
-		Create a thread that periodically checks for a file change after first calling doOnChange() on the current thread.
+		Create an asynchronous task that periodically checks for a file change after first calling doOnChange().
 		*/
 		void start();
 
 		/**
-		Stop the thread that periodically checks for a file change.
+		Stop the task that periodically checks for a file change.
 		*/
 		void stop();
 
 		/**
-		Is the thread that periodically checks for a file change running?
+		Is the task that periodically checks for a file change running?
 		*/
 		bool is_active();
 
+		/**
+		Stop all tasks that periodically check for a file change.
+		*/
+		static void stopAll();
 	private:
 
 		FileWatchdog(const FileWatchdog&);

src/main/include/log4cxx/helpers/threadutility.h

@@ -159,19 +159,24 @@ class LOG4CXX_EXPORT ThreadUtility
 		using Period = std::chrono::milliseconds;
 
 		/**
-		 * Add a periodic task
+		 * Add the \c taskName periodic task
 		 */
-		void addPeriodicTask(const LogString& name, std::function<void()> f, const Period& delay);
+		void addPeriodicTask(const LogString& taskName, std::function<void()> f, const Period& delay);
 
 		/**
 		 * Has a \c taskName periodic task already been added?
 		 */
-		bool hasPeriodicTask(const LogString& name);
+		bool hasPeriodicTask(const LogString& taskName);
 
 		/**
 		 * Remove the \c taskName periodic task
 		 */
-		void removePeriodicTask(const LogString& name);
+		void removePeriodicTask(const LogString& taskName);
+
+		/**
+		 * Remove any periodic task matching \c namePrefix
+		 */
+		void removePeriodicTasksMatching(const LogString& namePrefix);
 };
 
 } /* namespace helpers */