added more logging

jcupitt · jcupitt · commit b19ef88a3495 · 2016-12-20T14:55:31.000Z
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,7 @@ vips extension changelog
 dev
 ---
 	* Lower min vips version to 8.2, see #4
+	* Add more logging
 
 Version 1.0.2 (2016-12-06)
 --------------------------
diff --git a/RELEASE-1.0.3 b/RELEASE-1.0.3
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>2016-12-06</date>
+ <date>2016-12-20</date>
  <version>
-  <release>1.0.2</release>
+  <release>1.0.3</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -34,7 +34,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <file role='doc' name='CREDITS'/>
    <file role='doc' name='LICENSE.txt'/>
    <file role='doc' name='README.md'/>
-   <file role='doc' name='RELEASE-1.0.2'/>
+   <file role='doc' name='RELEASE-1.0.3'/>
    <file role='doc' name='ChangeLog'/>
 
    <file role='src' name='config.m4'/>
@@ -89,7 +89,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </extsrcrelease>
  <changelog>
 
-   <release>
+  <release>
    <stability><release>stable</release><api>stable</api></stability>
    <version><release>1.0.2</release><api>1.0.0</api></version>
    <date>2016-12-06</date>
diff --git a/php_vips.h b/php_vips.h
@@ -5,7 +5,7 @@
 extern zend_module_entry vips_module_entry;
 #define phpext_vips_ptr &vips_module_entry
 
-#define PHP_VIPS_VERSION "1.0.2" 
+#define PHP_VIPS_VERSION "1.0.3" 
 
 #ifdef PHP_WIN32
 #	define PHP_VIPS_API __declspec(dllexport)
diff --git a/vips-1.0.3.tgz b/vips-1.0.3.tgz
diff --git a/vips.c b/vips.c
@@ -3,8 +3,8 @@
  */
 
 /* Uncomment for some logging.
-#define VIPS_DEBUG
  */
+#define VIPS_DEBUG
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -18,6 +18,10 @@
 #include <vips/vips.h>
 #include <vips/debug.h>
 
+#undef VIPS_DEBUG_MSG
+#define VIPS_DEBUG_MSG( ... ) \
+		G_STMT_START { fprintf( stderr, __VA_ARGS__ ); fflush( stdout ); } G_STMT_END
+
 /* If you declare any globals in php_vips.h uncomment this:
 ZEND_DECLARE_MODULE_GLOBALS(vips)
 */
@@ -1621,6 +1625,8 @@ static void php_free_gobject(zend_resource *rsrc)
  */
 PHP_MINIT_FUNCTION(vips)
 {
+	VIPS_DEBUG_MSG("vips: PHP_MINIT_FUNCTION\n");
+
 	/* If you have INI entries, uncomment these lines
 	REGISTER_INI_ENTRIES();
 	*/
@@ -1650,15 +1656,16 @@ PHP_MINIT_FUNCTION(vips)
  */
 PHP_MSHUTDOWN_FUNCTION(vips)
 {
+	VIPS_DEBUG_MSG("vips: PHP_MSHUTDOWN_FUNCTION\n");
+
 	/* uncomment this line if you have INI entries
 	UNREGISTER_INI_ENTRIES();
 	*/
 
-#ifdef VIPS_DEBUG
-	printf( "php-vips-ext shutdown\n" );
-#endif /*VIPS_DEBUG*/
-
+	/*
+	VIPS_DEBUG_MSG("vips: vips_shutdown()\n");
 	vips_shutdown();
+	 */
 
 	return SUCCESS;
 }
@@ -1669,6 +1676,8 @@ PHP_MSHUTDOWN_FUNCTION(vips)
  */
 PHP_RINIT_FUNCTION(vips)
 {
+	VIPS_DEBUG_MSG("vips: PHP_RINIT_FUNCTION\n");
+
 #if defined(COMPILE_DL_VIPS) && defined(ZTS)
 	ZEND_TSRMLS_CACHE_UPDATE();
 #endif
@@ -1681,6 +1690,8 @@ PHP_RINIT_FUNCTION(vips)
  */
 PHP_RSHUTDOWN_FUNCTION(vips)
 {
+	VIPS_DEBUG_MSG("vips: PHP_RSHUTDOWN_FUNCTION\n");
+
 	return SUCCESS;
 }
 /* }}} */
