On Tue, Dec 4, 2012 at 9:01 PM, David Soria Parra <d...@php.net> wrote:
Advertising
> Commit: 15a251a424918e0242fb868a063353e250d8f89f > Author: David Soria Parra <d...@php.net> Tue, 4 Dec 2012 > 21:01:32 +0100 > Parents: 3de00bc6152cec1c017877aca75bc92e4a034585 > Branches: PHP-5.5 master > > Link: > http://git.php.net/?p=php-src.git;a=commitdiff;h=15a251a424918e0242fb868a063353e250d8f89f > > Log: > Overwrite execute_ex instead of execute in dtrace_execute > > Changed paths: > M Zend/zend_dtrace.c > M Zend/zend_dtrace.h > > > Diff: > diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c > index 3d109de..4e857a1 100644 > --- a/Zend/zend_dtrace.c > +++ b/Zend/zend_dtrace.c > @@ -44,7 +44,7 @@ ZEND_API zend_op_array > *dtrace_compile_file(zend_file_handle *file_handle, int t > } > > /* We wrap the execute function to have fire the execute-entry/return and > function-entry/return probes */ > -ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC) > +ZEND_API void dtrace_execute_ex(zend_op_array *op_array TSRMLS_DC) > { > int lineno; > char *scope, *filename, *funcname, *classname; > @@ -72,7 +72,7 @@ ZEND_API void dtrace_execute(zend_op_array *op_array > TSRMLS_DC) > DTRACE_FUNCTION_ENTRY(funcname, filename, lineno, > classname, scope); > } > > - execute(op_array TSRMLS_CC); > + execute_ex(op_array TSRMLS_CC); > > if (DTRACE_FUNCTION_RETURN_ENABLED() && funcname != NULL) { > DTRACE_FUNCTION_RETURN(funcname, filename, lineno, > classname, scope); > diff --git a/Zend/zend_dtrace.h b/Zend/zend_dtrace.h > index 49388e5..73c8845 100644 > --- a/Zend/zend_dtrace.h > +++ b/Zend/zend_dtrace.h > @@ -35,7 +35,7 @@ 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, zend_fcall_info *fci, int return_value_used TSRMLS_DC); > > ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle > *file_handle, int type TSRMLS_DC); > -ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC); > +ZEND_API void dtrace_execute_ex(zend_op_array *op_array TSRMLS_DC); > ZEND_API void dtrace_execute_internal(zend_execute_data > *execute_data_ptr, zend_fcall_info *fci, int return_value_used TSRMLS_DC); > #include <zend_dtrace_gen.h> > This doesn't look quite right. execute_ex takes an execute_data, not an op_array. Nikita
