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

Fixed bug CORE-4952 : SuperServer could hung on database shutdown

Browse Source
This commit is contained in:
hvlad 2015-10-03 13:07:17 +00:00
parent 82bf3591d7
commit 79e9404d50
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/jrd/cch.cpp
View File

@ -1985,6 +1985,32 @@ void CCH_shutdown(thread_db* tdbb)
if (!bcb)
return;
#ifdef CACHE_READER
// Shutdown the dedicated cache reader for this database
if (bcb->bcb_flags & BCB_cache_reader)
{
bcb->bcb_flags &= ~BCB_cache_reader;
dbb->dbb_reader_sem.release();
dbb->dbb_reader_fini.enter();
}
#endif
// Wait for cache writer startup to complete
while (bcb->bcb_flags & BCB_writer_start)
Thread::yield();
// Shutdown the dedicated cache writer for this database
if (bcb->bcb_flags & BCB_cache_writer)
{
bcb->bcb_flags &= ~BCB_cache_writer;
bcb->bcb_writer_sem.release(); // Wake up running thread
bcb->bcb_writer_fini.enter();
}
SyncLockGuard bcbSync(&bcb->bcb_syncObject, SYNC_EXCLUSIVE, "CCH_shutdown");
// Flush and release page buffers
@ -2018,32 +2044,6 @@ void CCH_shutdown(thread_db* tdbb)
}
}
#ifdef CACHE_READER
// Shutdown the dedicated cache reader for this database
if (bcb->bcb_flags & BCB_cache_reader)
{
bcb->bcb_flags &= ~BCB_cache_reader;
dbb->dbb_reader_sem.release();
dbb->dbb_reader_fini.enter();
}
#endif
// Wait for cache writer startup to complete
while (bcb->bcb_flags & BCB_writer_start)
Thread::yield();
// Shutdown the dedicated cache writer for this database
if (bcb->bcb_flags & BCB_cache_writer)
{
bcb->bcb_flags &= ~BCB_cache_writer;
bcb->bcb_writer_sem.release(); // Wake up running thread
bcb->bcb_writer_fini.enter();
}
// close the database file and all associated shadow files
dbb->dbb_page_manager.closeAll();