Fix tracing of apps that use dlsym, such as OpenArena.

diff --git a/glproc.py b/glproc.py
index fa1db1ec423f61f1908161f61097b96e1aab941d..2fde623cb8f7cb10fe1cf89880b409137a1ce5a7 100644 (file)
--- a/glproc.py
+++ b/glproc.py
@@ -421,7 +421,8 @@ class GlDispatcher(Dispatcher):
         print '#    define __getPrivateProcAddress(name) __wglGetProcAddress(name)'
         print '     static inline PROC __stdcall __wglGetProcAddress(const char * lpszProc);'
         print '#  else'
-        print '#    define __getPublicProcAddress(name) dlsym(RTLD_NEXT, name)'
+        print '     static void *libgl_handle = RTLD_NEXT;'
+        print '#    define __getPublicProcAddress(name) dlsym(libgl_handle, name)'
         print '#    define __getPrivateProcAddress(name) __glXGetProcAddressARB((const GLubyte *)(name))'
         print '     static inline __GLXextFuncPtr __glXGetProcAddressARB(const GLubyte * procName);'
         print '#  endif'

diff --git a/glxtrace.py b/glxtrace.py
index e1a5aa59e989b726351d385fa2c36ebf7597d4e1..050a0823ea3e363f98940aef69d894e50da6e411 100644 (file)
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -48,6 +48,10 @@ if __name__ == '__main__':
     print
     print '#include <stdlib.h>'
     print '#include <string.h>'
+    print
+    print '#ifndef _GNU_SOURCE'
+    print '#define _GNU_SOURCE // for dladdr'
+    print '#endif'
     print '#include <dlfcn.h>'
     print
     print '#include "trace_write.hpp"'
@@ -80,4 +84,54 @@ if __name__ == '__main__':
     print '    return procPtr;'
     print '}'
     print
+    print r'''
+
+/*
+ * Several applications, such as Quake3, use dlopen("libGL.so.1"), but
+ * LD_PRELOAD does not intercept symbols obtained via dlopen/dlsym, therefore
+ * we need to intercept the dlopen() call here, and redirect to our wrapper
+ * shared object.
+ */
+void *dlopen(const char *filename, int flag)
+{
+    typedef void * (*PFNDLOPEN)(const char *, int);
+    static PFNDLOPEN dlopen_ptr = NULL;
+    void *handle;
+
+    if (!dlopen_ptr) {
+        dlopen_ptr = (PFNDLOPEN)dlsym(RTLD_NEXT, "dlopen");
+        if (!dlopen_ptr) {
+            OS::DebugMessage("error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
+            return NULL;
+        }
+    }
+
+    handle = dlopen_ptr(filename, flag);
+
+    if (filename && handle) {
+        if (0) {
+            OS::DebugMessage("warning: dlopen(\"%s\", 0x%x)\n", filename, flag);
+        }
+
+        // FIXME: handle absolute paths and other versions
+        if (strcmp(filename, "libGL.so.1") == 0) {
+            // Use the true libGL.so handle instead of RTLD_NEXT from now on
+            libgl_handle = handle;
+
+            // Get the file path for our shared object, and use it instead
+            static int dummy = 0xdeedbeef;
+            Dl_info info;
+            if (dladdr(&dummy, &info)) {
+                OS::DebugMessage("apitrace: redirecting dlopen(\"%s\", 0x%x)\n", filename, flag);
+                handle = dlopen_ptr(info.dli_fname, flag);
+            } else {
+                OS::DebugMessage("warning: dladdr() failed\n");
+            }
+        }
+    }
+
+    return handle;
+}
+
+'''
     print '} /* extern "C" */'