Issue #924 fix some concurrency issues for GridResource
Former-commit-id:78491d6318[formerlye18782687c] [formerlyde742a4b8c[formerly 312361f3bacf9ed935ee7cd69be90192af34b3fd]] Former-commit-id:de742a4b8cFormer-commit-id:3e9abe8682
This commit is contained in:
Ben Steffensmeier
parent
a307242aea
commit
bcea00c92b
1 changed files with 149 additions and 136 deletions
|
|
@ -23,7 +23,6 @@ import java.text.DecimalFormat;
|
|||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
|
|
@ -196,6 +195,14 @@ public class GridResource extends
|
|||
|
||||
private StyleRule styleRule;
|
||||
|
||||
/**
|
||||
* The great protector of all things related to dataTimes, do not modify or
|
||||
* iterate over pdosToParse, dataTimes, or tileSet unless you sync on this
|
||||
* or else...
|
||||
*
|
||||
*/
|
||||
protected Object timeLock = new Object();
|
||||
|
||||
/**
|
||||
* Extends the MemoryBasedTileSet class so that we can have direct access to
|
||||
* the loadedData
|
||||
|
|
@ -575,12 +582,14 @@ public class GridResource extends
|
|||
|
||||
GribRecord[] records = resourceData.getRecords();
|
||||
GribRecord emptyRecord = new GribRecord();
|
||||
for (int i = 0; i < records.length; i++) {
|
||||
if (emptyRecord.equals(records[i])) {
|
||||
// Don't add empty records
|
||||
continue;
|
||||
synchronized (timeLock) {
|
||||
for (int i = 0; i < records.length; i++) {
|
||||
if (emptyRecord.equals(records[i])) {
|
||||
// Don't add empty records
|
||||
continue;
|
||||
}
|
||||
pdosToParse.add(records[i]);
|
||||
}
|
||||
pdosToParse.add(records[i]);
|
||||
}
|
||||
|
||||
if (resourceData.getNameGenerator() == null) {
|
||||
|
|
@ -650,14 +659,16 @@ public class GridResource extends
|
|||
|
||||
mbts = createTileSet(record, lvlSet, levelConverter);
|
||||
mbts.setMapDescriptor(descriptor);
|
||||
Set<DataTime> dateSet = tileSet.keySet();
|
||||
dataTimes.clear();
|
||||
Iterator<DataTime> dateIterator = dateSet.iterator();
|
||||
while (dateIterator.hasNext()) {
|
||||
dataTimes.add(dateIterator.next());
|
||||
}
|
||||
synchronized (timeLock) {
|
||||
Set<DataTime> dateSet = tileSet.keySet();
|
||||
dataTimes.clear();
|
||||
Iterator<DataTime> dateIterator = dateSet.iterator();
|
||||
while (dateIterator.hasNext()) {
|
||||
dataTimes.add(dateIterator.next());
|
||||
}
|
||||
|
||||
Collections.sort(dataTimes);
|
||||
Collections.sort(dataTimes);
|
||||
}
|
||||
|
||||
levels = new SingleLevel[lvlSet.size()];
|
||||
Iterator<SingleLevel> lvlIterator = lvlSet.iterator();
|
||||
|
|
@ -675,12 +686,14 @@ public class GridResource extends
|
|||
Set<SingleLevel> lvlSet, UnitConverter levelConverter)
|
||||
throws VizException {
|
||||
DataTime dataTime = record.getDataTime();
|
||||
Map<Float, GridMemoryBasedTileSet> tilemap = tileSet.get(dataTime);
|
||||
if (tilemap == null) {
|
||||
tilemap = new HashMap<Float, GridMemoryBasedTileSet>();
|
||||
tileSet.put(dataTime, tilemap);
|
||||
Map<Float, GridMemoryBasedTileSet> tilemap = null;
|
||||
synchronized (timeLock) {
|
||||
tilemap = tileSet.get(dataTime);
|
||||
if (tilemap == null) {
|
||||
tilemap = new HashMap<Float, GridMemoryBasedTileSet>();
|
||||
tileSet.put(dataTime, tilemap);
|
||||
}
|
||||
}
|
||||
|
||||
float convertedLevel = (float) levelConverter.convert(record
|
||||
.getModelInfo().getLevelOneValue());
|
||||
|
||||
|
|
@ -766,116 +779,109 @@ public class GridResource extends
|
|||
*/
|
||||
@Override
|
||||
protected void disposeInternal() {
|
||||
|
||||
for (Map.Entry<DataTime, Map<Float, GridMemoryBasedTileSet>> set : tileSet
|
||||
.entrySet()) {
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : set.getValue()
|
||||
synchronized (timeLock) {
|
||||
for (Map.Entry<DataTime, Map<Float, GridMemoryBasedTileSet>> set : tileSet
|
||||
.entrySet()) {
|
||||
tile.getValue().dispose();
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : set
|
||||
.getValue().entrySet()) {
|
||||
tile.getValue().dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initInternal(IGraphicsTarget target) throws VizException {
|
||||
this.target = target;
|
||||
synchronized (timeLock) {
|
||||
this.target = target;
|
||||
|
||||
synchronized (pdosToParse) {
|
||||
if (pdosToParse.size() > 0) {
|
||||
for (PluginDataObject pdo : pdosToParse) {
|
||||
createTile(pdo);
|
||||
}
|
||||
pdosToParse.clear();
|
||||
}
|
||||
}
|
||||
|
||||
boolean combineResources = combineOperation != CombineOperation.NONE;
|
||||
boolean combineResources = combineOperation != CombineOperation.NONE;
|
||||
|
||||
viewType = target.getViewType();
|
||||
Map<DataTime, Map<Float, GridMemoryBasedTileSet>> combinedSet = new HashMap<DataTime, Map<Float, GridMemoryBasedTileSet>>();
|
||||
for (Map.Entry<Integer, GridMemoryBasedTileSet> baseTileEntry : baseTiles
|
||||
.entrySet()) {
|
||||
GridMemoryBasedTileSet baseTile = baseTileEntry.getValue();
|
||||
baseTile.setMapDescriptor(descriptor);
|
||||
baseTile.init(target);
|
||||
if (combineResources && !baseTile.isCombined()) {
|
||||
Entry<Float, GridMemoryBasedTileSet> tileSetRef = null;
|
||||
// Need to find the reference in order to update the object when
|
||||
// it comes back as a new combined object
|
||||
for (Map.Entry<DataTime, Map<Float, GridMemoryBasedTileSet>> set : tileSet
|
||||
.entrySet()) {
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : set
|
||||
.getValue().entrySet()) {
|
||||
if (tile.getValue().getDataTime()
|
||||
.equals(baseTile.getDataTime())) {
|
||||
tileSetRef = tile;
|
||||
viewType = target.getViewType();
|
||||
Map<DataTime, Map<Float, GridMemoryBasedTileSet>> combinedSet = new HashMap<DataTime, Map<Float, GridMemoryBasedTileSet>>();
|
||||
for (Map.Entry<Integer, GridMemoryBasedTileSet> baseTileEntry : baseTiles
|
||||
.entrySet()) {
|
||||
GridMemoryBasedTileSet baseTile = baseTileEntry.getValue();
|
||||
baseTile.setMapDescriptor(descriptor);
|
||||
baseTile.init(target);
|
||||
if (combineResources && !baseTile.isCombined()) {
|
||||
Entry<Float, GridMemoryBasedTileSet> tileSetRef = null;
|
||||
// Need to find the reference in order to update the object
|
||||
// when
|
||||
// it comes back as a new combined object
|
||||
for (Map.Entry<DataTime, Map<Float, GridMemoryBasedTileSet>> set : tileSet
|
||||
.entrySet()) {
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : set
|
||||
.getValue().entrySet()) {
|
||||
if (tile.getValue().getDataTime()
|
||||
.equals(baseTile.getDataTime())) {
|
||||
tileSetRef = tile;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (tileSetRef != null) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
GridMemoryBasedTileSet combinedResourceData = combineResourceData(baseTile);
|
||||
if (tileSetRef != null) {
|
||||
break;
|
||||
tileSetRef.setValue(combinedResourceData);
|
||||
}
|
||||
}
|
||||
|
||||
GridMemoryBasedTileSet combinedResourceData = combineResourceData(baseTile);
|
||||
if (tileSetRef != null) {
|
||||
tileSetRef.setValue(combinedResourceData);
|
||||
baseTileEntry.setValue(combinedResourceData);
|
||||
}
|
||||
|
||||
baseTileEntry.setValue(combinedResourceData);
|
||||
}
|
||||
}
|
||||
DataTime[] primaryDataTimes = descriptor.getTimeMatchingMap().get(this);
|
||||
for (int i = 0; i < primaryDataTimes.length; i++) {
|
||||
Map<Float, GridMemoryBasedTileSet> map = tileSet
|
||||
.get(primaryDataTimes[i]);
|
||||
if (map != null) {
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : map
|
||||
.entrySet()) {
|
||||
if (baseTiles.values().contains(tile.getValue())) {
|
||||
if (combineResources) {
|
||||
DataTime[] primaryDataTimes = descriptor.getTimeMatchingMap().get(
|
||||
this);
|
||||
for (int i = 0; i < primaryDataTimes.length; i++) {
|
||||
Map<Float, GridMemoryBasedTileSet> map = tileSet
|
||||
.get(primaryDataTimes[i]);
|
||||
if (map != null) {
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : map
|
||||
.entrySet()) {
|
||||
if (baseTiles.values().contains(tile.getValue())) {
|
||||
if (combineResources) {
|
||||
Map<Float, GridMemoryBasedTileSet> map2 = new HashMap<Float, GridResource.GridMemoryBasedTileSet>();
|
||||
map2.put(tile.getKey(), tile.getValue());
|
||||
combinedSet.put(primaryDataTimes[i], map2);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
tile.getValue().init(target);
|
||||
|
||||
if (!tile.getValue().isCombined()) {
|
||||
GridMemoryBasedTileSet combinedResourceData = combineResourceData(tile
|
||||
.getValue());
|
||||
Map<Float, GridMemoryBasedTileSet> map2 = new HashMap<Float, GridResource.GridMemoryBasedTileSet>();
|
||||
map2.put(tile.getKey(), tile.getValue());
|
||||
map2.put(tile.getKey(), combinedResourceData);
|
||||
combinedSet.put(primaryDataTimes[i], map2);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
tile.getValue().init(target);
|
||||
|
||||
if (!tile.getValue().isCombined()) {
|
||||
GridMemoryBasedTileSet combinedResourceData = combineResourceData(tile
|
||||
.getValue());
|
||||
Map<Float, GridMemoryBasedTileSet> map2 = new HashMap<Float, GridResource.GridMemoryBasedTileSet>();
|
||||
map2.put(tile.getKey(), combinedResourceData);
|
||||
combinedSet.put(primaryDataTimes[i], map2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!combinedSet.isEmpty()) {
|
||||
tileSet = combinedSet;
|
||||
List<DataTime> newDataTimes = new ArrayList<DataTime>();
|
||||
if (!combinedSet.isEmpty()) {
|
||||
tileSet = combinedSet;
|
||||
List<DataTime> newDataTimes = new ArrayList<DataTime>();
|
||||
|
||||
for (Entry<DataTime, Map<Float, GridMemoryBasedTileSet>> entry : combinedSet
|
||||
.entrySet()) {
|
||||
newDataTimes.add(entry.getKey());
|
||||
for (Entry<DataTime, Map<Float, GridMemoryBasedTileSet>> entry : combinedSet
|
||||
.entrySet()) {
|
||||
newDataTimes.add(entry.getKey());
|
||||
}
|
||||
Collections.sort(newDataTimes);
|
||||
dataTimes = newDataTimes;
|
||||
}
|
||||
Collections.sort(newDataTimes, dataTime);
|
||||
dataTimes = newDataTimes;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* DataTime Comparator
|
||||
*/
|
||||
private static Comparator<DataTime> dataTime = new Comparator<DataTime>() {
|
||||
@Override
|
||||
public int compare(DataTime arg0, DataTime arg1) {
|
||||
return arg0.compareTo(arg1);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Combine the given tiles sets
|
||||
*
|
||||
|
|
@ -1217,11 +1223,13 @@ public class GridResource extends
|
|||
@Override
|
||||
public void setDescriptor(MapDescriptor descriptor) {
|
||||
this.descriptor = descriptor;
|
||||
for (Map.Entry<DataTime, Map<Float, GridMemoryBasedTileSet>> set : tileSet
|
||||
.entrySet()) {
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : set.getValue()
|
||||
synchronized (timeLock) {
|
||||
for (Map.Entry<DataTime, Map<Float, GridMemoryBasedTileSet>> set : tileSet
|
||||
.entrySet()) {
|
||||
tile.getValue().setMapDescriptor(this.descriptor);
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : set
|
||||
.getValue().entrySet()) {
|
||||
tile.getValue().setMapDescriptor(this.descriptor);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1238,22 +1246,24 @@ public class GridResource extends
|
|||
}
|
||||
}
|
||||
if (reproject) {
|
||||
// If we are reprojecting to screen space, clear all tiles
|
||||
for (Map.Entry<DataTime, Map<Float, GridMemoryBasedTileSet>> set : tileSet
|
||||
.entrySet()) {
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : set
|
||||
.getValue().entrySet()) {
|
||||
tile.getValue().dispose();
|
||||
pdosToParse.add(tile.getValue().getPluginDataObject());
|
||||
synchronized (timeLock) {
|
||||
// If we are reprojecting to screen space, clear all tiles
|
||||
for (Map.Entry<DataTime, Map<Float, GridMemoryBasedTileSet>> set : tileSet
|
||||
.entrySet()) {
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : set
|
||||
.getValue().entrySet()) {
|
||||
tile.getValue().dispose();
|
||||
pdosToParse.add(tile.getValue().getPluginDataObject());
|
||||
}
|
||||
}
|
||||
}
|
||||
tileSet.clear();
|
||||
baseTiles.clear();
|
||||
if (pdosToParse.size() > 0) {
|
||||
for (PluginDataObject pdo : pdosToParse) {
|
||||
createTile(pdo);
|
||||
tileSet.clear();
|
||||
baseTiles.clear();
|
||||
if (pdosToParse.size() > 0) {
|
||||
for (PluginDataObject pdo : pdosToParse) {
|
||||
createTile(pdo);
|
||||
}
|
||||
pdosToParse.clear();
|
||||
}
|
||||
pdosToParse.clear();
|
||||
}
|
||||
} else {
|
||||
for (GridMemoryBasedTileSet tile : baseTiles.values()) {
|
||||
|
|
@ -1453,41 +1463,44 @@ public class GridResource extends
|
|||
|
||||
@Override
|
||||
public void remove(DataTime dataTime) {
|
||||
Map<Float, GridMemoryBasedTileSet> ts = tileSet.remove(dataTime);
|
||||
if (ts == null) {
|
||||
return;
|
||||
}
|
||||
synchronized (timeLock) {
|
||||
Map<Float, GridMemoryBasedTileSet> ts = tileSet.remove(dataTime);
|
||||
if (ts == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : ts.entrySet()) {
|
||||
tile.getValue().dispose();
|
||||
}
|
||||
Set<DataTime> dateSet = tileSet.keySet();
|
||||
dataTimes.clear();
|
||||
Iterator<DataTime> dateIterator = dateSet.iterator();
|
||||
while (dateIterator.hasNext()) {
|
||||
dataTimes.add(dateIterator.next());
|
||||
}
|
||||
|
||||
Collections.sort(dataTimes);
|
||||
for (Map.Entry<Float, GridMemoryBasedTileSet> tile : ts.entrySet()) {
|
||||
tile.getValue().dispose();
|
||||
}
|
||||
Set<DataTime> dateSet = tileSet.keySet();
|
||||
dataTimes.clear();
|
||||
Iterator<DataTime> dateIterator = dateSet.iterator();
|
||||
while (dateIterator.hasNext()) {
|
||||
dataTimes.add(dateIterator.next());
|
||||
}
|
||||
|
||||
Collections.sort(dataTimes);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void resourceChanged(ChangeType type, Object object) {
|
||||
if (type.equals(ChangeType.DATA_UPDATE)) {
|
||||
PluginDataObject[] pdos = (PluginDataObject[]) object;
|
||||
synchronized (timeLock) {
|
||||
for (PluginDataObject pdo : pdos) {
|
||||
|
||||
for (PluginDataObject pdo : pdos) {
|
||||
|
||||
if (pdo != null) {
|
||||
if (CombineOperation.DIFFERENCE.equals(combineOperation)
|
||||
&& !(pdo instanceof CombinedGribRecord)) {
|
||||
// Do nothing, timematcher will take care of it.
|
||||
} else {
|
||||
if (target != null) {
|
||||
createTile(pdo);
|
||||
if (pdo != null) {
|
||||
if (CombineOperation.DIFFERENCE
|
||||
.equals(combineOperation)
|
||||
&& !(pdo instanceof CombinedGribRecord)) {
|
||||
// Do nothing, timematcher will take care of it.
|
||||
} else {
|
||||
pdosToParse.add(pdo);
|
||||
if (target != null) {
|
||||
createTile(pdo);
|
||||
} else {
|
||||
pdosToParse.add(pdo);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue