Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small rename.

Browse Source
This commit is contained in:
Florian Nücke
2022-01-28 00:58:59 +01:00
parent b75f5cbca2
commit cbb19eff70
5 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java
View File

@@ -70,7 +70,7 @@ public final class RPCDeviceBusAdapter implements Steppable {
///////////////////////////////////////////////////////////////////
public void mount() {
public void mountDevices() {
for (final RPCDevice device : unmountedDevices) {
device.mount();
}
@@ -79,7 +79,7 @@ public final class RPCDeviceBusAdapter implements Steppable {
unmountedDevices.clear();
}
public void unmount() {
public void unmountDevices() {
for (final RPCDevice device : mountedDevices) {
device.unmount();
}
@@ -88,8 +88,8 @@ public final class RPCDeviceBusAdapter implements Steppable {
mountedDevices.clear();
}
public void dispose() {
unmount();
public void disposeDevices() {
unmountDevices();
unmountedDevices.forEach(RPCDeviceList::dispose);
}

12
src/main/java/li/cil/oc2/common/vm/AbstractVirtualMachine.java
View File

@@ -90,8 +90,8 @@ public abstract class AbstractVirtualMachine implements VirtualMachine {
public void suspend() {
joinWorkerThread();
state.vmAdapter.unmount();
state.rpcAdapter.unmount();
state.vmAdapter.unmountDevices();
state.rpcAdapter.unmountDevices();
}
@Override
@@ -203,8 +203,8 @@ public abstract class AbstractVirtualMachine implements VirtualMachine {
state.board.setRunning(false);
state.board.reset();
state.rpcAdapter.reset();
state.rpcAdapter.dispose();
state.vmAdapter.dispose();
state.rpcAdapter.disposeDevices();
state.vmAdapter.disposeDevices();
runner = null;
}
@@ -309,7 +309,7 @@ public abstract class AbstractVirtualMachine implements VirtualMachine {
return;
}
final VMDeviceLoadResult loadResult = state.vmAdapter.mount();
final VMDeviceLoadResult loadResult = state.vmAdapter.mountDevices();
if (!loadResult.wasSuccessful()) {
if (loadResult.getErrorMessage() != null) {
error(loadResult.getErrorMessage(), false);
@@ -343,7 +343,7 @@ public abstract class AbstractVirtualMachine implements VirtualMachine {
runner = createRunner();
}
state.rpcAdapter.mount();
state.rpcAdapter.mountDevices();
setRunState(VMRunState.RUNNING);

8
src/main/java/li/cil/oc2/common/vm/VMDeviceBusAdapter.java
View File

@@ -32,7 +32,7 @@ public final class VMDeviceBusAdapter {
baseAddressProvider = provider;
}
public VMDeviceLoadResult mount() {
public VMDeviceLoadResult mountDevices() {
globalContext.joinWorkerThread();
for (final VMDevice device : unmountedDevices) {
@@ -63,7 +63,7 @@ public final class VMDeviceBusAdapter {
return VMDeviceLoadResult.success();
}
public void unmount() {
public void unmountDevices() {
globalContext.joinWorkerThread();
mountedDevices.forEach((device, context) -> {
@@ -75,8 +75,8 @@ public final class VMDeviceBusAdapter {
mountedDevices.clear();
}
public void dispose() {
unmount();
public void disposeDevices() {
unmountDevices();
unmountedDevices.forEach(VMDevice::dispose);
}

28
src/test/java/li/cil/oc2/common/bus/RPCDeviceTests.java
View File

@@ -42,7 +42,7 @@ public final class RPCDeviceTests {
final RPCDevice device = addEmptyDevice();
adapter.resume(controller, true);
adapter.mount();
adapter.mountDevices();
verify(device, never()).mount();
}
@@ -51,7 +51,7 @@ public final class RPCDeviceTests {
final RPCDevice device = addDevice();
adapter.resume(controller, true);
adapter.mount();
adapter.mountDevices();
verify(device).mount();
}
@@ -59,7 +59,7 @@ public final class RPCDeviceTests {
public void mountedDevicesAreUnmountedAndDisposedWhenRemoved() {
final RPCDevice device = addDevice();
adapter.resume(controller, true);
adapter.mount();
adapter.mountDevices();
removeDevice(device);
adapter.resume(controller, true);
@@ -82,9 +82,9 @@ public final class RPCDeviceTests {
public void mountedDevicesAreUnmountedButNotDisposedOnGlobalUnmount() {
final RPCDevice device = addDevice();
adapter.resume(controller, true);
adapter.mount();
adapter.mountDevices();
adapter.unmount();
adapter.unmountDevices();
verify(device).unmount();
verify(device, never()).dispose();
}
@@ -94,7 +94,7 @@ public final class RPCDeviceTests {
final RPCDevice device = addDevice();
adapter.resume(controller, true);
adapter.unmount();
adapter.unmountDevices();
verify(device, never()).unmount();
verify(device, never()).dispose();
}
@@ -103,9 +103,9 @@ public final class RPCDeviceTests {
public void mountedDevicesAreUnmountedAndDisposedOnGlobalDispose() {
final RPCDevice device = addDevice();
adapter.resume(controller, true);
adapter.mount();
adapter.mountDevices();
adapter.dispose();
adapter.disposeDevices();
verify(device).unmount();
verify(device).dispose();
}
@@ -115,7 +115,7 @@ public final class RPCDeviceTests {
final RPCDevice device = addDevice();
adapter.resume(controller, true);
adapter.dispose();
adapter.disposeDevices();
verify(device, never()).unmount();
verify(device).dispose();
}
@@ -124,10 +124,10 @@ public final class RPCDeviceTests {
public void devicesHaveMountCalledAfterGlobalUnmount() {
final RPCDevice device = addDevice();
adapter.resume(controller, true);
adapter.mount();
adapter.unmount();
adapter.mountDevices();
adapter.unmountDevices();
adapter.mount();
adapter.mountDevices();
verify(device, times(2)).mount();
}
@@ -144,7 +144,7 @@ public final class RPCDeviceTests {
verify(device1, never()).mount();
verify(device2, never()).mount();
adapter.mount();
adapter.mountDevices();
verify(device1).mount();
verify(device2).mount();
@@ -153,7 +153,7 @@ public final class RPCDeviceTests {
verify(device1, never()).unmount();
verify(device2, never()).unmount();
adapter.mount();
adapter.mountDevices();
verify(device1, atMostOnce()).mount();
verify(device2, atMostOnce()).mount();
}

50
src/test/java/li/cil/oc2/common/bus/VMDeviceTests.java
View File

@@ -74,7 +74,7 @@ public final class VMDeviceTests {
when(device.mount(any())).thenReturn(VMDeviceLoadResult.success());
adapter.addDevices(Collections.singleton(device));
assertTrue(adapter.mount().wasSuccessful());
assertTrue(adapter.mountDevices().wasSuccessful());
verify(device).mount(any());
}
@@ -86,11 +86,11 @@ public final class VMDeviceTests {
when(device2.mount(any())).thenReturn(VMDeviceLoadResult.success());
adapter.addDevices(Collections.singleton(device1));
adapter.mount();
adapter.mountDevices();
verify(device1).mount(any());
adapter.addDevices(Collections.singleton(device2));
adapter.mount();
adapter.mountDevices();
verifyNoMoreInteractions(device1);
}
@@ -100,7 +100,7 @@ public final class VMDeviceTests {
when(device.mount(any())).thenReturn(VMDeviceLoadResult.fail());
adapter.addDevices(Collections.singleton(device));
assertFalse(adapter.mount().wasSuccessful());
assertFalse(adapter.mountDevices().wasSuccessful());
verify(device).mount(any());
verify(device, never()).unmount();
verify(device, never()).dispose();
@@ -115,7 +115,7 @@ public final class VMDeviceTests {
adapter.addDevices(Collections.singleton(device1));
adapter.addDevices(Collections.singleton(device2));
adapter.mount();
adapter.mountDevices();
verify(device1).mount(any());
verify(device2).mount(any());
@@ -129,7 +129,7 @@ public final class VMDeviceTests {
when(device.mount(any())).thenReturn(VMDeviceLoadResult.success());
adapter.addDevices(Collections.singleton(device));
assertTrue(adapter.mount().wasSuccessful());
assertTrue(adapter.mountDevices().wasSuccessful());
adapter.removeDevices(Collections.singleton(device));
verify(device).unmount();
@@ -152,9 +152,9 @@ public final class VMDeviceTests {
when(device.mount(any())).thenReturn(VMDeviceLoadResult.success());
adapter.addDevices(Collections.singleton(device));
assertTrue(adapter.mount().wasSuccessful());
assertTrue(adapter.mountDevices().wasSuccessful());
adapter.unmount();
adapter.unmountDevices();
verify(device).unmount();
verify(device, never()).dispose();
}
@@ -165,7 +165,7 @@ public final class VMDeviceTests {
adapter.addDevices(Collections.singleton(device));
adapter.unmount();
adapter.unmountDevices();
verify(device, never()).unmount();
verify(device, never()).dispose();
}
@@ -175,9 +175,9 @@ public final class VMDeviceTests {
final VMDevice device = mock(VMDevice.class);
when(device.mount(any())).thenReturn(VMDeviceLoadResult.success());
adapter.addDevices(Collections.singleton(device));
adapter.mount();
adapter.mountDevices();
adapter.dispose();
adapter.disposeDevices();
verify(device).unmount();
verify(device).dispose();
}
@@ -187,7 +187,7 @@ public final class VMDeviceTests {
final VMDevice device = mock(VMDevice.class);
adapter.addDevices(Collections.singleton(device));
adapter.dispose();
adapter.disposeDevices();
verify(device, never()).unmount();
verify(device).dispose();
}
@@ -198,10 +198,10 @@ public final class VMDeviceTests {
when(device.mount(any())).thenReturn(VMDeviceLoadResult.success());
adapter.addDevices(Collections.singleton(device));
adapter.mount();
adapter.unmount();
adapter.mountDevices();
adapter.unmountDevices();
assertTrue(adapter.mount().wasSuccessful());
assertTrue(adapter.mountDevices().wasSuccessful());
verify(device, times(2)).mount(any());
}
@@ -216,7 +216,7 @@ public final class VMDeviceTests {
});
adapter.addDevices(Collections.singleton(device));
assertTrue(adapter.mount().wasSuccessful());
assertTrue(adapter.mountDevices().wasSuccessful());
verify(device).mount(any());
}
@@ -236,7 +236,7 @@ public final class VMDeviceTests {
context.getInterruptAllocator().claimInterrupt(claimedInterrupt);
adapter.addDevices(Collections.singleton(device));
assertTrue(adapter.mount().wasSuccessful());
assertTrue(adapter.mountDevices().wasSuccessful());
}
@Test
@@ -255,7 +255,7 @@ public final class VMDeviceTests {
});
adapter.addDevices(Collections.singleton(device));
assertTrue(adapter.mount().wasSuccessful());
assertTrue(adapter.mountDevices().wasSuccessful());
final int claimedInterruptMask = 1 << deviceData.interrupt;
deviceData.context.getInterruptController().raiseInterrupts(claimedInterruptMask);
@@ -273,7 +273,7 @@ public final class VMDeviceTests {
});
adapter.addDevices(Collections.singleton(device));
assertTrue(adapter.mount().wasSuccessful());
assertTrue(adapter.mountDevices().wasSuccessful());
final int someInterruptMask = 0x1;
assertThrows(IllegalArgumentException.class, () ->
@@ -296,14 +296,14 @@ public final class VMDeviceTests {
});
adapter.addDevices(Collections.singleton(device));
assertTrue(adapter.mount().wasSuccessful());
assertTrue(adapter.mountDevices().wasSuccessful());
final int claimedInterruptMask = 1 << deviceData.interrupt;
deviceData.context.getInterruptController().raiseInterrupts(claimedInterruptMask);
assertTrue((interruptController.getRaisedInterrupts() & claimedInterruptMask) != 0);
adapter.unmount();
adapter.unmountDevices();
assertFalse((interruptController.getRaisedInterrupts() & claimedInterruptMask) != 0);
}
@@ -321,7 +321,7 @@ public final class VMDeviceTests {
});
adapter.addDevices(Collections.singleton(device));
adapter.mount();
adapter.mountDevices();
}
@Test
@@ -341,7 +341,7 @@ public final class VMDeviceTests {
});
adapter.addDevices(Collections.singleton(device));
assertTrue(adapter.mount().wasSuccessful());
assertTrue(adapter.mountDevices().wasSuccessful());
assertTrue(deviceData.context.getMemoryMap().getMemoryRange(deviceData.device).isPresent());
}
@@ -363,11 +363,11 @@ public final class VMDeviceTests {
});
adapter.addDevices(Collections.singleton(device));
assertTrue(adapter.mount().wasSuccessful());
assertTrue(adapter.mountDevices().wasSuccessful());
assertTrue(deviceData.context.getMemoryMap().getMemoryRange(deviceData.device).isPresent());
adapter.unmount();
adapter.unmountDevices();
assertFalse(deviceData.context.getMemoryMap().getMemoryRange(deviceData.device).isPresent());
}