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

Front-ported Nickolay's improvement for the shared counter.

Browse Source
This commit is contained in:
dimitr 2014-08-10 20:07:45 +00:00
parent 3722fedb4b
commit 51d1cd35d3
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/jrd/Database.cpp
View File

@ -270,8 +270,8 @@ namespace Jrd
if (!counter->lock) if (!counter->lock)
{ {
Lock* const lock = FB_NEW_RPT(*dbb->dbb_permanent, 0) Lock* const lock =
Lock(tdbb, sizeof(SLONG), LCK_shared_counter, counter, blockingAst); FB_NEW_RPT(*dbb->dbb_permanent, 0) Lock(tdbb, sizeof(SLONG), LCK_shared_counter);
counter->lock = lock; counter->lock = lock;
lock->lck_key.lck_long = space; lock->lck_key.lck_long = space;
LCK_lock(tdbb, lock, LCK_PW, LCK_WAIT); LCK_lock(tdbb, lock, LCK_PW, LCK_WAIT);
@ -283,7 +283,6 @@ namespace Jrd
if (counter->curVal > counter->maxVal) if (counter->curVal > counter->maxVal)
{ {
LCK_convert(tdbb, counter->lock, LCK_PW, LCK_WAIT); LCK_convert(tdbb, counter->lock, LCK_PW, LCK_WAIT);
counter->curVal = LCK_read_data(tdbb, counter->lock); counter->curVal = LCK_read_data(tdbb, counter->lock);
if (!counter->curVal) if (!counter->curVal)
@ -294,31 +293,12 @@ namespace Jrd
counter->maxVal = counter->curVal + prefetch - 1; counter->maxVal = counter->curVal + prefetch - 1;
LCK_write_data(tdbb, counter->lock, counter->maxVal + 1); LCK_write_data(tdbb, counter->lock, counter->maxVal + 1);
LCK_convert(tdbb, counter->lock, LCK_SR, LCK_WAIT);
} }
return counter->curVal++; return counter->curVal++;
} }
int Database::SharedCounter::blockingAst(void* ast_object)
{
ValueCache* const counter = static_cast<ValueCache*>(ast_object);
fb_assert(counter && counter->lock);
Database* const dbb = counter->lock->lck_dbb;
try
{
AsyncContextHolder tdbb(dbb, FB_FUNCTION);
SyncLockGuard guard(&dbb->dbb_sh_counter_sync, SYNC_EXCLUSIVE, "Database::blockingAstSharedCounter");
LCK_downgrade(tdbb, counter->lock);
}
catch (const Exception&)
{} // no-op
return 0;
}
void Database::Linger::handler() void Database::Linger::handler()
{ {
JRD_shutdown_database(dbb, SHUT_DBB_RELEASE_POOLS); JRD_shutdown_database(dbb, SHUT_DBB_RELEASE_POOLS);

2
src/jrd/Database.h
View File

@ -259,8 +259,6 @@ public:
void shutdown(thread_db* tdbb); void shutdown(thread_db* tdbb);
private: private:
static int blockingAst(void* arg);
ValueCache m_counters[TOTAL_ITEMS]; ValueCache m_counters[TOTAL_ITEMS];
}; };