Skip to content
Permalink
Browse files

Move files into module-specific sub-directories

  • Loading branch information...
derickr committed Sep 21, 2019
1 parent 5747a74 commit 1e3a7da2759328aac40e645e64ee3a7f95ddc8a9
Showing with 233 additions and 3,160 deletions.
  1. +2 −0 .gitignore
  2. +3 −1 { → base}/xdebug_filter.c
  3. 0 { → base}/xdebug_filter.h
  4. +3 −2 { → base}/xdebug_monitor.c
  5. 0 { → base}/xdebug_monitor.h
  6. +14 −12 { → base}/xdebug_stack.c
  7. +1 −1 { → base}/xdebug_stack.h
  8. +6 −4 { → base}/xdebug_superglobals.c
  9. 0 { → base}/xdebug_superglobals.h
  10. +10 −1 config.m4
  11. +18 −8 config.w32
  12. +2 −2 { → coverage}/xdebug_branch_info.c
  13. +4 −2 { → coverage}/xdebug_branch_info.h
  14. +9 −7 { → coverage}/xdebug_code_coverage.c
  15. +6 −3 { → coverage}/xdebug_code_coverage.h
  16. +2 −1 { → debugger}/xdebug_com.c
  17. 0 { → debugger}/xdebug_com.h
  18. +10 −13 debugger/xdebug_handler_dbgp.c
  19. +1 −1 { → debugger}/xdebug_handler_dbgp.h
  20. +1 −1 { → debugger}/xdebug_handlers.c
  21. +5 −5 { → debugger}/xdebug_handlers.h
  22. +6 −4 { → gcstats}/xdebug_gc_stats.c
  23. 0 { → gcstats}/xdebug_gc_stats.h
  24. 0 { → lib}/usefulstuff.c
  25. 0 { → lib}/usefulstuff.h
  26. 0 { → lib}/xdebug_compat.c
  27. 0 { → lib}/xdebug_compat.h
  28. 0 { → lib}/xdebug_hash.c
  29. 0 { → lib}/xdebug_hash.h
  30. 0 { → lib}/xdebug_llist.c
  31. 0 { → lib}/xdebug_llist.h
  32. 0 { → lib}/xdebug_mm.h
  33. 0 { → lib}/xdebug_private.c
  34. +1 −0 { → lib}/xdebug_private.h
  35. 0 { → lib}/xdebug_set.c
  36. 0 { → lib}/xdebug_set.h
  37. 0 { → lib}/xdebug_str.c
  38. 0 { → lib}/xdebug_str.h
  39. +6 −5 { → lib}/xdebug_var.c
  40. +5 −5 { → lib}/xdebug_var.h
  41. 0 { → lib}/xdebug_xml.c
  42. +1 −1 { → lib}/xdebug_xml.h
  43. +64 −49 package.xml
  44. +6 −6 php_xdebug.h
  45. +11 −8 { → profiler}/xdebug_profiler.c
  46. +1 −1 { → profiler}/xdebug_profiler.h
  47. +5 −2 { → tracing}/xdebug_trace_computerized.c
  48. 0 { → tracing}/xdebug_trace_computerized.h
  49. +2 −1 { → tracing}/xdebug_trace_html.c
  50. 0 { → tracing}/xdebug_trace_html.h
  51. +5 −2 { → tracing}/xdebug_trace_textual.c
  52. 0 { → tracing}/xdebug_trace_textual.h
  53. +7 −6 { → tracing}/xdebug_tracing.c
  54. 0 { → tracing}/xdebug_tracing.h
  55. +16 −16 xdebug.c
  56. +0 −2,990 xdebug_handler_dbgp.c
@@ -6,6 +6,8 @@
/*.mk
/*.la
/.libs
*/*.lo
*/.libs
/libs.mk
/ac*.m4
/build
@@ -16,9 +16,11 @@
+----------------------------------------------------------------------+
*/
#include "php_xdebug.h"
#include "xdebug_private.h"

#include "xdebug_filter.h"

#include "lib/xdebug_private.h"

ZEND_EXTERN_MODULE_GLOBALS(xdebug)

int xdebug_filter_is_valid(void)
File renamed without changes.
@@ -18,10 +18,11 @@

#include "php_xdebug.h"

#include "xdebug_compat.h"
#include "xdebug_hash.h"
#include "xdebug_monitor.h"

#include "lib/xdebug_compat.h"
#include "lib/xdebug_hash.h"

ZEND_EXTERN_MODULE_GLOBALS(xdebug)

