Skip to content

Ensure the adapter name 100% matching when parsing proc/net/dev #92187

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 4 commits into from
Oct 2, 2023
Merged

Ensure the adapter name 100% matching when parsing proc/net/dev #92187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31a3f20
Ensure the adapter name 100% matching when parsing proc/net/dev
skyoxZ Sep 17, 2023
b61b179
Update src/libraries/System.Net.NetworkInformation/src/System/Net/Net…
skyoxZ Sep 18, 2023
25e1624
Move the stackalloc out of the loop
skyoxZ Sep 18, 2023
df63ccd
Update src/libraries/System.Net.NetworkInformation/src/System/Net/Net…
skyoxZ Sep 21, 2023
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
17 changes: 13 additions & 4 deletions ...t.NetworkInformation/src/System/Net/NetworkInformation/StringParsingHelpers.Statistics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,15 +407,25 @@ internal static IPInterfaceStatisticsTable ParseInterfaceStatisticsTableFromFile
{
sr.ReadLine();
sr.ReadLine();
int index = 0;
Span<Range> pieces = stackalloc Range[18]; // [0]-[16] used, +1 to ensure any additional segment goes into [17]
while (!sr.EndOfStream)
{
string line = sr.ReadLine()!;
if (line.Contains(name))
{
Comment on lines 414 to 415
Copy link
Contributor

@MichalPetryka MichalPetryka Sep 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it make sense to remove the Contains here since we're checking with SequenceEqual later again?

Copy link
Contributor Author

@skyoxZ skyoxZ Sep 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought the Contains is cheap so let it do a precheck might have a better performance.

Span<Range> pieces = stackalloc Range[18]; // [0] skipped, [1]-[16] used, +1 to ensure any additional segment goes into [17]
ReadOnlySpan<char> lineSpan = line;
pieces = pieces.Slice(0, lineSpan.SplitAny(pieces, " :", StringSplitOptions.RemoveEmptyEntries));
int pieceCount = lineSpan.SplitAny(pieces, " :", StringSplitOptions.RemoveEmptyEntries);

if (pieceCount < 17)
{
continue;
}

if (!lineSpan[pieces[0]].SequenceEqual(name))
{
// The adapter name doesn't exactly match.
continue;
}

return new IPInterfaceStatisticsTable()
{
Expand All @@ -438,7 +448,6 @@ internal static IPInterfaceStatisticsTable ParseInterfaceStatisticsTableFromFile
CompressedPacketsTransmitted = ParseUInt64AndClampToInt64(lineSpan[pieces[16]]),
};
}
index += 1;
}

throw ExceptionHelper.CreateForParseFailure();
Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkFiles/dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Inter-| Receive | Transmit
face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
wlan0a: 20000 394 2 4 6 8 10 12 429496730000 208 1 2 3 4 5 6
wlan0: 26622 394 2 4 6 8 10 12 429496730000 208 1 2 3 4 5 6
lo: 18446744073709551615 302 0 0 0 0 0 0 30008 302 0 0 0 0 0 0