Better fix for AV at exit() time, CORE-2917 :

hvlad · hvlad · commit 0979b7c9288b · 2010-04-29T08:51:24.000Z
a) WaitForSingleObject hungs when process unloads embedded library
b) shmem file was changed in incompatime way so build 26000 can't work together with any previous builds
c) time_t in shmem replaced by SINT64 to avoid possible issues with builds by MSVC 7.1 (where time_t is 32-bit)
diff --git a/src/common/classes/RefCounted.h b/src/common/classes/RefCounted.h
@@ -66,13 +66,13 @@ namespace Firebird
 		explicit Reference(RefCounted& refCounted) :
 			r(refCounted)
 		{
-			r.addRef();
+			r.RefCounted::addRef();
 		}
 
 		~Reference()
 		{
 			try {
-				r.release();
+				r.RefCounted::release();
 			}
 			catch (const Exception&)
 			{
diff --git a/src/jrd/trace/TraceConfigStorage.cpp b/src/jrd/trace/TraceConfigStorage.cpp
@@ -79,13 +79,13 @@ void checkFileError(const char* filename, const char* operation, ISC_STATUS iscE
 #endif
 }
 
-ConfigStorage::ConfigStorage()
+ConfigStorage::ConfigStorage() :
+	m_base(NULL),
+	m_cfg_file(-1),
+	m_dirty(false),
+	m_touchSemaphore(FB_NEW(*getDefaultMemoryPool()) AnyRef<Semaphore>),
+	m_touchSemRef(*m_touchSemaphore)
 {
-	m_base = NULL;
-	m_cfg_file = -1;
-	m_dirty = false;
-	m_thdId = 0;
-
 	PathName filename;
 #ifdef WIN_NT
 	DWORD sesID = 0;
@@ -120,20 +120,25 @@ ConfigStorage::ConfigStorage()
 		status_exception::raise(status);
 	}
 
-	fb_assert(m_base->version == 1);
+	fb_assert(m_base->version == 1 || m_base->version == 2);
 
 	StorageGuard guard(this);
 	checkFile();
 	++m_base->cnt_uses;
 
-	gds__thread_start(touchThread, (void*) this, THREAD_medium, 0, &m_thdId);
+	if (m_base->version == 2) 
+	{
+		if (gds__thread_start(touchThread, (void*) this, THREAD_medium, 0, NULL))
+			gds__log("Can't start touch thread");
+		else
+			m_touchStartSem.enter();
+	}
 }
 
 ConfigStorage::~ConfigStorage()
 {
 	// signal touchThread to finish
-	m_touchSemaphore.release();
-	THD_wait_for_completion(m_thdId);
+	m_touchSemaphore->Semaphore::release();
 
 	::close(m_cfg_file);
 	m_cfg_file = -1;
@@ -181,7 +186,7 @@ void ConfigStorage::initShMem(void* arg, sh_mem* shmemData, bool initialize)
 	// Initialize the shared data header
 	if (initialize)
 	{
-		header->version = 1;
+		header->version = 2;
 		header->change_number = 0;
 		header->session_number = 1;
 		header->cnt_uses = 0;
@@ -311,8 +316,13 @@ THREAD_ENTRY_DECLARE ConfigStorage::touchThread(THREAD_ENTRY_PARAM arg)
 
 void ConfigStorage::touchThreadFunc()
 {
+	AnyRef<Semaphore>* semaphore = m_touchSemaphore;
+	Reference semRef(*semaphore);
+
+	m_touchStartSem.release();
+
 	int delay = TOUCH_INTERVAL / 2;
-	while (!m_touchSemaphore.tryEnter(delay))
+	while (!semaphore->tryEnter(delay))
 	{
 		StorageGuard guard(this);
 
diff --git a/src/jrd/trace/TraceConfigStorage.h b/src/jrd/trace/TraceConfigStorage.h
@@ -31,6 +31,7 @@
 #include "../../common/classes/array.h"
 #include "../../common/classes/fb_string.h"
 #include "../../common/classes/init.h"
+#include "../../common/classes/RefCounted.h"
 #include "../../common/classes/semaphore.h"
 #include "../../jrd/isc.h"
 #include "../../jrd/ThreadStart.h"
@@ -95,11 +96,11 @@ friend class StorageInstance;
 		volatile ULONG change_number;
 		volatile ULONG session_number;
 		ULONG cnt_uses;
-		time_t touch_time;
 		char  cfg_file_name[MAXPATHLEN];
 #ifndef WIN_NT
 		struct mtx mutex;
 #endif
+		SINT64 touch_time;
 	};
 
 	// items in every session record at sessions file
@@ -125,8 +126,9 @@ friend class StorageInstance;
 #endif
 	int  m_cfg_file;
 	bool m_dirty;
-	Firebird::Semaphore m_touchSemaphore;
-	ThreadHandle m_thdId;
+	Firebird::Semaphore m_touchStartSem;
+	Firebird::AnyRef<Firebird::Semaphore>* m_touchSemaphore;
+	Firebird::Reference  m_touchSemRef;
 };
 
 

Original file line number	Diff line number	Diff line change
`@@ -66,13 +66,13 @@ namespace Firebird`
`66`	`66`	`explicit Reference(RefCounted& refCounted) :`
`67`	`67`	`r(refCounted)`
`68`	`68`	`{`
`69`		`- r.addRef();`
	`69`	`+ r.RefCounted::addRef();`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`~Reference()`
`73`	`73`	`{`
`74`	`74`	`try {`
`75`		`- r.release();`
	`75`	`+ r.RefCounted::release();`
`76`	`76`	`}`
`77`	`77`	`catch (const Exception&)`
`78`	`78`	`{`