X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffile_directories%2Fbinary%2Fclass_BaseBinaryFile.php;h=d2adfe87c170821c0672e1dc509384295cfaf5b1;hb=deb07dbc679f4cc7fe0e84eeb352f87f21ccf0aa;hp=4ed66c22dbc482b1c1deb5ae43c377e5993432e5;hpb=1413cff705baa0641da9c39ad0a53d57bb1ae24b;p=core.git

diff --git a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
index 4ed66c22..d2adfe87 100644
--- a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
+++ b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php
@@ -4,14 +4,20 @@ namespace Org\Mxchange\CoreFramework\Filesystem\File;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint;
 use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
-use Org\Mxchange\CoreFramework\Filesystem\Block;
-use Org\Mxchange\CoreFramework\Filesystem\Block\CalculatableBlock;
 use Org\Mxchange\CoreFramework\Filesystem\File\BaseAbstractFile;
+use Org\Mxchange\CoreFramework\Filesystem\FilePointer;
+use Org\Mxchange\CoreFramework\Index\Indexable;
+use Org\Mxchange\CoreFramework\Stack\File\StackableFile;
+use Org\Mxchange\CoreFramework\Traits\Index\IndexableTrait;
+use Org\Mxchange\CoreFramework\Traits\Stack\StackableTrait;
 
 // Import SPL stuff
 use \BadMethodCallException;
 use \InvalidArgumentException;
+use \LogicException;
+use \OutOfBoundsException;
 use \SplFileInfo;
 use \UnexpectedValueException;
 
