Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Some more cleanup to regex NonBacktracking #104766

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.

Sign up for GitHub

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 15 commits into from
Jul 12, 2024
Merged

Some more cleanup to regex NonBacktracking #104766

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
de5d185
Rent object[] rather than (uint,uint)[][] from the ArrayPool
stephentoub Jul 11, 2024
6306ab8
Remove unnecessary TInputReader generic from functions
stephentoub Jul 11, 2024
d2f41ff
Add more comments and do some renames
stephentoub Jul 11, 2024
9b51dc6
Remove unused TFindOptimizationsHandler from FindEndPositionDeltasNFA
stephentoub Jul 11, 2024
52718b4
Fix a stray input reader
stephentoub Jul 11, 2024
a922f06
Some more renames
stephentoub Jul 11, 2024
73c8226
Avoid duplicated reads of input character and nullability info
stephentoub Jul 11, 2024
341c6b7
Remove initialStateId from TryFindNextStartingPosition and make initi…
stephentoub Jul 11, 2024
9193d6f
Remove unused initialStatePos / initialStatePosCandidate
stephentoub Jul 11, 2024
b242f8e
Remove unnecessary generic args and remove resulting dead code
stephentoub Jul 11, 2024
401b65a
Put GetStateFlags back in IStateHandler and use it to avoid duplicati…
stephentoub Jul 11, 2024
adae5e2
Put out argument last in TryCreateNewTransition
stephentoub Jul 11, 2024
2d93daa
Store state to local in FindStartPositionDeltasDFA
stephentoub Jul 11, 2024
9f61425
Merge IAcceleratedStateHandler into IInitialStateHandler
stephentoub Jul 11, 2024
4e760f1
Remove MintermClassifier.IntLookup
stephentoub Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Rent object[] rather than (uint,uint)[][] from the ArrayPool
  • Loading branch information
@stephentoub
stephentoub committed Jul 11, 2024
commit de5d18538076f843a7eb75947eee5d78229cc523
17 changes: 10 additions & 7 deletions ....Text.RegularExpressions/src/System/Text/RegularExpressions/Symbolic/MintermClassifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,11 @@ public MintermClassifier(BDD[] minterms)
// in order to size the lookup array to minimize steady-state memory consumption of the potentially
// large lookup array. We prefer to use the byte[] _lookup when possible, in order to keep memory
// consumption to a minimum; doing so accomodates up to 255 minterms, which is the vast majority case.
// However, when there are more than 255 minterms, we need to use int[] _intLookup.
(uint, uint)[][] charRangesPerMinterm = ArrayPool<(uint, uint)[]>.Shared.Rent(minterms.Length);
// However, when there are more than 255 minterms, we need to use int[] _intLookup. We rent an object[]
// rather than a (uint,uint)[][] to avoid the extra type pressure on the ArrayPool (object[]s are common,
// (uint,uint)[][]s much less so).
object[] arrayPoolArray = ArrayPool<object>.Shared.Rent(minterms.Length);
Span<object> charRangesPerMinterm = arrayPoolArray.AsSpan(0, minterms.Length);

int maxChar = -1;
for (int mintermId = 1; mintermId < minterms.Length; mintermId++)
Expand All @@ -70,17 +73,17 @@ public MintermClassifier(BDD[] minterms)
}

// Return the rented array. We clear it before returning it in order to avoid all the ranges arrays being kept alive.
Array.Clear(charRangesPerMinterm, 0, minterms.Length);
ArrayPool<(uint, uint)[]>.Shared.Return(charRangesPerMinterm);
charRangesPerMinterm.Clear();
ArrayPool<object>.Shared.Return(arrayPoolArray);

// Creates the lookup array.
static T[] CreateLookup<T>(BDD[] minterms, ReadOnlySpan<(uint, uint)[]> charRangesPerMinterm, int _maxChar) where T : IBinaryInteger<T>
// Creates the lookup array. charRangesPerMinterm needs to have already been populated with (uint, uint)[] instances.
static T[] CreateLookup<T>(BDD[] minterms, ReadOnlySpan<object> charRangesPerMinterm, int _maxChar) where T : IBinaryInteger<T>
{
T[] lookup = new T[_maxChar + 1];
for (int mintermId = 1; mintermId < minterms.Length; mintermId++)
{
// Each minterm maps to a range of characters. Set each of the characters in those ranges to the corresponding minterm.
foreach ((uint start, uint end) in charRangesPerMinterm[mintermId])
foreach ((uint start, uint end) in ((uint, uint)[])charRangesPerMinterm[mintermId])
{
lookup.AsSpan((int)start, (int)(end + 1 - start)).Fill(T.CreateTruncating(mintermId));
}
Expand Down