From da96cbf5aa49ea70ea5516039c6997e9242a5be0 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Mon, 20 Aug 2012 09:45:27 -0700 Subject: [PATCH] cli: Add a simple "apitrace replay" sub-command. This calls out to glretrace in order to replay a trace. Currently it only supports the -w,--wait option, (and not yet any of the profiling support). With this command and the existing "apitrace dump-images", we're quite close to being able to relegate glretrace to an implementation detail used by the apitrace program, (such that soon, it won't be necessary to provide glretrace on the user's PATH). --- cli/CMakeLists.txt | 1 + cli/cli.hpp | 1 + cli/cli_main.cpp | 1 + cli/cli_replay.cpp | 125 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+) create mode 100644 cli/cli_replay.cpp diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index a6fc3a6..a0ffb71 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -8,6 +8,7 @@ add_executable (apitrace cli_pager.cpp cli_pickle.cpp cli_repack.cpp + cli_replay.cpp cli_trace.cpp cli_trim.cpp ) diff --git a/cli/cli.hpp b/cli/cli.hpp index 4f3e2b9..c701f52 100644 --- a/cli/cli.hpp +++ b/cli/cli.hpp @@ -47,6 +47,7 @@ extern const Command dump_command; extern const Command dump_images_command; extern const Command pickle_command; extern const Command repack_command; +extern const Command replay_command; extern const Command trace_command; extern const Command trim_command; diff --git a/cli/cli_main.cpp b/cli/cli_main.cpp index 8c619ba..6682717 100644 --- a/cli/cli_main.cpp +++ b/cli/cli_main.cpp @@ -73,6 +73,7 @@ static const Command * commands[] = { &dump_images_command, &pickle_command, &repack_command, + &replay_command, &trace_command, &trim_command, &help_command diff --git a/cli/cli_replay.cpp b/cli/cli_replay.cpp new file mode 100644 index 0000000..aaa68e2 --- /dev/null +++ b/cli/cli_replay.cpp @@ -0,0 +1,125 @@ +/********************************************************************* + * + * Copyright 2011 Jose Fonseca + * Copyright 2012 Intel Corporation + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + *********************************************************************/ + +#include +#include // for CHAR_MAX +#include +#include + +#include "cli.hpp" + +#include "os_string.hpp" +#include "os_process.hpp" + +#include "trace_resource.hpp" + +static const char *synopsis = "Replay a trace."; + +static void +usage(void) +{ + std::cout << "usage apitrace replay [OPTIONS] TRACE_FILE\n" + << synopsis << "\n" + "\n" + " -h, --help Show this help message and exit\n" + " -w, --wait Wait for user termination after the last frame\n" + "\n"; +} + +const static char * +shortOptions = "hw"; + +const static struct option +longOptions[] = { + {"help", no_argument, 0, 'h'}, + {"wait", required_argument, 0, 'w'}, + {0, 0, 0, 0} +}; + +static int +command(int argc, char *argv[]) +{ + bool wait = false; + const char *filename; + + int opt; + while ((opt = getopt_long(argc, argv, shortOptions, longOptions, NULL)) != -1) { + switch (opt) { + case 'h': + usage(); + return 0; + case 'w': + wait = true; + break; + default: + std::cerr << "error: unexpected option `" << opt << "`\n"; + usage(); + return 1; + } + } + + if (optind >= argc) { + std::cerr << "error: apitrace replay requires a trace file as an argument.\n"; + usage(); + return 1; + } + + if (optind < argc - 1) { + std::cerr << "error: apitrace replay can accept only a single trace file argument.\n"; + usage(); + return 1; + } + + filename = argv[optind]; + + /* FIXME: It would be cleaner to pull the replaying of the trace + * in-process here and generate the images directly. But that + * pulls in a non-trivial amount of the existing 'retrace' code, + * along with dependencies on GL, etc. + */ + std::vector command; + + os::String glretracePath = trace::findProgram("glretrace"); + command.push_back(glretracePath); + + if (wait) { + command.push_back("--wait"); + } + + command.push_back(filename); + command.push_back(NULL); + + return os::execute((char * const *)&command[0]); +} + +const Command replay_command = { + "replay", + synopsis, + usage, + command +}; -- 2.43.0