crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Reduce memory allocations in onNetworkGetBlocksMessage

Browse Source
This commit is contained in:
CalDescent 2021-06-02 09:09:06 +01:00
parent 2ceba45782
commit cffbd41f26
1 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/org/qortal/controller/Controller.java
View File

@ -1338,40 +1338,16 @@ public class Controller extends Thread {
// Ensure that we don't serve more blocks than the amount specified in the settings // Ensure that we don't serve more blocks than the amount specified in the settings
// Serializing multiple blocks is very slow, so by default we are using a low limit // Serializing multiple blocks is very slow, so by default we are using a low limit
int blockLimitPerRequest = Settings.getInstance().getMaxBlocksPerResponse(); int blockLimitPerRequest = Settings.getInstance().getMaxBlocksPerResponse();
int untrimmedBlockLimitPerRequest = Settings.getInstance().getMaxBlocksPerResponse();
List<BlockData> blockDataList = new ArrayList<>();
// Attempt to serve from our cache of latest blocks
synchronized (this.latestBlocks) {
blockDataList = this.latestBlocks.stream()
.dropWhile(cachedBlockData -> !Arrays.equals(cachedBlockData.getReference(), parentSignature))
.map(BlockData::new)
.collect(Collectors.toList());
}
if (blockDataList.isEmpty()) {
int numberRequested = Math.min(blockLimitPerRequest, getBlocksMessage.getNumberRequested()); int numberRequested = Math.min(blockLimitPerRequest, getBlocksMessage.getNumberRequested());
List<Block> blocks = new ArrayList<>();
BlockData blockData = repository.getBlockRepository().fromReference(parentSignature); BlockData blockData = repository.getBlockRepository().fromReference(parentSignature);
while (blockData != null && blockDataList.size() < numberRequested) { while (blockData != null && blocks.size() < numberRequested) {
blockDataList.add(blockData);
blockData = repository.getBlockRepository().fromReference(blockData.getSignature());
}
} else {
this.stats.getBlocksMessageStats.cacheHits.incrementAndGet();
if (blockDataList.size() >= getBlocksMessage.getNumberRequested())
this.stats.getBlocksMessageStats.fullyFromCache.incrementAndGet();
}
List<Block> blocks = new ArrayList<>();
for (BlockData blockData : blockDataList) {
if (blocks.size() < blockLimitPerRequest) {
Block block = new Block(repository, blockData); Block block = new Block(repository, blockData);
blocks.add(block); blocks.add(block);
} blockData = repository.getBlockRepository().fromReference(blockData.getSignature());
} }
Message blocksMessage = new BlocksMessage(blocks); Message blocksMessage = new BlocksMessage(blocks);