Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merged pull request #596
  • Loading branch information
derickr committed Jul 2, 2020
2 parents 8b694b3 + 9e4f079 commit 8568254
Show file tree
Hide file tree
Showing 166 changed files with 0 additions and 225 deletions.
6 changes: 0 additions & 6 deletions src/tracing/trace_html.c
Expand Up @@ -55,9 +55,6 @@ void xdebug_trace_html_write_header(void *ctxt)
fprintf(context->trace_file, "<table style='hyphens: auto; -webkit-hyphens: auto; -ms-hyphens: auto;' class='xdebug-trace' dir='ltr' border='1' cellspacing='0'>\n");
fprintf(context->trace_file, "\t<tr><th>#</th><th>Time</th>");
fprintf(context->trace_file, "<th>Mem</th>");
if (XINI_TRACE(show_mem_delta)) {
fprintf(context->trace_file, "<th>&#948; Mem</th>");
}
fprintf(context->trace_file, "<th colspan='2'>Function</th><th>Location</th></tr>\n");
fflush(context->trace_file);
}
Expand Down Expand Up @@ -88,9 +85,6 @@ void xdebug_trace_html_function_entry(void *ctxt, function_stack_entry *fse, int
xdebug_str_add(&str, xdebug_sprintf("<td>%d</td>", function_nr), 1);
xdebug_str_add(&str, xdebug_sprintf("<td>%0.6F</td>", fse->time - XG_BASE(start_time)), 1);
xdebug_str_add(&str, xdebug_sprintf("<td align='right'>%lu</td>", fse->memory), 1);
if (XINI_TRACE(show_mem_delta)) {
xdebug_str_add(&str, xdebug_sprintf("<td align='right'>%ld</td>", fse->memory - fse->prev_memory), 1);
}
xdebug_str_add(&str, "<td align='left'>", 0);
for (j = 0; j < fse->level - 1; j++) {
xdebug_str_add(&str, "&nbsp; &nbsp;", 0);
Expand Down
9 changes: 0 additions & 9 deletions src/tracing/trace_textual.c
Expand Up @@ -130,9 +130,6 @@ void xdebug_trace_textual_function_entry(void *ctxt, function_stack_entry *fse,

xdebug_str_add(&str, xdebug_sprintf("%10.4F ", fse->time - XG_BASE(start_time)), 1);
xdebug_str_add(&str, xdebug_sprintf("%10lu ", fse->memory), 1);
if (XINI_TRACE(show_mem_delta)) {
xdebug_str_add(&str, xdebug_sprintf("%+8ld ", fse->memory - fse->prev_memory), 1);
}
for (j = 0; j < fse->level; j++) {
xdebug_str_addl(&str, " ", 2, 0);
}
Expand Down Expand Up @@ -218,9 +215,6 @@ static void xdebug_return_trace_stack_common(xdebug_str *str, function_stack_ent
xdebug_str_add(str, xdebug_sprintf("%10.4F ", xdebug_get_utime() - XG_BASE(start_time)), 1);
xdebug_str_add(str, xdebug_sprintf("%10lu ", zend_memory_usage(0)), 1);

if (XINI_TRACE(show_mem_delta)) {
xdebug_str_addl(str, " ", 8, 0);
}
for (j = 0; j < fse->level; j++) {
xdebug_str_addl(str, " ", 2, 0);
}
Expand Down Expand Up @@ -296,9 +290,6 @@ void xdebug_trace_textual_assignment(void *ctxt, function_stack_entry *fse, char
xdebug_str *tmp_value;

xdebug_str_addl(&str, " ", 20, 0);
if (XINI_TRACE(show_mem_delta)) {
xdebug_str_addl(&str, " ", 8, 0);
}
for (j = 0; j <= fse->level; j++) {
xdebug_str_addl(&str, " ", 2, 0);
}
Expand Down
1 change: 0 additions & 1 deletion src/tracing/tracing.h
Expand Up @@ -45,7 +45,6 @@ typedef struct _xdebug_tracing_settings_t {
zend_long trace_options;
zend_long trace_format;

zend_bool show_mem_delta;
zend_bool collect_assignments;
zend_bool collect_return;
} xdebug_tracing_settings_t;
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00212-001.phpt
Expand Up @@ -7,7 +7,6 @@ xdebug.collect_params=1
xdebug.collect_return=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00212-002.phpt
Expand Up @@ -7,7 +7,6 @@ xdebug.collect_params=1
xdebug.collect_return=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00212-003-php72.phpt
Expand Up @@ -12,7 +12,6 @@ xdebug.collect_params=1
xdebug.collect_return=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00212-003-php74.phpt
Expand Up @@ -12,7 +12,6 @@ xdebug.collect_params=1
xdebug.collect_return=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00213-opcache.phpt
Expand Up @@ -12,7 +12,6 @@ xdebug.collect_params=1
xdebug.collect_return=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00213.phpt
Expand Up @@ -12,7 +12,6 @@ xdebug.collect_params=1
xdebug.collect_return=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00313.phpt
Expand Up @@ -3,7 +3,6 @@ Test for bug #313: Segmentation Fault in code coverage analysis on empty PHP fil
--INI--
xdebug.mode=coverage
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
--FILE--
<?php
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00334-noopcache.phpt
Expand Up @@ -8,7 +8,6 @@ check_reqs('!opcache');
--INI--
xdebug.mode=coverage
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00334-opcache.phpt
Expand Up @@ -8,7 +8,6 @@ check_reqs('opcache');
--INI--
xdebug.mode=coverage
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00470-php72.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00470-php74.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00472-php72.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00472-php74.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00515.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00697-php72.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00697-php74.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00703.phpt
Expand Up @@ -8,7 +8,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00757-001.phpt
Expand Up @@ -9,7 +9,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
--FILE--
<?php
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00757-002-php72-noopcache.phpt
Expand Up @@ -14,7 +14,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
--FILE--
<?php
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00757-002-php72-opcache.phpt
Expand Up @@ -14,7 +14,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
--FILE--
<?php
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00757-002-php74-noopcache.phpt
Expand Up @@ -14,7 +14,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
--FILE--
<?php
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00757-002-php74-opcache.phpt
Expand Up @@ -14,7 +14,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
--FILE--
<?php
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00766-php72.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00766-php74.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00879-php72.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug00879-php74.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug01180.phpt
Expand Up @@ -8,7 +8,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug01381.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug01386-php72-noopcache.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug01386-php72-opcache.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug01386-php74-noopcache.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug01386-php74-opcache.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/bug01502.phpt
Expand Up @@ -8,7 +8,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/coverage-php72.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/coverage-php74.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/coverage2-php72.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/coverage2-php74.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/coverage3.phpt
Expand Up @@ -8,7 +8,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/coverage4-php72.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/coverage4-php74.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/coverage5.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down
1 change: 0 additions & 1 deletion tests/coverage/coverage6-php72.phpt
Expand Up @@ -13,7 +13,6 @@ xdebug.collect_return=0
xdebug.collect_assignments=0
xdebug.auto_profile=0
xdebug.dump_globals=0
xdebug.show_mem_delta=0
xdebug.trace_format=0
xdebug.overload_var_dump=0
--FILE--
Expand Down

0 comments on commit 8568254

Please sign in to comment.