[HttpKernel] fixed memory collector

jfsimon · jfsimon · commit a011842982aa · 2013-03-18T16:18:56.000+01:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/memory.html.twig
@@ -10,7 +10,7 @@
     {% set text %}
         <div class="sf-toolbar-info-piece">
             <b>Memory usage</b>
-            <span>{{ '%.1f'|format(collector.memory / 1024 / 1024) }} / {{ collector.memoryLimit == -1 ? '&infin;' : collector.memoryLimit }} MB</span>
+            <span>{{ '%.1f'|format(collector.memory / 1024 / 1024) }} / {{ collector.memoryLimit == -1 ? '&infin;' : '%.1f'|format(collector.memoryLimit / 1024 / 1024)|escape }} MB</span>
         </div>
     {% endset %}
     {% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': false } %}
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/MemoryDataCollector.php
@@ -24,8 +24,8 @@ class MemoryDataCollector extends DataCollector
     public function __construct()
     {
         $this->data = array(
-            'memory' => 0,
-            'memory_limit' => rtrim(ini_get('memory_limit'), 'M')
+            'memory'       => 0,
+            'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
         );
     }
 
@@ -72,4 +72,14 @@ public function getName()
     {
         return 'memory';
     }
+
+    private function convertToBytes($memoryLimit)
+    {
+        if (preg_match('#^(\d+)([bkmgt])#i', $memoryLimit, $match)) {
+            $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);
+            $memoryLimit = ($match[1] * (1 << $shift[strtolower($match[2])]));
+        }
+
+        return (int) $memoryLimit;
+    }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/MemoryDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/MemoryDataCollectorTest.php
@@ -26,12 +26,30 @@ protected function setUp()
 
     public function testCollect()
     {
-        $c = new MemoryDataCollector();
+        $collector = new MemoryDataCollector();
+        $collector->collect(new Request(), new Response());
 
-        $c->collect(new Request(), new Response());
+        $this->assertInternalType('integer', $collector->getMemory());
+        $this->assertInternalType('integer', $collector->getMemoryLimit());
+        $this->assertSame('memory', $collector->getName());
+    }
 
-        $this->assertInternalType('integer',$c->getMemory());
-        $this->assertSame('memory',$c->getName());
+    /** @dataProvider getBytesConversionTestData */
+    public function testBytesConversion($limit, $bytes)
+    {
+        $collector = new MemoryDataCollector();
+        $method = new \ReflectionMethod($collector, 'convertToBytes');
+        $method->setAccessible(true);
+        $this->assertEquals($bytes, $method->invoke($collector, $limit));
     }
 
+    public function getBytesConversionTestData()
+    {
+        return array(
+            array('-1', -1),
+            array('2k', 2048),
+            array('2K', 2048),
+            array('1g', 1024 * 1024 * 1024),
+        );
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ class MemoryDataCollector extends DataCollector`
`24`	`24`	`public function __construct()`
`25`	`25`	`{`
`26`	`26`	`$this->data = array(`
`27`		`- 'memory' => 0,`
`28`		`- 'memory_limit' => rtrim(ini_get('memory_limit'), 'M')`
	`27`	`+ 'memory' => 0,`
	`28`	`+ 'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),`
`29`	`29`	`);`
`30`	`30`	`}`
`31`	`31`
`@@ -72,4 +72,14 @@ public function getName()`
`72`	`72`	`{`
`73`	`73`	`return 'memory';`
`74`	`74`	`}`
	`75`	`+`
	`76`	`+ private function convertToBytes($memoryLimit)`
	`77`	`+ {`
	`78`	`+ if (preg_match('#^(\d+)([bkmgt])#i', $memoryLimit, $match)) {`
	`79`	`+ $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);`
	`80`	`+ $memoryLimit = ($match[1] * (1 << $shift[strtolower($match[2])]));`
	`81`	`+ }`
	`82`	`+`
	`83`	`+ return (int) $memoryLimit;`
	`84`	`+ }`
`75`	`85`	`}`