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

front-ported fox for CORE-1098

Browse Source
This commit is contained in:
alexpeshkoff 2007-01-18 15:50:18 +00:00
parent 1881afc634
commit a13e291d5f
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/jrd/cch.cpp
View File

@ -1257,6 +1257,14 @@ void CCH_fini(thread_db* tdbb)
#ifdef CACHE_WRITER #ifdef CACHE_WRITER
/* Wait for cache writer startup to complete. */
while ((bcb = dbb->dbb_bcb) && (bcb->bcb_flags & BCB_writer_start))
{
THREAD_EXIT();
THREAD_YIELD();
THREAD_ENTER();
}
/* Shutdown the dedicated cache writer for this database. */ /* Shutdown the dedicated cache writer for this database. */
if ((bcb = dbb->dbb_bcb) && (bcb->bcb_flags & BCB_cache_writer)) { if ((bcb = dbb->dbb_bcb) && (bcb->bcb_flags & BCB_cache_writer)) {
@ -1755,6 +1763,10 @@ void CCH_init(thread_db* tdbb, ULONG number)
#ifdef CACHE_WRITER #ifdef CACHE_WRITER
if (!(dbb->dbb_flags & DBB_read_only)) { if (!(dbb->dbb_flags & DBB_read_only)) {
event_t* event = dbb->dbb_writer_event_init; event_t* event = dbb->dbb_writer_event_init;
// writer startup in progress
bcb->bcb_flags |= BCB_writer_start;
/* Initialize initialization event */ /* Initialize initialization event */
ISC_event_init(event, 0, 0); ISC_event_init(event, 0, 0);
count = ISC_event_clear(event); count = ISC_event_clear(event);
@ -1762,6 +1774,7 @@ void CCH_init(thread_db* tdbb, ULONG number)
if (gds__thread_start(cache_writer, dbb, if (gds__thread_start(cache_writer, dbb,
THREAD_high, 0, 0)) THREAD_high, 0, 0))
{ {
bcb->bcb_flags &= ~BCB_writer_start;
ERR_bugcheck_msg("cannot start thread"); ERR_bugcheck_msg("cannot start thread");
} }
THREAD_EXIT(); THREAD_EXIT();
@ -4054,14 +4067,14 @@ static THREAD_ENTRY_DECLARE cache_writer(THREAD_ENTRY_PARAM arg)
LCK_init fails we won't be able to accomplish anything anyway, so LCK_init fails we won't be able to accomplish anything anyway, so
return, unlike the other try blocks further down the page. */ return, unlike the other try blocks further down the page. */
event_t* writer_event = 0; event_t* writer_event = 0;
BufferControl* bcb = 0; BufferControl* bcb = dbb->dbb_bcb;
try { try {
writer_event = dbb->dbb_writer_event; writer_event = dbb->dbb_writer_event;
ISC_event_init(writer_event, 0, 0); ISC_event_init(writer_event, 0, 0);
LCK_init(tdbb, LCK_OWNER_attachment); LCK_init(tdbb, LCK_OWNER_attachment);
bcb = dbb->dbb_bcb;
bcb->bcb_flags |= BCB_cache_writer; bcb->bcb_flags |= BCB_cache_writer;
bcb->bcb_flags &= ~BCB_writer_start;
/* Notify our creator that we have started */ /* Notify our creator that we have started */
ISC_event_post(dbb->dbb_writer_event_init); ISC_event_post(dbb->dbb_writer_event_init);
@ -4069,7 +4082,9 @@ static THREAD_ENTRY_DECLARE cache_writer(THREAD_ENTRY_PARAM arg)
catch (const Firebird::Exception& ex) { catch (const Firebird::Exception& ex) {
Firebird::stuff_exception(status_vector, ex); Firebird::stuff_exception(status_vector, ex);
gds__log_status(dbb->dbb_filename.c_str(), status_vector); gds__log_status(dbb->dbb_filename.c_str(), status_vector);
ISC_event_fini(writer_event); ISC_event_fini(writer_event);
bcb->bcb_flags &= ~(BCB_cache_writer | BCB_writer_start);
THREAD_EXIT(); THREAD_EXIT();
return (THREAD_ENTRY_RETURN)(-1); return (THREAD_ENTRY_RETURN)(-1);
} }
@ -4085,6 +4100,7 @@ static THREAD_ENTRY_DECLARE cache_writer(THREAD_ENTRY_PARAM arg)
THREAD_EXIT(); THREAD_EXIT();
ISC_event_wait(1, &writer_event, &count, 10 * 1000000, NULL, 0); ISC_event_wait(1, &writer_event, &count, 10 * 1000000, NULL, 0);
THREAD_ENTER(); THREAD_ENTER();
bcb = dbb->dbb_bcb;
continue; continue;
} }

1
src/jrd/cch.h
View File

@ -90,6 +90,7 @@ public:
const int BCB_keep_pages = 1; /* set during btc_flush(), pages not removed from dirty binary tree */ const int BCB_keep_pages = 1; /* set during btc_flush(), pages not removed from dirty binary tree */
const int BCB_cache_writer = 2; /* cache writer thread has been started */ const int BCB_cache_writer = 2; /* cache writer thread has been started */
//const int BCB_checkpoint_db = 4; // WAL has requested a database checkpoint //const int BCB_checkpoint_db = 4; // WAL has requested a database checkpoint
const int BCB_writer_start = 4; // cache writer thread is starting now
const int BCB_writer_active = 8; /* no need to post writer event count */ const int BCB_writer_active = 8; /* no need to post writer event count */
#ifdef SUPERSERVER_V2 #ifdef SUPERSERVER_V2
const int BCB_cache_reader = 16; /* cache reader thread has been started */ const int BCB_cache_reader = 16; /* cache reader thread has been started */