MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[debugger] merged stashAndReattach and reattach functions into one reattach(keepCurrentVM)

Browse Source 
GitOrigin-RevId: 27db572b02c73500fcf85ae05ffc978f358e8958
This commit is contained in:
Sergei Vorobyov
2020-10-19 15:48:08 +00:00
committed by intellij-monorepo-bot
parent 3cffd1cf57
commit 0df0f8e507
3 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
+21 -34
View File
@@ -91,7 +91,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import static com.intellij.execution.configurations.RemoteConnection.*;
import static com.intellij.execution.configurations.RemoteConnection.ConnectionMode;
public abstract class DebugProcessImpl extends UserDataHolderBase implements DebugProcess {
private static final Logger LOG = Logger.getInstance(DebugProcessImpl.class);
@@ -930,12 +930,6 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
}
}
protected void stashProcess(boolean closedByUser) {
detachProcess(closedByUser, vmData -> {
myStashedVirtualMachines.addFirst(vmData);
});
}
protected void closeProcess(boolean closedByUser) {
detachProcess(closedByUser, vmData -> {
//if (DebuggerSettings.getInstance().UNMUTE_ON_STOP) {
@@ -2024,27 +2018,32 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
}
public void reattach(final DebugEnvironment environment) {
reattach(environment, () -> {});
reattach(environment, false, () -> {});
}
public void reattach(final DebugEnvironment environment, Runnable vmReadyCallback) {
reattach(environment, ReattachType.SEQUENCE, vmReadyCallback);
}
public void stashAndReattach(final DebugEnvironment environment, Runnable vmReadyCallback) {
reattach(environment, ReattachType.STASH, vmReadyCallback);
public void reattach(final DebugEnvironment environment, boolean keepCurrentVM, Runnable vmReadyCallback) {
reattach(environment, () -> {
if (keepCurrentVM) {
detachProcess(false, vmData -> {
myStashedVirtualMachines.addFirst(vmData);
});
} else {
closeProcess(false);
}
}, vmReadyCallback);
}
private void unstashAndReattach() {
VirtualMachineData vmData = myStashedVirtualMachines.pollFirst();
if (vmData != null && vmData.vm != null) {
reattach(vmData.connection, ReattachType.UNSTASH, () -> {
reattach(vmData.connection, () -> {}, () -> {
afterProcessStarted(() -> getManagerThread().schedule(new DebuggerCommandImpl() {
@Override
protected void action() {
try {
commitVM(vmData.vm.getVirtualMachine());
} catch (VMDisconnectedException e) {
}
catch (VMDisconnectedException e) {
fail();
}
}
@@ -2053,29 +2052,21 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
}
}
private void reattach(DebugEnvironment environment, ReattachType type, Runnable vmReadyCallback) {
reattach(environment.getRemoteConnection(), type, () -> {
private void reattach(DebugEnvironment environment, Runnable detachVm, Runnable vmReadyCallback) {
reattach(environment.getRemoteConnection(), detachVm, () -> {
createVirtualMachine(environment);
vmReadyCallback.run();
});
}
private void reattach(RemoteConnection connection, ReattachType type, Runnable attachVm) {
private void reattach(RemoteConnection connection, Runnable detachVm, Runnable attachVm) {
if (!myIsStopped.get()) {
getManagerThread().schedule(new DebuggerCommandImpl() {
@Override
protected void action() {
if (!myConnection.getConnectionMode().equals(ConnectionMode.FAKE_SERVER)) {
switch (type) {
case SEQUENCE:
closeProcess(false);
break;
case STASH:
stashProcess(false);
break;
case UNSTASH:
break;
}
ConnectionMode connectionMode = myConnection.getConnectionMode();
if (!ConnectionMode.FAKE_SERVER.equals(connectionMode)) {
detachVm.run();
}
getManagerThread().processRemaining();
doReattach();
@@ -2453,10 +2444,6 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
}
}
private enum ReattachType {
SEQUENCE, STASH, UNSTASH
}
private static class VirtualMachineData {
public final VirtualMachineProxyImpl vm;
public final RemoteConnection connection;
java/execution/impl/src/com/intellij/execution/JavaTestFrameworkDebuggerRunner.java
+1 -1
View File
@@ -56,7 +56,7 @@ public abstract class JavaTestFrameworkDebuggerRunner extends GenericDebuggerRun
if (process == null) break;
final RemoteConnection connection = new RemoteConnection(true, "127.0.0.1", String.valueOf(read), true);
final DebugEnvironment env = new DefaultDebugEnvironment(environment, state, connection, true);
((DebugProcessImpl)process).reattach(env, () -> {
((DebugProcessImpl)process).reattach(env, false, () -> {
try {
accept.getOutputStream().write(0);
}
java/execution/impl/src/com/intellij/openapi/externalSystem/service/execution/ForkedDebuggerThread.java
+1 -1
View File
@@ -213,7 +213,7 @@ class ForkedDebuggerThread extends Thread {
RemoteConnection connection = runConfiguration.createRemoteConnection();
DebugEnvironment environment = new DefaultDebugEnvironment(myMainExecutionEnvironment, myMainRunnableState, connection, true);
ApplicationManager.getApplication().invokeAndWait(() -> {
((DebugProcessImpl)debugProcess).stashAndReattach(environment, () -> callback.accept(debugProcess));
((DebugProcessImpl)debugProcess).reattach(environment, true, () -> callback.accept(debugProcess));
});
}
}