Skip to content

Commit

Permalink
Merged pull request #591
Browse files Browse the repository at this point in the history
  • Loading branch information
@derickr
derickr committed Jun 28, 2020
2 parents 44f0e99 + b566e91 commit 97a2fbb
Show file tree
Hide file tree
Showing 232 changed files with 2,132 additions and 1,681 deletions.
8 changes: 5 additions & 3 deletions config.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,20 +77,22 @@ if test "$PHP_XDEBUG" != "no"; then

PHP_XDEBUG_CFLAGS="$STD_CFLAGS $MAINTAINER_CFLAGS"

XDEBUG_BASE_SOURCES="src/base/base.c src/base/filter.c src/base/monitor.c src/base/stack.c src/base/superglobals.c"
XDEBUG_LIB_SOURCES="src/lib/usefulstuff.c src/lib/compat.c src/lib/crc32.c src/lib/hash.c src/lib/lib.c src/lib/llist.c src/lib/set.c src/lib/str.c src/lib/var.c src/lib/var_export_html.c src/lib/var_export_line.c src/lib/var_export_serialized.c src/lib/var_export_text.c src/lib/var_export_xml.c src/lib/xml.c"
XDEBUG_BASE_SOURCES="src/base/base.c src/base/filter.c"
XDEBUG_LIB_SOURCES="src/lib/usefulstuff.c src/lib/compat.c src/lib/crc32.c src/lib/hash.c src/lib/headers.c src/lib/lib.c src/lib/llist.c src/lib/set.c src/lib/str.c src/lib/var.c src/lib/var_export_html.c src/lib/var_export_line.c src/lib/var_export_serialized.c src/lib/var_export_text.c src/lib/var_export_xml.c src/lib/xml.c"

XDEBUG_COVERAGE_SOURCES="src/coverage/branch_info.c src/coverage/code_coverage.c"
XDEBUG_DEBUGGER_SOURCES="src/debugger/com.c src/debugger/debugger.c src/debugger/handler_dbgp.c src/debugger/handlers.c"
XDEBUG_DEVELOP_SOURCES="src/develop/develop.c src/develop/monitor.c src/develop/php_functions.c src/develop/stack.c src/develop/superglobals.c"
XDEBUG_GCSTATS_SOURCES="src/gcstats/gc_stats.c"
XDEBUG_PROFILER_SOURCES="src/profiler/profiler.c"
XDEBUG_TRACING_SOURCES="src/tracing/trace_computerized.c src/tracing/trace_html.c src/tracing/trace_textual.c src/tracing/tracing.c"

PHP_NEW_EXTENSION(xdebug, xdebug.c $XDEBUG_BASE_SOURCES $XDEBUG_LIB_SOURCES $XDEBUG_COVERAGE_SOURCES $XDEBUG_DEBUGGER_SOURCES $XDEBUG_GCSTATS_SOURCES $XDEBUG_PROFILER_SOURCES $XDEBUG_TRACING_SOURCES, $ext_shared,,$PHP_XDEBUG_CFLAGS,,yes)
PHP_NEW_EXTENSION(xdebug, xdebug.c $XDEBUG_BASE_SOURCES $XDEBUG_LIB_SOURCES $XDEBUG_COVERAGE_SOURCES $XDEBUG_DEBUGGER_SOURCES $XDEBUG_DEVELOP_SOURCES $XDEBUG_GCSTATS_SOURCES $XDEBUG_PROFILER_SOURCES $XDEBUG_TRACING_SOURCES, $ext_shared,,$PHP_XDEBUG_CFLAGS,,yes)
PHP_ADD_BUILD_DIR(PHP_EXT_BUILDDIR(xdebug)[/src/base])
PHP_ADD_BUILD_DIR(PHP_EXT_BUILDDIR(xdebug)[/src/lib])
PHP_ADD_BUILD_DIR(PHP_EXT_BUILDDIR(xdebug)[/src/coverage])
PHP_ADD_BUILD_DIR(PHP_EXT_BUILDDIR(xdebug)[/src/debugger])
PHP_ADD_BUILD_DIR(PHP_EXT_BUILDDIR(xdebug)[/src/develop])
PHP_ADD_BUILD_DIR(PHP_EXT_BUILDDIR(xdebug)[/src/gcstats])
PHP_ADD_BUILD_DIR(PHP_EXT_BUILDDIR(xdebug)[/src/profiler])
PHP_ADD_BUILD_DIR(PHP_EXT_BUILDDIR(xdebug)[/src/tracing])
Expand Down
6 changes: 4 additions & 2 deletions config.w32
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
ARG_WITH("xdebug", "Xdebug support", "no");

