/hg/icedtea-web: 2 new changesets
adomurad at icedtea.classpath.org
adomurad at icedtea.classpath.org
Fri May 17 09:36:31 PDT 2013
changeset 29aad2f10875 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=29aad2f10875
author: Adam Domurad <adomurad at redhat.com>
date: Fri May 17 12:31:32 2013 -0400
Fix PR854: Resizing an applet several times causes 100% CPU load
changeset 64f7c169eb3e in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=64f7c169eb3e
author: Adam Domurad <adomurad at redhat.com>
date: Fri May 17 12:34:41 2013 -0400
Reproducer for PR854
diffstat:
ChangeLog | 6 +
NEWS | 2 +
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 13 +-
tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html | 57 +++++++
tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java | 72 ++++++++++
tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java | 65 +++++++++
6 files changed, 203 insertions(+), 12 deletions(-)
diffs (254 lines):
diff -r 1b1e547ccb4a -r 64f7c169eb3e ChangeLog
--- a/ChangeLog Wed May 15 12:14:26 2013 +0200
+++ b/ChangeLog Fri May 17 12:34:41 2013 -0400
@@ -1,3 +1,9 @@
+2013-05-17 Adam Domurad <adomurad at redhat.com>
+
+ Fix PR854: Resizing an applet several times causes 100% CPU load
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
+ (handleMessage): Replace buggy initialization wait.
+
2013-05-14 Jiri Vanek <jvanek at redhat.com>
Jacob Wisor <gitne at excite.co.jp>
diff -r 1b1e547ccb4a -r 64f7c169eb3e NEWS
--- a/NEWS Wed May 15 12:14:26 2013 +0200
+++ b/NEWS Fri May 17 12:34:41 2013 -0400
@@ -9,6 +9,8 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
New in release 1.5 (2013-XX-XX):
+* Plugin
+ - PR854: Resizing an applet several times causes 100% CPU load
New in release 1.4 (2013-XX-XX):
* Added cs localization
diff -r 1b1e547ccb4a -r 64f7c169eb3e plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed May 15 12:14:26 2013 +0200
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 17 12:34:41 2013 -0400
@@ -665,18 +665,7 @@
if (message.startsWith("width")) {
// Wait for panel to come alive
- long maxTimeToSleep = APPLET_TIMEOUT;
- statusLock.lock();
- try {
- while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) &&
- maxTimeToSleep > 0) {
- maxTimeToSleep -= waitTillTimeout(statusLock, initComplete,
- maxTimeToSleep);
- }
- }
- finally {
- statusLock.unlock();
- }
+ waitForAppletInit(panel);
// 0 => width, 1=> width_value, 2 => height, 3=> height_value
String[] dimMsg = message.split(" ");
diff -r 1b1e547ccb4a -r 64f7c169eb3e tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/ResizeApplet/resources/ResizeApplet.html Fri May 17 12:34:41 2013 -0400
@@ -0,0 +1,57 @@
+<!--
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+ -->
+<html><head></head><body bgcolor="blue">
+<p><applet id="AppletId" code="ResizeApplet.class" archive="ResizeApplet.jar" codebase="." width="100" height="100">
+</applet></p>
+
+ <script type="text/javascript">
+ var applet = document.getElementById('AppletId');
+ function resizeApplet(dim) {
+ applet.style.height = dim + "px";
+ applet.style.width = dim + "px";
+ }
+ for (var i = 2; i <= 5; i++) {
+ applet.print("Resizing to " + (i * 100) + " by " + (i * 100));
+ resizeApplet(i * 100);
+ applet.sleep(50);
+ }
+ applet.print("*** APPLET FINISHED ***");
+ </script>
+
+</body>
+</html>
diff -r 1b1e547ccb4a -r 64f7c169eb3e tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/ResizeApplet/srcs/ResizeApplet.java Fri May 17 12:34:41 2013 -0400
@@ -0,0 +1,72 @@
+
+import java.applet.Applet;
+
+/* AppletTest.java
+Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+ */
+public class ResizeApplet extends Applet {
+
+ /* Make sures the process is exited if we stall */
+ private static class StallTimeoutThread extends Thread {
+ private static final int MILLISECONDS_TO_SLEEP = 5000;
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(MILLISECONDS_TO_SLEEP);
+ System.out.println("*** APPLET FINISHED ***");
+ } catch (InterruptedException ie) {
+ }
+ }
+ }
+
+ @Override
+ public void init() {
+ new StallTimeoutThread().start();
+ }
+
+ /* Utility for Javascript-side */
+ public void print(String str) {
+ System.out.println(str);
+ }
+
+ /* Utility for Javascript-side */
+ public synchronized void sleep(int time) {
+ try {
+ wait(time);
+ } catch (InterruptedException e) {
+ }
+ }
+}
diff -r 1b1e547ccb4a -r 64f7c169eb3e tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/reproducers/simple/ResizeApplet/testcases/ResizeAppletTests.java Fri May 17 12:34:41 2013 -0400
@@ -0,0 +1,65 @@
+/* AppletTestTests.java
+Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+ */
+
+import static org.junit.Assert.assertTrue;
+
+import net.sourceforge.jnlp.ProcessResult;
+import net.sourceforge.jnlp.ServerAccess.AutoClose;
+import net.sourceforge.jnlp.browsertesting.BrowserTest;
+import net.sourceforge.jnlp.browsertesting.Browsers;
+import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener;
+import net.sourceforge.jnlp.annotations.NeedsDisplay;
+import net.sourceforge.jnlp.annotations.TestInBrowsers;
+
+import org.junit.Test;
+
+public class ResizeAppletTests extends BrowserTest {
+
+ void assertContains(String source, String message, String substring) {
+ assertTrue(source + " should contain '" + substring + "' but did not!",
+ message.contains(substring));
+ }
+
+ @Test
+ @TestInBrowsers(testIn = { Browsers.all })
+ @NeedsDisplay
+ public void testResizing() throws Exception {
+ ProcessResult pr = server.executeBrowser("/ResizeApplet.html", AutoClose.CLOSE_ON_CORRECT_END);
+ assertContains("stdout", pr.stdout, AutoOkClosingListener.MAGICAL_OK_CLOSING_STRING);
+ assertContains("stdout", pr.stdout, "Resizing to 500 by 500");
+ }
+}
More information about the distro-pkg-dev
mailing list