AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Added a few checks for Controller.isStopping() in synchronizer loops, to try and speed up the shutdown time.

Browse Source
This commit is contained in:
CalDescent 2021-03-30 13:05:43 +01:00
parent e89d31eb5a
commit c3e5298ecd
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/qortal/controller/Synchronizer.java
View File

@ -257,9 +257,13 @@ public class Synchronizer {
// Currently we work forward from common block until we hit a block we don't have // Currently we work forward from common block until we hit a block we don't have
// TODO: rewrite as modified binary search! // TODO: rewrite as modified binary search!
int i; int i;
for (i = 1; i < blockSummariesFromCommon.size(); ++i) for (i = 1; i < blockSummariesFromCommon.size(); ++i) {
if (Controller.isStopping())
return SynchronizationResult.SHUTTING_DOWN;
if (!repository.getBlockRepository().exists(blockSummariesFromCommon.get(i).getSignature())) if (!repository.getBlockRepository().exists(blockSummariesFromCommon.get(i).getSignature()))
break; break;
}
// Note: index i - 1 isn't cleared: List.subList is fromIndex inclusive to toIndex exclusive // Note: index i - 1 isn't cleared: List.subList is fromIndex inclusive to toIndex exclusive
blockSummariesFromCommon.subList(0, i - 1).clear(); blockSummariesFromCommon.subList(0, i - 1).clear();
@ -308,6 +312,9 @@ public class Synchronizer {
// Check peer sent valid heights // Check peer sent valid heights
for (int i = 0; i < moreBlockSummaries.size(); ++i) { for (int i = 0; i < moreBlockSummaries.size(); ++i) {
if (Controller.isStopping())
return SynchronizationResult.SHUTTING_DOWN;
++lastSummaryHeight; ++lastSummaryHeight;
BlockSummaryData blockSummary = moreBlockSummaries.get(i); BlockSummaryData blockSummary = moreBlockSummaries.get(i);
@ -645,6 +652,9 @@ public class Synchronizer {
final int firstBlockHeight = blockSummaries.get(0).getHeight(); final int firstBlockHeight = blockSummaries.get(0).getHeight();
for (int i = 0; i < blockSummaries.size(); ++i) { for (int i = 0; i < blockSummaries.size(); ++i) {
if (Controller.isStopping())
return;
BlockSummaryData blockSummary = blockSummaries.get(i); BlockSummaryData blockSummary = blockSummaries.get(i);
// Qortal: minter is always a reward-share, so find actual minter and get their effective minting level // Qortal: minter is always a reward-share, so find actual minter and get their effective minting level