Revert "Introduced zend.enable_dtrace INI directive to enable/disable PHP call tracing"

This reverts commit 01239b0effbc1839aca6d03cdd4c3a0c1a509798.

diff --git a/NEWS b/NEWS
index a96d1c61acbf6dce95aa933cf2d2dce5f7724bda..94826541fd71d1324fc9baa13cbf8e1a0f886ea6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,10 +8,6 @@ PHP                                                                        NEWS
 - Date:
   . Fixed bug #69587 (DateInterval properties and isset). (jhdxr)
 
-- DTrace
-  . Introduced zend.enable_dtrace INI directive to enable/disable PHP
-    call tracing. It's disabled by default. (Dmitry)
-
 - Mbstring:
   . Fixed bug #73532 (Null pointer dereference in mb_eregi). (Laruence)
 

diff --git a/Zend/zend.c b/Zend/zend.c
index 8d221e82aa526fbb933591e5142714f0b2973ddf..12801c8b70a322efca3f43ca53ea3a9e8dc05698 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -134,9 +134,6 @@ ZEND_INI_BEGIN()
        STD_ZEND_INI_BOOLEAN("zend.multibyte", "0", ZEND_INI_PERDIR, OnUpdateBool, multibyte,      zend_compiler_globals, compiler_globals)
        ZEND_INI_ENTRY("zend.script_encoding",                  NULL,           ZEND_INI_ALL,           OnUpdateScriptEncoding)
        STD_ZEND_INI_BOOLEAN("zend.detect_unicode",                     "1",    ZEND_INI_ALL,           OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
-#if HAVE_DTRACE
-       STD_ZEND_INI_BOOLEAN("zend.enable_dtrace",                      "0",    ZEND_INI_SYSTEM,        OnUpdateBool, dtrace_enable,  zend_executor_globals, executor_globals)
-#endif
 #ifdef ZEND_SIGNALS
        STD_ZEND_INI_BOOLEAN("zend.signal_check", "0", ZEND_INI_SYSTEM, OnUpdateBool, check, zend_signal_globals_t, zend_signal_globals)
 #endif
@@ -694,9 +691,16 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) /
 
        zend_interrupt_function = NULL;
 
+#if HAVE_DTRACE
+/* build with dtrace support */
+       zend_compile_file = dtrace_compile_file;
+       zend_execute_ex = dtrace_execute_ex;
+       zend_execute_internal = dtrace_execute_internal;
+#else
        zend_compile_file = compile_file;
        zend_execute_ex = execute_ex;
        zend_execute_internal = NULL;
+#endif /* HAVE_SYS_SDT_H */
        zend_compile_string = compile_string;
        zend_throw_exception_hook = NULL;
 
@@ -822,14 +826,6 @@ void zend_post_startup(void) /* {{{ */
 #else
        virtual_cwd_deactivate();
 #endif
-#if HAVE_DTRACE
-       /* build with dtrace support */
-       if (EG(dtrace_enable)) {
-               zend_compile_file = dtrace_compile_file;
-               zend_execute_ex = dtrace_execute_ex;
-               zend_execute_internal = dtrace_execute_internal;
-       }
-#endif
 }
 /* }}} */
 

diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 4609c2637471be3f0ae56c9f4c395e19fb5a9cf6..fbbf503c4125494c82fce74d90e0ae2c46296ac1 100644 (file)
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -217,10 +217,6 @@ struct _zend_executor_globals {
        zend_bool active;
        zend_bool valid_symbol_table;
 
-#if HAVE_DTRACE
-       zend_bool dtrace_enable;
-#endif
-
        zend_long assertions;
 
        uint32_t           ht_iterators_count;     /* number of allocatd slots */