From 05385acb366afbb88451a6260e0a7ffe87480b9f Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Sun, 19 Apr 2015 16:01:46 +0200
Subject: [PATCH] Added Memory Manager timings

---
 src/pocketmine/MemoryManager.php | 4 ++++
 src/pocketmine/event/Timings.php | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pocketmine/MemoryManager.php b/src/pocketmine/MemoryManager.php
index 6ac15db26..15ffec5df 100644
--- a/src/pocketmine/MemoryManager.php
+++ b/src/pocketmine/MemoryManager.php
@@ -112,6 +112,8 @@ class MemoryManager{
 	}
 
 	public function check(){
+		Timings::$memoryManagerTimer->startTiming();
+
 		if(($this->memoryLimit > 0 or $this->globalMemoryLimit > 0) and ++$this->checkTicker >= $this->checkRate){
 			$this->checkTicker = 0;
 			$memory = Utils::getMemoryUsage(true);
@@ -142,6 +144,8 @@ class MemoryManager{
 			$this->garbageCollectionTicker = 0;
 			$this->triggerGarbageCollector();
 		}
+
+		Timings::$memoryManagerTimer->stopTiming();
 	}
 
 	public function triggerGarbageCollector(){
diff --git a/src/pocketmine/event/Timings.php b/src/pocketmine/event/Timings.php
index 171f335ea..3ac1f850b 100644
--- a/src/pocketmine/event/Timings.php
+++ b/src/pocketmine/event/Timings.php
@@ -33,6 +33,8 @@ abstract class Timings{
 	/** @var TimingsHandler */
 	public static $serverTickTimer;
 	/** @var TimingsHandler */
+	public static $memoryManagerTimer;
+	/** @var TimingsHandler */
 	public static $garbageCollectorTimer;
 	/** @var TimingsHandler */
 	public static $playerListTimer;
@@ -98,7 +100,8 @@ abstract class Timings{
 		}
 
 		self::$serverTickTimer = new TimingsHandler("** Full Server Tick");
-		self::$garbageCollectorTimer = new TimingsHandler("Garbage Collector");
+		self::$memoryManagerTimer = new TimingsHandler("Memory Manager");
+		self::$garbageCollectorTimer = new TimingsHandler("Garbage Collector", self::$memoryManagerTimer);
 		self::$playerListTimer = new TimingsHandler("Player List");
 		self::$connectionTimer = new TimingsHandler("Connection Handler");
 		self::$tickablesTimer = new TimingsHandler("Tickables");