diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2024-05-15 15:17:16 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-05-17 08:46:55 +0000 |
| commit | 15846cbccf63a4e74cce5b8cf0c1931fdcf81ccd (patch) | |
| tree | cc0f7740f5e2a84cf3c842e30bff93e926a00f6a /tools | |
| parent | df04197b8da247c029f5966369849c8dd8122398 (diff) | |
pkg/ipc: use flatrpc flags
Flatrpc flags are passed in RPC execution requests,
so to avoid conversions and duplicate set of flags
use flatrpc flags in pkg/ipc directly.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syz-execprog/execprog.go | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go index 5479637ea..fdeee6cef 100644 --- a/tools/syz-execprog/execprog.go +++ b/tools/syz-execprog/execprog.go @@ -215,7 +215,7 @@ func (ctx *Context) execute(pid int, env *ipc.Env, p *prog.Prog, progIndex int) for try := 0; ; try++ { output, info, hanged, err := env.ExecProg(callOpts, progData) if err != nil { - if ctx.execOpts.EnvFlags&ipc.FlagDebug != 0 { + if ctx.execOpts.EnvFlags&flatrpc.ExecEnvDebug != 0 { log.Logf(0, "result: hanged=%v err=%v\n\n%s", hanged, err, output) } if try > 10 { @@ -402,19 +402,19 @@ func createConfig(target *prog.Target, featuresFlags csource.Features, syscalls if err != nil { log.Fatalf("%v", err) } - if execOpts.EnvFlags&ipc.FlagSignal != 0 { - execOpts.ExecFlags |= ipc.FlagCollectCover + if execOpts.EnvFlags&flatrpc.ExecEnvSignal != 0 { + execOpts.ExecFlags |= flatrpc.ExecFlagCollectCover } if *flagCoverFile != "" { - execOpts.EnvFlags |= ipc.FlagSignal - execOpts.ExecFlags |= ipc.FlagCollectCover - execOpts.ExecFlags &^= ipc.FlagDedupCover + execOpts.EnvFlags |= flatrpc.ExecEnvSignal + execOpts.ExecFlags |= flatrpc.ExecFlagCollectCover + execOpts.ExecFlags &^= flatrpc.ExecFlagDedupCover } if *flagHints { - if execOpts.ExecFlags&ipc.FlagCollectCover != 0 { - execOpts.ExecFlags ^= ipc.FlagCollectCover + if execOpts.ExecFlags&flatrpc.ExecFlagCollectCover != 0 { + execOpts.ExecFlags ^= flatrpc.ExecFlagCollectCover } - execOpts.ExecFlags |= ipc.FlagCollectComps + execOpts.ExecFlags |= flatrpc.ExecFlagCollectComps } cfg := &mgrconfig.Config{ Sandbox: ipc.FlagsToSandbox(execOpts.EnvFlags), |