Fixed segfault at exit() time, CORE-2917

AlexPeshkoff · AlexPeshkoff · commit e8d1eeae2ff5 · 2010-04-20T11:08:32.000Z
diff --git a/src/jrd/trace/TraceConfigStorage.cpp b/src/jrd/trace/TraceConfigStorage.cpp
@@ -84,6 +84,7 @@ ConfigStorage::ConfigStorage()
 	m_base = NULL;
 	m_cfg_file = -1;
 	m_dirty = false;
+	m_thdId = 0;
 
 	PathName filename;
 #ifdef WIN_NT
@@ -125,13 +126,14 @@ ConfigStorage::ConfigStorage()
 	checkFile();
 	++m_base->cnt_uses;
 
-	gds__thread_start(touchThread, (void*) this, THREAD_medium, 0, 0);
+	gds__thread_start(touchThread, (void*) this, THREAD_medium, 0, &m_thdId);
 }
 
 ConfigStorage::~ConfigStorage()
 {
 	// signal touchThread to finish
 	m_touchSemaphore.release();
+	THD_wait_for_completion(m_thdId);
 
 	::close(m_cfg_file);
 	m_cfg_file = -1;
diff --git a/src/jrd/trace/TraceConfigStorage.h b/src/jrd/trace/TraceConfigStorage.h
@@ -33,7 +33,7 @@
 #include "../../common/classes/init.h"
 #include "../../common/classes/semaphore.h"
 #include "../../jrd/isc.h"
-#include "../../jrd/ThreadData.h"
+#include "../../jrd/ThreadStart.h"
 #include "../../jrd/trace/TraceSession.h"
 
 namespace Jrd {
@@ -126,6 +126,7 @@ friend class StorageInstance;
 	int  m_cfg_file;
 	bool m_dirty;
 	Firebird::Semaphore m_touchSemaphore;
+	ThreadHandle m_thdId;
 };
 
 
