changeset in /hg/icedtea6: - Fix rhbz478561 (freeze with empty s...
Deepak Bhole
dbhole at redhat.com
Tue Apr 14 10:56:59 PDT 2009
changeset 3ebbbd651177 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3ebbbd651177
description:
- Fix rhbz478561 (freeze with empty string return from Java side).
- Bump max workers from 3 to 20; limiting initial to 3, and growing if/when needed.
diffstat:
3 files changed, 36 insertions(+), 9 deletions(-)
ChangeLog | 7 +++++
IcedTeaPlugin.cc | 16 +++++++++----
plugin/icedtea/sun/applet/PluginMessageConsumer.java | 22 ++++++++++++++----
diffs (143 lines):
diff -r 97ad7002bc2e -r 3ebbbd651177 ChangeLog
--- a/ChangeLog Fri Apr 10 12:50:57 2009 +0200
+++ b/ChangeLog Tue Apr 14 13:58:42 2009 -0400
@@ -1,3 +1,10 @@ 2009-04-10 Matthias Klose <doko at ubuntu
+2009-04-10 Deepak Bhole <dbhole at redhat.com>
+
+ * IcedTeaPlugin.cc: Fix rhbz478561 (freeze with empty string return from
+ Java side).
+ * plugin/icedtea/sun/applet/PluginMessageConsumer.java: Bump max workers
+ from 3 to 20, limiting initial to 3, and growing if/when needed.
+
2009-04-10 Matthias Klose <doko at ubuntu.com>
* Makefile.am (check-jdk): Fix location of test input files, fix
diff -r 97ad7002bc2e -r 3ebbbd651177 IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc Fri Apr 10 12:50:57 2009 +0200
+++ b/IcedTeaPlugin.cc Tue Apr 14 13:58:42 2009 -0400
@@ -588,7 +588,7 @@ char const* TYPES[10] = { "Object",
PLUGIN_DEBUG_0ARG ("RECEIVE VALUE 1\n"); \
ResultContainer *resultC; \
factory->result_map.Get(reference, &resultC); \
- while (resultC->returnValue == "" && \
+ while (resultC->returnValue.IsVoid() == PR_TRUE && \
resultC->errorOccurred == PR_FALSE) \
{ \
PROCESS_PENDING_EVENTS_REF (reference); \
@@ -607,7 +607,7 @@ char const* TYPES[10] = { "Object",
PLUGIN_DEBUG_0ARG("RECEIVE SIZE 1\n"); \
ResultContainer *resultC; \
factory->result_map.Get(reference, &resultC); \
- while (resultC->returnValue == "" && \
+ while (resultC->returnValue.IsVoid() == PR_TRUE && \
resultC->errorOccurred == PR_FALSE) \
{ \
PROCESS_PENDING_EVENTS_REF (reference); \
@@ -631,7 +631,7 @@ char const* TYPES[10] = { "Object",
PLUGIN_DEBUG_0ARG("RECEIVE STRING 1\n"); \
ResultContainer *resultC; \
factory->result_map.Get(reference, &resultC); \
- while (resultC->returnValue == "" && \
+ while (resultC->returnValue.IsVoid() == PR_TRUE && \
resultC->errorOccurred == PR_FALSE) \
{ \
PROCESS_PENDING_EVENTS_REF (reference); \
@@ -655,7 +655,7 @@ char const* TYPES[10] = { "Object",
PLUGIN_DEBUG_0ARG("RECEIVE STRING UCS 1\n"); \
ResultContainer *resultC; \
factory->result_map.Get(reference, &resultC); \
- while (resultC->returnValueUCS.IsEmpty() && \
+ while (resultC->returnValueUCS.IsVoid() == PR_TRUE && \
resultC->errorOccurred == PR_FALSE) \
{ \
PROCESS_PENDING_EVENTS_REF (reference); \
@@ -855,6 +855,8 @@ ResultContainer::ResultContainer ()
returnIdentifier = -1;
returnValue.Truncate();
returnValueUCS.Truncate();
+ returnValue.SetIsVoid(PR_TRUE);
+ returnValueUCS.SetIsVoid(PR_TRUE);
errorMessage.Truncate();
errorOccurred = PR_FALSE;
@@ -877,6 +879,8 @@ ResultContainer::Clear()
returnIdentifier = -1;
returnValue.Truncate();
returnValueUCS.Truncate();
+ returnValue.SetIsVoid(PR_TRUE);
+ returnValueUCS.SetIsVoid(PR_TRUE);
errorMessage.Truncate();
errorOccurred = PR_FALSE;
@@ -3352,7 +3356,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
ResultContainer *resultC;
result_map.Get(reference, &resultC);
- resultC->returnValue = rest;
+ resultC->returnValue = rest;
+ resultC->returnValue.SetIsVoid(PR_FALSE);
PLUGIN_DEBUG_1ARG ("PLUGIN GOT RETURN VALUE: %s\n", resultC->returnValue.get());
}
else if (command == "GetStringUTFChars")
@@ -3440,6 +3445,7 @@ IcedTeaPluginFactory::HandleMessage (nsC
ResultContainer *resultC;
result_map.Get(reference, &resultC);
resultC->returnValueUCS = returnValueUCS;
+ resultC->returnValueUCS.SetIsVoid(PR_FALSE);
}
// Do nothing for: SetStaticField, SetField, ExceptionClear,
diff -r 97ad7002bc2e -r 3ebbbd651177 plugin/icedtea/sun/applet/PluginMessageConsumer.java
--- a/plugin/icedtea/sun/applet/PluginMessageConsumer.java Fri Apr 10 12:50:57 2009 +0200
+++ b/plugin/icedtea/sun/applet/PluginMessageConsumer.java Tue Apr 14 13:58:42 2009 -0400
@@ -35,7 +35,6 @@ obligated to do so. If you do not wish
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
-
package sun.applet;
import java.util.ArrayList;
@@ -45,17 +44,19 @@ import sun.applet.AppletSecurity;
class PluginMessageConsumer {
- int MAX_WORKERS = 3;
+ int MAX_WORKERS = 20;
LinkedList<String> readQueue = new LinkedList<String>();
ArrayList<PluginMessageHandlerWorker> workers = new ArrayList<PluginMessageHandlerWorker>();
PluginStreamHandler streamHandler = null;
+ AppletSecurity as;
public PluginMessageConsumer(PluginStreamHandler streamHandler) {
- AppletSecurity as = new AppletSecurity();
+ as = new AppletSecurity();
this.streamHandler = streamHandler;
- for (int i=0; i < MAX_WORKERS; i++) {
+ // create some workers at the start...
+ for (int i=0; i < 3; i++) {
PluginDebug.debug("Creating worker " + i);
PluginMessageHandlerWorker worker = new PluginMessageHandlerWorker(streamHandler, i, as);
worker.start();
@@ -96,6 +97,19 @@ class PluginMessageConsumer {
return worker;
}
}
+
+ // If we have less than MAX_WORKERS, create a new worker
+ if (workers.size() < MAX_WORKERS) {
+ PluginDebug.debug("Cannot find free worker, creating worker " + workers.size());
+ PluginMessageHandlerWorker worker = new PluginMessageHandlerWorker(streamHandler, workers.size(), as);
+ worker.start();
+ workers.add(worker);
+ worker.busy();
+ return worker;
+ } else {
+ // else wait
+ }
+
Thread.yield();
}
More information about the distro-pkg-dev
mailing list