Skip to content

Commit

Permalink
Merge branch 'triceratops-refactor'
Browse files Browse the repository at this point in the history
  • Loading branch information
@derickr
derickr committed Oct 25, 2014
2 parents b9c1eef + a858982 commit 37d2f7f
Show file tree
Hide file tree
Showing 28 changed files with 992 additions and 626 deletions.
2 changes: 1 addition & 1 deletion config.m4
View file
Expand Up @@ -26,7 +26,7 @@ dnl Check for new current_execute_data field in zend_executor_globals

CPPFLAGS=$old_CPPFLAGS

PHP_NEW_EXTENSION(xdebug, xdebug.c xdebug_branch_info.c xdebug_code_coverage.c xdebug_com.c xdebug_compat.c xdebug_handler_dbgp.c xdebug_handlers.c xdebug_llist.c xdebug_hash.c xdebug_private.c xdebug_profiler.c xdebug_set.c xdebug_stack.c xdebug_str.c xdebug_superglobals.c xdebug_tracing.c xdebug_var.c xdebug_xml.c usefulstuff.c, $ext_shared,,,,yes)
PHP_NEW_EXTENSION(xdebug, xdebug.c xdebug_branch_info.c xdebug_code_coverage.c xdebug_com.c xdebug_compat.c xdebug_handler_dbgp.c xdebug_handlers.c xdebug_llist.c xdebug_hash.c xdebug_private.c xdebug_profiler.c xdebug_set.c xdebug_stack.c xdebug_str.c xdebug_superglobals.c xdebug_tracing.c xdebug_trace_textual.c xdebug_trace_computerized.c xdebug_trace_html.c xdebug_var.c xdebug_xml.c usefulstuff.c, $ext_shared,,,,yes)
PHP_SUBST(XDEBUG_SHARED_LIBADD)
PHP_ADD_MAKEFILE_FRAGMENT
fi
2 changes: 1 addition & 1 deletion config.w32
View file
Expand Up @@ -4,6 +4,6 @@
ARG_WITH("xdebug", "Xdebug support", "no");

if (PHP_XDEBUG == "yes") {
EXTENSION("xdebug", "xdebug.c xdebug_branch_info.c xdebug_code_coverage.c xdebug_com.c xdebug_compat.c xdebug_handler_dbgp.c xdebug_handlers.c xdebug_llist.c xdebug_hash.c xdebug_private.c xdebug_profiler.c xdebug_set.c xdebug_stack.c xdebug_str.c xdebug_superglobals.c xdebug_tracing.c xdebug_var.c xdebug_xml.c usefulstuff.c");
EXTENSION("xdebug", "xdebug.c xdebug_branch_info.c xdebug_code_coverage.c xdebug_com.c xdebug_compat.c xdebug_handler_dbgp.c xdebug_handlers.c xdebug_llist.c xdebug_hash.c xdebug_private.c xdebug_profiler.c xdebug_set.c xdebug_stack.c xdebug_str.c xdebug_superglobals.c xdebug_tracing.c xdebug_trace_textual.c xdebug_trace_computerized.c xdebug_trace_html.c xdebug_var.c xdebug_xml.c usefulstuff.c");
AC_DEFINE("HAVE_XDEBUG", 1, "Xdebug support");
}
6 changes: 6 additions & 0 deletions package.xml
View file
Expand Up @@ -177,6 +177,12 @@ Tue, May 08, 2012 - xdebug 2.2.0
<file name="xdebug_superglobals.h" role="src" />
<file name="xdebug_tracing.c" role="src" />
<file name="xdebug_tracing.h" role="src" />
<file name="xdebug_trace_textual.c" role="src" />
<file name="xdebug_trace_textual.h" role="src" />
<file name="xdebug_trace_computerized.c" role="src" />
<file name="xdebug_trace_computerized.h" role="src" />
<file name="xdebug_trace_html.c" role="src" />
<file name="xdebug_trace_html.h" role="src" />
<file name="xdebug_var.c" role="src" />
<file name="xdebug_var.h" role="src" />
<file name="xdebug_xml.c" role="src" />
Expand Down
6 changes: 4 additions & 2 deletions php_xdebug.h
View file
Expand Up @@ -176,15 +176,17 @@ ZEND_BEGIN_MODULE_GLOBALS(xdebug)
void (*orig_var_dump_func)(INTERNAL_FUNCTION_PARAMETERS);
void (*orig_set_time_limit_func)(INTERNAL_FUNCTION_PARAMETERS);

FILE *trace_file;
xdebug_trace_handler_t *trace_handler;
void *trace_context;

zend_bool do_trace;
zend_bool auto_trace;
zend_bool trace_enable_trigger;
char *trace_output_dir;
char *trace_output_name;
long trace_options;
long trace_format;
char *tracefile_name;
//char *tracefile_name;
char *last_exception_trace;
char *last_eval_statement;