@@ -20,7 +26,7 @@ use \UnexpectedValueException;
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -37,7 +43,11 @@ use \UnexpectedValueException;
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-abstract class BaseBinaryFile extends BaseAbstractFile {
+abstract class BaseBinaryFile extends BaseAbstractFile implements BinaryFile {
+	// Load traits
+	use StackableTrait;
+	use IndexableTrait;
+
 	/**
 	 * Separator for header data
 	 */
@@ -135,11 +145,6 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	private $currentBlock = '';
 
-	/**
-	 * An instance of a Block class
-	 */
-	private $blockInstance = NULL;
-
 	/**
 	 * Protected constructor
 	 *
@@ -149,28 +154,6 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	protected function __construct (string $className) {
 		// Call parent constructor
 		parent::__construct($className);
-
-		// Init counters and gaps array
-		$this->initCountersGapsArray();
-	}
-
-	/**
-	 * Setter for Block instance
-	 *
-	 * @param	$blockInstance	An instance of an Block class
-	 * @return	void
-	 */
-	protected final function setBlockInstance (Block $blockInstance) {
-		$this->blockInstance = $blockInstance;
-	}
-
-	/**
-	 * Getter for Block instance
-	 *
-	 * @return	$blockInstance	An instance of an Block class
-	 */
-	public final function getBlockInstance () {
-		return $this->blockInstance;
 	}
 
 	/**
@@ -180,7 +163,7 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	void
 	 */
 	private function setBackBuffer (string $backBuffer) {
-		// ... and set it
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Setting backBuffer(%d)=%s - CALLED!', strlen($backBuffer), $backBuffer));
 		$this->backBuffer = $backBuffer;
 	}
 
@@ -190,17 +173,18 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	$backBuffer		Characters "stored" in back-buffer
 	 */
 	private function getBackBuffer () {
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Getting this->backBuffer(%d)=%s - CALLED!', strlen($this->backBuffer), $this->backBuffer));
 		return $this->backBuffer;
 	}
 
 	/**
-	 * Setter for currentBlock field
+	 * Setter for current field
 	 *
-	 * @param	$currentBlock	Characters to set a currently loaded block
+	 * @param	$current	Characters to set a currently loaded block
 	 * @return	void
 	 */
 	private function setCurrentBlock (string $currentBlock) {
-		// ... and set it
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Setting currentBlock(%d)=%s - CALLED!', strlen($currentBlock), $currentBlock));
 		$this->currentBlock = $currentBlock;
 	}
 
@@ -210,7 +194,7 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	$current	Currently read data
 	 */
 	public function getCurrentBlock () {
-		// Return it
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Getting this->currentBlock(%d)=%s - CALLED!', strlen($this->currentBlock), $this->currentBlock));
 		return $this->currentBlock;
 	}
 
@@ -277,54 +261,70 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 		$this->seekPosition = $seekPosition;
 	}
 
-	/**
-	 * Marks whole file as gaps-only (freshly created file
-	 *
-	 * @param	$type	Type of file
-	 * @param	$minimumBlockLength		Minimum block length
-	 * @return	void
-	 */
-	private function markFileGapsOnly (string $type, int $minimumBlockLength) {
-		// Very simple to do ...
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: type=%s,minimumBlockLength=%d - CALLED!', $type, $minimumBlockLength));
-		for ($idx = 0; $idx < FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($type . '_pre_allocate_count'); $idx++) {
-			// Mark start and end position as gap
-			$this->addGap($idx * $minimumBlockLength, $idx * $minimumBlockLength + $minimumBlockLength);
-		}
-
-		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
-	}
-
 	/**
 	 * Checks whether the abstracted file only contains gaps by counting all
 	 * gaps' bytes together and compare it to total length.
 	 *
 	 * @return	$isGapsOnly		Whether the abstracted file only contains gaps
+	 * @throws	OutOfBoundsException	If calculated file size is larger than actual
 	 */
-	private function isFileGapsOnly () {
+	public function isFileGapsOnly () {
 		// Count every gap
 		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
 		$gapsSize = 0;
 		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: this->gaps()=%d', count($this->gaps)));
 		foreach ($this->gaps as $gap) {
 			// Calculate size of found gap: end-start including both
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: gap[%s]=%d,ga[%s]=%d', self::GAPS_INDEX_START, $gap[self::GAPS_INDEX_START], self::GAPS_INDEX_END, $gap[self::GAPS_INDEX_END]));
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: gap[%s]=%d,ga[%s]=%d', self::GAPS_INDEX_START, $gap[self::GAPS_INDEX_START], self::GAPS_INDEX_END, $gap[self::GAPS_INDEX_END]));
 			$gapsSize += ($gap[self::GAPS_INDEX_END] - $gap[self::GAPS_INDEX_START]);
 
 			// Debug message
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: gapsSize=%d', $gapsSize));
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: gapsSize=%d', $gapsSize));
 		}
 
-		// Total gap size + header size must be same as file size
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: gapsSize=%d,this->fileSize=%d', $gapsSize, $this->getFileSize()));
-		$isGapsOnly = ($gapsSize + 1 == $this->getFileSize());
+		// Total gap size + header size + 1 must be same as file size
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: gapsSize=%d,this->headerSize=%d,this->fileSize=%d', $gapsSize, $this->getHeaderSize(), $this->getFileSize()));
+		$determinedFileSize = ($gapsSize + $this->getHeaderSize() + 1);
 
-		// Return status
+		// Should not be more!
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: determinedFileSize=%d,this->fileSize=%d', $determinedFileSize, $this->getFileSize()));
+		if ($determinedFileSize > $this->getFileSize()) {
+			// Should not happen
+			throw new OutOfBoundsException(sprintf('determinedFileSize=%d is larger than this->fileSize=%d', $determinedFileSize, $this->getFileSize()));
+		}
+
+		// Is it same?
+		$isGapsOnly = ($determinedFileSize == $this->getFileSize());
+
+		// Return flag
 		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: isGapsOnly=%d - EXIT!', intval($isGapsOnly)));
 		return $isGapsOnly;
 	}
 
+	/**
+	 * Marks whole file as gaps-only (freshly created file
+	 *
+	 * @param	$type	Type of file
+	 * @param	$minimumBlockLength		Minimum block length
+	 * @return	void
+	 */
+	private function markFileGapsOnly (string $type, int $minimumBlockLength) {
+		// Very simple to do ...
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: type=%s,minimumBlockLength=%d - CALLED!', $type, $minimumBlockLength));
+		for ($idx = 0; $idx < FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($type . '_pre_allocate_count'); $idx++) {
+			// Calculate start/end positions
+			$startPosition = $idx * $minimumBlockLength;
+			$endPosition = $idx * $minimumBlockLength + $minimumBlockLength;
+
+			// Mark start and end position as gap
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->addGap(%d, %d) ...', $startPosition, $endPosition));
+			$this->addGap($startPosition, $endPosition);
+		}
+
+		// Trace message
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+	}
+
 	/**
 	 * Adds a gap for given start and end position
 	 *
@@ -334,14 +334,14 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	private function addGap(int $startPosition, int $endPosition) {
 		// Push to gaps array
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: startPosition=%d,endPosition=%d - CALLED!', $startPosition, $endPosition));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: startPosition=%d,endPosition=%d - CALLED!', $startPosition, $endPosition));
 		array_push($this->gaps, [
 			self::GAPS_INDEX_START  => $startPosition,
 			self::GAPS_INDEX_END    => $endPosition,
 		]);
 
 		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
@@ -351,11 +351,11 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	private function initBackBuffer () {
 		// Simply call the setter
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
 		$this->setBackBuffer('');
 
 		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
@@ -367,22 +367,22 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	protected function rewindUpdateSeekPosition (bool $flushHeader = false) {
 		// Seek to beginning of file
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: flushHeader=%d - CALLED!', intval($flushHeader)));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: flushHeader=%d - CALLED!', intval($flushHeader)));
 		$this->rewind();
 
 		// And update seek position ...
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->updateSeekPosition() ...');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->updateSeekPosition() ...');
 		$this->updateSeekPosition();
 
 		// Flush headers?
 		if ($flushHeader) {
 			// ... to write it back into the file
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->flushFileHeader() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->flushFileHeader() ...');
 			$this->flushFileHeader();
 		}
 
 		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
@@ -392,11 +392,11 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	protected function seekToOldPosition () {
 		// Seek to currently ("old") saved position
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
-		$this->seek($this->getSeekPosition());
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
+		$this->seek($this->determineSeekPosition());
 
 		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
@@ -407,15 +407,15 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	protected function initFile (SplFileInfo $fileInfoInstance) {
 		// Get a file i/o pointer instance
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: fileInfoInstance[%s]=%s - CALLED!', get_class($fileInfoInstance), $fileInfoInstance));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: fileInfoInstance[%s]=%s - CALLED!', get_class($fileInfoInstance), $fileInfoInstance));
 		$pointerInstance = ObjectFactory::createObjectByConfiguredName('file_raw_input_output_class', array($fileInfoInstance));
 
 		// ... and set it here
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Setting pointerInstance=%s ...', $pointerInstance->__toString()));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Setting pointerInstance=%s ...', $pointerInstance->__toString()));
 		$this->setPointerInstance($pointerInstance);
 
 		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
@@ -427,21 +427,21 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	protected function markCurrentBlockAsEmpty (int $length) {
 		// Validate parameter
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: length=%d - CALLED!', $length));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: length=%d - CALLED!', $length));
 		if ($length < 1) {
 			// Length cannot below one
 			throw new InvalidArgumentException(sprintf('length=%d is not valid', $length));
 		}
 
 		// Get current seek position
-		$currentPosition = $this->key();
+		$currentPosition = $this->determineSeekPosition();
 
 		// Now add it as gap entry
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: currentPosition=%d', $currentPosition));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->addGap(%d, %d) ..', ($currentPosition - $length), $currentPosition));
 		$this->addGap(($currentPosition - $length), $currentPosition);
 
 		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
@@ -454,16 +454,30 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	public function initCountersGapsArray () {
 		// Init counter and seek position to header size
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->determineSeekPosition() - CALLED!');
+		$seekPosition = $this->getSeekPosition();
+
+		// Set counter
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%d', $seekPosition));
 		$this->setCounter(0);
-		$this->setSeekPosition($this->getHeaderSize());
+
+		// Get header size
+		$headerSize = $this->getHeaderSize();
+
+		// Set it
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Setting this->seekPosition=%d ...', $headerSize));
+		$this->setSeekPosition($headerSize);
 
 		// Init arrays
 		$this->gaps = [];
 		$this->damagedEntries = [];
 
+		// Seek back to old position
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->seek(%d) ...', $seekPosition));
+		$this->seek($seekPosition);
+
 		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
@@ -473,15 +487,15 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	public function updateSeekPosition () {
 		// Get key (= seek position)
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
-		$seekPosition = $this->key();
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
+		$seekPosition = $this->determineSeekPosition();
 
 		// And set it here
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%d', $seekPosition));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%d', $seekPosition));
 		$this->setSeekPosition($seekPosition);
 
 		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
@@ -493,7 +507,7 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	public static function isBlockSeparatorFound (string $str) {
 		// Validate parameter
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: str=%s - CALLED!', $str));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: str=%s - CALLED!', $str));
 		if (empty($str)) {
 			// Throw IAE
 			throw new InvalidArgumentException('Parameter "str" is empty');
@@ -503,7 +517,7 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 		$isFound = (strpos($str, chr(self::SEPARATOR_ENTRIES)) !== false);
 
 		// Return result
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: isFound=%d - EXIT!', intval($isFound)));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: isFound=%d - EXIT!', intval($isFound)));
 		return $isFound;
 	}
 
@@ -514,45 +528,46 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 * @param	$data			Data to be written
 	 * @param	$flushHeader	Whether to flush the header (default: flush)
 	 * @return	void
+	 * @throws	OutOfBoundsException	If the position is not seekable
 	 * @throws	InvalidArgumentException	If a parameter is invalid
 	 */
 	public function writeData (int $seekPosition, string $data, bool $flushHeader = true) {
 		// Validate parameter
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%s,data()=%d,flushHeader=%d - CALLED!', $seekPosition, strlen($data), intval($flushHeader)));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%s,data()=%d,flushHeader=%d - CALLED!', $seekPosition, strlen($data), intval($flushHeader)));
 		if ($seekPosition < 0) {
 			// Invalid seek position
-			throw new InvalidArgumentException(sprintf('seekPosition=%d is not valid', $seekPosition));
+			throw new OutOfBoundsException(sprintf('seekPosition=%d is not valid', $seekPosition));
 		} elseif (empty($data)) {
 			// Empty data is invalid, too
 			throw new InvalidArgumentException('Parameter "data" is empty');
 		}
 
 		// Write data at given position
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->writeAtPosition(%d,%s) ...', $seekPosition, $data));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->writeAtPosition(%d,%s) ...', $seekPosition, $data));
 		$this->writeAtPosition($seekPosition, $data);
 
 		// Increment counter
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->incrementCounter() ...');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->incrementCounter() ...');
 		$this->incrementCounter();
 
 		// Update seek position
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->updateSeekPosition() ...');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->updateSeekPosition() ...');
 		$this->updateSeekPosition();
 
 		// Flush the header?
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: flushHeader=%d', intval($flushHeader)));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: flushHeader=%d', intval($flushHeader)));
 		if ($flushHeader === true) {
 			// Flush header
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->flushFileHeader() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->flushFileHeader() ...');
 			$this->flushFileHeader();
 
 			// Seek to old position
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->seekToOldPosition() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->seekToOldPosition() ...');
 			$this->seekToOldPosition();
 		}
 
 		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
