From 68b5306c562c30df5ede227b451eadbf92c5c311 Mon Sep 17 00:00:00 2001 From: Kane York Date: Tue, 4 Aug 2020 19:12:49 -0700 Subject: feat(3p/nix): add --trace-file-access to nix-instantiate This builds on edef's work with depot-scan by adding a dedicated flag to the command. We piggyback on upstream's restricted-mode implementation, the checkSourcePath function. Change-Id: I52bb613549f40dbca1e8caa036635910c1a3d6d0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1654 Tested-by: BuildkiteCI Reviewed-by: glittershark --- third_party/nix/src/nix-instantiate/nix-instantiate.cc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'third_party/nix/src/nix-instantiate/nix-instantiate.cc') diff --git a/third_party/nix/src/nix-instantiate/nix-instantiate.cc b/third_party/nix/src/nix-instantiate/nix-instantiate.cc index be96943b12..7b8d6dd3d6 100644 --- a/third_party/nix/src/nix-instantiate/nix-instantiate.cc +++ b/third_party/nix/src/nix-instantiate/nix-instantiate.cc @@ -96,6 +96,7 @@ static int _main(int argc, char** argv) { bool findFile = false; bool evalOnly = false; bool parseOnly = false; + bool traceFileAccess = false; OutputKind outputKind = okPlain; bool xmlOutputSourceLocation = true; bool strict = false; @@ -143,6 +144,14 @@ static int _main(int argc, char** argv) { repair = Repair; } else if (*arg == "--dry-run") { settings.readOnlyMode = true; + } else if (*arg == "--trace-file-access") { + traceFileAccess = true; + } else if (*arg == "--trace-file-access=true") { + traceFileAccess = true; + } else if (*arg == "--trace-file-access=false") { + traceFileAccess = false; + } else if (*arg == "--notrace-file-access") { + traceFileAccess = false; } else if (*arg != "" && arg->at(0) == '-') { return false; } else { @@ -161,6 +170,11 @@ static int _main(int argc, char** argv) { auto state = std::make_unique(myArgs.searchPath, store); state->repair = repair; + if (traceFileAccess) { + state->EnableFileAccessTracing([](const Path& path) { + std::cerr << "trace: depot-scan: " << path << "\n"; + }); + } Bindings& autoArgs = *myArgs.getAutoArgs(*state); -- cgit 1.4.1