From 7203e72333c273b3ac132a26be537abd197d0888 Mon Sep 17 00:00:00 2001 From: Enrico Deiana Date: Tue, 31 Dec 2024 16:10:47 -0800 Subject: [PATCH] i#6662 public traces: allow v2p.textproto in trace dir (#7136) Allows the v2p.textproto file to be in the trace directory of public traces to avoid the following error: ``` $ drrun -t drmemtrace -indir ${path_to_public_trace_dir} -tool invariant_checker Invalid header Failed to initialize scheduler: Failed to open ${path_public_trace_dir}/v2p.textproto ERROR: failed to initialize analyzer ``` Issue #6662 --- clients/drcachesim/scheduler/scheduler_impl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/drcachesim/scheduler/scheduler_impl.cpp b/clients/drcachesim/scheduler/scheduler_impl.cpp index c75a5655615..3ff55edf368 100644 --- a/clients/drcachesim/scheduler/scheduler_impl.cpp +++ b/clients/drcachesim/scheduler/scheduler_impl.cpp @@ -161,7 +161,7 @@ scheduler_impl_tmpl_t::get_reader(const std::string &path, // Skip the auxiliary files. if (fname == DRMEMTRACE_MODULE_LIST_FILENAME || fname == DRMEMTRACE_FUNCTION_LIST_FILENAME || - fname == DRMEMTRACE_ENCODING_FILENAME) + fname == DRMEMTRACE_ENCODING_FILENAME || fname == DRMEMTRACE_V2P_FILENAME) continue; # ifdef HAS_SNAPPY if (ends_with(*iter, ".sz")) { @@ -1686,7 +1686,7 @@ scheduler_impl_tmpl_t::open_readers( // Skip the auxiliary files. if (fname == DRMEMTRACE_MODULE_LIST_FILENAME || fname == DRMEMTRACE_FUNCTION_LIST_FILENAME || - fname == DRMEMTRACE_ENCODING_FILENAME) + fname == DRMEMTRACE_ENCODING_FILENAME || fname == DRMEMTRACE_V2P_FILENAME) continue; const std::string file = path + DIRSEP + fname; files.push_back(file);