Move DTrace error handling into notification callback.

Author: beberlei

Zend/zend.c

@@ -847,6 +847,8 @@ int zend_startup(zend_utility_functions *utility_functions) /* {{{ */
 			zend_compile_file = dtrace_compile_file;
 			zend_execute_ex = dtrace_execute_ex;
 			zend_execute_internal = dtrace_execute_internal;
+
+			zend_register_error_notify_callback("dtrace", dtrace_error_notify_cb);
 		} else {
 			zend_compile_file = compile_file;
 			zend_execute_ex = execute_ex;
@@ -1314,15 +1316,6 @@ static ZEND_COLD void zend_error_va_list(
 		}
 	}
 
-#ifdef HAVE_DTRACE
-	if (DTRACE_ERROR_ENABLED()) {
-		char *dtrace_error_buffer;
-		zend_vspprintf(&dtrace_error_buffer, 0, format, args);
-		DTRACE_ERROR(dtrace_error_buffer, (char *)error_filename, error_lineno);
-		efree(dtrace_error_buffer);
-	}
-#endif /* HAVE_DTRACE */
-
 	zend_error_notify_all_callbacks(type, error_filename, error_lineno, format, args);
 
 	/* if we don't have a user defined error handler */

Zend/zend_dtrace.c

@@ -109,6 +109,16 @@ ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data, zval *ret
 	}
 }
 
+void dtrace_error_notify_cb(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args)
+{
+	if (DTRACE_ERROR_ENABLED()) {
+		char *dtrace_error_buffer;
+		zend_vspprintf(&dtrace_error_buffer, 0, format, args);
+		DTRACE_ERROR(dtrace_error_buffer, (char *)error_filename, error_lineno);
+		efree(dtrace_error_buffer);
+	}
+}
+
 /* }}} */
 
 #endif /* HAVE_DTRACE */

Zend/zend_dtrace.h

@@ -37,6 +37,8 @@ ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data);
 ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data, zval *return_value);
 #include <zend_dtrace_gen.h>
 
+void dtrace_error_notify_cb(int type, const char *error_filename, const uint32_t error_lineno, const char *format, va_list args);
+
 #endif /* HAVE_DTRACE */
 
 #ifdef	__cplusplus