@@ -561,6 +576,7 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 * @param	$seekPosition	Seek position in file
 	 * @param	$dataStream		Data to be written
 	 * @return	mixed			Number of writes bytes or false on error
+	 * @throws	OutOfBoundsException	If the position is not seekable
 	 * @throws	InvalidArgumentException	If a parameter is not valid
 	 */
 	public function writeAtPosition (int $seekPosition, string $dataStream) {
@@ -568,7 +584,7 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%d,dataStream(%d)=%s - CALLED!', $seekPosition, strlen($dataStream), $dataStream));
 		if ($seekPosition < 0) {
 			// Invalid seek position
-			throw new InvalidArgumentException(sprintf('seekPosition=%d is not valid.', $seekPosition));
+			throw new OutOfBoundsException(sprintf('seekPosition=%d is not valid.', $seekPosition));
 		} elseif (empty($dataStream)) {
 			// Empty dataStream
 			throw new InvalidArgumentException('Parameter "dataStream" is empty');
@@ -590,7 +606,7 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	public function isFileHeaderInitialized () {
 		// Default is not initialized
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
 		$isInitialized = false;
 
 		// Is the file initialized?
@@ -599,19 +615,19 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 			$this->rewind();
 
 			// Read file header
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->readFileHeader() ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->readFileHeader() ...');
 			$this->readFileHeader();
 
 			// Get header count
 			$headerCount = count($this->getHeader());
 
 			// The above method does already check the header
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: headerCount=%d', $headerCount));
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: headerCount=%d', $headerCount));
 			$isInitialized = ($headerCount > 0);
 		}
 
 		// Return result
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: isInitialized=%d - EXIT!', intval($isInitialized)));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: isInitialized=%d - EXIT!', intval($isInitialized)));
 		return $isInitialized;
 	}
 
