PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proc/gdbserial: add environment variables to configure rr invocation (#3726)

Browse Source 
Adds two environment variables to configure rr invocations.

Fixes #3670
This commit is contained in:
Alessandro Arzilli 2024-05-24 20:33:23 +02:00 committed by GitHub
parent 35ebb085c5
commit 40670aadc2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/usage/dlv_backend.md
View File

@ -12,6 +12,11 @@ are:
lldb Uses lldb-server or debugserver. lldb Uses lldb-server or debugserver.
rr Uses mozilla rr (https://github.com/mozilla/rr). rr Uses mozilla rr (https://github.com/mozilla/rr).
Some backends can be configured using environment variables:
* DELVE_DEBUGSERVER_PATH specifies the path of the debugserver executable for the lldb backend
* DELVE_RR_RECORD_FLAGS specifies additional flags used when calling 'rr record'
* DELVE_RR_REPLAY_FLAGS specifies additional flags used when calling 'rr replay'
### Options ### Options

5
cmd/dlv/cmds/commands.go
View File

@ -456,6 +456,11 @@ are:
lldb Uses lldb-server or debugserver. lldb Uses lldb-server or debugserver.
rr Uses mozilla rr (https://github.com/mozilla/rr). rr Uses mozilla rr (https://github.com/mozilla/rr).
Some backends can be configured using environment variables:
* DELVE_DEBUGSERVER_PATH specifies the path of the debugserver executable for the lldb backend
* DELVE_RR_RECORD_FLAGS specifies additional flags used when calling 'rr record'
* DELVE_RR_REPLAY_FLAGS specifies additional flags used when calling 'rr replay'
`}) `})
rootCommand.AddCommand(&cobra.Command{ rootCommand.AddCommand(&cobra.Command{

7
pkg/proc/gdbserial/rr.go
View File

@ -15,6 +15,11 @@ import (
"github.com/go-delve/delve/pkg/proc" "github.com/go-delve/delve/pkg/proc"
) )
const (
delveRecordFlagsEnvVar = "DELVE_RR_RECORD_FLAGS"
delveReplayFlagsEnvVar = "DELVE_RR_REPLAY_FLAGS"
)
// RecordAsync configures rr to record the execution of the specified // RecordAsync configures rr to record the execution of the specified
// program. Returns a run function which will actually record the program, a // program. Returns a run function which will actually record the program, a
// stop function which will prematurely terminate the recording of the // stop function which will prematurely terminate the recording of the
@ -31,6 +36,7 @@ func RecordAsync(cmd []string, wd string, quiet bool, stdin string, stdout proc.
args := make([]string, 0, len(cmd)+2) args := make([]string, 0, len(cmd)+2)
args = append(args, "record", "--print-trace-dir=3") args = append(args, "record", "--print-trace-dir=3")
args = append(args, config.SplitQuotedFields(os.Getenv(delveRecordFlagsEnvVar), '"')...)
args = append(args, cmd...) args = append(args, cmd...)
rrcmd := exec.Command("rr", args...) rrcmd := exec.Command("rr", args...)
var closefn func() var closefn func()
@ -141,6 +147,7 @@ func Replay(tracedir string, quiet, deleteOnDetach bool, debugInfoDirs []string,
if rrOnProcessPid != 0 { if rrOnProcessPid != 0 {
args = append(args, fmt.Sprintf("--onprocess=%d", rrOnProcessPid)) args = append(args, fmt.Sprintf("--onprocess=%d", rrOnProcessPid))
} }
args = append(args, config.SplitQuotedFields(os.Getenv(delveReplayFlagsEnvVar), '\'')...)
args = append(args, tracedir) args = append(args, tracedir)
rrcmd := exec.Command("rr", args...) rrcmd := exec.Command("rr", args...)