Mercurial > hg > release > icedtea7-forest-2.0 > jdk

changeset 4250:4c9ea1bf528a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6998716: client vm crashes making browser fails to respond under some scenarios Reviewed-by: art, denis, uta
author denis
date Wed, 27 Apr 2011 17:18:38 +0400
parents 16f52939fa41
children 03d764676479
files src/windows/native/sun/windows/ObjectList.cpp src/windows/native/sun/windows/ObjectList.h src/windows/native/sun/windows/awt_Component.cpp src/windows/native/sun/windows/awt_MenuItem.cpp src/windows/native/sun/windows/awt_Object.cpp src/windows/native/sun/windows/awt_Object.h src/windows/native/sun/windows/awt_Robot.cpp src/windows/native/sun/windows/awt_Toolkit.cpp src/windows/native/sun/windows/awt_TrayIcon.cpp src/windows/native/sun/windows/awtmsg.h
diffstat 10 files changed, 51 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/windows/ObjectList.cpp	Wed Apr 27 14:58:40 2011 +0400
+++ b/src/windows/native/sun/windows/ObjectList.cpp	Wed Apr 27 17:18:38 2011 +0400
@@ -48,7 +48,7 @@
     m_head = item;
 }
 
-void AwtObjectList::Remove(AwtObject* obj)
+BOOL AwtObjectList::Remove(AwtObject* obj)
 {
     CriticalSection::Lock l(m_lock);
 
@@ -64,11 +64,14 @@
             }
             DASSERT(item != NULL);
             delete item;
-            return;
+            return TRUE;
         }
         lastItem = item;
         item = item->next;
     }
+
+    return FALSE;
+
 //    DASSERT(FALSE);  // should never get here...
                       // even if it does it shouldn't be fatal.
 }
--- a/src/windows/native/sun/windows/ObjectList.h	Wed Apr 27 14:58:40 2011 +0400
+++ b/src/windows/native/sun/windows/ObjectList.h	Wed Apr 27 17:18:38 2011 +0400
@@ -46,7 +46,7 @@
     AwtObjectList();
 
     void Add(AwtObject* obj);
-    void Remove(AwtObject* obj);
+    BOOL Remove(AwtObject* obj);
 #ifdef DEBUG
     /* Used for sanity checks only. */
     AwtObject* LookUp(AwtObject* obj);
--- a/src/windows/native/sun/windows/awt_Component.cpp	Wed Apr 27 14:58:40 2011 +0400
+++ b/src/windows/native/sun/windows/awt_Component.cpp	Wed Apr 27 17:18:38 2011 +0400
@@ -1969,7 +1969,9 @@
 {
     // fix for 6259348: we should enter the SyncCall critical section before
     // disposing the native object, that is value 1 of lParam is intended for
-    AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)this, (LPARAM)1);
+    if(m_peerObject != NULL) { // is not being terminating
+        AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)m_peerObject, (LPARAM)1);
+    }
 
     return mrConsume;
 }
@@ -6534,8 +6536,7 @@
 {
     TRY_NO_HANG;
 
-    PDATA pData = JNI_GET_PDATA(self);
-    AwtObject::_Dispose(pData);
+    AwtObject::_Dispose(self);
 
     CATCH_BAD_ALLOC;
 }
--- a/src/windows/native/sun/windows/awt_MenuItem.cpp	Wed Apr 27 14:58:40 2011 +0400
+++ b/src/windows/native/sun/windows/awt_MenuItem.cpp	Wed Apr 27 17:18:38 2011 +0400
@@ -974,8 +974,7 @@
 {
     TRY_NO_HANG;
 
-    PDATA pData = JNI_GET_PDATA(self);
-    AwtObject::_Dispose(pData);
+    AwtObject::_Dispose(self);
 
     CATCH_BAD_ALLOC;
 }
--- a/src/windows/native/sun/windows/awt_Object.cpp	Wed Apr 27 14:58:40 2011 +0400
+++ b/src/windows/native/sun/windows/awt_Object.cpp	Wed Apr 27 17:18:38 2011 +0400
@@ -60,11 +60,20 @@
 
 void AwtObject::Dispose()
 {
-    theAwtObjectList.Remove(this);
+    AwtToolkit::GetInstance().PostMessage(WM_AWT_DELETEOBJECT, (WPARAM)this, (LPARAM)0);
+}
+
+void AwtObject::_Dispose(jobject self)
+{
+    TRY_NO_VERIFY;
+
+    CriticalSection::Lock l(AwtToolkit::GetInstance().GetSyncCS());
 
     // value 0 of lParam means that we should not attempt to enter the
     // SyncCall critical section, as it was entered someshere earlier
-    AwtToolkit::GetInstance().PostMessage(WM_AWT_DELETEOBJECT, (WPARAM)this, (LPARAM)0);
+    AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)self, (LPARAM)0);
+
+    CATCH_BAD_ALLOC;
 }
 
 void AwtObject::_Dispose(PDATA pData)
