Added ability to trigger on addresses and line numbers #241
Conversation
This file contains 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
Lamoreauxaj
force-pushed
the
trigger_modes
branch
3 times, most recently
from
ba9d12a
to
944ca15
Compare
Lamoreauxaj
force-pushed
the
trigger_modes
branch
from
944ca15
to
5bfa3bb
Compare
Xyene
reviewed
Jul 13, 2022
core/elf.ml
Outdated
| @@ -148,6 +167,72 @@ let find_symbol t name = | |||
| None) | |||
| ;; | |||
|
|
|||
| let find_selection t name : Selection.t option = | |||
| let find_line_selection name = | |||
| let split_name = String.split name ~on:':' in | |||
There was a problem hiding this comment.
Can we do a
match ... with
| [ desired_filename; desired_line; desired_col ] -> ...
| _ -> raise some errorhere?
Xyene
reviewed
Jul 13, 2022
core/elf.ml
Outdated
| | Some desired_filename, Some desired_line, Some filename -> | ||
| if String.(desired_filename = filename) && desired_line = line | ||
| then cols := (col, state.address) :: !cols | ||
| | None, _, _ | _, None, _ | _, _, None -> ()) |
There was a problem hiding this comment.
Suggested change
| | None, _, _ | _, None, _ | _, _, None -> ()) | |
| | _, _, _ -> ()) |
Xyene
reviewed
Jul 13, 2022
core/elf.ml
Outdated
| then | ||
| Core.eprint_s | ||
| [%message | ||
| "Multiple snapshot symbols on same line. Selecting one." |
There was a problem hiding this comment.
Let's switch this to a regular eprintf with non-sexp formatting because it's user-visible.
Xyene
reviewed
Jul 13, 2022
core/elf.ml
Outdated
| let find_symbol_selection name = | ||
| Option.map (find_symbol t name) ~f:(fun symbol -> Selection.Symbol symbol) | ||
| in | ||
| if String.is_prefix name ~prefix:"symbol:" |
There was a problem hiding this comment.
Let's extract this if/then branch into a short helper and use it here, that takes ~prefix and ~f, so that we can elide the hardcoding of the prefix lengths.
This feature adds triggers of the format `addr:0xfffff` or `line:file.ml:99:15`. All triggers can be prefixed with either `symbol:`, `addr:`, or `line:`, but if none is given, it will default to a symbol if possible and otherwise parse it as a line number or address. There is no feature to allow our fuzzy finding to work with the new options, but it could be possible to implement fuzzy finding on files for example. Signed-off-by: Aaron Lamoreaux <alamoreaux@janestreet.com>
Lamoreauxaj
force-pushed
the
trigger_modes
branch
from
5bfa3bb
to
d8c6318
Compare
|
Closing since this ended up being merged as part of another PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This feature adds triggers of the format
addr:0xffffforline:file.ml:99:15. All triggers can be prefixed with eithersymbol:,addr:, orline:, but if none is given, it will default to a symbol if possible and otherwise parse it as a line number or address.There is no feature to allow our fuzzy finding to work with the new options, but it could be possible to implement fuzzy finding on files for example.