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

do not initialize context pool in init() - TLS may be not ready for it

Browse Source
This commit is contained in:
alexpeshkoff 2008-01-24 11:09:37 +00:00
parent 3dd50957de
commit 0943027a19
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/classes/alloc.cpp
View File

@ -268,10 +268,6 @@ void MemoryPool::init()
// Now it's safe to actually create MemoryPool // Now it's safe to actually create MemoryPool
processMemoryPool = MemoryPool::createPool(); processMemoryPool = MemoryPool::createPool();
fb_assert(processMemoryPool); fb_assert(processMemoryPool);
#ifndef SUPERCLIENT
MemoryPool::setContextPool(processMemoryPool);
#endif
} }
// Should be last routine, called by InstanceControl, // Should be last routine, called by InstanceControl,
@ -1775,12 +1771,12 @@ void MemoryPool::deallocate(void *block)
MemoryPool& AutoStorage::getAutoMemoryPool() { MemoryPool& AutoStorage::getAutoMemoryPool() {
#ifndef SUPERCLIENT #ifndef SUPERCLIENT
MemoryPool* p = MemoryPool::getContextPool(); MemoryPool* p = MemoryPool::getContextPool();
#ifdef EMBEDDED #if defined(EMBEDDED) || (!defined(SUPERSERVER))
if (! p) if (! p)
{ {
p = getDefaultMemoryPool(); p = getDefaultMemoryPool();
} }
#endif //EMBEDDED #endif
#else //SUPERCLIENT #else //SUPERCLIENT
MemoryPool* p = getDefaultMemoryPool(); MemoryPool* p = getDefaultMemoryPool();
#endif //SUPERCLIENT #endif //SUPERCLIENT