Expand Down
2 changes: 1 addition & 1 deletion tests/bug00538-2.phpt
View file
Expand Up @@ -48,7 +48,7 @@ array(2) {
["params"]=>
array(3) {
["param1"]=>
string(%d) "'%sxdebug'"
string(%d) "'%s'"
["param2"]=>
string(16) "'candena\\a\\nb'"
["param3"]=>
Expand Down
18 changes: 9 additions & 9 deletions tests/stacktrace_variadic_html_0.phpt
View file
Expand Up @@ -32,28 +32,28 @@ foo( "foo", "bar", 3.1415 );
<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> Notice: notice in %sstacktrace_variadic_html_0.php on line <i>4</i></th></tr>
<tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
<tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_0.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_0.php<b>:</b>7</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_0.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_0.php<b>:</b>7</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>3</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/function.trigger-error.html' target='_new'>trigger_error</a>
( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_0.php<b>:</b>4</td></tr>
( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_0.php<b>:</b>4</td></tr>
</table></font>
<br />
<font size='1'><table class='xdebug-error xe-notice' dir='ltr' border='1' cellspacing='0' cellpadding='1'>
<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> Notice: notice in %sstacktrace_variadic_html_0.php on line <i>4</i></th></tr>
<tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
<tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_0.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_0.php<b>:</b>8</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_0.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_0.php<b>:</b>8</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>3</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/function.trigger-error.html' target='_new'>trigger_error</a>
( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_0.php<b>:</b>4</td></tr>
( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_0.php<b>:</b>4</td></tr>
</table></font>
<br />
<font size='1'><table class='xdebug-error xe-notice' dir='ltr' border='1' cellspacing='0' cellpadding='1'>
<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> Notice: notice in %sstacktrace_variadic_html_0.php on line <i>4</i></th></tr>
<tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
<tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_0.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_0.php<b>:</b>9</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_0.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_0.php<b>:</b>9</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>3</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/function.trigger-error.html' target='_new'>trigger_error</a>
( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_0.php<b>:</b>4</td></tr>
( )</td><td title='%sstacktrace_variadic_html_0.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_0.php<b>:</b>4</td></tr>
</table></font>
18 changes: 9 additions & 9 deletions tests/stacktrace_variadic_html_1.phpt
View file
Expand Up @@ -32,28 +32,28 @@ foo( "foo", "bar", 3.1415 );
<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> Notice: notice in %sstacktrace_variadic_html_1.php on line <i>4</i></th></tr>
<tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
<tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_1.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( <span><font color='#4e9a06'>long</font></span>, ??? )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_1.php<b>:</b>7</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_1.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( <span><font color='#4e9a06'>long</font></span>, ??? )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_1.php<b>:</b>7</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>3</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/function.trigger-error.html' target='_new'>trigger_error</a>
( <span><font color='#cc0000'>string(6)</font></span> )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_1.php<b>:</b>4</td></tr>
( <span><font color='#cc0000'>string(6)</font></span> )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_1.php<b>:</b>4</td></tr>
</table></font>
<br />
<font size='1'><table class='xdebug-error xe-notice' dir='ltr' border='1' cellspacing='0' cellpadding='1'>
<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> Notice: notice in %sstacktrace_variadic_html_1.php on line <i>4</i></th></tr>
<tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
<tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_1.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( <span><font color='#4e9a06'>long</font></span>, ...<i>variadic</i>(<span><font color='#75507b'>bool</font></span>) )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_1.php<b>:</b>8</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_1.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( <span><font color='#4e9a06'>long</font></span>, ...<i>variadic</i>(<span><font color='#75507b'>bool</font></span>) )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_1.php<b>:</b>8</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>3</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/function.trigger-error.html' target='_new'>trigger_error</a>
( <span><font color='#cc0000'>string(6)</font></span> )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_1.php<b>:</b>4</td></tr>
( <span><font color='#cc0000'>string(6)</font></span> )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_1.php<b>:</b>4</td></tr>
</table></font>
<br />
<font size='1'><table class='xdebug-error xe-notice' dir='ltr' border='1' cellspacing='0' cellpadding='1'>
<tr><th align='left' bgcolor='#f57900' colspan="5"><span style='background-color: #cc0000; color: #fce94f; font-size: x-large;'>( ! )</span> Notice: notice in %sstacktrace_variadic_html_1.php on line <i>4</i></th></tr>
<tr><th align='left' bgcolor='#e9b96e' colspan='5'>Call Stack</th></tr>
<tr><th align='center' bgcolor='#eeeeec'>#</th><th align='left' bgcolor='#eeeeec'>Time</th><th align='left' bgcolor='#eeeeec'>Memory</th><th align='left' bgcolor='#eeeeec'>Function</th><th align='left' bgcolor='#eeeeec'>Location</th></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_1.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( <span><font color='#cc0000'>string(3)</font></span>, ...<i>variadic</i>(<span><font color='#cc0000'>string(3)</font></span>, <span><font color='#f57900'>double</font></span>) )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_1.php<b>:</b>9</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>1</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>{main}( )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_1.php<b>:</b>0</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>2</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'>foo( <span><font color='#cc0000'>string(3)</font></span>, ...<i>variadic</i>(<span><font color='#cc0000'>string(3)</font></span>, <span><font color='#f57900'>double</font></span>) )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_1.php<b>:</b>9</td></tr>
<tr><td bgcolor='#eeeeec' align='center'>3</td><td bgcolor='#eeeeec' align='center'>%f</td><td bgcolor='#eeeeec' align='right'>%d</td><td bgcolor='#eeeeec'><a href='http://www.php.net/function.trigger-error.html' target='_new'>trigger_error</a>
( <span><font color='#cc0000'>string(6)</font></span> )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>../stacktrace_variadic_html_1.php<b>:</b>4</td></tr>
( <span><font color='#cc0000'>string(6)</font></span> )</td><td title='%sstacktrace_variadic_html_1.php' bgcolor='#eeeeec'>.../stacktrace_variadic_html_1.php<b>:</b>4</td></tr>
</table></font>

0 comments on commit 37d2f7f

Please sign in to comment.