Merge branch 'master' of github.com:libvips/php-vips-ext

jcupitt · jcupitt · commit 499765b11113 · 2020-08-28T02:12:36.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,9 @@
 vips extension changelog
 
-Version 1.0.11 (2020-08-xx)
+Version 1.0.11 (2020-1-xx)
 --------------------------
+	* More php_info() output [jcupitt]
+	  https://github.com/libvips/php-vips/issues/97
 	* add vips_image_set_type()
 	* add vips_type_from_name()
 
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/config.h.in~ b/config.h.in~
@@ -0,0 +1,58 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Whether to build vips as dynamic module */
+#undef COMPILE_DL_VIPS
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Whether you have vips */
+#undef HAVE_VIPS
+
+/* Define to the address where bug reports for this package should be sent. */
+/* #undef PACKAGE_BUGREPORT */
+
+/* Define to the full name of this package. */
+/* #undef PACKAGE_NAME */
+
+/* Define to the full name and version of this package. */
+/* #undef PACKAGE_STRING */
+
+/* Define to the one symbol short name of this package. */
+/* #undef PACKAGE_TARNAME */
+
+/* Define to the home page for this package. */
+/* #undef PACKAGE_URL */
+
+/* Define to the version of this package. */
+/* #undef PACKAGE_VERSION */
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
diff --git a/package.xml b/package.xml
@@ -15,7 +15,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>jcupitt@php.net</email>
   <active>yes</active>
  </lead>
- <date>2020-08-26</date>
+ <date>2020-08-28</date>
  <version>
   <release>1.0.11</release>
   <api>1.0.0</api>
@@ -27,6 +27,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <license filesource="LICENSE.txt">MIT</license>
  <notes>
 	* add vips_image_set_type()
+	* More php_info() output [jcupitt]
  </notes>
  <contents>
   <dir name="/">
@@ -75,9 +76,12 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <file role='test' name='038.phpt'/>
     <file role='test' name='039.phpt'/>
     <file role='test' name='040.phpt'/>
+    <file role='test' name='041.phpt'/>
+    <file role='test' name='042.phpt'/>
 
     <dir name="images">
      <file role='test' name='img_0076.jpg'/>
+     <file role='test' name='sRGB.icc'/>
     </dir>
   </dir>
  </dir>
@@ -101,9 +105,10 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <release>
    <stability><release>stable</release><api>stable</api></stability>
    <version><release>1.0.11</release><api>1.0.0</api></version>
-   <date>2020-07-26</date>
+   <date>2020-08-28</date>
    <notes>
 	* add vips_image_set_type()
+	* More php_info() output [jcupitt]
    </notes>
   </release>
 
diff --git a/vips-1.0.11.tgz b/vips-1.0.11.tgz
diff --git a/vips.c b/vips.c
@@ -2116,16 +2116,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);
 
@@ -2337,11 +2341,11 @@ const zend_function_entry vips_functions[] = {
 	PHP_FE(vips_cache_set_max_mem, arginfo_vips_cache_set_max_mem)
 	PHP_FE(vips_cache_set_max_files, arginfo_vips_cache_set_max_files)
 	PHP_FE(vips_concurrency_set, arginfo_vips_concurrency_set)
-    PHP_FE(vips_cache_get_max, arginfo_vips_cache_get_max)
+	PHP_FE(vips_cache_get_max, arginfo_vips_cache_get_max)
 	PHP_FE(vips_cache_get_max_mem, arginfo_vips_cache_get_max_mem)
 	PHP_FE(vips_cache_get_max_files, arginfo_vips_cache_get_max_files)
-    PHP_FE(vips_cache_get_size, arginfo_vips_cache_get_size)
-    PHP_FE(vips_concurrency_get, arginfo_vips_concurrency_get)
+	PHP_FE(vips_cache_get_size, arginfo_vips_cache_get_size)
+	PHP_FE(vips_concurrency_get, arginfo_vips_concurrency_get)
 	PHP_FE(vips_version, arginfo_vips_version)
 
 	PHP_FE_END	/* Must be the last line in vips_functions[] */
