8000 Improve the HCR workflow by testforstephen · Pull Request #335 · microsoft/java-debug · GitHub
[go: up one dir, main page]
Skip to content

Improve the HCR workflow #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
testforstephen merged 2 commits into from
Jul 1, 2020
Merged

Improve the HCR workflow #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9096e1
Improve the HCR workflow
Jun 22, 2020
8b6bcda
refine the error message
testforstephen Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...rosoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/ErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ public enum ErrorCode {
COMPLETIONS_FAILURE(1017),
EXCEPTION_INFO_FAILURE(1018),
EVALUATION_COMPILE_ERROR(2001),
EVALUATE_NOT_SUSPENDED_THREAD(2002);
EVALUATE_NOT_SUSPENDED_THREAD(2002),
HCR_FAILURE(3001);

private int id;

Expand Down
6 changes: 5 additions & 1 deletion ...re/src/main/java/com/microsoft/java/debug/core/adapter/handler/HotCodeReplaceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,12 @@ public CompletableFuture<Response> handle(Command command, Arguments arguments,

IHotCodeReplaceProvider provider = context.getProvider(IHotCodeReplaceProvider.class);

return provider.redefineClasses().thenApply(classNames -> {
return provider.redefineClasses().thenCompose(classNames -> {
response.body = new Responses.RedefineClassesResponse(classNames.toArray(new String[0]));
return CompletableFuture.completedFuture(response);
}).exceptionally(ex -> {
String errorMessage = ex.getCause() != null ? ex.getCause().getMessage() : ex.getMessage();
response.body = new Responses.RedefineClassesResponse(new String[0], errorMessage);
return response;
});
}
Expand Down
9 changes: 9 additions & 0 deletions ...osoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/protocol/Responses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,12 +299,21 @@ public ExceptionInfoResponse(String exceptionId, String description, ExceptionBr

public static class RedefineClassesResponse extends ResponseBody {
public String[] changedClasses = new String[0];
public String errorMessage = null;

/**
* Constructor.
*/
public RedefineClassesResponse(String[] changedClasses) {
this(changedClasses, null);
}

/**
* Constructor.
*/
public RedefineClassesResponse(String[] changedClasses, String errorMessage) {
this.changedClasses = changedClasses;
this.errorMessage = errorMessage;
}
}
}
37 changes: 28 additions & 9 deletions ...in/src/main/java/com/microsoft/java/debug/plugin/internal/JavaHotCodeReplaceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.logging.Level;
Expand All @@ -53,13 +55,16 @@
import org.eclipse.jdt.core.util.IClassFileReader;
import org.eclipse.jdt.core.util.ISourceAttribute;
import org.eclipse.jdt.internal.core.util.Util;
import org.eclipse.jdt.ls.core.internal.JobHelpers;

import com.microsoft.java.debug.core.Configuration;
import com.microsoft.java.debug.core.DebugException;
import com.microsoft.java.debug.core.DebugSettings;
import com.microsoft.java.debug.core.DebugUtility;
import com.microsoft.java.debug.core.IDebugSession;
import com.microsoft.java.debug.core.StackFrameUtility;
import com.microsoft.java.debug.core.adapter.AdapterUtils;
import com.microsoft.java.debug.core.adapter.ErrorCode;
import com.microsoft.java.debug.core.adapter.HotCodeReplaceEvent;
import com.microsoft.java.debug.core.adapter.IDebugAdapterContext;
import com.microsoft.java.debug.core.adapter.IHotCodeReplaceProvider;
Expand Down Expand Up @@ -96,9 +101,9 @@ public class JavaHotCodeReplaceProvider implements IHotCodeReplaceProvider, IRes

private PublishSubject<HotCodeReplaceEvent> eventSubject = PublishSubject.<HotCodeReplaceEvent>create();

private List<IResource> deltaResources = new ArrayList<>();
private Set<IResource> deltaResources = new LinkedHashSet<>();

private List<String> deltaClassNames = new ArrayList<>();
private Set<String> deltaClassNames = new LinkedHashSet<>();

/**
* Visitor for resource deltas.
Expand Down Expand Up @@ -300,14 +305,23 @@ public void onClassRedefined(Consumer<List<String>> consumer) {

@Override
public CompletableFuture<List<String>> redefineClasses() {
JobHelpers.waitForBuildJobs(10 * 1000);
return CompletableFuture.supplyAsync(() -> {
List<String> classNames = new ArrayList<>();
List<IResource> resources = new ArrayList<>();
String errorMessage = null;
synchronized (this) {
classNames.addAll(deltaClassNames);
doHotCodeReplace(deltaResources, deltaClassNames);
resources.addAll(deltaResources);
deltaResources.clear();
deltaClassNames.clear();
errorMessage = doHotCodeReplace(resources, classNames);
}

if (!classNames.isEmpty() && errorMessage != null) {
throw AdapterUtils.createCompletionException(errorMessage, ErrorCode.HCR_FAILURE);
}

return classNames;
});
}
Expand All @@ -325,27 +339,29 @@ private void publishEvent(HotCodeReplaceEvent.EventType type, String message, Ob
eventSubject.onNext(new HotCodeReplaceEvent(type, message, data));
}

private void doHotCodeReplace(List<IResource> resourcesToReplace, List<String> qualifiedNamesToReplace) {
private String doHotCodeReplace(List<IResource> resourcesToReplace, List<String> qualifiedNamesToReplace) {
if (context == null || currentDebugSession == null) {
return;
return null;
}

if (resourcesToReplace == null || qualifiedNamesToReplace == null || qualifiedNamesToReplace.isEmpty()
|| resourcesToReplace.isEmpty()) {
return;
return null;
}

filterNotLoadedTypes(resourcesToReplace, qualifiedNamesToReplace);
if (qualifiedNamesToReplace.isEmpty()) {
return;
return null;
// If none of the changed types are loaded, do nothing.
}

// Not supported scenario:
if (!currentDebugSession.getVM().canRedefineClasses()) {
return;
publishEvent(HotCodeReplaceEvent.EventType.ERROR, "JVM doesn't support hot reload classes");
return "JVM doesn't support hot reload classes";
}

String errorMessage = null;
publishEvent(HotCodeReplaceEvent.EventType.STARTING, "Start hot code replacement procedure...");

try {
Expand All @@ -367,6 +383,7 @@ private void doHotCodeReplace(List<IResource> resourcesToReplace, List<String> q

if (containsObsoleteMethods()) {
publishEvent(HotCodeReplaceEvent.EventType.ERROR, "JVM contains obsolete methods");
errorMessage = "JVM contains obsolete methods";
}

if (currentDebugSession.getVM().canPopFrames() && framesPopped) {
Expand All @@ -376,11 +393,13 @@ private void doHotCodeReplace(List<IResource> resourcesToReplace, List<String> q
}
} catch (DebugException e) {
logger.log(Level.SEVERE, "Failed to complete hot code replace: " + e.getMessage(), e);
errorMessage = e.getMessage();
} finally {
publishEvent(HotCodeReplaceEvent.EventType.END, "Completed hot code replace", qualifiedNamesToReplace);
threadFrameMap.clear();
}

threadFrameMap.clear();
return errorMessage;
}

private void filterNotLoadedTypes(List<IResource> resources, List<String> qualifiedNames) {
Expand Down
0