Apple-2-SW/lawless-legends
1
0
Fork 0
mirror of https://github.com/badvision/lawless-legends.git synced 2025-01-18 19:31:49 +00:00
Code Issues Projects Releases Wiki Activity

Switch device list to unsynchronized and use Eclipse collections for speed

Browse Source
This commit is contained in:
Brendan Robert 2021-04-02 16:46:26 -05:00
parent 8fd831479d
commit b727537457
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Platform/Apple/tools/jace/pom.xml
View File

@ -96,9 +96,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>30.1.1-jre</version>
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections</artifactId>
<version>10.4.0</version>
</dependency>
<dependency>
<groupId>org.xerial.thirdparty</groupId>

40
Platform/Apple/tools/jace/src/main/java/jace/core/Device.java
View File

@ -20,11 +20,8 @@ package jace.core;
import jace.state.Stateful;
import jace.config.Reconfigurable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import org.eclipse.collections.api.list.MutableList;
import org.eclipse.collections.impl.factory.Lists;
/**
* Device is a very simple abstraction of any emulation component. A device
@ -34,25 +31,26 @@ import java.util.concurrent.atomic.AtomicBoolean;
*
* Depending on the type of device, some special work might be required to
* attach or detach it to the active emulation (such as what should happen when
* a card is inserted or removed from a slot?)
* Created on May 10, 2007, 5:46 PM
* a card is inserted or removed from a slot?) Created on May 10, 2007, 5:46 PM
*
* @author Brendan Robert (BLuRry) brendan.robert@gmail.com
* @author Brendan Robert (BLuRry) brendan.robert@gmail.com
*/
@Stateful
public abstract class Device implements Reconfigurable {
protected Computer computer;
private List<Device> children;
private MutableList<Device> children;
private Device() {
children = Collections.synchronizedList(new ArrayList<>());
// TODO: Previously this was synchronized -- confirm this is safe to leave unsynchronized
children = Lists.mutable.<Device>empty();
}
public Device(Computer computer) {
this();
this.computer = computer;
}
// Number of cycles to do nothing (for cpu/video cycle accuracy)
@Stateful
private int waitCycles = 0;
@ -62,14 +60,14 @@ public abstract class Device implements Reconfigurable {
public boolean isPaused = false;
@Stateful
public boolean isAttached = false;
public void addChildDevice(Device d) {
children.add(d);
if (isAttached) {
d.attach();
}
}
public void removeChildDevice(Device d) {
children.remove(d);
d.suspend();
@ -77,19 +75,19 @@ public abstract class Device implements Reconfigurable {
d.detach();
}
}
public void addAllDevices(Collection<Device> devices) {
public void addAllDevices(Iterable<Device> devices) {
devices.forEach(this::addChildDevice);
}
public List<Device> getChildren() {
return Collections.unmodifiableList(children);
public Iterable<Device> getChildren() {
return children.asUnmodifiable();
}
public boolean getRunningProperty() {
return run;
}
public void addWaitCycles(int wait) {
waitCycles += wait;
}