@@ -619,24 +635,28 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 * Checks whether the assigned file has been initialized
 	 *
 	 * @return	$isInitialized		Whether the file's size is zero
+	 * @throws	UnexpectedValueException	If an unexpected value was returned
 	 */
 	public function isFileInitialized () {
 		// Get it from iterator which holds the pointer instance. If false is returned
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
 		$fileSize = $this->size();
 
 		/*
 		 * The returned file size should not be false or NULL as this means
 		 * that the pointer class does not work correctly.
 		 */
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: fileSize[%s]=%d', gettype($fileSize), $fileSize));
-		assert(is_int($fileSize));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: fileSize[%s]=%d', gettype($fileSize), $fileSize));
+		if (!is_int($fileSize)) {
+			// Bad file?
+			throw new UnexpectedValueException(sprintf('fileSize[]=%s is unexpected', gettype($fileSize)));
+		}
 
 		// Is more than 0 returned?
 		$isInitialized = ($fileSize > 0);
 
 		// Return result
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: isInitialized=%d - EXIT!', intval($isInitialized)));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: isInitialized=%d - EXIT!', intval($isInitialized)));
 		return $isInitialized;
 	}
 
@@ -648,76 +668,23 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	public function createFileHeader () {
 		// The file's header should not be initialized here
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
 		if ($this->isFileHeaderInitialized()) {
 			// Bad method call
-			//* DEBUG-DIE: */ die(sprintf('[%s:%d]: this=%s', __METHOD__, __LINE__, print_r($this, TRUE)));
+			//* DEBUG-DIE: */ ApplicationEntryPoint::exitApplication(sprintf('[%s:%d]: this=%s', __METHOD__, __LINE__, print_r($this, TRUE)));
 			throw new BadMethodCallException('File header is already initialized but method called');
 		}
 
 		// Simple flush file header which will create it.
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->flushFileHeader() ...');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->flushFileHeader() ...');
 		$this->flushFileHeader();
 
 		// Rewind seek position (to beginning of file) and update/flush file header
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->rewindUpdateSeekPosition() ...');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->rewindUpdateSeekPosition() ...');
 		$this->rewindUpdateSeekPosition();
 
 		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
