Fixed bug CORE-2184 : Bus error on SPARC

FirebirdSQL · Jan 19, 2010 · 577a3b8 · 577a3b8
1 parent 652bef8
commit 577a3b8
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/jrd/TempSpace.cpp b/src/jrd/TempSpace.cpp
@@ -37,6 +37,8 @@ using Firebird::TempFile;
 
 // Static definitions/initializations
 
+const size_t MIN_TEMP_BLOCK_SIZE	= 64 * 1024;
+
 Firebird::GlobalPtr<Firebird::Mutex> TempSpace::initMutex;
 Firebird::TempDirectoryList* TempSpace::tempDirs = NULL;
 size_t TempSpace::minBlockSize = 0;
@@ -149,6 +151,11 @@ TempSpace::TempSpace(MemoryPool& p, const Firebird::PathName& prefix)
 			MemoryPool& def_pool = *getDefaultMemoryPool();
 			tempDirs = FB_NEW(def_pool) Firebird::TempDirectoryList(def_pool);
 			minBlockSize = Config::getTempBlockSize();
+
+			if (minBlockSize < MIN_TEMP_BLOCK_SIZE)
+				minBlockSize = MIN_TEMP_BLOCK_SIZE;
+			else
+				minBlockSize = FB_ALIGN(minBlockSize, MIN_TEMP_BLOCK_SIZE);
 		}
 	}
 }
@@ -596,6 +603,7 @@ size_t TempSpace::allocateBatch(size_t count, size_t minSize, size_t maxSize, Se
 	freeMem = MIN(freeMem / count, maxSize);
 	freeMem = MAX(freeMem, minSize);
 	freeMem = MIN(freeMem, minBlockSize);
+	freeMem &= ~(FB_ALIGNMENT - 1);
 
 	Segment** prevSpace = &freeSegments;
 	freeSpace = freeSegments;