diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-09-02 23:28:51 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-09-02 23:28:51 +0800 |
| commit | 362f787b75b4c64b90455691ac00c5efcdc3ad76 (patch) | |
| tree | 597a5268ca09dcf355133f40b20607c476c02231 /Zend/zend_dtrace.c | |
| parent | 6848cb3f6301db11e1925f4457c0b58c2d169ccf (diff) | |
| parent | 4e2afbc1a0e539cbf59791bb92aca7afaa1b7af3 (diff) | |
| download | php-git-362f787b75b4c64b90455691ac00c5efcdc3ad76.tar.gz | |
Merge branch 'fix-dtrace-phpdbg' of https://github.com/reeze/php-src
Diffstat (limited to 'Zend/zend_dtrace.c')
| -rw-r--r-- | Zend/zend_dtrace.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c index 613596dc38..784e4da527 100644 --- a/Zend/zend_dtrace.c +++ b/Zend/zend_dtrace.c @@ -23,6 +23,11 @@ #include "zend_dtrace.h" #ifdef HAVE_DTRACE + +ZEND_API zend_op_array *(*zend_dtrace_compile_file)(zend_file_handle *file_handle, int type); +ZEND_API void (*zend_dtrace_execute)(zend_op_array *op_array); +ZEND_API void (*zend_dtrace_execute_internal)(zend_execute_data *execute_data, zval *return_value); + /* PHP DTrace probes {{{ */ static inline const char *dtrace_get_executed_filename(void) { @@ -41,9 +46,9 @@ static inline const char *dtrace_get_executed_filename(void) ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type) { zend_op_array *res; - DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, (char *)file_handle->filename); + DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path->val, (char *)file_handle->filename); res = compile_file(file_handle, type); - DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, (char *)file_handle->filename); + DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path->val, (char *)file_handle->filename); return res; } |