-	}
-
-	/**
-	 * Pre-allocates file (if enabled) with some space for later faster write access.
-	 *
-	 * @param	$type	Type of the file
-	 * @return	void
-	 * @throws	InvalidArgumentException	If a parameter is empty
-	 */
-	public function preAllocateFile (string $type) {
-		// Is it enabled?
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: type=%s - CALLED!', $type));
-		if (empty($type)) {
-			// Empty type
-			throw new InvalidArgumentException('Parameter "type" is empty');
-		} elseif (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($type . '_pre_allocate_enabled') != 'Y') {
-			// Don't continue here.
-			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Not pre-allocating file.'));
-			return;
-		}
-
-		// Message to user
-		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Pre-allocating file ...');
-
-		// Calculate minimum length for one entry and get file size
-		$minimumBlockLength = $this->getBlockInstance()->calculateMinimumBlockLength();
-		$fileSize = $this->getFileSize();
-
-		// Calulcate seek position
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: minimumBlockLength=%d,fileSize=%d', $minimumBlockLength, $fileSize));
-		$seekPosition = $minimumBlockLength * FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($type . '_pre_allocate_count') + $fileSize ;
-
-		// Now simply write a NUL there. This will pre-allocate the file.
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->writeAtPosition(%d,NUL) ...', $seekPosition));
-		$this->writeAtPosition($seekPosition, chr(0));
-
-		// Is the seek position zero?
-		if ($fileSize == 0) {
-			// Mark file as gaps-only
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->markGapsOnly(%s) ...', $type));
-			$this->markFileGapsOnly($type, $minimumBlockLength);
-		} else {
-			// Analyze file structure
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->analyzeFileStructure() ...');
-			$this->analyzeFileStructure();
-		}
-
-		// Rewind seek position
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->rewind() ...');
-		$this->rewind();
-
-		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
@@ -727,11 +694,11 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	public function determineSeekPosition () {
 		// Call pointer instance
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
 		$seekPosition = $this->getPointerInstance()->determineSeekPosition();
 
 		// Return position
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%d - EXIT!', $seekPosition));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%d - EXIT!', $seekPosition));
 		return $seekPosition;
 	}
 
@@ -741,14 +708,14 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 * @param	$offset		Offset to seek to (or used as "base" for other seeks)
 	 * @param	$whence		Added to offset (default: only use offset to seek to)
 	 * @return	$status		Status of file seek: 0 = success, -1 = failed
