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

A little bit more defensive approach to the dbb handle validation. It also avoids the second handle lookup.

Browse Source
This commit is contained in:
dimitr 2013-01-17 16:32:48 +00:00
parent 4851c402b1
commit 38ae66edb0
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/jrd/Database.h
View File

@ -202,31 +202,23 @@ class Database : public pool_alloc<type_dbb>, public Firebird::PublicHandle
public:
class SyncGuard
class SyncGuard : public Firebird::ExecuteWithLock
{
public:
explicit SyncGuard(Database* dbb, bool ast = false)
: sync(*dbb->dbb_sync)
explicit SyncGuard(Database* aDbb, bool isAst = false)
: dbb(aDbb), ast(isAst), sync(NULL)
{
if (!dbb->checkHandle())
if (!dbb->executeWithLock(this))
{
Firebird::status_exception::raise(Firebird::Arg::Gds(isc_bad_db_handle));
}
sync.addRef();
sync.lock(ast);
if (!dbb->checkHandle())
{
sync.unlock();
sync.release();
Firebird::status_exception::raise(Firebird::Arg::Gds(isc_bad_db_handle));
}
fb_assert(sync);
if (ast && dbb->dbb_flags & DBB_not_in_use)
{
sync.unlock();
sync.release();
sync->unlock();
sync->release();
Firebird::LongJump::raise();
}
}
@ -235,13 +227,20 @@ public:
{
try
{
sync.unlock();
sync->unlock();
}
catch (const Firebird::Exception&)
{
DtorException::devHalt();
}
sync.release();
sync->release();
}
void execute()
{
sync = dbb->dbb_sync;
sync->addRef();
sync->lock(ast);
}
private:
@ -249,7 +248,9 @@ public:
SyncGuard(const SyncGuard&);
SyncGuard& operator=(const SyncGuard&);
Sync& sync;
Database* const dbb;
const bool ast;
Sync* sync;
};
class Checkout