Add peak_malloced_memory to V8\HeapStatistics

V8 commit: v8/v8@ad93c01

Author: pinepain

src/php_v8_heap_statistics.cc

@@ -36,9 +36,9 @@ void php_v8_heap_statistics_create_from_heap_statistics(zval *return_value, v8::
     zend_update_property_double(this_ce, return_value, ZEND_STRL("used_heap_size"), hs->used_heap_size());
     zend_update_property_double(this_ce, return_value, ZEND_STRL("heap_size_limit"), hs->heap_size_limit());
     zend_update_property_double(this_ce, return_value, ZEND_STRL("malloced_memory"), hs->malloced_memory());
+    zend_update_property_double(this_ce, return_value, ZEND_STRL("peak_malloced_memory"), hs->peak_malloced_memory());
 
     zend_update_property_bool(this_ce, return_value, ZEND_STRL("does_zap_garbage"), static_cast<zend_long>(hs->does_zap_garbage()));
-
 }
 
 static PHP_METHOD(V8HeapStatistics, __construct) {
@@ -49,12 +49,14 @@ static PHP_METHOD(V8HeapStatistics, __construct) {
     double used_heap_size = 0;
     double heap_size_limit = 0;
     double malloced_memory = 0;
+    double peak_malloced_memory = 0;
 
     zend_bool does_zap_garbage = '\0';
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "|dddddddb",
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "|" "dddd" "dddd" "b",
                               &total_heap_size, &total_heap_size_executable, &total_physical_size, &total_available_size,
-                              &used_heap_size, &heap_size_limit, &malloced_memory, &does_zap_garbage) == FAILURE) {
+                              &used_heap_size, &heap_size_limit, &malloced_memory, &peak_malloced_memory,
+                              &does_zap_garbage) == FAILURE) {
         return;
     }
 
@@ -65,6 +67,7 @@ static PHP_METHOD(V8HeapStatistics, __construct) {
     zend_update_property_double(this_ce, getThis(), ZEND_STRL("used_heap_size"), used_heap_size);
     zend_update_property_double(this_ce, getThis(), ZEND_STRL("heap_size_limit"), heap_size_limit);
     zend_update_property_double(this_ce, getThis(), ZEND_STRL("malloced_memory"), malloced_memory);
+    zend_update_property_double(this_ce, getThis(), ZEND_STRL("peak_malloced_memory"), peak_malloced_memory);
 
     zend_update_property_bool(this_ce, getThis(), ZEND_STRL("does_zap_garbage"), does_zap_garbage);
 }
@@ -139,6 +142,16 @@ static PHP_METHOD(V8HeapStatistics, malloced_memory) {
     RETVAL_ZVAL(zend_read_property(this_ce, getThis(), ZEND_STRL("malloced_memory"), 0, &rv), 1, 0);
 }
 
+static PHP_METHOD(V8HeapStatistics, peak_malloced_memory) {
+    zval rv;
+
+    if (zend_parse_parameters_none() == FAILURE) {
+        return;
+    }
+
+    RETVAL_ZVAL(zend_read_property(this_ce, getThis(), ZEND_STRL("peak_malloced_memory"), 0, &rv), 1, 0);
+}
+
 static PHP_METHOD(V8HeapStatistics, does_zap_garbage) {
     zval rv;
 
@@ -155,6 +168,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_v8_heap_statistics___construct, ZEND_SEND_BY_VAL,
                 ZEND_ARG_TYPE_INFO(0, total_heap_size_executable, IS_DOUBLE, 0)
                 ZEND_ARG_TYPE_INFO(0, total_physical_size, IS_DOUBLE, 0)
                 ZEND_ARG_TYPE_INFO(0, total_available_size, IS_DOUBLE, 0)
+
                 ZEND_ARG_TYPE_INFO(0, used_heap_size, IS_DOUBLE, 0)
                 ZEND_ARG_TYPE_INFO(0, heap_size_limit, IS_DOUBLE, 0)
                 ZEND_ARG_TYPE_INFO(0, malloced_memory, IS_DOUBLE, 0)
@@ -184,6 +198,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_heap_statistics__malloced_memory, ZEND_RETURN_VALUE, 0, IS_DOUBLE, NULL, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_heap_statistics__peak_malloced_memory, ZEND_RETURN_VALUE, 0, IS_DOUBLE, NULL, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_heap_statistics__does_zap_garbage, ZEND_RETURN_VALUE, 0, _IS_BOOL, NULL, 0)
 ZEND_END_ARG_INFO()
 
