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

Fixed #7738: Crash on multiple connections/disconnections

Browse Source 
(cherry picked from commit 8e61e1111d)
This commit is contained in:
AlexPeshkoff 2023-09-06 13:40:07 +03:00
parent 4d7fb86fc1
commit b71eeb737f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jrd/cch.cpp
View File

@ -1528,6 +1528,10 @@ void CCH_init2(thread_db* tdbb)
Database* dbb = tdbb->getDatabase();
BufferControl* bcb = dbb->dbb_bcb;
// Avoid running CCH_init2() in 2 parallel threads
Firebird::MutexEnsureUnlock guard(bcb->bcb_threadStartup, FB_FUNCTION);
guard.enter();
if (!(bcb->bcb_flags & BCB_exclusive) || (bcb->bcb_flags & (BCB_cache_writer | BCB_writer_start)))
return;
@ -1548,6 +1552,7 @@ void CCH_init2(thread_db* tdbb)
{
// writer startup in progress
bcb->bcb_flags |= BCB_writer_start;
guard.leave();
try
{

3
src/jrd/cch.h
View File

@ -146,6 +146,9 @@ public:
Firebird::SyncObject bcb_syncLRU;
//Firebird::SyncObject bcb_syncPageWrite;
// If we make bcb_flags atomic this mutex will become unneeded: XCHG of bcb_flags is enough
Firebird::Mutex bcb_threadStartup;
typedef ThreadFinishSync<BufferControl*> BcbThreadSync;
static void cache_writer(BufferControl* bcb);