static void init_function_monitor_hash(xdebug_hash *internal, HashTable *functions_to_monitor)
File renamed without changes.
@@ -16,21 +16,23 @@
+----------------------------------------------------------------------+
*/
#include "php_xdebug.h"
#include "xdebug_private.h"
#include "xdebug_code_coverage.h"
#include "xdebug_com.h"
#include "xdebug_compat.h"
#include "xdebug_filter.h"
#include "xdebug_monitor.h"
#include "xdebug_profiler.h"
#include "xdebug_stack.h"
#include "xdebug_str.h"
#include "xdebug_superglobals.h"
#include "xdebug_var.h"

#include "main/php_ini.h"

#include "ext/standard/html.h"
#include "ext/standard/php_smart_string.h"
#include "xdebug_stack.h"

#include "main/php_ini.h"
#include "base/xdebug_filter.h"
#include "base/xdebug_monitor.h"
#include "base/xdebug_superglobals.h"
#include "coverage/xdebug_code_coverage.h"
#include "debugger/xdebug_com.h"
#include "lib/xdebug_compat.h"
#include "lib/xdebug_private.h"
#include "lib/xdebug_str.h"
#include "lib/xdebug_var.h"
#include "profiler/xdebug_profiler.h"

ZEND_EXTERN_MODULE_GLOBALS(xdebug)

@@ -19,7 +19,7 @@
#ifndef XDEBUG_STACK_H
#define XDEBUG_STACK_H

#include "xdebug_str.h"
#include "lib/xdebug_str.h"

#define XDEBUG_STACK_NO_DESC 0x01

@@ -17,12 +17,14 @@
+----------------------------------------------------------------------+
*/

#include "SAPI.h"

#include "php_xdebug.h"
#include "xdebug_private.h"
#include "xdebug_var.h"
#include "xdebug_compat.h"
#include "xdebug_superglobals.h"
#include "SAPI.h"

#include "lib/xdebug_compat.h"
#include "lib/xdebug_private.h"
#include "lib/xdebug_var.h"

extern ZEND_DECLARE_MODULE_GLOBALS(xdebug);

File renamed without changes.
@@ -77,7 +77,16 @@ if test "$PHP_XDEBUG" != "no"; then

PHP_XDEBUG_CFLAGS="$STD_CFLAGS $MAINTAINER_CFLAGS"

PHP_NEW_EXTENSION(xdebug, xdebug.c xdebug_branch_info.c xdebug_code_coverage.c xdebug_com.c xdebug_compat.c xdebug_gc_stats.c xdebug_filter.c xdebug_handler_dbgp.c xdebug_handlers.c xdebug_llist.c xdebug_monitor.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,,$PHP_XDEBUG_CFLAGS,,yes)
XDEBUG_BASE_SOURCES="base/xdebug_filter.c base/xdebug_monitor.c base/xdebug_stack.c base/xdebug_superglobals.c"
XDEBUG_LIB_SOURCES="lib/usefulstuff.c lib/xdebug_compat.c lib/xdebug_hash.c lib/xdebug_llist.c lib/xdebug_private.c lib/xdebug_set.c lib/xdebug_str.c lib/xdebug_var.c lib/xdebug_xml.c"

XDEBUG_COVERAGE_SOURCES="coverage/xdebug_branch_info.c coverage/xdebug_code_coverage.c"
XDEBUG_DEBUGGER_SOURCES="debugger/xdebug_com.c debugger/xdebug_handler_dbgp.c debugger/xdebug_handlers.c"
XDEBUG_GCSTATS_SOURCES="gcstats/xdebug_gc_stats.c"
XDEBUG_PROFILER_SOURCES="profiler/xdebug_profiler.c"
XDEBUG_TRACING_SOURCES="tracing/xdebug_trace_computerized.c tracing/xdebug_trace_html.c tracing/xdebug_trace_textual.c tracing/xdebug_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_SUBST(XDEBUG_SHARED_LIBADD)
PHP_ADD_MAKEFILE_FRAGMENT
fi
@@ -3,20 +3,30 @@
ARG_WITH("xdebug", "Xdebug support", "no");