@@ -198,6 +215,7 @@ static const zend_function_entry php_v8_heap_statistics_methods[] = {
         PHP_ME(V8HeapStatistics, used_heap_size, arginfo_v8_heap_statistics__used_heap_size, ZEND_ACC_PUBLIC)
         PHP_ME(V8HeapStatistics, heap_size_limit, arginfo_v8_heap_statistics__heap_size_limit, ZEND_ACC_PUBLIC)
         PHP_ME(V8HeapStatistics, malloced_memory, arginfo_v8_heap_statistics__malloced_memory, ZEND_ACC_PUBLIC)
+        PHP_ME(V8HeapStatistics, peak_malloced_memory, arginfo_v8_heap_statistics__peak_malloced_memory, ZEND_ACC_PUBLIC)
         PHP_ME(V8HeapStatistics, does_zap_garbage, arginfo_v8_heap_statistics__does_zap_garbage, ZEND_ACC_PUBLIC)
 
         PHP_FE_END
@@ -216,6 +234,7 @@ PHP_MINIT_FUNCTION (php_v8_heap_statistics) {
     zend_declare_property_double(this_ce, ZEND_STRL("used_heap_size"), 0, ZEND_ACC_PRIVATE);
     zend_declare_property_double(this_ce, ZEND_STRL("heap_size_limit"), 0, ZEND_ACC_PRIVATE);
     zend_declare_property_double(this_ce, ZEND_STRL("malloced_memory"), 0, ZEND_ACC_PRIVATE);
+    zend_declare_property_double(this_ce, ZEND_STRL("peak_malloced_memory"), 0, ZEND_ACC_PRIVATE);
 
     zend_declare_property_bool(this_ce, ZEND_STRL("does_zap_garbage"), false, ZEND_ACC_PRIVATE);
 

stubs/src/HeapStatistics.php

@@ -54,6 +54,10 @@ class  HeapStatistics
      * @var float
      */
     private $malloced_memory;
+    /**
+     * @var float
+     */
+    private $peak_malloced_memory;
     /**
      * @var bool
      */
@@ -77,6 +81,7 @@ public function __construct(
         float $used_heap_size,
         float $heap_size_limit,
         float $malloced_memory,
+        float $peak_malloced_memory,
         bool $does_zap_garbage
     ) {
         $this->total_heap_size = $total_heap_size;
@@ -86,6 +91,7 @@ public function __construct(
         $this->used_heap_size = $used_heap_size;
         $this->heap_size_limit = $heap_size_limit;
         $this->malloced_memory = $malloced_memory;
+        $this->peak_malloced_memory = $peak_malloced_memory;
         $this->does_zap_garbage = $does_zap_garbage;
     }
 
@@ -124,6 +130,11 @@ public function malloced_memory() : float
         return $this->malloced_memory;
     }
 
+    public function peak_malloced_memory() : float
+    {
+        return $this->peak_malloced_memory;
+    }
+
     public function does_zap_garbage() : bool
     {
         return $this->does_zap_garbage;

tests/V8HeapStatistics.phpt

@@ -8,7 +8,7 @@ V8\HeapStatistics
 /** @var \Phpv8Testsuite $helper */
 $helper = require '.testsuite.php';
 
-$hs = new \V8\HeapStatistics(1, 2, 3, 4, 5, 6, 7, true);
+$hs = new \V8\HeapStatistics(1, 2, 3, 4, 5, 6, 7, 8, true);
 
 $helper->header('Object representation');
 $helper->dump($hs);
@@ -20,7 +20,7 @@ $helper->dump_object_methods($hs);
 --EXPECT--
 Object representation:
 ----------------------
-object(V8\HeapStatistics)#2 (8) {
+object(V8\HeapStatistics)#2 (9) {
   ["total_heap_size":"V8\HeapStatistics":private]=>
   float(1)
   ["total_heap_size_executable":"V8\HeapStatistics":private]=>
@@ -35,6 +35,8 @@ object(V8\HeapStatistics)#2 (8) {
   float(6)
   ["malloced_memory":"V8\HeapStatistics":private]=>
   float(7)
+  ["peak_malloced_memory":"V8\HeapStatistics":private]=>
+  float(8)
   ["does_zap_garbage":"V8\HeapStatistics":private]=>
   bool(true)
 }

tests/V8Isolate.phpt

@@ -46,7 +46,7 @@ object(V8\Isolate)#2 (5) {
 V8\Exceptions\GenericException: Not in context!
 
 V8\Isolate->GetHeapStatistics():
-    object(V8\HeapStatistics)#28 (8) {
+    object(V8\HeapStatistics)#28 (9) {
       ["total_heap_size":"V8\HeapStatistics":private]=>
       float(%d)
       ["total_heap_size_executable":"V8\HeapStatistics":private]=>
@@ -61,6 +61,8 @@ V8\Isolate->GetHeapStatistics():
       float(%d)
       ["malloced_memory":"V8\HeapStatistics":private]=>
       float(%d)
+      ["peak_malloced_memory":"V8\HeapStatistics":private]=>
+      float(%d)
       ["does_zap_garbage":"V8\HeapStatistics":private]=>
       bool(false)
     }

tests/V8Isolate_limit_memory.phpt

@@ -91,7 +91,7 @@ object(V8\Isolate)#3 (5) {
   ["memory_limit_hit":"V8\Isolate":private]=>
   bool(true)
 }
-object(V8\HeapStatistics)#14 (8) {
+object(V8\HeapStatistics)#14 (9) {
   ["total_heap_size":"V8\HeapStatistics":private]=>
   float(%d)
   ["total_heap_size_executable":"V8\HeapStatistics":private]=>
@@ -106,6 +106,8 @@ object(V8\HeapStatistics)#14 (8) {
   float(%d)
   ["malloced_memory":"V8\HeapStatistics":private]=>
   float(%d)
+  ["peak_malloced_memory":"V8\HeapStatistics":private]=>
+  float(%d)
   ["does_zap_garbage":"V8\HeapStatistics":private]=>
   bool(false)
 }

tests/V8Script_Run_out_of_memory.phpt

@@ -2,7 +2,8 @@
 V8\Script::Run() - out of memory example
 --SKIPIF--
 <?php if (!extension_loaded("v8")) print "skip"; ?>
-<?php //if (!getenv("DEV_TESTS")) print "skip"; ?>
+<?php if (!getenv("DEV_TESTS")) print "skip"; ?>
+<?php if (getenv("SKIP_SLOW_TESTS")) print "skip slow"; ?>
 --FILE--
 <?php
 /** @var \Phpv8Testsuite $helper */