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

Jrd's deletePool() now return pointer to next database's pool as suggested by dlh

Browse Source
This commit is contained in:
alexpeshkoff 2006-10-31 12:27:49 +00:00
parent 986ab45be8
commit c7f3b027d6
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jrd/all.cpp
View File

@ -98,17 +98,20 @@ JrdMemoryPool *JrdMemoryPool::createPool() {
return result;
}
void JrdMemoryPool::deletePool(JrdMemoryPool* pool) {
JrdMemoryPool** JrdMemoryPool::deletePool(JrdMemoryPool* pool) {
Database* dbb = GET_DBB();
for (int n = 0; n < dbb->dbb_pools.getCount(); ++n)
JrdMemoryPool** rc = 0;
for (size_t n = 0; n < dbb->dbb_pools.getCount(); ++n)
{
if (dbb->dbb_pools[n] == pool)
{
dbb->dbb_pools.remove(n);
rc = dbb->dbb_pools.remove(n);
break;
}
}
fb_assert(rc);
MemoryPool::deletePool(pool);
return rc;
}
void JrdMemoryPool::noDbbDeletePool(JrdMemoryPool* pool) {

2
src/jrd/all.h
View File

@ -50,7 +50,7 @@ protected:
public:
static JrdMemoryPool *createDbPool(Firebird::MemoryStats &stats);
static JrdMemoryPool *createPool();
static void deletePool(JrdMemoryPool* pool);
static JrdMemoryPool** deletePool(JrdMemoryPool* pool);
static void noDbbDeletePool(JrdMemoryPool* pool);
Jrd::DataComprControl* plb_dccs;

2
src/jrd/jrd.h
View File

@ -317,7 +317,7 @@ private:
if (*itr && *itr == dbb_bufferpool)
dbb_bufferpool = 0;
if (*itr && *itr != dbb_permanent)
JrdMemoryPool::deletePool(*itr);
itr = JrdMemoryPool::deletePool(*itr);
else
++itr;
}