if (PHP_XDEBUG != 'no') {
var XDEBUG_BASE_SOURCES="base.c filter.c monitor.c stack.c superglobals.c"
var XDEBUG_LIB_SOURCES="usefulstuff.c compat.c crc32.c hash.c lib.c llist.c set.c str.c var.c var_export_html.c var_export_line.c var_export_serialized.c var_export_text.c var_export_xml.c xml.c"
var XDEBUG_BASE_SOURCES="base.c filter.c"
var XDEBUG_LIB_SOURCES="usefulstuff.c compat.c crc32.c hash.c headers.c lib.c llist.c set.c str.c var.c var_export_html.c var_export_line.c var_export_serialized.c var_export_text.c var_export_xml.c xml.c"

var XDEBUG_COVERAGE_SOURCES="branch_info.c code_coverage.c"
var XDEBUG_DEBUGGER_SOURCES="com.c debugger.c handler_dbgp.c handlers.c"
var XDEBUG_DEVELOP_SOURCES="develop.c monitor.c php_functions.c stack.c superglobals.c"
var XDEBUG_GCSTATS_SOURCES="gc_stats.c"
var XDEBUG_PROFILER_SOURCES="profiler.c"
var XDEBUG_TRACING_SOURCES="trace_computerized.c trace_html.c trace_textual.c tracing.c"
Expand All @@ -25,6 +26,7 @@ if (PHP_XDEBUG != 'no') {
ADD_SOURCES(configure_module_dirname + "/src/lib", XDEBUG_LIB_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/coverage", XDEBUG_COVERAGE_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/debugger", XDEBUG_DEBUGGER_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/develop", XDEBUG_DEVELOP_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/gcstats", XDEBUG_GCSTATS_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/profiler", XDEBUG_PROFILER_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/src/tracing", XDEBUG_TRACING_SOURCES, "xdebug");
Expand Down
19 changes: 13 additions & 6 deletions package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@ Thu, Jul 25, 2019 - xdebug 2.8.0beta1
<file name="base.h" role="src" />
<file name="filter.c" role="src" />
<file name="filter.h" role="src" />
<file name="monitor.c" role="src" />
<file name="monitor.h" role="src" />
<file name="stack.c" role="src" />
<file name="stack.h" role="src" />
<file name="superglobals.c" role="src" />
<file name="superglobals.h" role="src" />
</dir>
<dir name="lib">
<file name="usefulstuff.c" role="src" />
Expand All @@ -99,6 +93,8 @@ Thu, Jul 25, 2019 - xdebug 2.8.0beta1
<file name="crc32.h" role="src" />
<file name="hash.c" role="src" />
<file name="hash.h" role="src" />
<file name="headers.c" role="src" />
<file name="headers.h" role="src" />
<file name="lib.c" role="src" />
<file name="lib.h" role="src" />
<file name="lib_private.h" role="src" />
Expand Down Expand Up @@ -131,6 +127,17 @@ Thu, Jul 25, 2019 - xdebug 2.8.0beta1
<file name="code_coverage.h" role="src" />
<file name="code_coverage_private.h" role="src" />
</dir>
<dir name="develop">
<file name="develop.c" role="src" />
<file name="develop.h" role="src" />
<file name="monitor.c" role="src" />
<file name="monitor.h" role="src" />
<file name="php_functions.c" role="src" />
<file name="stack.c" role="src" />
<file name="stack.h" role="src" />
<file name="superglobals.c" role="src" />
<file name="superglobals.h" role="src" />
</dir>
<dir name="debugger">
<file name="com.c" role="src" />
<file name="com.h" role="src" />
Expand Down
62 changes: 4 additions & 58 deletions php_xdebug.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "coverage/branch_info.h"
#include "coverage/code_coverage.h"
#include "debugger/debugger.h"
#include "develop/develop.h"
#include "lib/lib.h"
#include "gcstats/gc_stats.h"
#include "profiler/profiler.h"
Expand Down Expand Up @@ -86,37 +87,11 @@ struct xdebug_base_info {
zif_handler orig_pcntl_fork_func;
int output_is_tty;
zend_bool in_debug_info;
char *last_exception_trace;
zend_long error_reporting_override;
zend_bool error_reporting_overridden;
unsigned int function_count;
char *last_eval_statement;

/* headers */
xdebug_llist *headers;

/* used for collection errors */
zend_bool do_collect_errors;
xdebug_llist *collected_errors;

/* used for function monitoring */
zend_bool do_monitor_functions;
xdebug_hash *functions_to_monitor;
xdebug_llist *monitored_functions_found; /* List of functions found */

/* superglobals */
zend_bool dumped;
xdebug_llist server;
xdebug_llist get;
xdebug_llist post;
xdebug_llist cookie;
xdebug_llist files;
xdebug_llist env;
xdebug_llist request;
xdebug_llist session;

/* scream */
zend_bool in_at;
char *last_exception_trace;

/* in-execution checking */
zend_bool in_execution;
Expand All @@ -131,37 +106,6 @@ struct xdebug_base_info {

struct {
zend_long max_nesting_level;
zend_long max_stack_frames;
zend_bool collect_includes;
zend_long collect_params;
zend_bool collect_return;
zend_bool collect_vars;
zend_bool collect_assignments;
zend_bool show_ex_trace;
zend_bool show_error_trace;
zend_bool show_local_vars;
zend_bool show_mem_delta;
char *file_link_format;
char *filename_format;
zend_bool force_display_errors;
zend_long force_error_reporting;
zend_long halt_level;

zend_long overload_var_dump;

/* variable dumping limitation settings */
zend_long display_max_children;
zend_long display_max_data;
zend_long display_max_depth;
zend_long cli_color;

/* superglobals */
zend_bool dump_globals;
zend_bool dump_once;
zend_bool dump_undefined;

/* scream */
zend_bool do_scream;
} settings;
};

Expand All @@ -170,6 +114,7 @@ ZEND_BEGIN_MODULE_GLOBALS(xdebug)
struct {
xdebug_coverage_globals_t coverage;
xdebug_debugger_globals_t debugger;
xdebug_develop_globals_t develop;
xdebug_gc_stats_globals_t gc_stats;
xdebug_library_globals_t library;
xdebug_profiler_globals_t profiler;
Expand All @@ -178,6 +123,7 @@ ZEND_BEGIN_MODULE_GLOBALS(xdebug)
struct {
xdebug_coverage_settings_t coverage;
xdebug_debugger_settings_t debugger;
xdebug_develop_settings_t develop;
xdebug_gc_stats_settings_t gc_stats;
xdebug_library_settings_t library;
xdebug_profiler_settings_t profiler;
Expand Down

0 comments on commit 97a2fbb

Please sign in to comment.