Skip to content

Cleanup BitMapper sizeof type #86881

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 1 commit into from
May 31, 2023
Merged

Cleanup BitMapper sizeof type #86881

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/libraries/Common/src/System/Diagnostics/DiagnosticsHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ internal static bool CompareTags(List<KeyValuePair<string, object?>>? sortedTags
}

int count = sortedTags.Count;
int size = count / (sizeof(long) * 8) + 1;
int size = count / (sizeof(ulong) * 8) + 1;
BitMapper bitMapper = new BitMapper(size <= 100 ? stackalloc ulong[size] : new ulong[size]);

if (tags2 is ICollection<KeyValuePair<string, object?>> tagsCol)
Expand Down Expand Up @@ -124,15 +124,15 @@ public BitMapper(Span<ulong> bitMap)
{
_bitMap = bitMap;
_bitMap.Clear();
_maxIndex = bitMap.Length * sizeof(long) * 8;
_maxIndex = bitMap.Length * sizeof(ulong) * 8;
}

public int MaxIndex => _maxIndex;

private static void GetIndexAndMask(int index, out int bitIndex, out ulong mask)
{
bitIndex = index >> 6;
int bit = index & (sizeof(long) * 8 - 1);
bitIndex = index >> 6; // divide by 64 == (sizeof(ulong) * 8) bits
int bit = index & (sizeof(ulong) * 8 - 1);
mask = 1UL << bit;
}

Expand Down