mirror
/
MapWithAI
kopia lustrzana https://github.com/JOSM/MapWithAI
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Change how the threading was done for downloading MapWithAI data 

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2019-10-15 09:22:08 -06:00
rodzic 0983fe9d6d
commit 980c00a8cf
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
1 zmienionych plików z 22 dodań i 31 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

53
src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtils.java
Wyświetl plik

@ -12,6 +12,7 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.RecursiveTask;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -85,19 +86,9 @@ public final class MapWithAIDataUtils {
if (bbox.isValid()) { if (bbox.isValid()) {
final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(); final PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor();
monitor.setCancelable(Boolean.FALSE); monitor.setCancelable(Boolean.FALSE);
final List<BBox> bboxes = reduceBBoxSize(bbox); monitor.beginTask(tr("Downloading {0} data", MapWithAIPlugin.NAME));
monitor.beginTask(tr("Downloading {0} data", MapWithAIPlugin.NAME), bboxes.size()); monitor.indeterminateSubTask(null);
final ForkJoinPool pool = new ForkJoinPool(); new ForkJoinPool().invoke(new GetDataRunnable(bbox, dataSet)); // TODO use an application level pool
for (final BBox tbbox : bboxes) {
pool.submit(new GetDataRunnable(tbbox, dataSet, monitor));
}
pool.shutdown();
try {
pool.awaitTermination(10, TimeUnit.SECONDS);
} catch (InterruptedException e) {
Logging.debug(e);
Thread.currentThread().interrupt();
}
monitor.finishTask(); monitor.finishTask();
monitor.close(); monitor.close();
} }
@ -107,24 +98,31 @@ public final class MapWithAIDataUtils {
return dataSet; return dataSet;
} }
private static class GetDataRunnable implements Runnable { private static class GetDataRunnable extends RecursiveTask<DataSet> {
private final BBox bbox; private static final long serialVersionUID = 258423685658089715L;
private final DataSet dataSet; private final transient BBox bbox;
private final PleaseWaitProgressMonitor monitor; private final transient DataSet dataSet;
public GetDataRunnable(BBox bbox, DataSet dataSet, PleaseWaitProgressMonitor monitor) { public GetDataRunnable(BBox bbox, DataSet dataSet) {
this.bbox = bbox; this.bbox = bbox;
this.dataSet = dataSet; this.dataSet = dataSet;
this.monitor = monitor;
} }
@Override @Override
public void run() { public DataSet compute() {
final DataSet temporaryDataSet = getDataReal(getBbox()); List<BBox> bboxes = reduceBBoxSize(bbox);
synchronized (MapWithAIDataUtils.GetDataRunnable.class) { if (bboxes.size() == 1) {
getDataSet().mergeFrom(temporaryDataSet); final DataSet temporaryDataSet = getDataReal(getBbox());
synchronized (MapWithAIDataUtils.GetDataRunnable.class) {
dataSet.mergeFrom(temporaryDataSet);
}
} else {
Collection<GetDataRunnable> tasks = bboxes.parallelStream()
.map(tBbox -> new GetDataRunnable(tBbox, getRawResult())).collect(Collectors.toList());
tasks.forEach(GetDataRunnable::fork);
tasks.forEach(GetDataRunnable::join);
} }
monitor.worked(1); return dataSet;
} }
/** /**
@ -134,13 +132,6 @@ public final class MapWithAIDataUtils {
return bbox; return bbox;
} }
/**
* @return The {@code DataSet} associated with this object
*/
public DataSet getDataSet() {
return dataSet;
}
private static DataSet getDataReal(BBox bbox) { private static DataSet getDataReal(BBox bbox) {
InputStream inputStream = null; InputStream inputStream = null;
final DataSet dataSet = new DataSet(); final DataSet dataSet = new DataSet();