rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

high-speed composite logger #416 

java-driven development
This commit is contained in:
rusefillc 2022-11-14 18:26:13 -05:00
parent cbd737fd39
commit 330addb2e9
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java_console/inifile/src/main/java/com/rusefi/config/Field.java
View File

@ -158,6 +158,19 @@ public class Field {
return options[ordinal];
}
// todo: move universal setValue one day
public void setValueU32(byte[] content, int value) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
LittleEndianOutputStream dout = new LittleEndianOutputStream(baos);
try {
dout.writeInt(value);
byte[] src = baos.toByteArray();
System.arraycopy(src, 0, content, getOffset(), 4);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
public void setValue(byte[] content, boolean value) {
ByteBuffer wrapped = FileUtil.littleEndianWrap(content, 0, content.length);
if (bitOffset != NO_BIT_OFFSET) {

29
java_console/io/src/test/java/com/rusefi/binaryprotocol/test/TcpServerSandbox.java
View File

@ -5,6 +5,7 @@ import com.rusefi.Listener;
import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.IncomingDataBuffer;
import com.rusefi.config.generated.Fields;
import com.rusefi.config.generated.TsOutputs;
import com.rusefi.io.IoStream;
import com.rusefi.io.commands.HelloCommand;
import com.rusefi.io.tcp.BinaryProtocolServer;
@ -28,8 +29,7 @@ import static com.rusefi.io.tcp.BinaryProtocolServer.getOutputCommandResponse;
* @see TcpClientSandbox
*/
public class TcpServerSandbox {
private final static byte [] TOTALLY_EMPTY_CONFIGURATION = new byte[Fields.TOTAL_CONFIG_SIZE];
private final static byte [] TOTALLY_EMPTY_OUTPUTS = new byte[Fields.TS_TOTAL_OUTPUT_SIZE];
private final static byte[] TOTALLY_EMPTY_CONFIGURATION = new byte[Fields.TOTAL_CONFIG_SIZE];
public static void main(String[] args) throws IOException {
Listener serverSocketCreationCallback = parameter -> System.out.println("serverSocketCreationCallback");
@ -43,12 +43,17 @@ public class TcpServerSandbox {
public void run() {
System.out.println("Run server socket: " + socket);
EcuState ecuState = new EcuState();
try {
IoStream stream = new TcpIoStream(TcpServerSandbox.class.getSimpleName(), socket);
IncomingDataBuffer in = stream.getDataBuffer();
while (!socket.isClosed()) {
handleCommand(stream, in, socket);
handleCommand(ecuState, stream, in, socket);
ecuState.onCommand();
}
@ -63,7 +68,21 @@ public class TcpServerSandbox {
serverSocketCreationCallback, StatusConsumer.ANONYMOUS);
}
private static void handleCommand(IoStream stream, IncomingDataBuffer in, Socket socket) throws IOException {
static class EcuState {
private final byte[] outputs = new byte[Fields.TS_TOTAL_OUTPUT_SIZE];
long startUpTime = System.currentTimeMillis();
public void onCommand() {
int seconds = (int) ((System.currentTimeMillis() - startUpTime) / 1000);
TsOutputs.SECONDS.setValueU32(outputs, seconds);
}
}
private static void handleCommand(EcuState ecuState, IoStream stream, IncomingDataBuffer in, Socket socket) throws IOException {
Integer length = BinaryProtocolServer.getPendingPacketLengthOrHandleProtocolCommand(socket, new BinaryProtocolServer.Context(), in);
if (length == null)
return;
@ -80,7 +99,7 @@ public class TcpServerSandbox {
} else if (command == Fields.TS_CRC_CHECK_COMMAND) {
stream.sendPacket(BinaryProtocolServer.createCrcResponse(TOTALLY_EMPTY_CONFIGURATION));
} else if (command == Fields.TS_OUTPUT_COMMAND) {
byte[] response = getOutputCommandResponse(payload, TOTALLY_EMPTY_OUTPUTS);
byte[] response = getOutputCommandResponse(payload, ecuState.outputs);
stream.sendPacket(response);
} else if (command == Fields.TS_READ_COMMAND) {
DataInputStream dis = new DataInputStream(new ByteArrayInputStream(payload, 1, payload.length - 1));