From 0fb5ec7152c79d10711139158533f96204755788 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 28 Aug 2019 22:14:34 +0200
Subject: [SERVER] Speed up shutdown of integrity checker

---
 src/server/integrity.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/server/integrity.c b/src/server/integrity.c
index e7ebeb2..1fcb558 100644
--- a/src/server/integrity.c
+++ b/src/server/integrity.c
@@ -13,6 +13,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <pthread.h>
+#include <signal.h>
 
 #define CHECK_QUEUE_SIZE 200
 
@@ -56,13 +58,14 @@ void integrity_init()
 void integrity_shutdown()
 {
 	assert( queueLen != -1 );
+	if ( !bRunning )
+		return;
 	logadd( LOG_DEBUG1, "Shutting down integrity checker...\n" );
+	pthread_kill( thread, SIGINT );
 	mutex_lock( &integrityQueueLock );
 	pthread_cond_signal( &queueSignal );
 	mutex_unlock( &integrityQueueLock );
 	thread_join( thread, NULL );
-	while ( bRunning )
-		usleep( 10000 );
 	mutex_destroy( &integrityQueueLock );
 	pthread_cond_destroy( &queueSignal );
 	logadd( LOG_DEBUG1, "Integrity checker exited normally.\n" );
-- 
cgit v1.2.3-55-g7522