MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-73432 Deprecate RecurrentTaskExecutor and replace it with ScheduledExecutor

Browse Source 
GitOrigin-RevId: b9641e844427b973f36d32a9aaa1bb93a552dc96
This commit is contained in:
Andrey Lisin
2024-08-27 10:30:25 +02:00
committed by intellij-monorepo-bot
parent 4aa99fd33a
commit ee07968f60
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ClientModeMultiProcessDebugger.java
View File

@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Pair;
import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.xdebugger.XSourcePosition;
import com.intellij.xdebugger.breakpoints.SuspendPolicy;
@@ -21,6 +22,8 @@ import com.jetbrains.python.tables.TableCommandType;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
/**
* @see com.jetbrains.python.debugger.pydev.transport.ClientModeDebuggerTransport
@@ -44,7 +47,7 @@ public class ClientModeMultiProcessDebugger implements ProcessDebugger {
private final CompositeRemoteDebuggerCloseListener myCompositeListener = new CompositeRemoteDebuggerCloseListener();
private final RecurrentTaskExecutor<RemoteDebugger> myExecutor;
private final ScheduledExecutorService myScheduler;
public ClientModeMultiProcessDebugger(@NotNull final IPyDebugProcess debugProcess,
@NotNull String host, int port) {
@@ -53,24 +56,32 @@ public class ClientModeMultiProcessDebugger implements ProcessDebugger {
myPort = port;
String connectionThreadsName = "Debugger connection threads (" + host + ":" + port + ")";
myExecutor = new RecurrentTaskExecutor<>(connectionThreadsName, this::tryToConnectRemoteDebugger, this::onRemoteDebuggerConnected);
myScheduler = ConcurrencyUtil.newSingleScheduledThreadExecutor(connectionThreadsName);
Runnable task = () -> {
try {
tryToConnectRemoteDebugger();
}
catch (Exception e) {
LOG.info(e);
}
};
myScheduler.scheduleAtFixedRate(task, 0, 500, TimeUnit.MILLISECONDS);
}
/**
* Should either successfully connect to the debugger script and return the
* {@link RemoteDebugger} or throw {@link IOException} because of the
* Should either successfully connect to the debugger script or throw {@link IOException} because of the
* connection error or the socket timeout error.
* <p>
* We assume that debugger is successfully connected if the Python debugger
* script responded on `CMD_VERSION` command (see
* {@link RemoteDebugger#handshake()}).
* script responded on `CMD_VERSION` command (see {@link RemoteDebugger#handshake()}).
*
* @return the successfully connected {@link RemoteDebugger}
* @throws Exception if the connection or timeout error occurred
* @see com.jetbrains.python.debugger.pydev.transport.ClientModeDebuggerTransport
*/
@NotNull
private RemoteDebugger tryToConnectRemoteDebugger() throws Exception {
private void tryToConnectRemoteDebugger() throws Exception {
RemoteDebugger debugger = new RemoteDebugger(myDebugProcess, myHost, myPort) {
@Override
protected void onProcessCreatedEvent(int commandSequence) {
@@ -81,11 +92,10 @@ public class ClientModeMultiProcessDebugger implements ProcessDebugger {
catch (PyDebuggerException e) {
LOG.info(e);
}
myExecutor.incrementRequests();
}
};
debugger.waitForConnect();
return debugger;
onRemoteDebuggerConnected(debugger);
}
private void onRemoteDebuggerConnected(@NotNull RemoteDebugger debugger) {
@@ -122,10 +132,6 @@ public class ClientModeMultiProcessDebugger implements ProcessDebugger {
myDebuggerStatusHolder.onConnecting();
// increment the number of debugger connection request initially
myExecutor.incrementRequests();
// waiting for the first connected thread
if (!myDebuggerStatusHolder.awaitWhileConnecting()) {
throw new PyDebuggerException("The process terminated before IDE established connection with Python debugger script");
}
@@ -135,7 +141,7 @@ public class ClientModeMultiProcessDebugger implements ProcessDebugger {
public void close() {
myDebuggerStatusHolder.onDisconnectionInitiated();
myExecutor.dispose();
myScheduler.shutdownNow();
for (ProcessDebugger d : allDebuggers()) {
d.close();
@@ -152,7 +158,7 @@ public class ClientModeMultiProcessDebugger implements ProcessDebugger {
public void disconnect() {
myDebuggerStatusHolder.onDisconnectionInitiated();
myExecutor.dispose();
myScheduler.shutdownNow();
for (ProcessDebugger d : allDebuggers()) {
d.disconnect();

4
python/pydevSrc/src/com/jetbrains/python/debugger/pydev/RecurrentTaskExecutor.kt
View File

@@ -3,9 +3,6 @@ package com.jetbrains.python.debugger.pydev
import com.intellij.openapi.diagnostic.Logger
import com.intellij.util.ConcurrencyUtil
import com.jetbrains.python.debugger.pydev.RecurrentTaskExecutor.Companion.FIXED_THREAD_POOL_SIZE
import com.jetbrains.python.debugger.pydev.RecurrentTaskExecutor.Companion.PERFORM_TASK_ATTEMPT_DELAY
import com.jetbrains.python.debugger.pydev.RecurrentTaskExecutor.RecurrentTask
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
@@ -42,6 +39,7 @@ import kotlin.concurrent.withLock
* is no longer needed to shutdown the executor service and stop the task
* threads.
*/
@Deprecated("Use ScheduledTaskExecutor instead")
class RecurrentTaskExecutor<out T>(threadsName: String,
private val recurrentTask: RecurrentTask<T>,
private val callback: Callback<T>) {