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

Backported fix for bug CORE-2184 : Bus error on SPARC

Browse Source
This commit is contained in:
hvlad 2010-01-19 08:27:46 +00:00
parent f5f1ea84ab
commit dcfa92fac3
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/TempSpace.cpp
View File

@ -33,6 +33,8 @@
// Static definitions/initializations // Static definitions/initializations
const size_t MIN_TEMP_BLOCK_SIZE = 64 * 1024;
Firebird::Mutex TempSpace::initMutex; Firebird::Mutex TempSpace::initMutex;
Firebird::TempDirectoryList* TempSpace::tempDirs = NULL; Firebird::TempDirectoryList* TempSpace::tempDirs = NULL;
size_t TempSpace::minBlockSize = 0; size_t TempSpace::minBlockSize = 0;
@ -145,6 +147,11 @@ TempSpace::TempSpace(MemoryPool& p, const Firebird::PathName& prefix)
MemoryPool& def_pool = *getDefaultMemoryPool(); MemoryPool& def_pool = *getDefaultMemoryPool();
tempDirs = FB_NEW(def_pool) Firebird::TempDirectoryList(def_pool); tempDirs = FB_NEW(def_pool) Firebird::TempDirectoryList(def_pool);
minBlockSize = Config::getTempBlockSize(); minBlockSize = Config::getTempBlockSize();
if (minBlockSize < MIN_TEMP_BLOCK_SIZE)
minBlockSize = MIN_TEMP_BLOCK_SIZE;
else
minBlockSize = FB_ALIGN(minBlockSize, MIN_TEMP_BLOCK_SIZE);
} }
} }
} }
@ -606,6 +613,7 @@ size_t TempSpace::allocateBatch(size_t count, size_t minSize, size_t maxSize, Se
freeMem = MIN(freeMem / count, maxSize); freeMem = MIN(freeMem / count, maxSize);
freeMem = MAX(freeMem, minSize); freeMem = MAX(freeMem, minSize);
freeMem = MIN(freeMem, minBlockSize); freeMem = MIN(freeMem, minBlockSize);
freeMem &= ~(FB_ALIGNMENT - 1);
Segment** prevSpace = &freeSegments; Segment** prevSpace = &freeSegments;
freeSpace = freeSegments; freeSpace = freeSegments;