-
Notifications
You must be signed in to change notification settings - Fork 710
Xdc Pool for timeouts and votes #9521
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d55c1e9
implement pool for timeouts and votes
cicr99 3720141
remove unnecessary array allocation
cicr99 2632581
Merge branch 'master' into feature/xdc-pool
ak88 f340887
Merge branch 'master' into feature/xdc-pool
ak88 75b3322
merged
ak88 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,20 @@ | ||
| // SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited | ||
| // SPDX-License-Identifier: LGPL-3.0-only | ||
|
|
||
| using Nethermind.Core; | ||
| using Nethermind.Core.Crypto; | ||
| using System.Text.Json.Serialization; | ||
| using RlpBehaviors = Nethermind.Serialization.Rlp.RlpBehaviors; | ||
|
|
||
| namespace Nethermind.Xdc.Types; | ||
|
|
||
| public class Vote(BlockRoundInfo proposedBlockInfo, ulong gapNumber, Signature signature = null) | ||
| public class Vote(BlockRoundInfo proposedBlockInfo, ulong gapNumber, Signature signature = null) : IXdcPoolItem | ||
| { | ||
| private readonly VoteDecoder _decoder = new(); | ||
| public BlockRoundInfo ProposedBlockInfo { get; set; } = proposedBlockInfo; | ||
| public ulong GapNumber { get; set; } = gapNumber; | ||
| public Signature? Signature { get; set; } = signature; | ||
|
|
||
| public override string ToString() => | ||
| $"{ProposedBlockInfo.Round}:{GapNumber}:{ProposedBlockInfo.BlockNumber}"; | ||
|
|
||
| public (ulong Round, Hash256 hash) PoolKey() => (ProposedBlockInfo.Round, Keccak.Compute(_decoder.Encode(this, RlpBehaviors.ForSealing).Bytes)); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| // SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited | ||
| // SPDX-License-Identifier: LGPL-3.0-only | ||
| // SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited | ||
| // SPDX-License-Identifier: LGPL-3.0-only | ||
|
|
||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using Nethermind.Core.Collections; | ||
| using Nethermind.Core.Crypto; | ||
| using Nethermind.Core.Threading; | ||
|
|
||
| namespace Nethermind.Xdc; | ||
|
|
||
| public class XdcPool<T> where T : IXdcPoolItem | ||
| { | ||
| private readonly Dictionary<(ulong Round, Hash256 Hash), ArrayPoolList<T>> _items = new(); | ||
| private readonly McsLock _lock = new(); | ||
|
|
||
| public long Add(T item) | ||
| { | ||
| using var lockRelease = _lock.Acquire(); | ||
| { | ||
| var key = item.PoolKey(); | ||
| if (!_items.TryGetValue(key, out var list)) | ||
| { | ||
| //128 should be enough to cover all master nodes and some extras | ||
| list = new ArrayPoolList<T>(128); | ||
| _items[key] = list; | ||
| } | ||
| if (!list.Contains(item)) | ||
| list.Add(item); | ||
| return list.Count; | ||
| } | ||
| } | ||
|
|
||
| public void EndRound(ulong round) | ||
| { | ||
| using var lockRelease = _lock.Acquire(); | ||
| { | ||
| foreach (var key in _items.Keys) | ||
| { | ||
| if (key.Round <= round && _items.Remove(key, out ArrayPoolList<T> list)) | ||
| { | ||
| list?.Dispose(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public IReadOnlyCollection<T> GetItems(T item) | ||
| { | ||
| using var lockRelease = _lock.Acquire(); | ||
| { | ||
| var key = item.PoolKey(); | ||
| if (_items.TryGetValue(key, out ArrayPoolList<T> list)) | ||
| { | ||
| //Allocating a new array since it goes outside the lock | ||
| return list.ToArray(); | ||
| } | ||
| return []; | ||
| } | ||
| } | ||
|
|
||
| public long GetCount(T item) | ||
| { | ||
| using var lockRelease = _lock.Acquire(); | ||
| { | ||
| var key = item.PoolKey(); | ||
| if (_items.TryGetValue(key, out ArrayPoolList<T> list)) | ||
| { | ||
| return list.Count; | ||
| } | ||
| return 0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public interface IXdcPoolItem | ||
| { | ||
| (ulong Round, Hash256 hash) PoolKey(); | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.