mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-20 13:54:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add async handling with CompletableFuture to fillList

Browse source 
The creation of TradeStatistics3ListItem is rather fast but the
applying to the list is due sorting pretty slow (300 ms) as
its > 100k items. We do the applying on the callback thread.
Seems JavaFx permits that. So we can keep the UI thread unblocked.

Remove modelReadyListener

Renamed model.selectedTradeStatistics to model.tradeStatisticsByCurrency
This commit is contained in:
chimp1984 2021-11-01 22:52:39 +01:00
parent 603e9fde17
commit 65706e7c14
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
1 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsView.java
View file

@ -103,6 +103,7 @@ import java.text.DecimalFormat;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@ -172,7 +173,6 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
private ChangeListener<String> priceColumnLabelListener;
private ListChangeListener<XYChart.Data<Number, Number>> itemsChangeListener;
private ListChangeListener<TradeStatistics3> tradeStatisticsByCurrencyListener;
private ChangeListener<Boolean> modelReadyListener;
@SuppressWarnings("FieldCanBeLocal")
private MonadicBinding<Void> currencySelectionBinding;
@ -243,10 +243,8 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
layoutChart();
};
tradeStatisticsByCurrencyListener = c -> {
nrOfTradeStatisticsLabel.setText(Res.get("market.trades.nrOfTrades", model.selectedTradeStatistics.size()));
if (model.modelReady.get()) {
fillList();
}
nrOfTradeStatisticsLabel.setText(Res.get("market.trades.nrOfTrades", model.tradeStatisticsByCurrency.size()));
fillList();
};
parentHeightListener = (observable, oldValue, newValue) -> layout();
@ -285,19 +283,6 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
layout();
return null;
});
modelReadyListener = (observable, oldValue, newValue) -> {
if (newValue) {
long ts = System.currentTimeMillis();
fillList();
tableView.setItems(sortedList);
layout();
log.error("{}", System.currentTimeMillis() - ts);
UserThread.execute(() -> model.modelReady.removeListener(modelReadyListener));
}
};
}
@Override
@ -336,7 +321,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
toggleGroup.selectedToggleProperty().addListener(timeUnitChangeListener);
priceAxisY.widthProperty().addListener(priceAxisYWidthListener);
volumeAxisY.widthProperty().addListener(volumeAxisYWidthListener);
model.selectedTradeStatistics.addListener(tradeStatisticsByCurrencyListener);
model.tradeStatisticsByCurrency.addListener(tradeStatisticsByCurrencyListener);
priceAxisY.labelProperty().bind(priceColumnLabel);
priceColumnLabel.addListener(priceColumnLabelListener);
@ -353,7 +338,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
volumeAxisX.setTickLabelFormatter(getTimeAxisStringConverter());
volumeInUsdAxisX.setTickLabelFormatter(getTimeAxisStringConverter());
nrOfTradeStatisticsLabel.setText(Res.get("market.trades.nrOfTrades", model.selectedTradeStatistics.size()));
nrOfTradeStatisticsLabel.setText(Res.get("market.trades.nrOfTrades", model.tradeStatisticsByCurrency.size()));
exportLink.setOnAction(e -> exportToCsv());
UserThread.runAfter(this::updateChartData, 100, TimeUnit.MILLISECONDS);
@ -374,9 +359,10 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
user.requestPersistence();
});
model.modelReady.addListener(modelReadyListener);
tableView.setItems(sortedList);
fillList();
layout();
// modelReadyListener will get triggered once async data preparation in model is completed
log.error("activate took {} ms", System.currentTimeMillis() - ts);
}
@ -387,7 +373,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
toggleGroup.selectedToggleProperty().removeListener(timeUnitChangeListener);
priceAxisY.widthProperty().removeListener(priceAxisYWidthListener);
volumeAxisY.widthProperty().removeListener(volumeAxisYWidthListener);
model.selectedTradeStatistics.removeListener(tradeStatisticsByCurrencyListener);
model.tradeStatisticsByCurrency.removeListener(tradeStatisticsByCurrencyListener);
priceAxisY.labelProperty().unbind();
priceColumnLabel.removeListener(priceColumnLabelListener);
@ -405,7 +391,6 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
if (rootParent != null) {
rootParent.heightProperty().removeListener(parentHeightListener);
}
model.modelReady.removeListener(modelReadyListener);
}
private void showVolumeAsUsd(Boolean showUsd) {
@ -416,12 +401,22 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
}
private void fillList() {
List<TradeStatistics3ListItem> tradeStatistics3ListItems = model.selectedTradeStatistics.stream()
.map(tradeStatistics -> new TradeStatistics3ListItem(tradeStatistics,
coinFormatter,
model.showAllTradeCurrenciesProperty.get()))
.collect(Collectors.toList());
listItems.setAll(tradeStatistics3ListItems);
long ts = System.currentTimeMillis();
CompletableFuture.supplyAsync(() -> {
return model.tradeStatisticsByCurrency.stream()
.map(tradeStatistics -> new TradeStatistics3ListItem(tradeStatistics,
coinFormatter,
model.showAllTradeCurrenciesProperty.get()))
.collect(Collectors.toList());
}).whenComplete((items, throwable) -> {
log.error("Creating listItems took {} ms", System.currentTimeMillis() - ts);
long ts2 = System.currentTimeMillis();
listItems.setAll(items);
// Is slow because of sorting of > 100k items. But at least it seems it works on the thread from the
// CompletableFuture callback, so we do not block the UI thread;.
log.error("Applying sorted list took {} ms",
System.currentTimeMillis() - ts2);
});
}
private void exportToCsv() {