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

Fixed an order of operations error in the first dbb destructor implementation.

Browse Source
This commit is contained in:
bellardo 2002-09-22 19:08:33 +00:00
parent ecf9cfe6b5
commit dfe98160bd
2 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jrd/jrd.cpp
View File

@ -2528,7 +2528,7 @@ STATUS DLL_EXPORT GDS_DROP_DATABASE(STATUS * user_status, ATT * handle)
}
JRD_SS_MUTEX_UNLOCK;
delete dbb;
dbb::deleteDbb(dbb);
tdbb->tdbb_database = NULL;
if (err) {
user_status[0] = gds_arg_gds;
@ -6080,7 +6080,7 @@ static void shutdown_database(DBB dbb, BOOLEAN release_pools)
}
#endif
if (release_pools) {
delete dbb;
dbb::deleteDbb(dbb);
tdbb->tdbb_database = NULL;
}
}

55
src/jrd/jrd.h
View File

@ -112,29 +112,21 @@ class dbb : private pool_alloc<type_dbb>
public:
static dbb* newDbb(MemoryPool& p) { return new(p) dbb(p); }
~dbb()
// The deleteDbb function MUST be used to delete a dbb object.
// The function hides some tricky order of operations. Since the
// memory for the vectors in the dbb is allocated out of the dbb's
// permanent memory pool, the entire delete() operation needs
// to complete _before_ the permanent pool is deleted, or else
// risk an aborted engine.
static void deleteDbb(dbb *toDelete)
{
pool_vec_type::iterator itr;
for(itr = dbb_pools.begin(); itr != dbb_pools.end(); ++itr)
{
if (*itr == dbb_bufferpool)
dbb_bufferpool = 0;
if (*itr != dbb_permanent)
delete *itr;
}
if (dbb_bufferpool != 0)
delete dbb_bufferpool;
delete dbb_permanent;
if (toDelete == 0)
return;
JrdMemoryPool *perm = toDelete->dbb_permanent;
delete toDelete;
delete perm;
}
// The delete operators are no-oped because the dbb memory is allocated from the
// dbb's own permanent pool. That pool has already been released by the dbb
// destructor, so the memory has already been released. Hence the operator
// delete no-op.
void operator delete(void *mem) {}
void operator delete[](void *mem) {}
class dbb *dbb_next; /* Next database block in system */
class att *dbb_attachments; /* Active attachments */
struct bcb *dbb_bcb; /* Buffer control block */
@ -238,6 +230,29 @@ private:
dbb_charsets(p)
{
}
~dbb()
{
pool_vec_type::iterator itr;
for(itr = dbb_pools.begin(); itr != dbb_pools.end(); ++itr)
{
if (*itr == dbb_bufferpool)
dbb_bufferpool = 0;
if (*itr != dbb_permanent)
delete *itr;
}
if (dbb_bufferpool != 0)
delete dbb_bufferpool;
}
// The delete operators are no-oped because the dbb memory is allocated from the
// dbb's own permanent pool. That pool has already been released by the dbb
// destructor, so the memory has already been released. Hence the operator
// delete no-op.
void operator delete(void *mem) {}
void operator delete[](void *mem) {}
dbb(const dbb&); // no impl.
const dbb& operator =(const dbb&) { return *this; }
};