@@ -73,14 +82,10 @@
 
     CriticalSection::Lock l(AwtToolkit::GetInstance().GetSyncCS());
 
-    if (pData != NULL) {
-        AwtObject *o = (AwtObject *)pData;
-        AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSE, (WPARAM)o, (LPARAM)0);
-    }
+    AwtToolkit::GetInstance().SendMessage(WM_AWT_DISPOSEPDATA, (WPARAM)pData, (LPARAM)0);
 
     CATCH_BAD_ALLOC;
 }
-
 /*
  * Return the peer associated with some target.  This information is
  * maintained in a hashtable at the java level.
--- a/src/windows/native/sun/windows/awt_Object.h	Wed Apr 27 14:58:40 2011 +0400
+++ b/src/windows/native/sun/windows/awt_Object.h	Wed Apr 27 17:18:38 2011 +0400
@@ -67,6 +67,10 @@
     virtual void Dispose();
 
     // Static method to be called from JNI methods to dispose AwtObject
+    // specified by jobject
+    static void _Dispose(jobject self);
+
+    // Static method to be called from JNI methods to dispose AwtObject
     // specified by pData
     static void _Dispose(PDATA pData);
 
--- a/src/windows/native/sun/windows/awt_Robot.cpp	Wed Apr 27 14:58:40 2011 +0400
+++ b/src/windows/native/sun/windows/awt_Robot.cpp	Wed Apr 27 17:18:38 2011 +0400
@@ -353,8 +353,7 @@
 {
     TRY_NO_VERIFY;
 
-    PDATA pData = JNI_GET_PDATA(self);
-    AwtObject::_Dispose(pData);
+    AwtObject::_Dispose(self);
 
     CATCH_BAD_ALLOC;
 }
--- a/src/windows/native/sun/windows/awt_Toolkit.cpp	Wed Apr 27 14:58:40 2011 +0400
+++ b/src/windows/native/sun/windows/awt_Toolkit.cpp	Wed Apr 27 17:18:38 2011 +0400
@@ -740,18 +740,34 @@
               canDispose = syncCS.TryEnter();
           }
           if (canDispose) {
-              AwtObject *o = (AwtObject *)wParam;
-              o->Dispose();
-              if (shouldEnterCriticalSection) {
-                  syncCS.Leave();
+              if(wParam != NULL) {
+                  AwtObject *o = (AwtObject *) JNI_GET_PDATA((jobject)wParam);
+                  if(o != NULL && theAwtObjectList.Remove(o)) {
+                      o->Dispose();
+                  }
+                  if (shouldEnterCriticalSection) {
+                      syncCS.Leave();
+                  }
               }
           } else {
               AwtToolkit::GetInstance().PostMessage(WM_AWT_DISPOSE, wParam, lParam);
           }
           return 0;
       }
+      case WM_AWT_DISPOSEPDATA: {
+          /*
+           * NOTE: synchronization routine (like in WM_AWT_DISPOSE) was omitted because
+           * this handler is called ONLY while disposing Cursor and Font objects where
+           * synchronization takes place.
+           */
+          AwtObject *o = (AwtObject *) wParam;
+          if(o != NULL && theAwtObjectList.Remove(o)) {
+              o->Dispose();
+          }
+          return 0;
+      }
       case WM_AWT_DELETEOBJECT: {
-          AwtObject *p = (AwtObject *)wParam;
+          AwtObject *p = (AwtObject *) wParam;
           if (p->CanBeDeleted()) {
               // all the messages for this component are processed, so
               // it can be deleted
--- a/src/windows/native/sun/windows/awt_TrayIcon.cpp	Wed Apr 27 14:58:40 2011 +0400
+++ b/src/windows/native/sun/windows/awt_TrayIcon.cpp	Wed Apr 27 17:18:38 2011 +0400
@@ -926,8 +926,7 @@
 {
     TRY;
 
-    PDATA pData = JNI_GET_PDATA(self);
-    AwtObject::_Dispose(pData);
+    AwtObject::_Dispose(self);
 
     CATCH_BAD_ALLOC;
 }
--- a/src/windows/native/sun/windows/awtmsg.h	Wed Apr 27 14:58:40 2011 +0400
+++ b/src/windows/native/sun/windows/awtmsg.h	Wed Apr 27 17:18:38 2011 +0400
@@ -219,6 +219,7 @@
 
     WM_AWT_ENDCOMPOSITION,
     WM_AWT_DISPOSE,
+    WM_AWT_DISPOSEPDATA,
     WM_AWT_DELETEOBJECT,
     WM_AWT_SETCONVERSIONSTATUS,
     WM_AWT_GETCONVERSIONSTATUS,