Skip to content

Commit b38c31b

Browse files
committed
Remove v8::Debug agent stuff
Debug Agent support was removed from V8 with 3.28 line which is pretty old meanwhile.
1 parent c767977 commit b38c31b

10 files changed

+1
-261
lines changed

README.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ class V8Js
5555
const FLAG_FORCE_ARRAY = 2;
5656
const FLAG_PROPAGATE_PHP_EXCEPTIONS = 4;
5757

58-
const DEBUG_AUTO_BREAK_NEVER = 1;
59-
const DEBUG_AUTO_BREAK_ONCE = 2;
60-
const DEBUG_AUTO_BREAK_ALWAYS = 3;
61-
6258
/* Methods */
6359

6460
/**
@@ -140,16 +136,6 @@ class V8Js
140136
public function clearPendingException()
141137
{}
142138

143-
/**
144-
* Starts V8 debug agent for use with Google Chrome Developer Tools (Eclipse Plugin)
145-
* @param string $agent_name
146-
* @param int $port
147-
* @param int $auto_break
148-
* @return bool
149-
*/
150-
public function startDebugAgent($agent_name = "V8Js", $port = 9222, $auto_break = V8Js::DEBUG_AUTO_BREAK_NEVER)
151-
{}
152-
153139
/** Static methods **/
154140

155141
/**

config.m4

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,6 @@ int main ()
110110
AC_MSG_ERROR([could not determine libv8 version])
111111
fi
112112

113-
AC_CACHE_CHECK(for debuggersupport in v8, ac_cv_v8_debuggersupport, [
114-
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <v8-debug.h>]],
115-
[[v8::Debug::DisableAgent()]])],
116-
[ac_cv_v8_debuggersupport=yes],
117-
[ac_cv_v8_debuggersupport=no])
118-
])
119-
120-
if test "$ac_cv_v8_debuggersupport" = "yes"; then
121-
AC_DEFINE([ENABLE_DEBUGGER_SUPPORT], [1], [Enable debugger support in V8Js])
122-
fi
123-
124113
AC_LANG_RESTORE
125114
LIBS=$old_LIBS
126115
LDFLAGS=$old_LDFLAGS
@@ -170,7 +159,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <v8-debug.h>]],
170159
v8js_class.cc \
171160
v8js_commonjs.cc \
172161
v8js_convert.cc \
173-
v8js_debug.cc \
174162
v8js_exceptions.cc \
175163
v8js_methods.cc \
176164
v8js_object_export.cc \

config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if (PHP_V8JS != "no") {
1313
AC_DEFINE("PHP_V8_API_VERSION", "3017015", "", false);
1414
AC_DEFINE("PHP_V8_VERSION", "3.17.15", "", true);
1515

16-
EXTENSION("v8js", "v8js_array_access.cc v8js.cc v8js_class.cc v8js_commonjs.cc v8js_convert.cc v8js_debug.cc v8js_exceptions.cc v8js_methods.cc v8js_object_export.cc v8js_timer.cc v8js_v8.cc v8js_v8object_class.cc v8js_variables.cc", "yes");
16+
EXTENSION("v8js", "v8js_array_access.cc v8js.cc v8js_class.cc v8js_commonjs.cc v8js_convert.cc v8js_exceptions.cc v8js_methods.cc v8js_object_export.cc v8js_timer.cc v8js_v8.cc v8js_v8object_class.cc v8js_variables.cc", "yes");
1717

1818
} else {
1919
WARNING("v8js not enabled, headers or libs not found");

php_v8js_macros.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ extern "C" {
8585
#define V8JS_FLAG_FORCE_ARRAY (1<<1)
8686
#define V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS (1<<2)
8787

88-
#define V8JS_DEBUG_AUTO_BREAK_NEVER 0
89-
#define V8JS_DEBUG_AUTO_BREAK_ONCE 1
90-
#define V8JS_DEBUG_AUTO_BREAK_ALWAYS 2
91-
9288
/* Convert zval into V8 value */
9389
v8::Handle<v8::Value> zval_to_v8js(zval *, v8::Isolate * TSRMLS_DC);
9490

samples/debug_callback_line_processor.php

Lines changed: 0 additions & 36 deletions
This file was deleted.

samples/debug_line_processor.php

Lines changed: 0 additions & 22 deletions
This file was deleted.

v8js_class.cc

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ extern "C" {
2828

2929
#include "php_v8js_macros.h"
3030
#include "v8js_v8.h"
31-
#include "v8js_debug.h"
3231
#include "v8js_exceptions.h"
3332
#include "v8js_v8object_class.h"
3433
#include "v8js_timer.h"
@@ -1000,17 +999,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_v8js_checkstring, 0, 0, 1)
1000999
ZEND_ARG_INFO(0, script)
10011000
ZEND_END_ARG_INFO()
10021001

