From 49370c21d1c9db0c765fddac81b0fb96d9f64eeb Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Thu, 29 May 2014 04:11:20 +0200
Subject: [PATCH] Removed locks from MainLogger

---
 src/pocketmine/utils/MainLogger.php | 14 ++++++--------
 src/pocketmine/utils/mainLogger.php | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/pocketmine/utils/MainLogger.php b/src/pocketmine/utils/MainLogger.php
index c98b4b2bb..2f31c7548 100644
--- a/src/pocketmine/utils/MainLogger.php
+++ b/src/pocketmine/utils/MainLogger.php
@@ -152,16 +152,15 @@ class MainLogger extends \Thread implements Logger{
 		if(!is_resource($this->logResource)){
 			throw new \RuntimeException("Couldn't open log file");
 		}
-		flock($this->logResource, LOCK_EX);
 
 		while($this->shutdown === false){
 			if(strlen($this->logStream) >= 4096){
-				$this->synchronized(function (){
-					$chunks = strlen($this->logStream) >> 12;
-					$chunk = substr($this->logStream, 0, $chunks << 12);
-					$this->logStream = substr($this->logStream, $chunks << 12);
-					fwrite($this->logResource, $chunk);
-				});
+				$this->lock();
+				$chunks = strlen($this->logStream) >> 12;
+				$chunk = substr($this->logStream, 0, $chunks << 12);
+				$this->logStream = substr($this->logStream, $chunks << 12);
+				$this->unlock();
+				fwrite($this->logResource, $chunk);
 			}else{
 				usleep(250000); //sleep for 0.25 seconds
 			}
@@ -170,7 +169,6 @@ class MainLogger extends \Thread implements Logger{
 			fwrite($this->logResource, $this->logStream);
 		}
 
-		flock($this->logResource, LOCK_UN);
 		fclose($this->logResource);
 	}
 }
\ No newline at end of file
diff --git a/src/pocketmine/utils/mainLogger.php b/src/pocketmine/utils/mainLogger.php
index c98b4b2bb..2f31c7548 100644
--- a/src/pocketmine/utils/mainLogger.php
+++ b/src/pocketmine/utils/mainLogger.php
@@ -152,16 +152,15 @@ class MainLogger extends \Thread implements Logger{
 		if(!is_resource($this->logResource)){
 			throw new \RuntimeException("Couldn't open log file");
 		}
-		flock($this->logResource, LOCK_EX);
 
 		while($this->shutdown === false){
 			if(strlen($this->logStream) >= 4096){
-				$this->synchronized(function (){
-					$chunks = strlen($this->logStream) >> 12;
-					$chunk = substr($this->logStream, 0, $chunks << 12);
-					$this->logStream = substr($this->logStream, $chunks << 12);
-					fwrite($this->logResource, $chunk);
-				});
+				$this->lock();
+				$chunks = strlen($this->logStream) >> 12;
+				$chunk = substr($this->logStream, 0, $chunks << 12);
+				$this->logStream = substr($this->logStream, $chunks << 12);
+				$this->unlock();
+				fwrite($this->logResource, $chunk);
 			}else{
 				usleep(250000); //sleep for 0.25 seconds
 			}
@@ -170,7 +169,6 @@ class MainLogger extends \Thread implements Logger{
 			fwrite($this->logResource, $this->logStream);
 		}
 
-		flock($this->logResource, LOCK_UN);
 		fclose($this->logResource);
 	}
 }
\ No newline at end of file