firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 02:03:04 +01:00
Code Issues

Separated shutdown (mostly for locks) from destruction.

Browse Source
This commit is contained in:
dimitr 2013-11-13 07:44:50 +00:00
parent 9d721140ef
commit fe23598a23
4 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/CryptoManager.cpp
View File

@ -141,6 +141,8 @@ namespace Jrd {
CryptoManager::~CryptoManager() CryptoManager::~CryptoManager()
{ {
delete stateLock;
delete threadLock;
} }
void CryptoManager::terminateCryptThread(thread_db*) void CryptoManager::terminateCryptThread(thread_db*)
@ -163,11 +165,7 @@ namespace Jrd {
cryptPlugin = NULL; cryptPlugin = NULL;
} }
if (stateLock) LCK_release(tdbb, stateLock);
{
LCK_release(tdbb, stateLock);
stateLock = NULL;
}
} }
void CryptoManager::takeStateLock(thread_db* tdbb) void CryptoManager::takeStateLock(thread_db* tdbb)

27
src/jrd/GlobalRWLock.cpp
View File

@ -83,34 +83,27 @@ GlobalRWLock::GlobalRWLock(thread_db* tdbb, MemoryPool& p, lck_t lckType,
GlobalRWLock::~GlobalRWLock() GlobalRWLock::~GlobalRWLock()
{ {
if (cachedLock) delete cachedLock;
shutdownLock();
} }
void GlobalRWLock::shutdownLock() void GlobalRWLock::shutdownLock(thread_db* tdbb)
{ {
thread_db* tdbb = JRD_get_thread_data(); SET_TDBB(tdbb);
Attachment::CheckoutLockGuard counterGuard(tdbb->getAttachment(), counterMutex, Attachment* const att = tdbb->getAttachment();
FB_FUNCTION, true); Attachment::CheckoutLockGuard counterGuard(att, counterMutex, FB_FUNCTION, true);
COS_TRACE(("(%p)->shutdownLock readers(%d), blocking(%d), pendingWriters(%d), currentWriter(%d), lck_physical(%d)", COS_TRACE(("(%p)->shutdownLock readers(%d), blocking(%d), pendingWriters(%d), currentWriter(%d), lck_physical(%d)",
this, readers, blocking, pendingWriters, currentWriter, cachedLock->lck_physical)); this, readers, blocking, pendingWriters, currentWriter, cachedLock->lck_physical));
if (!cachedLock)
return;
LCK_release(tdbb, cachedLock); LCK_release(tdbb, cachedLock);
delete cachedLock;
cachedLock = NULL;
} }
bool GlobalRWLock::lockWrite(thread_db* tdbb, SSHORT wait) bool GlobalRWLock::lockWrite(thread_db* tdbb, SSHORT wait)
{ {
SET_TDBB(tdbb); SET_TDBB(tdbb);
Attachment* att = tdbb->getAttachment(); Attachment* const att = tdbb->getAttachment();
{ // scope 1 { // scope 1
Attachment::CheckoutLockGuard counterGuard(att, counterMutex, FB_FUNCTION, true); Attachment::CheckoutLockGuard counterGuard(att, counterMutex, FB_FUNCTION, true);
@ -191,7 +184,7 @@ void GlobalRWLock::unlockWrite(thread_db* tdbb)
{ {
SET_TDBB(tdbb); SET_TDBB(tdbb);
Attachment* att = tdbb->getAttachment(); Attachment* const att = tdbb->getAttachment();
Attachment::CheckoutLockGuard counterGuard(att, counterMutex, FB_FUNCTION, true); Attachment::CheckoutLockGuard counterGuard(att, counterMutex, FB_FUNCTION, true);
COS_TRACE(("(%p)->unlockWrite readers(%d), blocking(%d), pendingWriters(%d), currentWriter(%d), lck_physical(%d)", COS_TRACE(("(%p)->unlockWrite readers(%d), blocking(%d), pendingWriters(%d), currentWriter(%d), lck_physical(%d)",
@ -219,7 +212,7 @@ bool GlobalRWLock::lockRead(thread_db* tdbb, SSHORT wait, const bool queueJump)
{ {
SET_TDBB(tdbb); SET_TDBB(tdbb);
Attachment* att = tdbb->getAttachment(); Attachment* const att = tdbb->getAttachment();
bool needFetch; bool needFetch;
@ -294,7 +287,7 @@ void GlobalRWLock::unlockRead(thread_db* tdbb)
{ {
SET_TDBB(tdbb); SET_TDBB(tdbb);
Attachment* att = tdbb->getAttachment(); Attachment* const att = tdbb->getAttachment();
Attachment::CheckoutLockGuard counterGuard(att, counterMutex, FB_FUNCTION, true); Attachment::CheckoutLockGuard counterGuard(att, counterMutex, FB_FUNCTION, true);
COS_TRACE(("(%p)->unlockRead readers(%d), blocking(%d), pendingWriters(%d), currentWriter(%d), lck_physical(%d)", COS_TRACE(("(%p)->unlockRead readers(%d), blocking(%d), pendingWriters(%d), currentWriter(%d), lck_physical(%d)",
@ -317,7 +310,7 @@ void GlobalRWLock::unlockRead(thread_db* tdbb)
bool GlobalRWLock::tryReleaseLock(thread_db* tdbb) bool GlobalRWLock::tryReleaseLock(thread_db* tdbb)
{ {
Attachment* att = tdbb->getAttachment(); Attachment* const att = tdbb->getAttachment();
Attachment::CheckoutLockGuard counterGuard(att, counterMutex, FB_FUNCTION, true); Attachment::CheckoutLockGuard counterGuard(att, counterMutex, FB_FUNCTION, true);
COS_TRACE(("(%p)->tryReleaseLock readers(%d), blocking(%d), pendingWriters(%d), currentWriter(%d), lck_physical(%d)", COS_TRACE(("(%p)->tryReleaseLock readers(%d), blocking(%d), pendingWriters(%d), currentWriter(%d), lck_physical(%d)",

2
src/jrd/GlobalRWLock.h
View File

@ -69,7 +69,7 @@ public:
bool lockRead(thread_db* tdbb, SSHORT wait, const bool queueJump = false); bool lockRead(thread_db* tdbb, SSHORT wait, const bool queueJump = false);
void unlockRead(thread_db* tdbb); void unlockRead(thread_db* tdbb);
bool tryReleaseLock(thread_db* tdbb); bool tryReleaseLock(thread_db* tdbb);
void shutdownLock(); void shutdownLock(thread_db* tdbb);
protected: protected:
// Flag to indicate that somebody is waiting via lock manager. // Flag to indicate that somebody is waiting via lock manager.

6
src/jrd/nbak.cpp
View File

@ -861,11 +861,11 @@ bool BackupManager::actualizeState(thread_db* tdbb)
return true; return true;
} }
void BackupManager::shutdown(thread_db* /*tdbb*/) void BackupManager::shutdown(thread_db* tdbb)
{ {
shutDown = true; shutDown = true;
closeDelta(); closeDelta();
stateLock->shutdownLock(); stateLock->shutdownLock(tdbb);
allocLock->shutdownLock(); allocLock->shutdownLock(tdbb);
} }