Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 5.6k
Aggregate adjacent memory sizes regardless of r+x#45401
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
eiriktsarpalis
merged 11 commits into
dotnet:master
from
am11:feature/processmodule-addressesDec 10, 2020
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
23a6dc9
Aggregate adjacent memory sizes regardless of r+x
am11 2c61645
Merge dotnet/master into feature/processmodule
am11 9fdc4eb
Account for rows preceding the first one with r+w
am11 a8bf88f
Account for last line
am11 c164e4f
Update src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsSt…
am11 c09623f
Update src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsSt…
am11 758047f
Move module flag assignment after the final commit
am11 cd566d4
Improve readibility of moduleHasReadAndExecFlags
am11 97d6907
Update src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsSt…
am11 b47bced
Update src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsSt…
am11 ec9785a
Decouple line parsing from ProcessModule parsing
eiriktsarpalis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
163 changes: 163 additions & 0 deletions
163 src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.ParseMapModules.cs
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,163 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics; | ||
| using System.Diagnostics.CodeAnalysis; | ||
| using System.Globalization; | ||
| using System.IO; | ||
| using System.Text; | ||
| internal static partial class Interop | ||
| { | ||
| internal static partial class procfs | ||
| { | ||
| private const string MapsFileName = "/maps"; | ||
| private static string GetMapsFilePathForProcess(int pid) => | ||
| RootPath + pid.ToString(CultureInfo.InvariantCulture) + MapsFileName; | ||
| internal static ProcessModuleCollection? ParseMapsModules(int pid) | ||
| { | ||
| try | ||
| { | ||
| return ParseMapsModulesCore(File.ReadLines(GetMapsFilePathForProcess(pid))); | ||
| } | ||
| catch (IOException) { } | ||
| catch (UnauthorizedAccessException) { } | ||
| return null; | ||
| } | ||
| private static ProcessModuleCollection ParseMapsModulesCore(IEnumerable<string> lines) | ||
| { | ||
| Debug.Assert(lines != null); | ||
| ProcessModule? module = null; | ||
| ProcessModuleCollection modules = new(capacity: 0); | ||
| bool moduleHasReadAndExecFlags = false; | ||
| foreach (string line in lines) | ||
| { | ||
| if (!TryParseMapsEntry(line, out (long StartAddress, int Size, bool HasReadAndExecFlags, string Path) parsedLine)) | ||
| { | ||
| // Invalid entry for the purposes of ProcessModule parsing, | ||
| // discard flushing the current module if it exists. | ||
| CommitCurrentModule(); | ||
| continue; | ||
| } | ||
| // Check if entry is a continuation of the current module. | ||
| if (module is not null && | ||
| module.FileName == parsedLine.Path && | ||
| (long)module.BaseAddress + module.ModuleMemorySize == parsedLine.StartAddress) | ||
| { | ||
| // Is continuation, update the current module. | ||
| module.ModuleMemorySize += parsedLine.Size; | ||
| moduleHasReadAndExecFlags |= parsedLine.HasReadAndExecFlags; | ||
| continue; | ||
| } | ||
| // Not a continuation, commit any current modules and create a new one. | ||
| CommitCurrentModule(); | ||
| module = new ProcessModule | ||
| { | ||
| FileName = parsedLine.Path, | ||
| ModuleName = Path.GetFileName(parsedLine.Path), | ||
| ModuleMemorySize = parsedLine.Size, | ||
| EntryPointAddress = IntPtr.Zero // unknown | ||
| }; | ||
| // on 32-bit platforms, it throws System.OverflowException with IntPtr.ctor(Int64), | ||
| // so we use IntPtr.ctor(void*) to skip the overflow checking. | ||
| unsafe | ||
| { | ||
| module.BaseAddress = new IntPtr((void*)parsedLine.StartAddress); | ||
| } | ||
| moduleHasReadAndExecFlags = parsedLine.HasReadAndExecFlags; | ||
| } | ||
| // Commit any pending modules. | ||
| CommitCurrentModule(); | ||
| return modules; | ||
| void CommitCurrentModule() | ||
| { | ||
| // we only add module to collection, if at least one row had 'r' and 'x' set. | ||
| if (moduleHasReadAndExecFlags && module is not null) | ||
| { | ||
| modules.Add(module); | ||
| module = null; | ||
| } | ||
| } | ||
| } | ||
| private static bool TryParseMapsEntry(string line, out (long StartAddress, int Size, bool HasReadAndExecFlags, string Path) parsedLine) | ||
| { | ||
| // Use a StringParser to avoid string.Split costs | ||
| var parser = new StringParser(line, separator: ' ', skipEmpty: true); | ||
| // Parse the address start and size | ||
| (long start, int size) = parser.ParseRaw(TryParseAddressRange); | ||
| if (size < 0) | ||
| { | ||
| parsedLine = default; | ||
| return false; | ||
| } | ||
| // Parse the permissions | ||
| bool lineHasReadAndExecFlags = parser.ParseRaw(HasReadAndExecFlags); | ||
| // Skip past the offset, dev, and inode fields | ||
| parser.MoveNext(); | ||
| parser.MoveNext(); | ||
| parser.MoveNext(); | ||
| // we only care about the named modules | ||
| if (!parser.MoveNext()) | ||
| { | ||
| parsedLine = default; | ||
| return false; | ||
| } | ||
| // Parse the pathname | ||
| string pathname = parser.ExtractCurrentToEnd(); | ||
| parsedLine = (start, size, lineHasReadAndExecFlags, pathname); | ||
| return true; | ||
| static (long Start, int Size) TryParseAddressRange(string s, ref int start, ref int end) | ||
| { | ||
| int pos = s.IndexOf('-', start, end - start); | ||
| if (pos > 0) | ||
| { | ||
| if (long.TryParse(s.AsSpan(start, pos), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out long startingAddress) && | ||
| long.TryParse(s.AsSpan(pos + 1, end - (pos + 1)), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out long endingAddress)) | ||
| { | ||
| return (startingAddress, (int)(endingAddress - startingAddress)); | ||
| } | ||
| } | ||
| return (0, -1); | ||
| } | ||
| static bool HasReadAndExecFlags(string s, ref int start, ref int end) | ||
| { | ||
| bool sawRead = false, sawExec = false; | ||
| for (int i = start; i < end; i++) | ||
| { | ||
| if (s[i] == 'r') | ||
| sawRead = true; | ||
| else if (s[i] == 'x') | ||
| sawExec = true; | ||
| } | ||
| return sawRead & sawExec; | ||
| } | ||
| } | ||
| } | ||
| } | ||
87 changes: 0 additions & 87 deletions
87 src/libraries/Common/src/Interop/Linux/procfs/Interop.ProcFsStat.cs
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
2 changes: 2 additions & 0 deletions
2 src/libraries/System.Diagnostics.Process/src/System.Diagnostics.Process.csproj
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
35 changes: 1 addition & 34 deletions
35 src/libraries/System.Diagnostics.Process/src/System/Diagnostics/ProcessManager.Linux.cs
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
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.