Changeset 41913 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render

Timestamp:

Jun 25, 2012 3:56:22 PM (13 years ago)

Author:

vboxsync

Message:

crOpenGL/OSX: fix concurency and freed memory reference

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (7 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m

@@ -264 +264 @@
 - (NSView*)dockTileScreen;
 - (void)reshapeDockTile;
+- (void)cleanupData;
 @end
 
@@ -669 +670 @@
 }
 
-- (void)dealloc
-{
-    DEBUG_MSG(("OVIW(%p): dealloc OverlayView\n", (void*)self));
-
+- (void)cleanupData
+{
     [self deleteFBO];
 
@@ -679 +678 @@
         if ([m_pGLCtx view] == self)
             [m_pGLCtx clearDrawable];
+
+        m_pGLCtx = nil;
     }
     if (m_pSharedGLCtx)
@@ -686 +687 @@
 
         [m_pSharedGLCtx release];
+
+        m_pSharedGLCtx = nil;
     }
 
     [self clearVisibleRegions];
+}
+
+- (void)dealloc
+{
+    DEBUG_MSG(("OVIW(%p): dealloc OverlayView\n", (void*)self));
+
+    [self cleanupData];
 
     [super dealloc];
@@ -701 +711 @@
 {
     DEBUG_MSG(("OVIW(%p): setGLCtx: new ctx: %p\n", (void*)self, (void*)pCtx));
+    if (m_pGLCtx == pCtx)
+        return;
+
+    /* ensure the context drawable is cleared to avoid holding a reference to inexistent view */
+    if (m_pGLCtx)
+        [m_pGLCtx clearDrawable];
 
     m_pGLCtx = pCtx;
@@ -1779 +1795 @@
     [pWin setContentView: nil];
     [[pWin parentWindow] removeChildWindow: pWin];
+    
     /*
     a = [pWin retainCount];
@@ -1784 +1801 @@
         [pWin performSelector:@selector(release)]
     */
+    /* We can NOT run synchronously with the main thread since this may lead to a deadlock,
+       caused by main thread waiting xpcom thread, xpcom thread waiting to main hgcm thread,
+       and main hgcm thread waiting for us, this is why use waitUntilDone:NO, 
+       which should cause no harm */ 
     [pWin performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
     /*
     [pWin release];
     */
+
+    /* We can NOT run synchronously with the main thread since this may lead to a deadlock,
+       caused by main thread waiting xpcom thread, xpcom thread waiting to main hgcm thread,
+       and main hgcm thread waiting for us, this is why use waitUntilDone:NO. 
+       We need to avoid concurrency though, so we cleanup some data right away via a cleanupData call */
+    [(OverlayView*)pView cleanupData];
 
     /* There seems to be a bug in the performSelector method which is called in