X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmain%2Fclasses%2Ffile_directories%2Fbinary%2Fclass_BaseBinaryFile.php;fp=inc%2Fmain%2Fclasses%2Ffile_directories%2Fbinary%2Fclass_BaseBinaryFile.php;h=9ce33ec223d3af94213756d44b65442cef8a3e31;hb=de1f271c2bdb43725f6671ea6588a44cf33bf091;hp=f346fb69fe882d37e7fe3a5a04c96ebb26dcfd15;hpb=46130e59d03880cc54ea2ddba9c660fe28d8a7d0;p=core.git

diff --git a/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php b/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php
index f346fb69..9ce33ec2 100644
--- a/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php
+++ b/inc/main/classes/file_directories/binary/class_BaseBinaryFile.php
@@ -150,7 +150,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 		/* Only for debugging
 		if (isset($this->gaps[0])) {
 			// Output first and last gap
-			self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] this->gaps[0]=%s,this->gaps[%s]=%s', __METHOD__, __LINE__, print_r($this->gaps[0], TRUE), (count($this->gaps) - 1), print_r($this->gaps[count($this->gaps) - 1], TRUE)));
+			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] this->gaps[0]=%s,this->gaps[%s]=%s', __METHOD__, __LINE__, print_r($this->gaps[0], TRUE), (count($this->gaps) - 1), print_r($this->gaps[count($this->gaps) - 1], TRUE)));
 		} // END - if
 		*/
 
@@ -162,7 +162,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 		} // END - if
 
 		// Debug output
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] gapsSize=%s,this->headerSize=%s', __METHOD__, __LINE__, $gapsSize, $this->getHeaderSize()));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] gapsSize=%s,this->headerSize=%s', __METHOD__, __LINE__, $gapsSize, $this->getHeaderSize()));
 
 		// Total gap size + header size must be same as file size
 		$isGapsOnly = (($this->getHeaderSize() + $gapsSize) == $this->getFileSize());
@@ -258,16 +258,16 @@ class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	void
 	 */
 	public function updateSeekPosition () {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
 
 		// Get key (= seek position)
 		$seekPosition = $this->key();
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Setting seekPosition=%s', __METHOD__, __LINE__, $seekPosition));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] Setting seekPosition=%s', __METHOD__, __LINE__, $seekPosition));
 
 		// And set it here
 		$this->setSeekPosition($seekPosition);
 
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
 	}
 
 	/**
@@ -277,7 +277,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	void
 	 */
 	protected function rewindUpdateSeekPosition () {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
 
 		// flushFileHeader must be callable
 		assert(is_callable(array($this, 'flushFileHeader')));
@@ -291,7 +291,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 		// ... to write it back into the file
 		$this->flushFileHeader();
 
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
 	}
 
 	/**
@@ -300,12 +300,12 @@ class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	void
 	 */
 	protected function seekToOldPosition () {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
 
 		// Seek to currently ("old") saved position
 		$this->seek($this->getSeekPosition());
 
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
 	}
 
 	/**
@@ -402,7 +402,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	void
 	 */
 	public function writeData ($seekPosition, $data, $flushHeader = TRUE) {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] seekPosition=%s,data()=%d - CALLED!', __METHOD__, __LINE__, $seekPosition, strlen($data)));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] seekPosition=%s,data()=%d - CALLED!', __METHOD__, __LINE__, $seekPosition, strlen($data)));
 
 		// Write data at given position
 		$this->getPointerInstance()->writeAtPosition($seekPosition, $data);
@@ -422,7 +422,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 			$this->seekToOldPosition();
 		} // END - if
 
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
 	}
 
 	/**
@@ -448,7 +448,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	$isInitialized	Whether the file header is initialized
 	 */
 	public function isFileHeaderInitialized () {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
 
 		// Default is not initialized
 		$isInitialized = FALSE;
@@ -457,12 +457,12 @@ class BaseBinaryFile extends BaseAbstractFile {
 		if ($this->isFileInitialized()) {
 			// Some bytes has been written, so rewind to start of it.
 			$rewindStatus = $this->rewind();
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] rewindStatus=%s', __METHOD__, __LINE__, $rewindStatus));
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] rewindStatus=%s', __METHOD__, __LINE__, $rewindStatus));
 
 			// Is the rewind() call successfull?
 			if ($rewindStatus != 1) {
 				// Something bad happened
-				self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Could not rewind().', __METHOD__, __LINE__));
+				self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] Could not rewind().', __METHOD__, __LINE__));
 			} // END - if
 
 			// Read file header
@@ -473,7 +473,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 		} // END - if
 
 		// Return result
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] isInitialized=%d - EXIT!', __METHOD__, __LINE__, intval($isInitialized)));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] isInitialized=%d - EXIT!', __METHOD__, __LINE__, intval($isInitialized)));
 		return $isInitialized;
 	}
 
@@ -483,11 +483,11 @@ class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	$isInitialized		Whether the file's size is zero
 	 */
 	public function isFileInitialized () {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
 
 		// Get it from iterator which holds the pointer instance. If FALSE is returned
 		$fileSize = $this->size();
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] fileSize=%s', __METHOD__, __LINE__, $fileSize));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] fileSize=%s', __METHOD__, __LINE__, $fileSize));
 
 		/*
 		 * The returned file size should not be FALSE or NULL as this means
@@ -499,7 +499,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 		$isInitialized = ($fileSize > 0);
 
 		// Return result
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] isInitialized=%d - EXIT!', __METHOD__, __LINE__, intval($isInitialized)));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] isInitialized=%d - EXIT!', __METHOD__, __LINE__, intval($isInitialized)));
 		return $isInitialized;
 	}
 
@@ -509,7 +509,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	void
 	 */
 	public function createFileHeader () {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
 
 		// The file's header should not be initialized here
 		assert(!$this->isFileHeaderInitialized());
@@ -520,7 +520,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 		// Rewind seek position (to beginning of file) and update/flush file header
 		$this->rewindUpdateSeekPosition();
 
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
 	}
 
 	/**
@@ -530,27 +530,27 @@ class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	void
 	 */
 	public function preAllocateFile ($type) {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
 
 		// Is it enabled?
 		if ($this->getConfigInstance()->getConfigEntry($type . '_pre_allocate_enabled') != 'Y') {
 			// Not enabled
-			self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Not pre-allocating file.', __METHOD__, __LINE__));
+			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] Not pre-allocating file.', __METHOD__, __LINE__));
 
 			// Don't continue here.
 			return;
 		} // END - if
 
 		// Message to user