-	 * @throws	InvalidArgumentException	 If a parameter is not valid
+	 * @throws	OutOfBoundsException	If the position is not seekable
 	 */
 	public function seek (int $offset, int $whence = SEEK_SET) {
 		// Validate parameter
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: offset=%d,whence=%d - CALLED!', $offset, $whence));
 		if ($offset < 0) {
 			// No offset is smaller than zero
-			throw new InvalidArgumentException(sprintf('offset=%d is not valid', $offset));
+			throw new OutOfBoundsException(sprintf('offset=%d is not valid', $offset));
 		}
 
 		// Call pointer instance
@@ -764,19 +731,24 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 *
 	 * @param	$bytes	Amount of bytes to read
 	 * @return	$data	Data read from file
-	 * @throws	InvalidArgumentException	 If a parameter is not valid
+	 * @throws	OutOfBoundsException	If the position is not seekable
 	 */
 	public function read (int $bytes = 0) {
 		// Validate parameter
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: bytes=%d - CALLED!', $bytes));
 		if ($bytes < 0) {
-			// Throw IAE
-			throw new InvalidArgumentException(sprintf('bytes=%d is not valid', $bytes));
+			// Throw exception
+			throw new OutOfBoundsException(sprintf('bytes=%d is not valid', $bytes));
 		}
 
 		// Call pointer instance
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->pointerInstance->read(%d) ...', $bytes));
 		$data = $this->getPointerInstance()->read($bytes);
 
+		// Update seek position
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->updateSeekPosition() ...');
+		$this->updateSeekPosition();
+
 		// Return data
 		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: data[%s]=%s - EXIT!', gettype($data), $data));
 		return $data;
@@ -806,91 +778,94 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 */
 	public function analyzeFileStructure () {
 		// Make sure the file is initialized
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
 		if (!$this->isFileInitialized()) {
 			// Bad method call
 			throw new BadMethodCallException('Method called but file is not initialized.');
 		}
 
 		// Init counters and gaps array
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->initCounterGapsArrays() ...');
 		$this->initCountersGapsArray();
 
 		// Output message (as this may take some time)
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('Analyzing file structure ... (this may take some time)'));
 
-		// First rewind to the begining
-		$this->rewind();
+		// First Seek to right after file header
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->seek(%d) ...', $this->getHeaderSize() + 1));
+		$this->seek($this->getHeaderSize() + 1);
 
 		// Then try to load all entries
-		while ($this->valid()) {
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: this->seekPosition=%d, looping through file ...', $this->getSeekPosition()));
+		while ($this->isValid()) {
 			// Get current entry
 			$current = $this->getCurrentBlock();
 
+			// Go to next entry
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: current=%s, calling this->readNextBlock() ...', $current));
+			$this->readNextBlock();
+
 			/*
 			 * If the block is empty, maybe the whole file is? This could mean
 			 * that the file has been pre-allocated.
 			 */
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: current[]=%s', gettype($current)));
-			if (empty($current)) {
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: current(%d)[]=%s', strlen($current), gettype($current)));
+			if (empty(trim($current, chr(0)))) {
 				// Then skip this part
 				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: current[]=%s is empty - CONTINUE!', gettype($current)));
 				continue;
 			}
 
-			// Go to next entry
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: current()=%d', strlen($current)));
-			$this->next();
+			// Handle current record
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: current(%d)[%s]=%s', strlen($current), gettype($current), $current));
 		}
 
 		// If the last read block is empty, check gaps
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: current()=%d', strlen($current)));
-		if (empty($current)) {
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: current()=%d', strlen($current)));
+		if (empty(trim($current, chr(0)))) {
 			// Output message
-			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('Found a total of %d gaps.', count($this->gaps)));
+			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Found a total of %d gaps.', count($this->gaps)));
 
 			// Check gaps, if the whole file is empty.
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->isFileGapsOnly() ...');
 			if ($this->isFileGapsOnly()) {
 				// Only gaps, so don't continue here.
 				/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: File is gaps-only - EXIT!');
 				return;
 			}
+		}
 
-			/*
-			 * The above call has calculated a total size of all gaps. If the
-			 * percentage of gaps passes a "soft" limit and last
-			 * defragmentation is to far in the past, or if a "hard" limit has
-			 * reached, run defragmentation.
-			 */
-			if ($this->isDefragmentationNeeded()) {
-				// Run "defragmentation"
-				$this->doRunDefragmentation();
-			}
+		/*
+		 * The above call has calculated a total size of all gaps. If the
+		 * percentage of gaps passes a "soft" limit and last
+		 * defragmentation is to far in the past, or if a "hard" limit has
+		 * reached, run defragmentation.
+		 */
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->isDefragmentationNeeded() ...');
+		if ($this->isDefragmentationNeeded()) {
+			// Run "defragmentation"
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->doRunDefragmentation() ...');
+			$this->doRunDefragmentation();
 		}
 
 		// Trace message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
-	 * Advances to next "block" of bytes
+	 * Reads next "block" of bytes into $currentBlock field. THis method loads
+	 * the whole file into memory when the file is just freshly initialized
+	 * (only zeros in it).
 	 *
 	 * @return	void
-	 * @throws	UnexpectedValueException	If some unexpected value was found
 	 */
-	public function next () {
-		// Is there nothing to read?
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
-		if (!$this->valid()) {
-			// Nothing to read
-			return;
-		}
-
+	private function readNextBlock () {
 		// First calculate minimum block length
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: key()=%d', $this->key()));
-		$length = $this->getBlockInstance()->calculateMinimumBlockLength();
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: length=%d', $length));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: this->seekPosition=%d - CALLED!', $this->getSeekPosition()));
+		$length = $this->getIndexInstance()->calculateMinimumBlockLength();
 
 		// Read possibly back-buffered bytes from previous call of next().
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: this->seekPosition=%d,length=%d', $this->getSeekPosition(), $length));
 		$data = $this->getBackBuffer();
 
 		/*
@@ -898,65 +873,118 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 		 * "block" may not fit, so this loop will continue until the EOB or EOF
 		 * has been reached whatever comes first.
 		 */
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: data()=%d', strlen($data)));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: this->seekPosition=%d,data()=%d', $this->getSeekPosition(), strlen($data)));
 		while ((!$this->isEndOfFileReached()) && (empty($data) || !self::isBlockSeparatorFound($data))) {
 			// Then read the next possible block
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->read(%d) ...', $length));
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: this->seekPosition=%d, calling this->read(%d) ...', $this->getSeekPosition(), $length));
 			$block = $this->read($length);
 
-			// Is it all empty?
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: block()=%d,length=%s', strlen($block), $length));
-			if (strlen(trim($block, chr(0))) == 0) {
-				// Mark this block as empty
-				/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling markCurrentBlockAsEmpty(%d) ...', strlen($block)));
-				$this->markCurrentBlockAsEmpty(strlen($block));
-
-				// Skip to next block
-				/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CONTINUE!');
-				continue;
+			// Is the block empty?
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: block()=%d,length=%d', strlen($block), $length));
+			if (strlen($block) == 0) {
+				// Read empty block, maybe EOF
+				/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: this->seekPosition=%d, block is empty, maybe EOF reached - BREAK!', $this->getSeekPosition()));
+				break;
+			} elseif (empty(trim($block, chr(0)))) {
+				// Mark it as empty
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: this->seekPosition=%d, calling this->markCurrentBlockAsEmpty(%d) ...', $this->getSeekPosition(), $length));
+				$this->markCurrentBlockAsEmpty($length);
 			}
 
 			// At this block then
 			$data .= $block;
 
-			// A debug message
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: data()=%d', strlen($data)));
-		}
-
-		// EOF reached?
-		if ($this->isEndOfFileReached()) {
-			// Set whole data as current read block
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling setCurrentBlock(%d) ...', strlen($data)));
-			$this->setCurrentBlock($data);
-
-			// Then abort here silently
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EOF reached - EXIT!');
-			return;
+			// Debug message
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: this->seekPosition=%d,data()=%d', $this->getSeekPosition(), strlen($data)));
 		}
 
 		/*
 		 * Init back-buffer which is the data that has been found beyond the
 		 * separator.
 		 */
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->initBackBuffer(), clearing this->currentBlock ...');
 		$this->initBackBuffer();
+		$this->setCurrentBlock('');
+
+		// Is $data empty?
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: data(%d)=%s', strlen($data), $data));
+		if (empty(trim($data, chr(0)))) {
+			// Yes, maybe whole file was ...
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: this->seekPosition=%d, maybe empty file found - EXIT!', $this->getSeekPosition()));
+			return;
+		}
 
 		// Separate data
 		$dataArray = explode(chr(self::SEPARATOR_ENTRIES), $data);
 
-		// This array must contain two elements
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: dataArray()=%d', count($dataArray)));
-		//* PRINTR-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: dataArray=%s', print_r($dataArray, true)));
-		if (count($dataArray) != 2) {
-			// Bad count
-			throw new UnexpectedValueException(sprintf('dataArray()=%d is not expected, want 2', count($dataArray)));
+		// Left part is the actual block, right one the back-buffer data, if found
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: dataArray()=%d', count($dataArray)));
+		/* PRINTR-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: dataArray=%s', print_r($dataArray, true)));
+		$this->setCurrentBlock($dataArray[0]);
+
+		// Is back buffere data found?
+		if (isset($dataArray[1]) && !empty(trim($dataArray[1], chr(0)))) {
+			// Set back buffer
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Setting this->backBuffer=%s ...', $dataArray[1]));
+			$this->setBackBuffer($dataArray[1]);
 		}
 
-		// Left part is the actual block, right one the back-buffer data
-		$this->setCurrentBlock($dataArray[0]);
-		$this->setBackBuffer($dataArray[1]);
+		// Trace message
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+	}
+
+	/**
+	 * Pre-allocates file (if enabled) with some space for later faster write access.
+	 *
+	 * @param	$type	Type of the file
+	 * @return	void
+	 * @throws	InvalidArgumentException	If a parameter is empty
+	 * @throws	BadMethodCallException	If this->stackInstance is not properly set
+	 */
+	protected function preAllocateFileByTypeLength (string $type, int $minimumBlockLength) {
+		// Is it enabled?
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: type=%s,minimumBlockLength=%d - CALLED!', $type, $minimumBlockLength));
+		if (empty($type)) {
+			// Empty type
+			throw new InvalidArgumentException('Parameter "type" is empty');
+		} elseif ($minimumBlockLength < 1) {
+			// Invalid block length
+			throw new InvalidArgumentException(sprintf('Parameter minimumBlockLength=%d is not valid', $minimumBlockLength));
+		} elseif (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($type . '_pre_allocate_enabled') != 'Y') {
+			// Don't continue here.
+			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Not pre-allocating file.'));
+			return;
+		}
+
+		// Get file size
+		$fileSize = $this->getFileSize();
+
+		// Calulcate seek position
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: minimumBlockLength=%d,fileSize=%d', $minimumBlockLength, $fileSize));
+		$seekPosition = $this->getHeaderSize() + $minimumBlockLength * FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($type . '_pre_allocate_count') + $fileSize ;
+
+		// Now simply write a NUL there. This will pre-allocate the file.
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->writeAtPosition(%d,NUL) ...', $seekPosition));
+		$this->writeAtPosition($seekPosition, chr(0));
+
+		// Is the seek position zero?
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: fileSize=%d', $fileSize));
+		if ($fileSize == 0) {
+			// Mark file as gaps-only
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: Calling this->markGapsOnly(%s,%d) ...', $type, $minimumBlockLength));
+			$this->markFileGapsOnly($type, $minimumBlockLength);
+		} else {
+			// Analyze file structure
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->analyzeFileStructure() ...');
+			$this->analyzeFileStructure();
+		}
+
+		// Rewind seek position
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->rewind() ...');
+		$this->rewind();
 
 		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
 	}
 
 	/**
@@ -964,37 +992,33 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 	 * This method will return true if an emptied (nulled) entry has been found.
 	 *
 	 * @return	$isValid	Whether the next entry is valid
-	 * @throws	UnexpectedValueException	If some value is not expected
+	 * @throws	InvalidArgumentException	If a parameter is not valid
 	 */
-	public function valid () {
-		// First calculate minimum block length
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
-		$length = $this->getBlockInstance()->calculateMinimumBlockLength();
-
-		// Short be more than zero!
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: length=%d', $length));
+	protected function isValidByLength (int $length) {
+		// Validate parameter
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: length=%d - CALLED!', $length));
 		if ($length < 1) {
-			// Throw UVE
-			throw new UnexpectedValueException(sprintf('length=%d is not expected', $length));
+			// Throw IAE
+			throw new InvalidArgumentException(sprintf('Parameter length=%d is not valid', $length));
 		}
 
 		// Get current seek position
-		$seekPosition = $this->key();
+		$seekPosition = $this->determineSeekPosition();
 
 		// Then try to read it
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%d', $seekPosition));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%d', $seekPosition));
 		$data = $this->read($length);
 
 		// If some bytes could be read, all is fine
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: data[%s]()=%d', gettype($data), strlen($data)));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: data[%s]()=%d', gettype($data), strlen($data)));
 		$isValid = ((is_string($data)) && (strlen($data) > 0));
 
 		// Get header size
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: isValid=%d', intval($isValid)));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: isValid=%d', intval($isValid)));
 		$headerSize = $this->getHeaderSize();
 
 		// Is the seek position at or beyond the header?
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%d,headerSize=%d', $seekPosition, $headerSize));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: seekPosition=%d,headerSize=%d', $seekPosition, $headerSize));
 		if ($seekPosition >= $headerSize) {
 			// Seek back to old position
 			$isValid = ($isValid && $this->seek($seekPosition) === 0);
@@ -1004,48 +1028,31 @@ abstract class BaseBinaryFile extends BaseAbstractFile {
 		}
 
 		// Return result
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: isValid=%d - EXIT!', intval($isValid)));
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: isValid=%d - EXIT!', intval($isValid)));
 		return $isValid;
 	}
 
