Abstract execv().

[apitrace] / common / trace_tools_trace.cpp

diff --git a/common/trace_tools_trace.cpp b/common/trace_tools_trace.cpp
index 4ba38e0704f1df235afc1a64f96f279ddc769c9e..146f19f650ec159f44cfd75433a35b70ccd18868 100644 (file)
--- a/common/trace_tools_trace.cpp
+++ b/common/trace_tools_trace.cpp
@@ -31,6 +31,7 @@
 #include <iostream>
 
 #include "os_path.hpp"
+#include "os_process.hpp"
 #include "trace_tools.hpp"
 
 
@@ -39,14 +40,15 @@ namespace trace {
 
 
 #if defined(__APPLE__)
-#define CLI_TRACE_VARIABLE "DYLD_LIBRARY_PATH"
-#define CLI_TRACE_WRAPPER  "OpenGL"
+#define TRACE_VARIABLE "DYLD_LIBRARY_PATH"
+#define GL_TRACE_WRAPPER  "OpenGL"
 #elif defined(_WIN32)
-#define CLI_TRACE_VARIABLE ""
-#define CLI_TRACE_WRAPPER  "opengl32.dll"
+#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
 
 
@@ -84,13 +86,35 @@ findFile(const char *relPath,
 
 
 int
-traceProgram(char * const *argv,
+traceProgram(API api,
+             char * const *argv,
              const char *output,
              bool verbose)
 {
-    os::Path wrapper;
+    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
+        relPath = "wrappers/" EGL_TRACE_WRAPPER;
+        absPath = APITRACE_WRAPPER_INSTALL_DIR "/" EGL_TRACE_WRAPPER;
+        break;
+#endif
+    default:
+        std::cerr << "error: invalid API\n";
+        return 1;
+    }
 
-    wrapper = findFile("wrappers/" CLI_TRACE_WRAPPER, APITRACE_WRAPPER_INSTALL_DIR CLI_TRACE_WRAPPER, verbose);
+    os::Path wrapper;
+    wrapper = findFile(relPath, absPath, verbose);
 
     if (!wrapper.length()) {
         return 1;
@@ -104,6 +128,8 @@ traceProgram(char * const *argv,
         APITRACE_WRAPPER_INSTALL_DIR "\n"
         "to the directory with the application to trace, then run the application.\n";
 
+    return 1;
+
 #else
 
 #if defined(__APPLE__)
@@ -113,11 +139,11 @@ traceProgram(char * const *argv,
 #endif
 
     if (verbose) {
-        std::cerr << CLI_TRACE_VARIABLE << "=" << wrapper.str() << "\n";
+        std::cerr << TRACE_VARIABLE << "=" << wrapper.str() << "\n";
     }
 
     /* FIXME: Don't modify the current environment */
-    setenv(CLI_TRACE_VARIABLE, wrapper.str(), 1);
+    setenv(TRACE_VARIABLE, wrapper.str(), 1);
 
     if (output) {
         setenv("TRACE_FILE", output, 1);
@@ -132,17 +158,16 @@ traceProgram(char * const *argv,
         std::cerr << "\n";
     }
 
-    execvp(argv[0], argv);
+    int status = os::execute(argv);
 
-    unsetenv(CLI_TRACE_VARIABLE);
+    unsetenv(TRACE_VARIABLE);
     if (output) {
         unsetenv("TRACE_FILE");
     }
-
-    std::cerr << "error: Failed to execute " << argv[0] << "\n";
+    
+    return status;
 #endif
 
-    return 1;
 }