rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

my test phone is oooooold

This commit is contained in:
rusefi 2020-08-15 22:03:43 -04:00
parent 3e207b5549
commit 42bf7f03c4
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java_console/io/src/main/java/com/rusefi/CompatibleFunction.java Normal file
View File

@ -0,0 +1,8 @@
package com.rusefi;
/**
* reducing Android level down from 24
*/
public interface CompatibleFunction<T, R> {
R apply(T t);
}

3
java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java
View File

@ -1,6 +1,7 @@
package com.rusefi.io.tcp;
import com.devexperts.logging.Logging;
import com.rusefi.CompatibleFunction;
import com.rusefi.Listener;
import com.rusefi.Timeouts;
import com.rusefi.binaryprotocol.BinaryProtocol;
@ -32,7 +33,7 @@ public class BinaryProtocolProxy {
public static final int USER_IO_TIMEOUT = 10 * Timeouts.MINUTE;
public static ServerSocketReference createProxy(IoStream targetEcuSocket, int serverProxyPort, AtomicInteger relayCommandCounter) throws IOException {
Function<Socket, Runnable> clientSocketRunnableFactory = clientSocket -> () -> {
CompatibleFunction<Socket, Runnable> clientSocketRunnableFactory = clientSocket -> () -> {
TcpIoStream clientStream = null;
try {
clientStream = new TcpIoStream("[[proxy]] ", clientSocket);

16
java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java
View File

@ -2,6 +2,7 @@ package com.rusefi.io.tcp;
import com.devexperts.logging.Logging;
import com.opensr5.ConfigurationImage;
import com.rusefi.CompatibleFunction;
import com.rusefi.Listener;
import com.rusefi.NamedThreadFactory;
import com.rusefi.Timeouts;
@ -72,7 +73,7 @@ public class BinaryProtocolServer implements BinaryProtocolCommands {
public void start(LinkManager linkManager, int port, Listener serverSocketCreationCallback, Context context) throws IOException {
log.info("BinaryProtocolServer on " + port);
Function<Socket, Runnable> clientSocketRunnableFactory = clientSocket -> () -> {
CompatibleFunction<Socket, Runnable> clientSocketRunnableFactory = clientSocket -> () -> {
try {
runProxy(linkManager, clientSocket, context);
} catch (IOException e) {
@ -92,11 +93,11 @@ public class BinaryProtocolServer implements BinaryProtocolCommands {
* @param serverSocketCreationCallback this callback is invoked once we open the server socket
* @return
*/
public static ServerSocketReference tcpServerSocket(int port, String threadName, Function<Socket, Runnable> socketRunnableFactory, Listener serverSocketCreationCallback) throws IOException {
public static ServerSocketReference tcpServerSocket(int port, String threadName, CompatibleFunction<Socket, Runnable> socketRunnableFactory, Listener serverSocketCreationCallback) throws IOException {
return tcpServerSocket(socketRunnableFactory, port, threadName, serverSocketCreationCallback, PLAIN_SOCKET_FACTORY);
}
public static ServerSocketReference tcpServerSocket(Function<Socket, Runnable> clientSocketRunnableFactory, int port, String threadName, Listener serverSocketCreationCallback, ServerSocketFunction nonSecureSocketFunction) throws IOException {
public static ServerSocketReference tcpServerSocket(CompatibleFunction<Socket, Runnable> clientSocketRunnableFactory, int port, String threadName, Listener serverSocketCreationCallback, ServerSocketFunction nonSecureSocketFunction) throws IOException {
ThreadFactory threadFactory = getThreadFactory(threadName);
Objects.requireNonNull(serverSocketCreationCallback, "serverSocketCreationCallback");
@ -125,7 +126,14 @@ public class BinaryProtocolServer implements BinaryProtocolCommands {
@NotNull
public static ThreadFactory getThreadFactory(String threadName) {
return THREAD_FACTORIES_BY_NAME.computeIfAbsent(threadName, NamedThreadFactory::new);
synchronized (THREAD_FACTORIES_BY_NAME) {
ThreadFactory threadFactory = THREAD_FACTORIES_BY_NAME.get(threadName);
if (threadFactory == null) {
threadFactory = new NamedThreadFactory(threadName);
THREAD_FACTORIES_BY_NAME.put(threadName, threadFactory);
}
return threadFactory;
}
}
@SuppressWarnings("InfiniteLoopStatement")

6
java_console/io/src/main/java/com/rusefi/proxy/NetworkConnector.java
View File

@ -70,10 +70,10 @@ public class NetworkConnector implements Closeable {
return start(authToken, context, reconnectListener, controllerConnector);
}
public NetworkConnectorResult start(String authToken, NetworkConnectorContext context, ReconnectListener reconnectListener, LinkManager controllerConnector) {
public NetworkConnectorResult start(String authToken, NetworkConnectorContext context, ReconnectListener reconnectListener, LinkManager linkManager) {
ControllerInfo controllerInfo;
try {
controllerInfo = getControllerInfo(controllerConnector, controllerConnector.getConnector().getBinaryProtocol().getStream());
controllerInfo = getControllerInfo(linkManager, linkManager.getConnector().getBinaryProtocol().getStream());
} catch (IOException e) {
return NetworkConnectorResult.ERROR;
}
@ -87,7 +87,7 @@ public class NetworkConnector implements Closeable {
proxyReconnectSemaphore.acquire();
try {
start(context.serverPortForControllers(), controllerConnector, authToken, (String message) -> {
start(context.serverPortForControllers(), linkManager, authToken, (String message) -> {
log.error(message + " Disconnect from proxy server detected, now sleeping " + context.reconnectDelay() + " seconds");
sleep(context.reconnectDelay() * Timeouts.SECOND);
log.debug("Releasing semaphore");