if (PHP_XDEBUG != 'no') {
var files = 'xdebug.c xdebug_branch_info.c xdebug_code_coverage.c ' +
'xdebug_com.c xdebug_compat.c xdebug_filter.c xdebug_gc_stats.c ' +
'xdebug_handler_dbgp.c ' +
'xdebug_handlers.c xdebug_llist.c xdebug_monitor.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';
var XDEBUG_BASE_SOURCES="xdebug_filter.c xdebug_monitor.c xdebug_stack.c xdebug_superglobals.c"
var XDEBUG_LIB_SOURCES="usefulstuff.c xdebug_compat.c xdebug_hash.c xdebug_llist.c xdebug_private.c xdebug_set.c xdebug_str.c xdebug_var.c xdebug_xml.c"

var XDEBUG_COVERAGE_SOURCES="xdebug_branch_info.c xdebug_code_coverage.c"
var XDEBUG_DEBUGGER_SOURCES="xdebug_com.c xdebug_handler_dbgp.c xdebug_handlers.c"
var XDEBUG_GCSTATS_SOURCES="xdebug_gc_stats.c"
var XDEBUG_PROFILER_SOURCES="xdebug_profiler.c"
var XDEBUG_TRACING_SOURCES="xdebug_trace_computerized.c xdebug_trace_html.c xdebug_trace_textual.c xdebug_tracing.c"

var files = "xdebug.c";

if (typeof(ZEND_EXTENSION) == 'undefined') {
EXTENSION('xdebug', files);
} else {
ZEND_EXTENSION('xdebug', files);
}
ADD_FLAG("CFLAGS_XDEBUG", " /I " + configure_module_dirname + " ");
ADD_SOURCES(configure_module_dirname + "/base", XDEBUG_BASE_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/lib", XDEBUG_LIB_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/coverage", XDEBUG_COVERAGE_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/debugger", XDEBUG_DEBUGGER_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/gcstats", XDEBUG_GCSTATS_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/profiler", XDEBUG_PROFILER_SOURCES, "xdebug");
ADD_SOURCES(configure_module_dirname + "/tracing", XDEBUG_TRACING_SOURCES, "xdebug");

AC_DEFINE("HAVE_XDEBUG", 1, "Xdebug support");
}
@@ -12,8 +12,8 @@
#include <stdlib.h>
#include <math.h>
#include "php_xdebug.h"
#include "xdebug_str.h"
#include "xdebug_hash.h"
#include "lib/xdebug_hash.h"
#include "lib/xdebug_str.h"

ZEND_EXTERN_MODULE_GLOBALS(xdebug)

@@ -19,10 +19,12 @@
#ifndef __HAVE_XDEBUG_BRANCH_INFO_H__
#define __HAVE_XDEBUG_BRANCH_INFO_H__

#include "xdebug_set.h"
#include "xdebug_str.h"
#include "zend_compile.h"

#include "lib/xdebug_hash.h"
#include "lib/xdebug_set.h"
#include "lib/xdebug_str.h"

#if ZEND_USE_ABS_JMP_ADDR
# define XDEBUG_ZNODE_JMP_LINE(node, opline, base) (int32_t)(((long)((node).jmp_addr) - (long)(base_address)) / sizeof(zend_op))
#else
@@ -17,15 +17,17 @@
*/

#include "php_xdebug.h"
#include "xdebug_private.h"
#include "xdebug_filter.h"
#include "xdebug_set.h"
#include "xdebug_stack.h"
#include "xdebug_var.h"

#include "xdebug_branch_info.h"
#include "xdebug_code_coverage.h"
#include "xdebug_compat.h"
#include "xdebug_tracing.h"

#include "base/xdebug_filter.h"
#include "base/xdebug_stack.h"
#include "lib/xdebug_compat.h"
#include "lib/xdebug_private.h"
#include "lib/xdebug_set.h"
#include "lib/xdebug_var.h"
#include "tracing/xdebug_tracing.h"

extern ZEND_DECLARE_MODULE_GLOBALS(xdebug);

@@ -20,11 +20,14 @@
#define __HAVE_XDEBUG_CODE_COVERAGE_H__

#include "php.h"
#include "xdebug_compat.h"
#include "xdebug_hash.h"
#include "xdebug_mm.h"

#include "xdebug_branch_info.h"

#include "lib/xdebug_private.h"
#include "lib/xdebug_compat.h"
#include "lib/xdebug_hash.h"
#include "lib/xdebug_mm.h"

typedef struct xdebug_coverage_line {
int lineno;
int count;
@@ -49,9 +49,10 @@
# define poll WSAPoll
#endif

#include "xdebug_private.h"
#include "xdebug_com.h"

#include "lib/xdebug_private.h"

ZEND_EXTERN_MODULE_GLOBALS(xdebug)

#if !WIN32 && !WINNT
File renamed without changes.
@@ -36,21 +36,18 @@
#include "php_globals.h"
#include "php_xdebug.h"

#include "xdebug_private.h"
#include "xdebug_compat.h"

#include "coverage/xdebug_code_coverage.h"

#include "xdebug_com.h"
#include "xdebug_compat.h"
#include "xdebug_handler_dbgp.h"
#include "xdebug_hash.h"
#include "xdebug_llist.h"
#include "xdebug_mm.h"
#include "xdebug_private.h"
#include "xdebug_stack.h"
#include "xdebug_var.h"
#include "xdebug_xml.h"

#include "base/xdebug_stack.h"
#include "coverage/xdebug_code_coverage.h"
#include "lib/xdebug_compat.h"
#include "lib/xdebug_hash.h"
#include "lib/xdebug_llist.h"
#include "lib/xdebug_mm.h"
#include "lib/xdebug_private.h"
#include "lib/xdebug_var.h"
#include "lib/xdebug_xml.h"

#ifdef PHP_WIN32
#include "win32/time.h"
@@ -21,7 +21,7 @@

#include <string.h>
#include "xdebug_handlers.h"
#include "xdebug_xml.h"
#include "lib/xdebug_xml.h"

#define DBGP_VERSION "1.0"

@@ -20,7 +20,7 @@
#include "xdebug_com.h"
#include "xdebug_handlers.h"
#include "xdebug_handler_dbgp.h"
#include "xdebug_mm.h"
#include "lib/xdebug_mm.h"

xdebug_remote_handler_info handlers[] = {
{ "dbgp", "DBGp - Common DeBuGger Protocol", xdebug_handler_dbgp },
@@ -20,11 +20,11 @@
#define __HAVE_XDEBUG_HANDLERS_H__

#include "php_xdebug.h"
#include "xdebug_compat.h"
#include "xdebug_llist.h"
#include "xdebug_hash.h"
#include "xdebug_private.h"
#include "usefulstuff.h"
#include "lib/xdebug_compat.h"
#include "lib/xdebug_llist.h"
#include "lib/xdebug_hash.h"
#include "lib/xdebug_private.h"
#include "lib/usefulstuff.h"

typedef struct _xdebug_brk_admin xdebug_brk_admin;
typedef struct _xdebug_brk_info xdebug_brk_info;
@@ -15,14 +15,16 @@
| Authors: Benjamin Eberlei <kontakt@beberlei.de> |
+----------------------------------------------------------------------+
*/

#include "php_xdebug.h"
#include "xdebug_gc_stats.h"
#include "xdebug_stack.h"
#include "php.h"
#include "zend_builtin_functions.h"
#include "SAPI.h"
#include "Zend/zend_long.h"

#include "php_xdebug.h"
#include "xdebug_gc_stats.h"

#include "base/xdebug_stack.h"

/* Set correct int format to use */
#if SIZEOF_ZEND_LONG == 4
# define XDEBUG_GCINT_FMT "u"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -31,6 +31,7 @@
#include "zend_exceptions.h"
#include "zend_vm.h"
#include "zend_hash.h"

#include "xdebug_hash.h"
#include "xdebug_llist.h"
#include "xdebug_set.h"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -26,11 +26,12 @@
#include "zend_smart_str.h"

#include "php_xdebug.h"
#include "xdebug_compat.h"
#include "xdebug_private.h"
#include "xdebug_mm.h"
#include "xdebug_var.h"
#include "xdebug_xml.h"

#include "lib/xdebug_compat.h"
#include "lib/xdebug_mm.h"
#include "lib/xdebug_private.h"
#include "lib/xdebug_var.h"
#include "lib/xdebug_xml.h"

/* Set correct int format to use */
#include "Zend/zend_long.h"
@@ -18,11 +18,11 @@

#include "zend.h"
#include "php_xdebug.h"
#include "xdebug_compat.h"
#include "xdebug_str.h"
#include "xdebug_xml.h"
#include "xdebug_compat.h"
#include "xdebug_private.h"

#include "lib/xdebug_compat.h"
#include "lib/xdebug_private.h"
#include "lib/xdebug_str.h"
#include "lib/xdebug_xml.h"

#ifndef __HAVE_XDEBUG_VAR_H__
#define __HAVE_XDEBUG_VAR_H__
File renamed without changes.
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/

#include "xdebug_str.h"
#include "lib/xdebug_str.h"

#ifndef __HAVE_XDEBUG_XML_H__
#define __HAVE_XDEBUG_XML_H__

0 comments on commit 1e3a7da

Please sign in to comment.
You can’t perform that action at this time.