TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-23 20:32:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

reduces the danger of race conditions

Browse Source
This commit is contained in:
hneemann 2021-05-01 11:40:15 +02:00
parent 4a8564198b
commit 1af59a16cf
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/de/neemann/digital/core/io/telnet/Server.java
View File

@ -5,7 +5,7 @@
*/ */
package de.neemann.digital.core.io.telnet; package de.neemann.digital.core.io.telnet;
import de.neemann.digital.core.Observer; import de.neemann.digital.core.SyncAccess;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -22,7 +22,8 @@ public class Server {
private final ServerThread serverThread; private final ServerThread serverThread;
private boolean telnetEscape; private boolean telnetEscape;
private ClientThread client; private ClientThread client;
private Observer notify; private Telnet telnet;
private SyncAccess syncAccess;
Server(int port) throws IOException { Server(int port) throws IOException {
buffer = new ByteBuffer(1024); buffer = new ByteBuffer(1024);
@ -48,8 +49,15 @@ public class Server {
buffer.deleteAll(); buffer.deleteAll();
} }
void setNotify(Observer notify) { /**
this.notify = notify; * Connects the server with the telnet node
*
* @param telnet the telnet node
* @param syncAccess used to access the model
*/
public void setTelnetNode(Telnet telnet, SyncAccess syncAccess) {
this.telnet = telnet;
this.syncAccess = syncAccess;
} }
boolean hasData() { boolean hasData() {
@ -65,9 +73,11 @@ public class Server {
} }
private void dataReceived(int data) { private void dataReceived(int data) {
buffer.put((byte) data); if (syncAccess != null)
if (notify != null) syncAccess.modify(() -> {
notify.hasChanged(); buffer.put((byte) data);
telnet.hasChanged();
});
} }
boolean isDead() { boolean isDead() {

2
src/main/java/de/neemann/digital/core/io/telnet/Telnet.java
View File

@ -103,7 +103,7 @@ public class Telnet extends Node implements Element {
throw new NodeException(Lang.get("err_couldNotCreateServer"), e); throw new NodeException(Lang.get("err_couldNotCreateServer"), e);
} }
server.setTelnetEscape(telnetEscape); server.setTelnetEscape(telnetEscape);
server.setNotify(() -> model.modify(Telnet.this::hasChanged)); server.setTelnetNode(this, model);
} }
} }