X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=common%2Ftrace_tools_trace.cpp;h=4c0082d7e51771e1d540c9ce53e5372ca27ef713;hb=45080ce539648a3fc073375cd9212b031a611f10;hp=146f19f650ec159f44cfd75433a35b70ccd18868;hpb=03c5d3d41dc219051cbbb8b84ea505e15ff433c4;p=apitrace

diff --git a/common/trace_tools_trace.cpp b/common/trace_tools_trace.cpp
index 146f19f..4c0082d 100644
--- a/common/trace_tools_trace.cpp
+++ b/common/trace_tools_trace.cpp
@@ -30,9 +30,10 @@
 
 #include <iostream>
 
-#include "os_path.hpp"
+#include "os_string.hpp"
 #include "os_process.hpp"
 #include "trace_tools.hpp"
+#include "trace_resource.hpp"
 
 
 
@@ -43,7 +44,6 @@ namespace trace {
 #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 TRACE_VARIABLE "LD_PRELOAD"
@@ -52,101 +52,160 @@ namespace trace {
 #endif
 
 
-os::Path
-findFile(const char *relPath,
-         const char *absPath,
-         bool verbose)
+static inline bool
+copyWrapper(const os::String & wrapperPath,
+            const char *programPath,
+            bool verbose)
 {
-    os::Path complete;
+    os::String wrapperFilename(wrapperPath);
+    wrapperFilename.trimDirectory();
 
-    /* First look in the same directory from which this process is
-     * running, (to support developers running a compiled program that
-     * has not been installed. */
-    os::Path process_dir = os::getProcessName();
+    os::String tmpWrapper(programPath);
+    tmpWrapper.trimFilename();
+    tmpWrapper.join(wrapperFilename);
 
-    process_dir.trimFilename();
-
-    complete = process_dir;
-    complete.join(relPath);
-
-    if (complete.exists())
-        return complete;
+    if (verbose) {
+        std::cerr << wrapperPath << " -> " << tmpWrapper << "\n";
+    }
 
-    /* Second, look in the directory for installed wrappers. */
-    complete = absPath;
-    if (complete.exists())
-        return complete;
+    if (tmpWrapper.exists()) {
+        std::cerr << "error: not overwriting " << tmpWrapper << "\n";
+        return false;
+    }
 
-    if (verbose) {
-        std::cerr << "error: cannot find " << relPath << " or " << absPath << "\n";
+    if (!os::copyFile(wrapperPath, tmpWrapper, false)) {
+        std::cerr << "error: failed to copy " << wrapperPath << " into " << tmpWrapper << "\n";
+        return false;
     }
 
-    return "";
+    return true;
 }
 
 
+static const char *glWrappers[] = {
+    GL_TRACE_WRAPPER,
+    NULL
+};
+
+#ifdef EGL_TRACE_WRAPPER
+static const char *eglWrappers[] = {
+    EGL_TRACE_WRAPPER,
+    NULL
+};
+#endif
+
+#ifdef _WIN32
+static const char *d3d7Wrappers[] = {
+    "ddraw.dll",
+    NULL
+};
+
+static const char *d3d8Wrappers[] = {
+    "d3d8.dll",
+    NULL
+};
+
+static const char *d3d9Wrappers[] = {
+    "d3d9.dll",
+    NULL
+};
+
+static const char *dxgiWrappers[] = {
+    "dxgitrace.dll",
+    //"dxgi.dll",
+    "d3d10.dll",
+    "d3d10_1.dll",
+    "d3d11.dll",
+    NULL
+};
+#endif
+
 int
 traceProgram(API api,
              char * const *argv,
              const char *output,
              bool verbose)
 {
-    const char *relPath;
-    const char *absPath;
+    const char **wrapperFilenames;
+    unsigned numWrappers;
+    int status = 1;
+
+    /*
+     * TODO: simplify code
+     */
 
     switch (api) {
     case API_GL:
-        relPath = "wrappers/" GL_TRACE_WRAPPER;
-        absPath = APITRACE_WRAPPER_INSTALL_DIR "/" GL_TRACE_WRAPPER;
+        wrapperFilenames = glWrappers;
         break;
+#ifdef EGL_TRACE_WRAPPER
     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;
+        wrapperFilenames = eglWrappers;
+        break;
+#endif
+#ifdef _WIN32
+    case API_D3D7:
+        wrapperFilenames = d3d7Wrappers;
+        break;
+    case API_D3D8:
+        wrapperFilenames = d3d8Wrappers;
+        break;
+    case API_D3D9:
+        wrapperFilenames = d3d9Wrappers;
+        break;
+    case API_D3D10:
+    case API_D3D10_1:
+    case API_D3D11:
+        wrapperFilenames = dxgiWrappers;
         break;
 #endif
     default:
-        std::cerr << "error: invalid API\n";
+        std::cerr << "error: unsupported API\n";
         return 1;
     }
 
-    os::Path wrapper;
-    wrapper = findFile(relPath, absPath, verbose);
-
-    if (!wrapper.length()) {
-        return 1;
+    numWrappers = 0;
+    while (wrapperFilenames[numWrappers]) {
+        ++numWrappers;
     }
 
-#if defined(_WIN32)
+    unsigned i;
+    for (i = 0; i < numWrappers; ++i) {
+        const char *wrapperFilename = wrapperFilenames[i];
 
-    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";
+        os::String wrapperPath = findWrapper(wrapperFilename);
 
-    return 1;
+        if (!wrapperPath.length()) {
+            std::cerr << "error: failed to find " << wrapperFilename << "\n";
+            goto exit;
+        }
 
-#else
+#if defined(_WIN32)
+        /* On Windows copy the wrapper to the program directory.
+         */
+        if (!copyWrapper(wrapperPath, argv[0], verbose)) {
+            goto exit;
+        }
+#endif /* _WIN32 */
 
 #if defined(__APPLE__)
-    /* On Mac OS X, using DYLD_LIBRARY_PATH, we actually set the
-     * directory, not the file. */
-    wrapper.trimFilename();
+        /* On Mac OS X, using DYLD_LIBRARY_PATH, we actually set the
+         * directory, not the file. */
+        wrapperPath.trimFilename();
 #endif
 
-    if (verbose) {
-        std::cerr << TRACE_VARIABLE << "=" << wrapper.str() << "\n";
+#if defined(TRACE_VARIABLE)
+        assert(numWrappers == 1);
+        if (verbose) {
+            std::cerr << TRACE_VARIABLE << "=" << wrapperPath.str() << "\n";
+        }
+        /* FIXME: Don't modify the current environment */
+        os::setEnvironment(TRACE_VARIABLE, wrapperPath.str());
+#endif /* TRACE_VARIABLE */
     }
 
-    /* FIXME: Don't modify the current environment */
-    setenv(TRACE_VARIABLE, wrapper.str(), 1);
-
     if (output) {
-        setenv("TRACE_FILE", output, 1);
+        os::setEnvironment("TRACE_FILE", output);
     }
 
     if (verbose) {
@@ -158,15 +217,27 @@ traceProgram(API api,
         std::cerr << "\n";
     }
 
-    int status = os::execute(argv);
+    status = os::execute(argv);
+
+exit:
+#if defined(TRACE_VARIABLE)
+    os::unsetEnvironment(TRACE_VARIABLE);
+#endif
+#if defined(_WIN32)
+    for (unsigned j = 0; j < i; ++j) {
+        const char *wrapperFilename = wrapperFilenames[j];
+        os::String tmpWrapper(argv[0]);
+        tmpWrapper.trimFilename();
+        tmpWrapper.join(wrapperFilename);
+        os::removeFile(tmpWrapper);
+    }
+#endif
 
-    unsetenv(TRACE_VARIABLE);
     if (output) {
-        unsetenv("TRACE_FILE");
+        os::unsetEnvironment("TRACE_FILE");
     }
     
     return status;
-#endif
 
 }