Changeset 51194 in vbox

Timestamp:

May 6, 2014 10:59:56 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93575

Message:

crOpenGL: 1.don't unload rt-dependant libs 2.wait for sync thread termination properly

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/Makefile.kmk (modified) (1 diff)
• Additions/common/crOpenGL/load.c (modified) (1 diff)
• GuestHost/OpenGL/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

@@ -236 +236 @@
 VBoxOGL_DEFS.win   += VBOX_WITH_WDDM
 endif
-
+if1of ($(KBUILD_TARGET), linux)
+VBoxOGL_LDFLAGS += -Wl,-z,nodelete
+endif
 ifdef VBOX_WITH_WDDM
 #

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -459 +459 @@
         ASMAtomicWriteBool(&stub.bShutdownSyncThread, true);
         {
-            /*RTThreadWait might return too early, which cause our code being unloaded while RT thread wrapper is still running*/
-            int rc = pthread_join(RTThreadGetNative(stub.hSyncThread), NULL);
-            if (!rc)
+            int rc = RTThreadWait(stub.hSyncThread, RT_INDEFINITE_WAIT, NULL);
+            if (RT_FAILURE(rc))
             {
-                crDebug("pthread_join failed %i", rc);
+                WARN(("RTThreadWait_join failed %i", rc));
             }
         }

trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk

@@ -117 +117 @@
 VBoxOGLcrutil_CLEAN = \
         $(VBOX_PATH_CROGL_GENFILES)/debug_opcodes.c
+if1of ($(KBUILD_TARGET), linux)
+VBoxOGLcrutil_LDFLAGS += -Wl,-z,nodelete
+endif
 
 # vc7 hangs during compilation of this file when optimizations are enabled.
@@ -157 +160 @@
 if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
  VBoxOGLhostcrutil_INSTTYPE.win = both
+endif
+if1of ($(KBUILD_TARGET), linux)
+VBoxOGLhostcrutil_LDFLAGS = $(NO_SUCH_VARIABLE)
 endif
 VBoxOGLhostcrutil_LDFLAGS.darwin = $(VBoxOGLcrutil_LDFLAGS.darwin) \