1003-
#ifdef ENABLE_DEBUGGER_SUPPORT
1004-
ZEND_BEGIN_ARG_INFO_EX(arginfo_v8js_destruct, 0, 0, 0)
1005-
ZEND_END_ARG_INFO()
1006-
1007-
ZEND_BEGIN_ARG_INFO_EX(arginfo_v8js_startdebugagent, 0, 0, 0)
1008-
ZEND_ARG_INFO(0, agentName)
1009-
ZEND_ARG_INFO(0, port)
1010-
ZEND_ARG_INFO(0, auto_break)
1011-
ZEND_END_ARG_INFO()
1012-
#endif /* ENABLE_DEBUGGER_SUPPORT */
1013-
10141002
ZEND_BEGIN_ARG_INFO(arginfo_v8js_getpendingexception, 0)
10151003
ZEND_END_ARG_INFO()
10161004

@@ -1055,10 +1043,6 @@ static const zend_function_entry v8js_methods[] = { /* {{{ */
10551043
PHP_ME(V8Js, getExtensions, arginfo_v8js_getextensions, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
10561044
PHP_ME(V8Js, setTimeLimit, arginfo_v8js_settimelimit, ZEND_ACC_PUBLIC)
10571045
PHP_ME(V8Js, setMemoryLimit, arginfo_v8js_setmemorylimit, ZEND_ACC_PUBLIC)
1058-
#ifdef ENABLE_DEBUGGER_SUPPORT
1059-
PHP_ME(V8Js, __destruct, arginfo_v8js_destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
1060-
PHP_ME(V8Js, startDebugAgent, arginfo_v8js_startdebugagent, ZEND_ACC_PUBLIC)
1061-
#endif
10621046
{NULL, NULL, NULL}
10631047
};
10641048
/* }}} */
@@ -1125,12 +1109,6 @@ PHP_MINIT_FUNCTION(v8js_class) /* {{{ */
11251109
zend_declare_class_constant_long(php_ce_v8js, ZEND_STRL("FLAG_FORCE_ARRAY"), V8JS_FLAG_FORCE_ARRAY TSRMLS_CC);
11261110
zend_declare_class_constant_long(php_ce_v8js, ZEND_STRL("FLAG_PROPAGATE_PHP_EXCEPTIONS"), V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS TSRMLS_CC);
11271111

1128-
#ifdef ENABLE_DEBUGGER_SUPPORT
1129-
zend_declare_class_constant_long(php_ce_v8js, ZEND_STRL("DEBUG_AUTO_BREAK_NEVER"), V8JS_DEBUG_AUTO_BREAK_NEVER TSRMLS_CC);
1130-
zend_declare_class_constant_long(php_ce_v8js, ZEND_STRL("DEBUG_AUTO_BREAK_ONCE"), V8JS_DEBUG_AUTO_BREAK_ONCE TSRMLS_CC);
1131-
zend_declare_class_constant_long(php_ce_v8js, ZEND_STRL("DEBUG_AUTO_BREAK_ALWAYS"), V8JS_DEBUG_AUTO_BREAK_ALWAYS TSRMLS_CC);
1132-
#endif
1133-
11341112
le_v8js_script = zend_register_list_destructors_ex(v8js_script_dtor, NULL, PHP_V8JS_SCRIPT_RES_NAME, module_number);
11351113

11361114
#if PHP_V8_API_VERSION >= 4004010 && PHP_V8_API_VERSION < 4004044

v8js_debug.cc

Lines changed: 0 additions & 113 deletions
This file was deleted.

v8js_debug.h

Lines changed: 0 additions & 25 deletions
This file was deleted.

v8js_v8.cc

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ extern "C" {
3131

3232
#include "php_v8js_macros.h"
3333
#include "v8js_v8.h"
34-
#include "v8js_debug.h"
3534
#include "v8js_timer.h"
3635
#include "v8js_exceptions.h"
3736

@@ -123,17 +122,6 @@ void v8js_v8_call(v8js_ctx *c, zval **return_value,
123122
* the time & memory limit. */
124123
v8js_timer_push(time_limit, memory_limit, c TSRMLS_CC);
125124

126-
#ifdef ENABLE_DEBUGGER_SUPPORT
127-
if(c == v8js_debug_context && v8js_debug_auto_break_mode != V8JS_DEBUG_AUTO_BREAK_NEVER) {
128-
v8::Debug::DebugBreak(c->isolate);
129-
130-
if(v8js_debug_auto_break_mode == V8JS_DEBUG_AUTO_BREAK_ONCE) {
131-
/* If break-once-mode was enabled, reset flag. */
132-
v8js_debug_auto_break_mode = V8JS_DEBUG_AUTO_BREAK_NEVER;
133-
}
134-
}
135-
#endif /* ENABLE_DEBUGGER_SUPPORT */
136-
137125
/* Execute script */
138126
c->in_execution++;
139127
v8::Local<v8::Value> result = v8_call(c->isolate);

0 commit comments

Comments
 (0)