dsp Mon, 20 Jul 2009 10:12:34 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=284424
Changed paths:
U php/php-src/trunk/Zend/zend.c
U php/php-src/trunk/Zend/zend_dtrace.c
U php/php-src/trunk/Zend/zend_dtrace.h
U php/php-src/trunk/Zend/zend_exceptions.c
U php/php-src/trunk/Zend/zend_vm_def.h
U php/php-src/trunk/Zend/zend_vm_execute.h
U php/php-src/trunk/configure.in
U php/php-src/trunk/main/main.c
Log:
- Define HAVE_DTRACE if dtrace is available and ifdef all calls to dtrace probes
Modified: php/php-src/trunk/Zend/zend.c
===================================================================
--- php/php-src/trunk/Zend/zend.c 2009-07-20 10:12:12 UTC (rev 284423)
+++ php/php-src/trunk/Zend/zend.c 2009-07-20 10:12:34 UTC (rev 284424)
@@ -1590,12 +1590,14 @@
va_start(args, format);
+#ifdef HAVE_DTRACE
if(DTRACE_ERROR_ENABLED()) {
char *dtrace_error_buffer;
zend_vspprintf(&dtrace_error_buffer, 0, format, args);
DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);
efree(dtrace_error_buffer);
}
+#endif /* HAVE_DTRACE */
/* if we don't have a user defined error handler */
Modified: php/php-src/trunk/Zend/zend_dtrace.c
===================================================================
--- php/php-src/trunk/Zend/zend_dtrace.c 2009-07-20 10:12:12 UTC (rev
284423)
+++ php/php-src/trunk/Zend/zend_dtrace.c 2009-07-20 10:12:34 UTC (rev
284424)
@@ -22,7 +22,7 @@
#include "zend_API.h"
#include "zend_dtrace.h"
-#ifdef HAVE_SYS_SDT_H
+#ifdef HAVE_DTRACE
/* PHP DTrace probes {{{ */
static inline char *dtrace_get_executed_filename(TSRMLS_D)
{
@@ -118,5 +118,5 @@
}
/* }}} */
-#endif
+#endif /* HAVE_DTRACE */
Modified: php/php-src/trunk/Zend/zend_dtrace.h
===================================================================
--- php/php-src/trunk/Zend/zend_dtrace.h 2009-07-20 10:12:12 UTC (rev
284423)
+++ php/php-src/trunk/Zend/zend_dtrace.h 2009-07-20 10:12:34 UTC (rev
284424)
@@ -29,7 +29,7 @@
extern "C" {
#endif
-#ifdef HAVE_SYS_SDT_H
+#ifdef HAVE_DTRACE
ZEND_API zend_op_array *(*zend_dtrace_compile_file)(zend_file_handle
*file_handle, int type TSRMLS_DC);
ZEND_API void (*zend_dtrace_execute)(zend_op_array *op_array TSRMLS_DC);
ZEND_API void (*zend_dtrace_execute_internal)(zend_execute_data
*execute_data_ptr, int return_value_used TSRMLS_DC);
@@ -39,33 +39,8 @@
ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr, int
return_value_used TSRMLS_DC);
#include <zend_dtrace_gen.h>
-#else
+#endif /* HAVE_DTRACE */
-#define DTRACE_COMPILE_FILE_ENTRY(arg0, arg1)
-#define DTRACE_COMPILE_FILE_ENTRY_ENABLED() (0)
-#define DTRACE_COMPILE_FILE_RETURN(arg0, arg1)
-#define DTRACE_COMPILE_FILE_RETURN_ENABLED() (0)
-#define DTRACE_ERROR(arg0, arg1, arg2)
-#define DTRACE_ERROR_ENABLED() (0)
-#define DTRACE_EXCEPTION_CAUGHT(arg0)
-#define DTRACE_EXCEPTION_CAUGHT_ENABLED() (0)
-#define DTRACE_EXCEPTION_THROWN(arg0)
-#define DTRACE_EXCEPTION_THROWN_ENABLED() (0)
-#define DTRACE_EXECUTE_ENTRY(arg0, arg1)
-#define DTRACE_EXECUTE_ENTRY_ENABLED() (0)
-#define DTRACE_EXECUTE_RETURN(arg0, arg1)
-#define DTRACE_EXECUTE_RETURN_ENABLED() (0)
-#define DTRACE_FUNCTION_ENTRY(arg0, arg1, arg2, arg3, arg4)
-#define DTRACE_FUNCTION_ENTRY_ENABLED() (0)
-#define DTRACE_FUNCTION_RETURN(arg0, arg1, arg2, arg3, arg4)
-#define DTRACE_FUNCTION_RETURN_ENABLED() (0)
-#define DTRACE_REQUEST_SHUTDOWN(arg0, arg1, arg2)
-#define DTRACE_REQUEST_SHUTDOWN_ENABLED() (0)
-#define DTRACE_REQUEST_STARTUP(arg0, arg1, arg2)
-#define DTRACE_REQUEST_STARTUP_ENABLED() (0)
-
-#endif /* HAVE_SYS_SDT */
-
#ifdef __cplusplus
}
#endif
Modified: php/php-src/trunk/Zend/zend_exceptions.c
===================================================================
--- php/php-src/trunk/Zend/zend_exceptions.c 2009-07-20 10:12:12 UTC (rev
284423)
+++ php/php-src/trunk/Zend/zend_exceptions.c 2009-07-20 10:12:34 UTC (rev
284424)
@@ -83,6 +83,7 @@
void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
{
+#ifdef HAVE_DTRACE
if (DTRACE_EXCEPTION_THROWN_ENABLED()) {
zstr classname;
char *s_classname;
@@ -97,6 +98,7 @@
efree(classname.v);
efree(s_classname);
}
+#endif /* HAVE_DTRACE */
if (exception != NULL) {
zval *previous = EG(exception);
Modified: php/php-src/trunk/Zend/zend_vm_def.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_def.h 2009-07-20 10:12:12 UTC (rev
284423)
+++ php/php-src/trunk/Zend/zend_vm_def.h 2009-07-20 10:12:34 UTC (rev
284424)
@@ -2627,6 +2627,7 @@
}
ce = Z_OBJCE_P(EG(exception));
+#ifdef HAVE_DTRACE
if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
char *s_classname;
int s_classname_len;
@@ -2634,6 +2635,7 @@
DTRACE_EXCEPTION_CAUGHT(s_classname);
efree(s_classname);
}
+#endif /* HAVE_DTRACE */
if (ce != EX_T(opline->op1.u.var).class_entry) {
if (!instanceof_function(ce,
EX_T(opline->op1.u.var).class_entry TSRMLS_CC)) {
Modified: php/php-src/trunk/Zend/zend_vm_execute.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_execute.h 2009-07-20 10:12:12 UTC (rev
284423)
+++ php/php-src/trunk/Zend/zend_vm_execute.h 2009-07-20 10:12:34 UTC (rev
284424)
@@ -1191,6 +1191,7 @@
}
ce = Z_OBJCE_P(EG(exception));
+#ifdef HAVE_DTRACE
if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
char *s_classname;
int s_classname_len;
@@ -1198,6 +1199,7 @@
DTRACE_EXCEPTION_CAUGHT(s_classname);
efree(s_classname);
}
+#endif /* HAVE_DTRACE */
if (ce != EX_T(opline->op1.u.var).class_entry) {
if (!instanceof_function(ce,
EX_T(opline->op1.u.var).class_entry TSRMLS_CC)) {
Modified: php/php-src/trunk/configure.in
===================================================================
--- php/php-src/trunk/configure.in 2009-07-20 10:12:12 UTC (rev 284423)
+++ php/php-src/trunk/configure.in 2009-07-20 10:12:34 UTC (rev 284424)
@@ -907,7 +907,8 @@
[PHP_ADD_DTRACE([Zend/zend_dtrace.d], [main/main.c, Zend/zend_API.c \
Zend/zend_execute.c Zend/zend_exceptions.c \
Zend/zend_dtrace.c Zend/zend.c])
- PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h])],
+ PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h])
+ AC_DEFINE(HAVE_DTRACE, 1, [Whether to enable DTrace support])],
[])
fi
Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c 2009-07-20 10:12:12 UTC (rev 284423)
+++ php/php-src/trunk/main/main.c 2009-07-20 10:12:34 UTC (rev 284424)
@@ -1441,7 +1441,9 @@
{
int retval = SUCCESS;
+#ifdef HAVE_DTRACE
DTRACE_REQUEST_STARTUP(SAFE_FILENAME(SG(request_info).path_translated),
SAFE_FILENAME(SG(request_info).request_uri),
SAFE_FILENAME(SG(request_info).request_method));
+#endif /* HAVE_DTRACE */
#ifdef PHP_WIN32
PG(com_initialized) = 0;
@@ -1724,7 +1726,9 @@
}
#endif
+#ifdef HAVE_DTRACE
DTRACE_REQUEST_SHUTDOWN(SAFE_FILENAME(SG(request_info).path_translated),
SAFE_FILENAME(SG(request_info).request_uri),
SAFE_FILENAME(SG(request_info).request_method));
+#endif /* HAVE_DTRACE */
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