-		self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Pre-allocating file ...', __METHOD__, __LINE__));
+		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] Pre-allocating file ...', __METHOD__, __LINE__));
 
 		// Calculate minimum length for one entry
 		$minLengthEntry = $this->getBlockInstance()->calculateMinimumBlockLength();
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] minLengthEntry=%s', __METHOD__, __LINE__, $minLengthEntry));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] minLengthEntry=%s', __METHOD__, __LINE__, $minLengthEntry));
 
 		// Calulcate seek position
 		$seekPosition = $minLengthEntry * $this->getConfigInstance()->getConfigEntry($type . '_pre_allocate_count');
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] seekPosition=%s', __METHOD__, __LINE__, $seekPosition));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] seekPosition=%s', __METHOD__, __LINE__, $seekPosition));
 
 		// Now simply write a NUL there. This will pre-allocate the file.
 		$this->writeData($seekPosition, chr(0));
@@ -558,7 +558,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 		// Rewind seek position (to beginning of file) and update/flush file header
 		$this->rewindUpdateSeekPosition();
 
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
 	}
 
 	/**
@@ -615,7 +615,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 	 * @return	void
 	 */
 	public function analyzeFile () {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] CALLED!', __METHOD__, __LINE__));
 
 		// Make sure the file is initialized
 		assert($this->isFileInitialized());
@@ -624,7 +624,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 		$this->initCountersGapsArray();
 
 		// Output message (as this may take some time)
-		self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Analyzing file structure ... (this may take some time)', __METHOD__, __LINE__));
+		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] Analyzing file structure ... (this may take some time)', __METHOD__, __LINE__));
 
 		// First rewind to the begining
 		$this->rewind();
@@ -647,13 +647,13 @@ class BaseBinaryFile extends BaseAbstractFile {
 			} // END - if
 
 			// Debug message
-			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] current()=%d', __METHOD__, __LINE__, strlen($current)));
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] current()=%d', __METHOD__, __LINE__, strlen($current)));
 		} // END - while
 
 		// If the last read block is empty, check gaps
 		if (empty($current)) {
 			// Output message
-			self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] Found a total of %s gaps.', __METHOD__, __LINE__, count($this->gaps)));
+			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] Found a total of %s gaps.', __METHOD__, __LINE__, count($this->gaps)));
 
 			// Check gaps, if the whole file is empty.
 			if ($this->isFileOnlyGaps()) {
@@ -672,7 +672,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 				$this->doRunDefragmentation();
 			} // END - if
 		} // END - if
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] EXIT!', __METHOD__, __LINE__));
 	}
 
 	/**
@@ -688,14 +688,14 @@ class BaseBinaryFile extends BaseAbstractFile {
 		} // END - if
 
 		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d] key()=%d', __FUNCTION__, __LINE__, $this->key()));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d] key()=%d', __FUNCTION__, __LINE__, $this->key()));
 
 		// Make sure the block instance is set
 		assert($this->getBlockInstance() instanceof CalculatableBlock);
 
 		// First calculate minimum block length
 		$length = $this->getBlockInstance()->calculateMinimumBlockLength();
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d] length=%s', __FUNCTION__, __LINE__, $length));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d] length=%s', __FUNCTION__, __LINE__, $length));
 
 		// Short be more than zero!
 		assert($length > 0);
@@ -713,7 +713,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 			$block = $this->read($length);
 
 			// Debug message
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d] block()=%d,length=%s', __FUNCTION__, __LINE__, strlen($block), $length));
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d] block()=%d,length=%s', __FUNCTION__, __LINE__, strlen($block), $length));
 
 			// Is it all empty?
 			if (strlen(trim($block)) == 0) {
@@ -728,17 +728,17 @@ class BaseBinaryFile extends BaseAbstractFile {
 			$data .= $block;
 
 			// A debug message
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('[%s:%d] data()=%d', __FUNCTION__, __LINE__, strlen($data)));
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d] data()=%d', __FUNCTION__, __LINE__, strlen($data)));
 		} // END - while
 
 		// EOF reached?
 		if ($this->isEndOfFileReached()) {
 			// Set whole data as current read block
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('Calling setCurrentBlock(' . strlen($data) . ') ...');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Calling setCurrentBlock(' . strlen($data) . ') ...');
 			$this->setCurrentBlock($data);
 
 			// Then abort here silently
-			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('EOF reached.');
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('EOF reached.');
 			return;
 		} // END - if
 
@@ -752,7 +752,7 @@ class BaseBinaryFile extends BaseAbstractFile {
 		$dataArray = explode(chr(self::SEPARATOR_ENTRIES), $data);
 
 		// This array must contain two elements
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('dataArray=' . print_r($dataArray, TRUE));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('dataArray=' . print_r($dataArray, TRUE));
 		assert(count($dataArray) == 2);
 
 		// Left part is the actual block, right one the back-buffer data