Skip to content
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

Jump to bottom

Do not try to refresh threads to compute resume/suspend #837

Merged
merged 1 commit into from
Oct 6, 2023
Merged

Do not try to refresh threads to compute resume/suspend #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
83 changes: 30 additions & 53 deletions org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/debugmodel/DSPDebugTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,22 @@
import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
import java.util.Map.Entry;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.function.UnaryOperator;
import java.util.stream.Collectors;

import org.eclipse.core.resources.IMarkerDelta;
import org.eclipse.core.runtime.CoreException;
Expand Down Expand Up @@ -79,7 +78,6 @@
import org.eclipse.lsp4j.debug.TerminatedEventArguments;
import org.eclipse.lsp4j.debug.Thread;
import org.eclipse.lsp4j.debug.ThreadEventArguments;
import org.eclipse.lsp4j.debug.ThreadsResponse;
import org.eclipse.lsp4j.debug.launch.DSPLauncher;
import org.eclipse.lsp4j.debug.services.IDebugProtocolClient;
import org.eclipse.lsp4j.debug.services.IDebugProtocolServer;
Expand Down Expand Up @@ -130,10 +128,6 @@ public class DSPDebugTarget extends DSPDebugElement implements IDebugTarget, IDe
* they are up to date (against the {@link #refreshThreads} flag).
*/
private final Map<Integer, DSPThread> threads = Collections.synchronizedMap(new TreeMap<>());
/**
* Set to true to update the threads list from the debug adapter.
*/
private final AtomicBoolean refreshThreads = new AtomicBoolean(true);

private boolean fTerminated = false;
private boolean fSentTerminateRequest = false;
Expand Down Expand Up @@ -214,6 +208,7 @@ public void initialize(IProgressMonitor monitor) throws CoreException {
debugProtocolServer = debugProtocolLauncher.getRemoteProxy();

CompletableFuture<?> future = initialize(dspParameters, subMonitor);
future.thenRun(this::triggerUpdateThreads); // VSCode always queries "threads" after configurationDone
monitorGet(future, subMonitor);
} catch (Exception e) {
terminated();
Expand Down Expand Up @@ -458,7 +453,7 @@ public void continued(ContinuedEventArguments body) {

@Override
public void stopped(StoppedEventArguments body) {
threadPool.execute(() -> {
triggerUpdateThreads().thenRunAsync(() -> {
DSPThread source = null;
if (body.getThreadId() != null) {
source = getThread(body.getThreadId());
Expand All @@ -474,7 +469,7 @@ public void stopped(StoppedEventArguments body) {
source.stopped();
source.fireSuspendEvent(calcDetail(body.getReason()));
}
});
}, threadPool);
}

private int calcDetail(String reason) {
Expand Down Expand Up @@ -556,46 +551,7 @@ public IProcess getProcess() {

@Override
public DSPThread[] getThreads() {
if (!refreshThreads.getAndSet(false)) {
synchronized (threads) {
Collection<DSPThread> values = threads.values();
return values.toArray(new DSPThread[values.size()]);
}
}
try {
var server = getDebugProtocolServer();
if (server == null) {
return new DSPThread[0];
}
CompletableFuture<ThreadsResponse> threads2 = server.threads();
CompletableFuture<DSPThread[]> future = threads2.thenApplyAsync(threadsResponse -> {
synchronized (threads) {
final var lastThreads = new TreeMap<Integer, DSPThread>(threads);
threads.clear();
Thread[] body = threadsResponse.getThreads();
for (Thread thread : body) {
DSPThread dspThread = lastThreads.get(thread.getId());
if (dspThread == null) {
dspThread = new DSPThread(this, thread.getId());
}
dspThread.update(thread);
threads.put(thread.getId(), dspThread);
// fireChangeEvent(DebugEvent.CONTENT);
}
Collection<DSPThread> values = threads.values();
return values.toArray(new DSPThread[values.size()]);
}
});
return future.get();
} catch (RuntimeException | ExecutionException e) {
if (isTerminated()) {
return new DSPThread[0];
}
DSPPlugin.logError(e);
} catch (InterruptedException e) {
java.lang.Thread.currentThread().interrupt();
}
return new DSPThread[0];
return threads.values().toArray(DSPThread[]::new);
}

/**
Expand Down Expand Up @@ -632,8 +588,29 @@ public void exited(ExitedEventArguments args) {

@Override
public void thread(ThreadEventArguments args) {
refreshThreads.set(true);
fireChangeEvent(DebugEvent.CONTENT);
triggerUpdateThreads();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that in case where multiple threads are started in quick succession this will cause multiple threads() calls to be made in quick succession.

}

private CompletableFuture<?> triggerUpdateThreads() {
return getDebugProtocolServer().threads().thenAcceptAsync(threadsResponse -> {
var threadIds = Arrays.stream(threadsResponse.getThreads()).map(Thread::getId).collect(Collectors.toSet());
boolean contentChanged = false;
synchronized (threads) {
contentChanged = threads.keySet().removeIf(Predicate.not(threadIds::contains));
for (Thread thread : threadsResponse.getThreads()) {
DSPThread dspThread = threads.get(thread.getId());
if (dspThread == null) {
dspThread = new DSPThread(this, thread.getId());
threads.put(dspThread.getId(), dspThread);
contentChanged = true;
}
dspThread.update(thread);
}
}
if (contentChanged) {
fireChangeEvent(DebugEvent.CONTENT);
}
});
}

@Override
Expand Down
14 changes: 9 additions & 5 deletions org.eclipse.lsp4e.debug/src/org/eclipse/lsp4e/debug/debugmodel/DSPThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ public DSPThread(DSPDebugTarget debugTarget, Integer threadId) {
*/
public void update(Thread thread) {
Assert.isTrue(Objects.equals(this.id, thread.getId()));
this.name = thread.getName();
if (!Objects.equals(this.name, thread.getName())) {
fireChangeEvent(DebugEvent.STATE);
this.name = thread.getName();
}
refreshFrames.set(true);
// fireChangeEvent(DebugEvent.STATE);
}

@Override
Expand Down Expand Up @@ -101,7 +103,7 @@ public void continued() {
public void stopped() {
isSuspended = true;
stepping = false;
refreshFrames.set(true);
frames.clear();
}

@Override
Expand Down Expand Up @@ -226,8 +228,10 @@ public IStackFrame getTopStackFrame() throws DebugException {
}
}

@Override
public IStackFrame[] getStackFrames() throws DebugException {
@Override public IStackFrame[] getStackFrames() throws DebugException {
if (!isSuspended()) {
return new IStackFrame[0];
}
if (!refreshFrames.getAndSet(false)) {
synchronized (frames) {
return frames.toArray(new DSPStackFrame[frames.size()]);
Expand Down