*********************************************************************/
+#include <stdlib.h>
+
#include <iostream>
-#include "os_path.hpp"
+#include "os_string.hpp"
+#include "os_process.hpp"
+#include "trace_resource.hpp"
#include "trace_tools.hpp"
namespace trace {
-#ifdef __APPLE__
-#define CLI_TRACE_VARIABLE "DYLD_LIBRARY_PATH"
-#define CLI_TRACE_WRAPPER "OpenGL"
+#if defined(__APPLE__)
+#define TRACE_VARIABLE "DYLD_LIBRARY_PATH"
+#define GL_TRACE_WRAPPER "OpenGL"
+#elif defined(_WIN32)
+#define TRACE_VARIABLE ""
+#define GL_TRACE_WRAPPER "opengl32.dll"
#else
-#define CLI_TRACE_VARIABLE "LD_PRELOAD"
-#define CLI_TRACE_WRAPPER "glxtrace.so"
+#define TRACE_VARIABLE "LD_PRELOAD"
+#define GL_TRACE_WRAPPER "glxtrace.so"
+#define EGL_TRACE_WRAPPER "egltrace.so"
#endif
-static os::Path
-findWrapper(const char *filename, bool verbose)
+int
+traceProgram(API api,
+ char * const *argv,
+ const char *output,
+ bool verbose)
{
- os::Path complete;
-
- /* First look in the same directory from which this process is
- * running, (to support developers running a compiled program that
- * has not been installed. */
-#if 1
- os::Path process_dir = os::getProcessName();
-
- process_dir.trimFilename();
-
- complete = process_dir;
- complete.join("wrappers");
- complete.join(filename);
+ const char *relPath;
+ const char *absPath;
+
+ switch (api) {
+ case API_GL:
+ relPath = "wrappers/" GL_TRACE_WRAPPER;
+ absPath = APITRACE_WRAPPER_INSTALL_DIR "/" GL_TRACE_WRAPPER;
+ break;
+ case API_EGL:
+#ifndef EGL_TRACE_WRAPPER
+ std::cerr << "error: unsupported API\n";
+ return 1;
#else
- complete = APITRACE_BINARY_DIR "/wrappers";
- complete.join(filename);
+ relPath = "wrappers/" EGL_TRACE_WRAPPER;
+ absPath = APITRACE_WRAPPER_INSTALL_DIR "/" EGL_TRACE_WRAPPER;
+ break;
#endif
+ default:
+ std::cerr << "error: invalid API\n";
+ return 1;
+ }
- if (complete.exists())
- return complete;
-
- /* Second, look in the directory for installed wrappers. */
- complete = APITRACE_WRAPPER_INSTALL_DIR;
- complete.join(filename);
-
- if (complete.exists())
- return complete;
-
- std::cerr << "error: cannot find " << filename << " (looked in " <<
- APITRACE_WRAPPER_INSTALL_DIR << ")\n";
- exit(1);
+ os::String wrapper;
+ wrapper = findFile(relPath, absPath, verbose);
- return "";
-}
+ if (!wrapper.length()) {
+ return 1;
+ }
-int
-traceProgram(char * const *argv,
- const char *output,
- bool verbose)
-{
-#ifdef _WIN32
+#if defined(_WIN32)
std::cerr <<
"The 'apitrace trace' command is not supported for this operating system.\n"
"Instead, you will need to copy opengl32.dll, d3d8.dll, or d3d9.dll from\n"
APITRACE_WRAPPER_INSTALL_DIR "\n"
"to the directory with the application to trace, then run the application.\n";
+
return 1;
#else
- os::Path binary = findWrapper(CLI_TRACE_WRAPPER, verbose);
+#if defined(__APPLE__)
/* On Mac OS X, using DYLD_LIBRARY_PATH, we actually set the
* directory, not the file. */
-#ifdef __APPLE__
- binary.trimFilename();
+ wrapper.trimFilename();
#endif
if (verbose) {
- std::cerr << CLI_TRACE_VARIABLE << "=" << binary.str() << "\n";
+ std::cerr << TRACE_VARIABLE << "=" << wrapper.str() << "\n";
}
/* FIXME: Don't modify the current environment */
- setenv(CLI_TRACE_VARIABLE, binary.str(), 1);
+ setenv(TRACE_VARIABLE, wrapper.str(), 1);
if (output) {
setenv("TRACE_FILE", output, 1);
std::cerr << "\n";
}
- execvp(argv[0], argv);
-
- unsetenv(CLI_TRACE_VARIABLE);
+ int status = os::execute(argv);
+
+ unsetenv(TRACE_VARIABLE);
if (output) {
unsetenv("TRACE_FILE");
}
-
- std::cerr << "error: Failed to execute " << argv[0] << "\n";
+
+ return status;
#endif
- return 1;
}