add more php_info() output

jcupitt · jcupitt · commit 095f48322d12 · 2020-01-09T12:26:36.000Z
Add output to php-info for some basic memory stats. See libvips/php-vips#97
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,10 @@
 vips extension changelog
 
+Version 1.0.11 (2020-1-xx)
+--------------------------
+	* More php_info() output [jcupitt]
+	  https://github.com/libvips/php-vips/issues/97
+
 Version 1.0.10 (2018-12-xx)
 --------------------------
 	* Fix win32 build [TBK]
diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ libvips website, or build your own.
 $ pear package
 ```
 
-to make `vips-1.0.9.tgz`.
+To make `vips-1.0.11.tgz`.
 
 To install by hand:
 
diff --git a/package.xml b/package.xml
@@ -15,9 +15,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>jcupitt@php.net</email>
   <active>yes</active>
  </lead>
- <date>2019-09-26</date>
+ <date>2020-01-09</date>
  <version>
-  <release>1.0.10</release>
+  <release>1.0.11</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -26,9 +26,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license filesource="LICENSE.txt">MIT</license>
  <notes>
-	* Add vips_image_write_to_array() [jcupitt]
-	* Update links for new home [jcupitt]
-	* Fix win32 build [TBK]
+	* More php_info() output [jcupitt]
  </notes>
  <contents>
   <dir name="/">
@@ -100,6 +98,15 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </extsrcrelease>
  <changelog>
 
+  <release>
+   <stability><release>stable</release><api>stable</api></stability>
+   <version><release>1.0.11</release><api>1.0.0</api></version>
+   <date>2020-1-9</date>
+   <notes>
+	* More php_info() output [jcupitt]
+   </notes>
+  </release>
+
   <release>
    <stability><release>stable</release><api>stable</api></stability>
    <version><release>1.0.10</release><api>1.0.0</api></version>
diff --git a/vips-1.0.11.tgz b/vips-1.0.11.tgz
diff --git a/vips.c b/vips.c
@@ -2058,16 +2058,20 @@ PHP_MINFO_FUNCTION(vips)
 
 	vips_snprintf(digits, 256, "%zd", vips_cache_get_max_mem());
 	php_info_print_table_row(2, "Cache max mem", digits);
-
 	vips_snprintf(digits, 256, "%d", vips_cache_get_max());
 	php_info_print_table_row(2, "Cache max operations", digits);
-
 	vips_snprintf(digits, 256, "%d", vips_cache_get_size());
 	php_info_print_table_row(2, "Cache current operations", digits);
-
 	vips_snprintf(digits, 256, "%d", vips_cache_get_max_files());
 	php_info_print_table_row(2, "Cache max open files", digits);
 
+	vips_snprintf(digits, 256, "%d", vips_tracked_get_allocs());
+	php_info_print_table_row(2, "Memory allocations", digits);
+	vips_snprintf(digits, 256, "%zd", vips_tracked_get_mem());
+	php_info_print_table_row(2, "Memory currently allocated", digits);
+	vips_snprintf(digits, 256, "%zd", vips_tracked_get_mem_highwater());
+	php_info_print_table_row(2, "Memory high water", digits);
+
 	vips_snprintf(digits, 256, "%d", vips_concurrency_get());
 	php_info_print_table_row(2, "Concurrency", digits);
 
