From 766b602fc36510ba3ac93410db10928629059403 Mon Sep 17 00:00:00 2001 From: Jinbo Wang Date: Mon, 17 Aug 2020 15:19:36 +0800 Subject: [PATCH] Add setting to control the jdwp request timeout (#863) * Add setting to control the jdwp request timeout * Add the range constraint for the settings --- README.md | 3 ++- package.json | 13 ++++++++++--- package.nls.json | 3 ++- package.nls.zh.json | 3 ++- src/configurationProvider.ts | 2 ++ 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c00c2af..b3dc0e5 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,8 @@ Please also check the documentation of [Language Support for Java by Red Hat](ht - `java.debug.settings.stepping.skipSynthetics`: Skip synthetic methods when stepping. - `java.debug.settings.stepping.skipStaticInitializers`: Skip static initializer methods when stepping. - `java.debug.settings.stepping.skipConstructors`: Skip constructor methods when stepping. -- `java.debug.settings.limitOfVariablesPerJdwpRequest`: The maximum number of variables or fields that can be requested in one JDWP request. The higher the value, the less frequently debuggee will be requested when expanding the variable view. Also a large number can cause JDWP request timeout. Defaults to 100. +- `java.debug.settings.jdwp.limitOfVariablesPerJdwpRequest`: The maximum number of variables or fields that can be requested in one JDWP request. The higher the value, the less frequently debuggee will be requested when expanding the variable view. Also a large number can cause JDWP request timeout. Defaults to 100. +- `java.debug.settings.jdwp.requestTimeout`: The timeout (ms) of JDWP request when the debugger communicates with the target JVM. Defaults to 3000. Pro Tip: The documentation [Configuration.md](https://github.com/microsoft/vscode-java-debug/blob/master/Configuration.md) provides lots of samples to demonstrate how to use these debug configurations, recommend to take a look. diff --git a/package.json b/package.json index 1b8750a..a5e8eb2 100644 --- a/package.json +++ b/package.json @@ -686,10 +686,17 @@ "description": "%java.debugger.launch.skipConstructors.description%", "default": false }, - "java.debug.settings.limitOfVariablesPerJdwpRequest": { + "java.debug.settings.jdwp.limitOfVariablesPerJdwpRequest": { "type": "number", - "description": "%java.debugger.configuration.limitOfVariablesPerJdwpRequest.description%", - "default": 100 + "description": "%java.debugger.configuration.jdwp.limitOfVariablesPerJdwpRequest.description%", + "default": 100, + "minimum": 1 + }, + "java.debug.settings.jdwp.requestTimeout": { + "type": "number", + "description": "%java.debugger.configuration.jdwp.requestTimeout.description%", + "default": 3000, + "minimum": 100 } } } diff --git a/package.nls.json b/package.nls.json index df7b3a0..4cb2677 100644 --- a/package.nls.json +++ b/package.nls.json @@ -55,5 +55,6 @@ "java.debugger.configuration.forceBuildBeforeLaunch": "Force building the workspace before launching java program.", "java.debugger.configuration.console": "The specified console to launch Java program. If you want to customize the console for a specific debug session, please modify the 'console' config in launch.json.", "java.debugger.configuration.exceptionBreakpoint.skipClasses": "Skip the specified classes when breaking on exception. You could use the built-in variables such as '$JDK' and '$Libraries' to skip a group of classes, or add a specific class name expression, e.g. java.*, *.Foo", - "java.debugger.configuration.limitOfVariablesPerJdwpRequest.description": "The maximum number of variables or fields that can be requested in one JDWP request. The higher the value, the less frequently debuggee will be requested when expanding the variable view. Also a large number can cause JDWP request timeout." + "java.debugger.configuration.jdwp.limitOfVariablesPerJdwpRequest.description": "The maximum number of variables or fields that can be requested in one JDWP request. The higher the value, the less frequently debuggee will be requested when expanding the variable view. Also a large number can cause JDWP request timeout.", + "java.debugger.configuration.jdwp.requestTimeout.description": "The timeout (ms) of JDWP request when the debugger communicates with the target JVM." } diff --git a/package.nls.zh.json b/package.nls.zh.json index 7e81c91..ccbd610 100644 --- a/package.nls.zh.json +++ b/package.nls.zh.json @@ -54,5 +54,6 @@ "java.debugger.configuration.forceBuildBeforeLaunch": "在启动java程序之前强制编译整个工作空间。", "java.debugger.configuration.console": "指定的控制台用于启动Java程序。如果要为特定的调试会话自定义控制台，请修改launch.json中的“console”配置。", "java.debugger.configuration.exceptionBreakpoint.skipClasses": "当发生异常时，跳过指定的类。你可以使用内置变量，如'$JDK'和'$Libraries'来跳过一组类，或者添加一个特定的类名表达式，如java.*，*.Foo。", - "java.debugger.configuration.limitOfVariablesPerJdwpRequest.description": "一次JDWP请求中可以请求的变量或字段的最大数量。该值越高，在展开变量视图时，请求debuggee的频率就越低。同时数量过大也会导致JDWP请求超时。" + "java.debugger.configuration.jdwp.limitOfVariablesPerJdwpRequest.description": "一次JDWP请求中可以请求的变量或字段的最大数量。该值越高，在展开变量视图时，请求debuggee的频率就越低。同时数量过大也会导致JDWP请求超时。", + "java.debugger.configuration.jdwp.requestTimeout.description": "调试器与目标JVM通信时JDWP请求的超时时间（ms）。" } \ No newline at end of file diff --git a/src/configurationProvider.ts b/src/configurationProvider.ts index eb30434..a038728 100644 --- a/src/configurationProvider.ts +++ b/src/configurationProvider.ts @@ -558,6 +558,8 @@ async function updateDebugSettings(event?: vscode.ConfigurationChangeEvent) { stepFilters, exceptionFilters, exceptionFiltersUpdated: event && event.affectsConfiguration("java.debug.settings.exceptionBreakpoint.skipClasses"), + limitOfVariablesPerJdwpRequest: Math.max(debugSettingsRoot.settings.jdwp.limitOfVariablesPerJdwpRequest, 1), + jdwpRequestTimeout: Math.max(debugSettingsRoot.settings.jdwp.requestTimeout, 100), })); if (logLevel === "FINE") { // tslint:disable-next-line:no-console