dsp Mon, 16 Nov 2009 02:06:44 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=290800
Log:
Set eol-style
Changed paths:
UU php/php-src/trunk/Zend/zend_dtrace.c
UU php/php-src/trunk/Zend/zend_dtrace.d
UU php/php-src/trunk/Zend/zend_dtrace.h
Modified: php/php-src/trunk/Zend/zend_dtrace.c
===================================================================
--- php/php-src/trunk/Zend/zend_dtrace.c 2009-11-15 22:13:05 UTC (rev 290799)
+++ php/php-src/trunk/Zend/zend_dtrace.c 2009-11-16 02:06:44 UTC (rev 290800)
@@ -1,122 +1,122 @@
-/*
- +----------------------------------------------------------------------+
- | Zend Engine |
- +----------------------------------------------------------------------+
- | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.00 of the Zend license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.zend.com/license/2_00.txt. |
- | If you did not receive a copy of the Zend license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | lice...@zend.com so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: David Soria Parra <david.soriapa...@sun.com> |
- +----------------------------------------------------------------------+
-*/
-
-/* $Id: $ */
-
-#include "zend.h"
-#include "zend_API.h"
-#include "zend_dtrace.h"
-
-#ifdef HAVE_DTRACE
-/* PHP DTrace probes {{{ */
-static inline char *dtrace_get_executed_filename(TSRMLS_D)
-{
- if (EG(current_execute_data) && EG(current_execute_data)->op_array) {
- return EG(current_execute_data)->op_array->filename;
- } else {
- return zend_get_executed_filename(TSRMLS_C);
- }
-}
-
-ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC)
-{
- zend_op_array *res;
- DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, file_handle->filename);
- res = compile_file(file_handle, type TSRMLS_CC);
- DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, file_handle->filename);
-
- return res;
-}
-
-/* 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)
-{
- int lineno, s_funcname_len, s_classname_len;
- char *scope, *filename, *s_funcname, *s_classname;
- zstr classname, funcname;
-
- scope = filename = s_funcname = s_classname = NULL;
- classname = funcname = EMPTY_ZSTR;
-
- /* we need filename and lineno for both execute and function probes */
- if (DTRACE_EXECUTE_ENTRY_ENABLED() || DTRACE_EXECUTE_RETURN_ENABLED()
- || DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
- filename = dtrace_get_executed_filename(TSRMLS_C);
- lineno = zend_get_executed_lineno(TSRMLS_C);
- }
-
- if (DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
- funcname = get_active_function_name(TSRMLS_C);
- classname = get_active_class_name(&scope TSRMLS_CC);
-
- /* We encode everything to utf8 so that we have a predictable output */
- if (funcname.u != NULL)
- zend_unicode_to_string(ZEND_U_CONVERTER(UG(utf8_conv)), &s_funcname, &s_funcname_len, funcname.u, u_strlen(funcname.u) TSRMLS_CC);
-
- /* classname might be EMPTY_STR, in that case we have pass NULL to the probe, so that
- we use appropriate predicates in our dtrace scripts to detect if we are in class context */
- if (u_strlen(classname.u) > 0)
- zend_unicode_to_string(ZEND_U_CONVERTER(UG(utf8_conv)), &s_classname, &s_classname_len, classname.u, u_strlen(classname.u) TSRMLS_CC);
- }
-
- if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
- DTRACE_EXECUTE_ENTRY(filename, lineno);
- }
-
- if (DTRACE_FUNCTION_ENTRY_ENABLED() && funcname.u != NULL) {
- DTRACE_FUNCTION_ENTRY(s_funcname, filename, lineno, s_classname, scope);
- }
-
- execute(op_array TSRMLS_CC);
-
- if (DTRACE_FUNCTION_RETURN_ENABLED() && funcname.u != NULL) {
- DTRACE_FUNCTION_RETURN(s_funcname, filename, lineno, s_classname, scope);
- }
-
- if (DTRACE_EXECUTE_RETURN_ENABLED()) {
- DTRACE_EXECUTE_RETURN(filename, lineno);
- }
-
- if (DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
- /* s_funcname and s_classname were allocated by zend_unicode_to_string */
- if (s_funcname != NULL)
- efree(s_funcname);
- if (s_classname != NULL)
- efree(s_classname);
- }
-}
-
-ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC)
-{
- int lineno;
- 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);
- }
-
- DTRACE_EXECUTE_ENTRY(filename, lineno);
-
- execute_internal(execute_data_ptr, return_value_used TSRMLS_CC);
-
- DTRACE_EXECUTE_RETURN(filename, lineno);
-}
-
-/* }}} */
-#endif /* HAVE_DTRACE */
-
+/*
+ +----------------------------------------------------------------------+
+ | Zend Engine |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 2.00 of the Zend license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.zend.com/license/2_00.txt. |
+ | If you did not receive a copy of the Zend license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | lice...@zend.com so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Authors: David Soria Parra <david.soriapa...@sun.com> |
+ +----------------------------------------------------------------------+
+*/
+
+/* $Id: $ */
+
+#include "zend.h"
+#include "zend_API.h"
+#include "zend_dtrace.h"
+
+#ifdef HAVE_DTRACE
+/* PHP DTrace probes {{{ */
+static inline char *dtrace_get_executed_filename(TSRMLS_D)
+{
+ if (EG(current_execute_data) && EG(current_execute_data)->op_array) {
+ return EG(current_execute_data)->op_array->filename;
+ } else {
+ return zend_get_executed_filename(TSRMLS_C);
+ }
+}
+
+ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC)
+{
+ zend_op_array *res;
+ DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, file_handle->filename);
+ res = compile_file(file_handle, type TSRMLS_CC);
+ DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, file_handle->filename);
+
+ return res;
+}
+
+/* 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)
+{
+ int lineno, s_funcname_len, s_classname_len;
+ char *scope, *filename, *s_funcname, *s_classname;
+ zstr classname, funcname;
+
+ scope = filename = s_funcname = s_classname = NULL;
+ classname = funcname = EMPTY_ZSTR;
+
+ /* we need filename and lineno for both execute and function probes */
+ if (DTRACE_EXECUTE_ENTRY_ENABLED() || DTRACE_EXECUTE_RETURN_ENABLED()
+ || DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
+ filename = dtrace_get_executed_filename(TSRMLS_C);
+ lineno = zend_get_executed_lineno(TSRMLS_C);
+ }
+
+ if (DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
+ funcname = get_active_function_name(TSRMLS_C);
+ classname = get_active_class_name(&scope TSRMLS_CC);
+
+ /* We encode everything to utf8 so that we have a predictable output */
+ if (funcname.u != NULL)
+ zend_unicode_to_string(ZEND_U_CONVERTER(UG(utf8_conv)), &s_funcname, &s_funcname_len, funcname.u, u_strlen(funcname.u) TSRMLS_CC);
+
+ /* classname might be EMPTY_STR, in that case we have pass NULL to the probe, so that
+ we use appropriate predicates in our dtrace scripts to detect if we are in class context */
+ if (u_strlen(classname.u) > 0)
+ zend_unicode_to_string(ZEND_U_CONVERTER(UG(utf8_conv)), &s_classname, &s_classname_len, classname.u, u_strlen(classname.u) TSRMLS_CC);
+ }
+
+ if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
+ DTRACE_EXECUTE_ENTRY(filename, lineno);
+ }
+
+ if (DTRACE_FUNCTION_ENTRY_ENABLED() && funcname.u != NULL) {
+ DTRACE_FUNCTION_ENTRY(s_funcname, filename, lineno, s_classname, scope);
+ }
+
+ execute(op_array TSRMLS_CC);
+
+ if (DTRACE_FUNCTION_RETURN_ENABLED() && funcname.u != NULL) {
+ DTRACE_FUNCTION_RETURN(s_funcname, filename, lineno, s_classname, scope);
+ }
+
+ if (DTRACE_EXECUTE_RETURN_ENABLED()) {
+ DTRACE_EXECUTE_RETURN(filename, lineno);
+ }
+
+ if (DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
+ /* s_funcname and s_classname were allocated by zend_unicode_to_string */
+ if (s_funcname != NULL)
+ efree(s_funcname);
+ if (s_classname != NULL)
+ efree(s_classname);
+ }
+}
+
+ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC)
+{
+ int lineno;
+ 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);
+ }
+
+ DTRACE_EXECUTE_ENTRY(filename, lineno);
+
+ execute_internal(execute_data_ptr, return_value_used TSRMLS_CC);
+
+ DTRACE_EXECUTE_RETURN(filename, lineno);
+}
+
+/* }}} */
+#endif /* HAVE_DTRACE */
+
Property changes on: php/php-src/trunk/Zend/zend_dtrace.c
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: php/php-src/trunk/Zend/zend_dtrace.d
===================================================================
--- php/php-src/trunk/Zend/zend_dtrace.d 2009-11-15 22:13:05 UTC (rev 290799)
+++ php/php-src/trunk/Zend/zend_dtrace.d 2009-11-16 02:06:44 UTC (rev 290800)
@@ -1,37 +1,37 @@
-/*
- +----------------------------------------------------------------------+
- | Zend Engine |
- +----------------------------------------------------------------------+
- | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.00 of the Zend license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.zend.com/license/2_00.txt. |
- | If you did not receive a copy of the Zend license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | lice...@zend.com so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: David Soria Parra <david.soriapa...@sun.com> |
- +----------------------------------------------------------------------+
-*/
-
-/* $Id: $ */
-
-provider php {
- probe exception__caught(char *classname);
- probe exception__thrown(char* classname);
- probe request__startup(char* request_file, char* request_uri, char* request_method);
- probe request__shutdown(char* request_file, char* request_uri, char* request_method);
- probe compile__file__entry(char * compile_file, char *compile_file_translated);
- probe compile__file__return(char *compile_file, char *compile_file_translated);
- probe error(char *errormsg, char *request_file, int lineno);
- probe execute__entry(char* request_file, int lineno);
- probe execute__return(char* request_file, int lineno);
- probe function__entry(char* function_name, char* request_file, int lineno, char* classname, char* scope);
- probe function__return(char* function_name, char* request_file, int lineno, char* classname, char* scope);
-};
-
-#pragma D attributes Evolving/Evolving/Common provider php provider
-#pragma D attributes Private/Private/Unknown provider php module
-#pragma D attributes Private/Private/Unknown provider php function
+/*
+ +----------------------------------------------------------------------+
+ | Zend Engine |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 2.00 of the Zend license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.zend.com/license/2_00.txt. |
+ | If you did not receive a copy of the Zend license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | lice...@zend.com so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Authors: David Soria Parra <david.soriapa...@sun.com> |
+ +----------------------------------------------------------------------+
+*/
+
+/* $Id: $ */
+
+provider php {
+ probe exception__caught(char *classname);
+ probe exception__thrown(char* classname);
+ probe request__startup(char* request_file, char* request_uri, char* request_method);
+ probe request__shutdown(char* request_file, char* request_uri, char* request_method);
+ probe compile__file__entry(char * compile_file, char *compile_file_translated);
+ probe compile__file__return(char *compile_file, char *compile_file_translated);
+ probe error(char *errormsg, char *request_file, int lineno);
+ probe execute__entry(char* request_file, int lineno);
+ probe execute__return(char* request_file, int lineno);
+ probe function__entry(char* function_name, char* request_file, int lineno, char* classname, char* scope);
+ probe function__return(char* function_name, char* request_file, int lineno, char* classname, char* scope);
+};
+
+#pragma D attributes Evolving/Evolving/Common provider php provider
+#pragma D attributes Private/Private/Unknown provider php module
+#pragma D attributes Private/Private/Unknown provider php function
Property changes on: php/php-src/trunk/Zend/zend_dtrace.d
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: php/php-src/trunk/Zend/zend_dtrace.h
===================================================================
--- php/php-src/trunk/Zend/zend_dtrace.h 2009-11-15 22:13:05 UTC (rev 290799)
+++ php/php-src/trunk/Zend/zend_dtrace.h 2009-11-16 02:06:44 UTC (rev 290800)
@@ -1,48 +1,48 @@
-/*
- +----------------------------------------------------------------------+
- | Zend Engine |
- +----------------------------------------------------------------------+
- | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
- +----------------------------------------------------------------------+
- | This source file is subject to version 2.00 of the Zend license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | http://www.zend.com/license/2_00.txt. |
- | If you did not receive a copy of the Zend license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | lice...@zend.com so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Authors: David Soria Parra <david.soriapa...@sun.com> |
- +----------------------------------------------------------------------+
-*/
-
-/* $Id: $ */
-
-#ifndef _ZEND_DTRACE_H
-#define _ZEND_DTRACE_H
-
-#ifndef ZEND_WIN32
-# include <unistd.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#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);
-
-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_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC);
-#include <zend_dtrace_gen.h>
-
-#endif /* HAVE_DTRACE */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ZEND_DTRACE_H */
+/*
+ +----------------------------------------------------------------------+
+ | Zend Engine |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 2.00 of the Zend license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.zend.com/license/2_00.txt. |
+ | If you did not receive a copy of the Zend license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | lice...@zend.com so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Authors: David Soria Parra <david.soriapa...@sun.com> |
+ +----------------------------------------------------------------------+
+*/
+
+/* $Id: $ */
+
+#ifndef _ZEND_DTRACE_H
+#define _ZEND_DTRACE_H
+
+#ifndef ZEND_WIN32
+# include <unistd.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#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);
+
+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_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC);
+#include <zend_dtrace_gen.h>
+
+#endif /* HAVE_DTRACE */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _ZEND_DTRACE_H */
Property changes on: php/php-src/trunk/Zend/zend_dtrace.h
___________________________________________________________________
Added: svn:eol-style
+ native
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
