Commit:f3d18add089113a032d785169a6859c8719db307
Author:Xinchen Hui larue...@php.net Wed, 14 Aug 2013 11:44:37
+0800
Parents: bab33f7e05fce2ec3834149826da6cbb1545d962
f4dc2240a048050a87a6e3e31573f13a2256cf2e
Branches: PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=f3d18add089113a032d785169a6859c8719db307
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Changed paths:
MM Zend/zend.c
MM Zend/zend_dtrace.c
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM main/main.c
Diff:
diff --cc Zend/zend_dtrace.c
index 165172a,8846893..a07edd6
--- a/Zend/zend_dtrace.c
+++ b/Zend/zend_dtrace.c
@@@ -44,10 -44,10 +44,10 @@@ ZEND_API zend_op_array *dtrace_compile_
}
/* 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_execute_data *execute_data TSRMLS_DC)
{
int lineno;
- char *scope, *filename, *funcname, *classname;
+ const char *scope, *filename, *funcname, *classname;
scope = filename = funcname = classname = NULL;
/* we need filename and lineno for both execute and function probes */
@@@ -69,13 -69,13 +69,13 @@@
}
if (DTRACE_FUNCTION_ENTRY_ENABLED() funcname != NULL) {
- DTRACE_FUNCTION_ENTRY(funcname, filename, lineno, classname,
scope);
+ DTRACE_FUNCTION_ENTRY((char *)funcname, (char *)filename,
lineno, (char *)classname, (char *)scope);
}
- execute(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);
+ DTRACE_FUNCTION_RETURN((char *)funcname, (char *)filename,
lineno, (char *)classname, (char *)scope);
}
if (DTRACE_EXECUTE_RETURN_ENABLED()) {
@@@ -83,23 -83,23 +83,23 @@@
}
}
-ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr,
int return_value_used TSRMLS_DC)
+ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr,
zend_fcall_info *fci, int return_value_used TSRMLS_DC)
{
int lineno;
- char *filename;
+ const char *filename;
if (DTRACE_EXECUTE_ENTRY_ENABLED() || DTRACE_EXECUTE_RETURN_ENABLED()) {
filename = dtrace_get_executed_filename(TSRMLS_C);
lineno = zend_get_executed_lineno(TSRMLS_C);
}
if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
- DTRACE_EXECUTE_ENTRY(filename, lineno);
+ DTRACE_EXECUTE_ENTRY((char *)filename, lineno);
}
- execute_internal(execute_data_ptr, return_value_used TSRMLS_CC);
+ execute_internal(execute_data_ptr, fci, return_value_used TSRMLS_CC);
if (DTRACE_EXECUTE_RETURN_ENABLED()) {
- DTRACE_EXECUTE_RETURN(filename, lineno);
+ DTRACE_EXECUTE_RETURN((char *)filename, lineno);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