-	/**
-	 * Gets current seek position ("key").
-	 *
-	 * @return	$key	Current key in iteration
-	 */
-	public function key () {
-		// Call pointer instance
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
-		$key = $this->getPointerInstance()->determineSeekPosition();
-
-		// Return key
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-BINARY-FILE: key[%s]=%d - EXIT!', gettype($key), $key));
-		return $key;
-	}
-
 	/**
 	 * Reads the file header
 	 *
 	 * @return	void
+	 * @throws	LogicException	If both instances are not set
 	 */
 	public function readFileHeader () {
-		// Call block instance
+		// Is index set or stack?
 		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
-		$this->getBlockInstance()->readFileHeader();
-
-		// Trace message
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');
-	}
-
-	/**
-	 * Flushes the file header
-	 *
-	 * @return	void
-	 */
-	public function flushFileHeader () {
-		// Call block instance
-		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: CALLED!');
-		$this->getBlockInstance()->flushFileHeader();
+		if ($this->getIndexInstance() instanceof Indexable) {
+			// Call index instance
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->indexInstance->readIndexHeader() ...');
+			$this->getIndexInstance()->readIndexHeader();
+		} elseif ($this->getStackInstance() instanceof StackableFile) {
+			// Call stacke instance
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: Calling this->stackInstance->readStackHeader() ...');
+			$this->getStackInstance()->readStackHeader();
+		} else {
+			// Bad logic?
+			throw new LogicException('Wether indexInstance nor stackInstance are set');
+		}
 
 		// Trace message
 		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('BASE-BINARY-FILE: EXIT!');