* obtain reference snapshots, by doing on a reference system:
mkdir /path/to/reference/snapshots/
- glretrace -s /path/to/reference/snapshots/ application.trace
+ apitrace dump-images -o /path/to/reference/snapshots/ application.trace
* prune the snapshots which are not interesting
Alternatively, for a HTML summary, use `apitrace diff-images`:
- glretrace -s /path/to/test/snapshots/ application.trace
+ apitrace dump-images -o /path/to/test/snapshots/ application.trace
apitrace diff-images --output summary.html /path/to/reference/snapshots/ /path/to/test/snapshots/
#include <getopt.h>
#include <iostream>
-#include "cli.hpp"
-
#include "os_string.hpp"
-#include "os_process.hpp"
-#include "trace_resource.hpp"
+#include "cli.hpp"
+#include "cli_retrace.hpp"
static const char *synopsis = "Dump frame images obtained from a trace.";
command(int argc, char *argv[])
{
os::String prefix;
- const char *calls, *filename, *output = NULL;
+ const char *calls = NULL;
+ const char *traceName = NULL;
+ const char *output = NULL;
int opt;
while ((opt = getopt_long(argc, argv, shortOptions, longOptions, NULL)) != -1) {
return 1;
}
- filename = argv[optind];
+ traceName = argv[optind];
if (output == NULL) {
- prefix = filename;
+ prefix = traceName;
prefix.trimDirectory();
prefix.trimExtension();
+ prefix.append('.');
output = prefix.str();
}
- std::vector<const char *> command;
+ std::vector<const char *> opts;
- os::String glretracePath = trace::findProgram("glretrace");
- command.push_back(glretracePath);
- command.push_back("-s");
- command.push_back(output);
- command.push_back("-S");
+ opts.push_back("-s");
+ opts.push_back(output);
+ opts.push_back("-S");
if (calls)
- command.push_back(calls);
+ opts.push_back(calls);
else
- command.push_back("*/frame");
- command.push_back(filename);
- command.push_back(NULL);
+ opts.push_back("*/frame");
- return os::execute((char * const *)&command[0]);
+ return executeRetrace(opts, traceName);
}
const Command dump_images_command = {
#include <getopt.h>
#include <iostream>
-#include "cli.hpp"
-
#include "os_string.hpp"
#include "os_process.hpp"
#include "trace_parser.hpp"
#include "trace_resource.hpp"
+#include "cli.hpp"
+#include "cli_retrace.hpp"
+
static const char *synopsis = "Replay a trace.";
static void
usage(void)
{
- std::cout << "usage apitrace retrace [OPTIONS] TRACE_FILE\n"
+ std::cout << "usage: apitrace retrace [OPTIONS] TRACE_FILE\n"
<< synopsis << "\n"
"\n"
" -h, --help Show this help message and exit\n"
return trace::API_UNKNOWN;
}
-static int
-command(int argc, char *argv[])
-{
- bool wait = false;
- const char *traceName;
-
- 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 retrace requires a trace file as an argument.\n";
- usage();
- return 1;
- }
-
- if (optind < argc - 1) {
- std::cerr << "error: apitrace retrace can accept only a single trace file argument.\n";
- usage();
- return 1;
- }
-
- traceName = argv[optind];
-
- trace::API api = guessApi(traceName);
-
- std::vector<const char *> command;
+int
+executeRetrace(const std::vector<const char *> & opts,
+ const char *traceName,
+ trace::API api) {
const char *retraceName;
switch (api) {
case trace::API_GL:
break;
}
+ std::vector<const char *> command;
os::String retracePath = trace::findProgram(retraceName);
- if (retracePath) {
+ if (retracePath.length()) {
command.push_back(retracePath);
} else {
command.push_back(retraceName);
}
- if (wait) {
- command.push_back("--wait");
- }
+ command.insert(command.end(), opts.begin(), opts.end());
command.push_back(traceName);
command.push_back(NULL);
return os::execute((char * const *)&command[0]);
}
+int
+executeRetrace(const std::vector<const char *> & opts,
+ const char *traceName) {
+ trace::API api = guessApi(traceName);
+ return executeRetrace(opts, traceName, api);
+}
+
+static int
+command(int argc, char *argv[])
+{
+ std::vector<const char *> opts;
+
+ const char *traceName;
+
+ int opt;
+ while ((opt = getopt_long(argc, argv, shortOptions, longOptions, NULL)) != -1) {
+ switch (opt) {
+ case 'h':
+ usage();
+ return 0;
+ case 'w':
+ opts.push_back("--wait");
+ break;
+ default:
+ std::cerr << "error: unexpected option `" << opt << "`\n";
+ usage();
+ return 1;
+ }
+ }
+
+ if (optind >= argc) {
+ std::cerr << "error: apitrace retrace requires a trace file as an argument.\n";
+ usage();
+ return 1;
+ }
+
+ if (optind < argc - 1) {
+ std::cerr << "error: apitrace retrace can accept only a single trace file argument.\n";
+ usage();
+ return 1;
+ }
+
+ traceName = argv[optind];
+
+ return executeRetrace(opts, traceName);
+}
+
const Command retrace_command = {
"retrace",
synopsis,
--- /dev/null
+/*********************************************************************
+ *
+ * Copyright 2011 Jose Fonseca
+ * 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.
+ *
+ *********************************************************************/
+
+#ifndef _CLI_RETRACE_HPP_
+#define _CLI_RETRACE_HPP_
+
+
+#include <vector>
+#include "trace_api.hpp"
+
+
+int
+executeRetrace(const std::vector<const char *> & opts,
+ const char *traceName,
+ trace::API api);
+
+int
+executeRetrace(const std::vector<const char *> & opts,
+ const char *traceName);
+
+
+#endif /* _CLI_RETRACE_HPP_ */
projects / apitrace / commitdiff