com php-src: Pass zend_execute_data instead of zend _op_array: Zend/zend_dtrace.c Zend/zend_dtrace .h
| From: | David Soria Parra | Date: | Tue, 04 Dec 2012 23:45:23 +0000 |
| Subject: | com php-src: Pass zend_execute_data instead of zend _op_array: Zend/zend_dtrace.c Zend/zend_dtrace .h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70654@lists.php.net to get a copy of this message | ||
Commit: 288f8734f6eeae88ce9201295c22a7848d14e2ca
Author: David Soria Parra <dsp@php.net> Wed, 5 Dec 2012 00:45:23 +0100
Parents: 15a251a424918e0242fb868a063353e250d8f89f
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=288f8734f6eeae88ce9201295c22a7848d14e2ca
Log:
Pass zend_execute_data instead of zend_op_array
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 4e857a1..165172a 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_ex(zend_op_array *op_array TSRMLS_DC)
+ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data TSRMLS_DC)
{
int lineno;
char *scope, *filename, *funcname, *classname;
@@ -72,7 +72,7 @@ ZEND_API void dtrace_execute_ex(zend_op_array *op_array TSRMLS_DC)
DTRACE_FUNCTION_ENTRY(funcname, filename, lineno, classname, scope);
}
- execute_ex(op_array TSRMLS_CC);
+ execute_ex(execute_data 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 73c8845..26008af 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_ex(zend_op_array *op_array TSRMLS_DC);
+ZEND_API void dtrace_execute_ex(zend_execute_data *execute_data 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>