Changeset 62650 in webkit

Timestamp:

Jul 7, 2010 3:27:46 AM (14 years ago)

Author:

steveblock@google.com

Message:

2010-07-07 Steve Block <​steveblock@google.com>

Reviewed by Adam Barth.

JavaInstanceV8 needs to push a local reference frame to avoid table overflow.
​https://bugs.webkit.org/show_bug.cgi?id=41516

This change is required to help prevent the Java virtual machine from
running out of local references. The Java virtual machine supports only
a limited number of local references. Normally, local references are
cleared when the native method returns.

This change adds calls to PushLocalFrame() and PopLocalFrame() around
each invocation of a method on JavaInstance. These calls instruct the
virtual machine to clear local references when the frame is popped.
This means that in the case where many calls to JavaInstance methods
are made within the same native call, local references are cleared as
soon as they are no longer needed, thus conserving references.

This change mirrors exactly JavaInstanceJSC.

No new tests.

• bridge/jni/v8/JavaInstanceV8.cpp: (JavaInstance::virtualBegin): (JavaInstance::virtualEnd):
• bridge/jni/v8/JavaInstanceV8.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/jni/v8/JavaInstanceV8.cpp (modified) (5 diffs)
• bridge/jni/v8/JavaInstanceV8.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-07  Steve Block  <steveblock@google.com>
+
+        Reviewed by Adam Barth.
+
+        JavaInstanceV8 needs to push a local reference frame to avoid table overflow.
+        https://bugs.webkit.org/show_bug.cgi?id=41516
+
+        This change is required to help prevent the Java virtual machine from
+        running out of local references. The Java virtual machine supports only
+        a limited number of local references. Normally, local references are
+        cleared when the native method returns.
+
+        This change adds calls to PushLocalFrame() and PopLocalFrame() around
+        each invocation of a method on JavaInstance. These calls instruct the
+        virtual machine to clear local references when the frame is popped.
+        This means that in the case where many calls to JavaInstance methods
+        are made within the same native call, local references are cleared as
+        soon as they are no longer needed, thus conserving references.
+
+        This change mirrors exactly JavaInstanceJSC.
+
+        No new tests.
+
+        * bridge/jni/v8/JavaInstanceV8.cpp:
+        (JavaInstance::virtualBegin):
+        (JavaInstance::virtualEnd):
+        * bridge/jni/v8/JavaInstanceV8.h:
+
 2010-07-06  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/bridge/jni/v8/JavaInstanceV8.cpp

@@ -33 +33 @@
 
 #include <assert.h>
-#include <utils/Log.h>
-
-#define LOG_TAG "v8binding"
 
 using namespace JSC::Bindings;
@@ -49 +46 @@
     m_instance = 0;
     delete m_class;
+}
+
+#define NUM_LOCAL_REFS 64
+
+void JavaInstance::virtualBegin()
+{
+    getJNIEnv()->PushLocalFrame(NUM_LOCAL_REFS);
+}
+
+void JavaInstance::virtualEnd()
+{
+    getJNIEnv()->PopLocalFrame(0);
 }
 
@@ -80 +89 @@
         }
     }
-    if (!method) {
-        LOGW("unable to find an appropiate method\n");
+    if (!method)
         return false;
-    }
 
     const JavaMethod* jMethod = static_cast<const JavaMethod*>(method);
@@ -157 +164 @@
     m_instance = m_env->NewGlobalRef(instance);
 
-    LOGV("new global ref %p for %p\n", m_instance, instance);
-
     if (!m_instance)
         fprintf(stderr, "%s:  could not get GlobalRef for %p\n", __PRETTY_FUNCTION__, instance);
@@ -165 +170 @@
 JObjectWrapper::~JObjectWrapper()
 {
-    LOGV("deleting global ref %p\n", m_instance);
     m_env->DeleteGlobalRef(m_instance);
 }

trunk/WebCore/bridge/jni/v8/JavaInstanceV8.h

@@ -90 +90 @@
     mutable JavaClass* m_class;
 
-    virtual void virtualBegin() {}
-    virtual void virtualEnd() {}
+    virtual void virtualBegin();
+    virtual void virtualEnd();
 };