Re: [PHP-CVS] svn: php/php-src/trunk/ Zend/zend.c Zend/zend_dtrace.c Zend/zend_dtrace.h Zend/zend_exceptions.c Zend/zend_vm_def.h Zend/zend_vm_execute.h configure.in main/main.c

[Pierre Joye]

On Mon, Jul 20, 2009 at 12:12 PM, David Soria Parra wrote:

> Log:
> - Define HAVE_DTRACE if dtrace is available and ifdef all calls to dtrace 
> probes

Thanks! :)

Cheers,
-- 
Pierre

http://blog.thepimp.net | http://www.libgd.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: php/php-src/trunk/ Zend/zend.c Zend/zend_dtrace.c Zend/zend_dtrace.h Zend/zend_exceptions.c Zend/zend_vm_def.h Zend/zend_vm_execute.h configure.in main/main.c

[David Soria Parra]

dsp Mon, 20 Jul 2009 10:12:34 +

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.c2009-07-20 10:12:12 UTC (rev 
284423)
+++ php/php-src/trunk/Zend/zend_dtrace.c2009-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.h2009-07-20 10:12:12 UTC (rev 
284423)
+++ php/php-src/trunk/Zend/zend_dtrace.h2009-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 

-#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.c2009-07-20 10:12:12 UTC (rev 
284423)
+++ php/php-src/trunk/Zend/zend_exceptions.c2009-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.h2009-07-20 10:12:12 UTC (rev 
284423)
+++ php/php-src/trunk/Zend/zend_vm_def.h2009-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_classnam