eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-25 05:23:51 +00:00
Code Activity

Improved concurrency for RaceLogMappingWrapper

Browse Source
This commit is contained in:
Steffen Schaefer committed 2016-06-23 09:03:09 +02:00
1 parent d8a72494ea
commit 54bb0a26f9
1 file changed
+13 -9
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RaceLogMappingWrapper.java
+13 -9
View File
@@ -8,8 +8,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
@@ -23,20 +21,27 @@ import com.sap.sse.common.WithID;
public abstract class RaceLogMappingWrapper<ItemT extends WithID> {
private final ConcurrentMap<ItemT, List<DeviceMappingWithRegattaLogEvent<ItemT>>> mappings = new ConcurrentHashMap<>();
private final Map<ItemT, List<DeviceMappingWithRegattaLogEvent<ItemT>>> mappings = new HashMap<>();
private final Map<DeviceIdentifier, List<DeviceMappingWithRegattaLogEvent<ItemT>>> mappingsByDevice = new HashMap<>();
private synchronized Map<ItemT, List<DeviceMappingWithRegattaLogEvent<ItemT>>> getMappings() {
return new HashMap<>(mappings);
}
private synchronized Map<DeviceIdentifier, List<DeviceMappingWithRegattaLogEvent<ItemT>>> getMappingsByDevice() {
return new HashMap<>(mappingsByDevice);
}
public void forEachMapping(Consumer<DeviceMappingWithRegattaLogEvent<ItemT>> callback) {
forEachMapping((item, mapping) -> callback.accept(mapping));
}
public void forEachDevice(Consumer<DeviceIdentifier> callback) {
mappingsByDevice.keySet().forEach(callback::accept);
getMappingsByDevice().keySet().forEach(callback::accept);
}
public void forEachMapping(BiConsumer<ItemT, DeviceMappingWithRegattaLogEvent<ItemT>> callback) {
for (Map.Entry<ItemT, List<DeviceMappingWithRegattaLogEvent<ItemT>>> entry : mappings.entrySet()) {
for (Map.Entry<ItemT, List<DeviceMappingWithRegattaLogEvent<ItemT>>> entry : getMappings().entrySet()) {
ItemT item = entry.getKey();
for (DeviceMappingWithRegattaLogEvent<ItemT> mapping : entry.getValue()) {
callback.accept(item, mapping);
@@ -46,7 +51,7 @@ public abstract class RaceLogMappingWrapper<ItemT extends WithID> {
public void forEachMappingOfDeviceIncludingTimePoint(DeviceIdentifier device, TimePoint timePoint,
Consumer<DeviceMappingWithRegattaLogEvent<ItemT>> callback) {
List<DeviceMappingWithRegattaLogEvent<ItemT>> mappingsForDevice = mappingsByDevice.get(device);
List<DeviceMappingWithRegattaLogEvent<ItemT>> mappingsForDevice = getMappingsByDevice().get(device);
if (mappingsForDevice != null) {
for (DeviceMappingWithRegattaLogEvent<ItemT> mapping : mappingsForDevice) {
if (mapping.getTimeRange().includes(timePoint)) {
@@ -89,9 +94,8 @@ public abstract class RaceLogMappingWrapper<ItemT extends WithID> {
updateMappings(newMappings, loadIfNotCovered);
}
private void updateMappings(Map<ItemT, List<DeviceMappingWithRegattaLogEvent<ItemT>>> newMappings,
private synchronized void updateMappings(Map<ItemT, List<DeviceMappingWithRegattaLogEvent<ItemT>>> newMappings,
boolean loadIfNotCovered) {
// TODO lock
if (loadIfNotCovered) {
Set<ItemT> itemsToProcess = new HashSet<ItemT>(mappings.keySet());
itemsToProcess.addAll(newMappings.keySet());