From andrew at icedtea.classpath.org Sun May 1 10:12:43 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Sun, 01 May 2011 17:12:43 +0000 Subject: /hg/icedtea: Bump to b136. Message-ID: changeset e53fc64228c1 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e53fc64228c1 author: Andrew John Hughes date: Sun May 01 18:12:29 2011 +0100 Bump to b136. 2011-04-29 Andrew John Hughes * patches/boot/icedtea-dyn.patch: Dropped; java.lang.invoke now compiled in bootstrap mode. * patches/icedtea-demo-swingapplet.patch: Dropped, upstream. * patches/icedtea-tools.patch; Dropped, obsolete. * Makefile.am: (OPENJDK_VERSION): Bump to b136. (CORBA_CHANGESET): Updated. (HOTSPOT_CHANGESET): Likewise. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (JAXP_DROP_ZIP): Likewise. (JAXP_DROP_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Dropped removed patches. (ICEDTEA_BOOT_PATCHES): Drop icedtea- dyn.patch and add ecj-autoboxing.patch. * patches/boot/ecj-autoboxing.patch: New patch to avoid trying to cast to primitive types from Object. * patches/boot/ecj-diamond.patch, * patches/boot/ecj-stringswitch.patch, * patches/boot/ecj-trywithresources.patch: Remove additional cases introduced in b131-b136. * patches/boot/fontconfig.patch, * patches/boot/jar.patch, * patches/boot/xbootclasspath.patch, * patches/cacao/arch.patch, * patches/debian/icedtea-uname.patch, * patches/hotspot/default/icedtea-gcc-suffix.patch, * patches/hotspot/default/icedtea-params-cast-size_t.patch, * patches/icedtea-libraries.patch, * patches/icedtea-rhino.patch, * patches/icedtea-update-bootclasspath.patch, * patches/sh4-support.patch: Updated to apply against b136. diffstat: ChangeLog | 50 + Makefile.am | 40 +- patches/boot/ecj-autoboxing.patch | 259 ++++ patches/boot/ecj-diamond.patch | 839 ++++++++------ patches/boot/ecj-stringswitch.patch | 69 +- patches/boot/ecj-trywithresources.patch | 670 +++++++++++- patches/boot/fontconfig.patch | 5 +- patches/boot/icedtea-dyn.patch | 11 - patches/boot/jar.patch | 23 - patches/boot/xbootclasspath.patch | 34 +- patches/cacao/arch.patch | 49 +- patches/debian/icedtea-uname.patch | 14 +- patches/hotspot/default/icedtea-gcc-suffix.patch | 13 +- patches/hotspot/default/icedtea-params-cast-size_t.patch | 50 +- patches/icedtea-demo-swingapplet.patch | 10 - patches/icedtea-libraries.patch | 130 +- patches/icedtea-rhino.patch | 31 +- patches/icedtea-tools.patch | 79 - patches/icedtea-update-bootclasspath.patch | 10 +- patches/sh4-support.patch | 67 +- 20 files changed, 1720 insertions(+), 733 deletions(-) diffs (truncated from 5645 to 500 lines): diff -r 0f9261320112 -r e53fc64228c1 ChangeLog --- a/ChangeLog Thu Apr 21 20:12:07 2011 -0400 +++ b/ChangeLog Sun May 01 18:12:29 2011 +0100 @@ -1,3 +1,53 @@ +2011-04-29 Andrew John Hughes + + * patches/boot/icedtea-dyn.patch: + Dropped; java.lang.invoke now compiled in + bootstrap mode. + * patches/icedtea-demo-swingapplet.patch: + Dropped, upstream. + * patches/icedtea-tools.patch; + Dropped, obsolete. + * Makefile.am: + (OPENJDK_VERSION): Bump to b136. + (CORBA_CHANGESET): Updated. + (HOTSPOT_CHANGESET): Likewise. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (HOTSPOT_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + (JAXP_DROP_ZIP): Likewise. + (JAXP_DROP_SHA256SUM): Likewise. + (ICEDTEA_PATCHES): Dropped removed patches. + (ICEDTEA_BOOT_PATCHES): Drop icedtea-dyn.patch + and add ecj-autoboxing.patch. + * patches/boot/ecj-autoboxing.patch: + New patch to avoid trying to cast to primitive types + from Object. + * patches/boot/ecj-diamond.patch, + * patches/boot/ecj-stringswitch.patch, + * patches/boot/ecj-trywithresources.patch: + Remove additional cases introduced in b131-b136. + * patches/boot/fontconfig.patch, + * patches/boot/jar.patch, + * patches/boot/xbootclasspath.patch, + * patches/cacao/arch.patch, + * patches/debian/icedtea-uname.patch, + * patches/hotspot/default/icedtea-gcc-suffix.patch, + * patches/hotspot/default/icedtea-params-cast-size_t.patch, + * patches/icedtea-libraries.patch, + * patches/icedtea-rhino.patch, + * patches/icedtea-update-bootclasspath.patch, + * patches/sh4-support.patch: + Updated to apply against b136. + 2011-04-21 Omair Majid * patches/bytebuffer-compact.patch: Drop patch. It only contained diff -r 0f9261320112 -r e53fc64228c1 Makefile.am --- a/Makefile.am Thu Apr 21 20:12:07 2011 -0400 +++ b/Makefile.am Sun May 01 18:12:29 2011 +0100 @@ -1,22 +1,22 @@ # Dependencies -OPENJDK_VERSION = b130 +OPENJDK_VERSION = b136 -CORBA_CHANGESET = 59f02c101698 -HOTSPOT_CHANGESET = 4071da7ef7b3 -JAXP_CHANGESET = b6f201c0649a -JAXWS_CHANGESET = 4c04de31900b -JDK_CHANGESET = 6753b79d7bb5 -LANGTOOLS_CHANGESET = 4659da7bff78 -OPENJDK_CHANGESET = d39d0c08731a +CORBA_CHANGESET = b62418551e20 +HOTSPOT_CHANGESET = ef8632d52263 +JAXP_CHANGESET = 1c2f25bf36b1 +JAXWS_CHANGESET = 339c2d381d80 +JDK_CHANGESET = 1631a3dee8fc +LANGTOOLS_CHANGESET = 8e26c4aee63c +OPENJDK_CHANGESET = d4aea1a51d62 -CORBA_SHA256SUM = 4c6db5299947c3ed11a7f72da55a3cd89197c143f10d77c75036aa2f2cf296a6 -HOTSPOT_SHA256SUM = 4ec39fddd8d5ff9e7e9e2dfeb4fff37c26e84c1aaa9a3f3953e4bedb00bc6713 -JAXP_SHA256SUM = a1a5c6b2671f83d4675f9ba25013c6a16a4cf4d1040fcd2ff4143c92bd5496a3 -JAXWS_SHA256SUM = 8fe84a61142d579487bee98133fc26e57aedb97f781dc925ad3803aa40f5c061 -JDK_SHA256SUM = 650922377d1e847c26e1ea7475a46ae6f8bac3ba7747a2c1467c7136d1b7b4d6 -LANGTOOLS_SHA256SUM = 1df1bb1edd5f912405398c0024f8290f6a9030172dd1196c52e2c461769a1a07 -OPENJDK_SHA256SUM = 937930cb6c3174f8bdbf3d0034832fbde539fd62591087f1d6fcec695ed20519 +CORBA_SHA256SUM = 82eebaa8a248e18a4e4a0552716453c1f7877135ea73b51f3056fdec850267f9 +HOTSPOT_SHA256SUM = 3868c969833dc3b88523d711fc21cfc2c57fea5b6f387a7082aff5634b35c0a1 +JAXP_SHA256SUM = 91b65e352002079045dc1dee1c2a1af92db74a589b11b0a01777760adca80c64 +JAXWS_SHA256SUM = 01747b77f40ffe554a3ee0ff8b902db0d743a1f8f6260c9141a1fb3d1c6cc230 +JDK_SHA256SUM = f08020de62bef31ff0a42564d06c84817150f943729132045e8af602c608467b +LANGTOOLS_SHA256SUM = e7384d93ac86c5b91b767bbbcb58a7037089446943935292d0d7706d16becc9f +OPENJDK_SHA256SUM = 7143dc00cad9b7f8a653e8e22aec9fd3fa354325eaf79007326b16b887b6fbe6 CACAO_VERSION = e321b101a9ee CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444 @@ -31,8 +31,8 @@ JAF_DROP_ZIP = jdk7-jaf-2010_08_19.zip JAF_DROP_SHA256SUM = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e JAXP_DROP_URL = http://icedtea.classpath.org/download/drops -JAXP_DROP_ZIP = jaxp-1_4_5-dev.zip -JAXP_DROP_SHA256SUM = 938cce9d3f0afaa5d076c62a2de081862102d10bfe04a0767122f2dff5bd975e +JAXP_DROP_ZIP = jaxp-1_4_5-dev1.zip +JAXP_DROP_SHA256SUM = 050cba755c2632dc5ec5ffcdb17f2f4d36a018306c357fdd5c8996d877954de5 ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7 OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7 @@ -236,7 +236,6 @@ ICEDTEA_PATCHES = \ patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \ patches/icedtea-rmi_amd64.patch \ - patches/icedtea-tools.patch \ patches/icedtea-demos.patch \ patches/icedtea-headers.patch \ patches/hotspot/$(HSBUILD)/icedtea-headers.patch \ @@ -271,7 +270,6 @@ patches/security/icedtea-6592792.patch \ patches/security/icedtea-6733959.patch \ patches/security/icedtea-6755943.patch \ - patches/icedtea-demo-swingapplet.patch \ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-disable-intree-ec.patch \ patches/icedtea-sources.patch \ @@ -347,7 +345,6 @@ patches/boot/test_gamma.patch \ patches/boot/tools.jar.patch \ patches/boot/icedtea-jopt.patch \ - patches/boot/icedtea-dyn.patch \ patches/boot/icedtea-jaxp-dependency.patch \ patches/boot/genstubs-nofork.patch \ patches/boot/getannotation-cast.patch \ @@ -361,7 +358,8 @@ patches/boot/jaxws-jdk-dependency.patch \ patches/boot/hotspot-jdk-dependency.patch \ patches/boot/ecj-multicatch.patch \ - patches/boot/ecj-trywithresources.patch + patches/boot/ecj-trywithresources.patch \ + patches/boot/ecj-autoboxing.patch if CP39408_JAVAH ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch diff -r 0f9261320112 -r e53fc64228c1 patches/boot/ecj-autoboxing.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/ecj-autoboxing.patch Sun May 01 18:12:29 2011 +0100 @@ -0,0 +1,263 @@ +diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/CallSite.java +--- openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java Wed Apr 20 04:38:36 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/CallSite.java Sat Apr 30 02:38:41 2011 +0100 +@@ -309,7 +309,7 @@ + + private static Object maybeReBox(Object x) { + if (x instanceof Integer) { +- int xi = (int) x; ++ int xi = (Integer) x; + if (xi == (byte) xi) + x = xi; // must rebox; see JLS 5.1.7 + } +diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/FromGeneric.java +--- openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java Wed Apr 20 04:38:36 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/FromGeneric.java Sat Apr 30 02:38:41 2011 +0100 +@@ -502,10 +502,10 @@ + protected A0 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) + { return new A0(e, i, c, t); } + protected Object invoke_L0() throws Throwable { return convert_L((Object)invoker.invokeExact(target)); } +- protected Object invoke_I0() throws Throwable { return convert_I((int) invoker.invokeExact(target)); } +- protected Object invoke_J0() throws Throwable { return convert_J((long) invoker.invokeExact(target)); } +- protected Object invoke_F0() throws Throwable { return convert_F((float) invoker.invokeExact(target)); } +- protected Object invoke_D0() throws Throwable { return convert_D((double)invoker.invokeExact(target)); } ++ protected Object invoke_I0() throws Throwable { return convert_I((Integer) invoker.invokeExact(target)); } ++ protected Object invoke_J0() throws Throwable { return convert_J((Long) invoker.invokeExact(target)); } ++ protected Object invoke_F0() throws Throwable { return convert_F((Float) invoker.invokeExact(target)); } ++ protected Object invoke_D0() throws Throwable { return convert_D((Double)invoker.invokeExact(target)); } + } + static class A1 extends Adapter { + protected A1(MethodHandle entryPoint) { super(entryPoint); } // to build prototype +@@ -514,10 +514,10 @@ + protected A1 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) + { return new A1(e, i, c, t); } + protected Object invoke_L1(Object a0) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0)); } +- protected Object invoke_I1(Object a0) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0)); } +- protected Object invoke_J1(Object a0) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0)); } +- protected Object invoke_F1(Object a0) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0)); } +- protected Object invoke_D1(Object a0) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0)); } ++ protected Object invoke_I1(Object a0) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0)); } ++ protected Object invoke_J1(Object a0) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0)); } ++ protected Object invoke_F1(Object a0) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0)); } ++ protected Object invoke_D1(Object a0) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0)); } + } + static class A2 extends Adapter { + protected A2(MethodHandle entryPoint) { super(entryPoint); } // to build prototype +@@ -526,10 +526,10 @@ + protected A2 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) + { return new A2(e, i, c, t); } + protected Object invoke_L2(Object a0, Object a1) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1)); } +- protected Object invoke_I2(Object a0, Object a1) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1)); } +- protected Object invoke_J2(Object a0, Object a1) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1)); } +- protected Object invoke_F2(Object a0, Object a1) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1)); } +- protected Object invoke_D2(Object a0, Object a1) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1)); } ++ protected Object invoke_I2(Object a0, Object a1) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1)); } ++ protected Object invoke_J2(Object a0, Object a1) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1)); } ++ protected Object invoke_F2(Object a0, Object a1) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1)); } ++ protected Object invoke_D2(Object a0, Object a1) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1)); } + } + static class A3 extends Adapter { + protected A3(MethodHandle entryPoint) { super(entryPoint); } // to build prototype +@@ -538,10 +538,10 @@ + protected A3 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) + { return new A3(e, i, c, t); } + protected Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2)); } +- protected Object invoke_I3(Object a0, Object a1, Object a2) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2)); } +- protected Object invoke_J3(Object a0, Object a1, Object a2) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2)); } +- protected Object invoke_F3(Object a0, Object a1, Object a2) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2)); } +- protected Object invoke_D3(Object a0, Object a1, Object a2) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2)); } ++ protected Object invoke_I3(Object a0, Object a1, Object a2) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2)); } ++ protected Object invoke_J3(Object a0, Object a1, Object a2) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2)); } ++ protected Object invoke_F3(Object a0, Object a1, Object a2) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2)); } ++ protected Object invoke_D3(Object a0, Object a1, Object a2) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2)); } + } + static class A4 extends Adapter { + protected A4(MethodHandle entryPoint) { super(entryPoint); } // to build prototype +@@ -550,10 +550,10 @@ + protected A4 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) + { return new A4(e, i, c, t); } + protected Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3)); } +- protected Object invoke_I4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3)); } +- protected Object invoke_J4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3)); } +- protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3)); } +- protected Object invoke_D4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3)); } ++ protected Object invoke_I4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3)); } ++ protected Object invoke_J4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3)); } ++ protected Object invoke_F4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3)); } ++ protected Object invoke_D4(Object a0, Object a1, Object a2, Object a3) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3)); } + } + static class A5 extends Adapter { + protected A5(MethodHandle entryPoint) { super(entryPoint); } // to build prototype +@@ -562,10 +562,10 @@ + protected A5 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) + { return new A5(e, i, c, t); } + protected Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4)); } +- protected Object invoke_I5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4)); } +- protected Object invoke_J5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4)); } +- protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4)); } +- protected Object invoke_D5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4)); } ++ protected Object invoke_I5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4)); } ++ protected Object invoke_J5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4)); } ++ protected Object invoke_F5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4)); } ++ protected Object invoke_D5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4)); } + } + static class A6 extends Adapter { + protected A6(MethodHandle entryPoint) { super(entryPoint); } // to build prototype +@@ -574,10 +574,10 @@ + protected A6 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) + { return new A6(e, i, c, t); } + protected Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); } +- protected Object invoke_I6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); } +- protected Object invoke_J6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); } +- protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); } +- protected Object invoke_D6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); } ++ protected Object invoke_I6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); } ++ protected Object invoke_J6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); } ++ protected Object invoke_F6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); } ++ protected Object invoke_D6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5)); } + } + static class A7 extends Adapter { + protected A7(MethodHandle entryPoint) { super(entryPoint); } // to build prototype +@@ -586,10 +586,10 @@ + protected A7 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) + { return new A7(e, i, c, t); } + protected Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } +- protected Object invoke_I7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } +- protected Object invoke_J7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } +- protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } +- protected Object invoke_D7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } ++ protected Object invoke_I7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } ++ protected Object invoke_J7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } ++ protected Object invoke_F7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } ++ protected Object invoke_D7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6)); } + } + static class A8 extends Adapter { + protected A8(MethodHandle entryPoint) { super(entryPoint); } // to build prototype +@@ -598,10 +598,10 @@ + protected A8 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) + { return new A8(e, i, c, t); } + protected Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } +- protected Object invoke_I8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } +- protected Object invoke_J8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } +- protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } +- protected Object invoke_D8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } ++ protected Object invoke_I8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } ++ protected Object invoke_J8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } ++ protected Object invoke_F8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } ++ protected Object invoke_D8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7)); } + } + static class A9 extends Adapter { + protected A9(MethodHandle entryPoint) { super(entryPoint); } // to build prototype +@@ -610,10 +610,10 @@ + protected A9 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) + { return new A9(e, i, c, t); } + protected Object invoke_L9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } +- protected Object invoke_I9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } +- protected Object invoke_J9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } +- protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } +- protected Object invoke_D9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } ++ protected Object invoke_I9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } ++ protected Object invoke_J9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } ++ protected Object invoke_F9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } ++ protected Object invoke_D9(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8)); } + } + static class A10 extends Adapter { + protected A10(MethodHandle entryPoint) { super(entryPoint); } // to build prototype +@@ -622,9 +622,9 @@ + protected A10 makeInstance(MethodHandle e, MethodHandle i, MethodHandle c, MethodHandle t) + { return new A10(e, i, c, t); } + protected Object invoke_L10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_L((Object)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } +- protected Object invoke_I10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_I((int) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } +- protected Object invoke_J10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_J((long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } +- protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_F((float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } +- protected Object invoke_D10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_D((double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } ++ protected Object invoke_I10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_I((Integer) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } ++ protected Object invoke_J10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_J((Long) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } ++ protected Object invoke_F10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_F((Float) invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } ++ protected Object invoke_D10(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7, Object a8, Object a9) throws Throwable { return convert_D((Double)invoker.invokeExact(target, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)); } + } + } +diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/MethodHandleImpl.java +--- openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Wed Apr 20 04:38:36 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java Sat Apr 30 02:38:41 2011 +0100 +@@ -832,52 +832,52 @@ + return addTypeString(target, this); + } + private Object invoke_V(Object... av) throws Throwable { +- if ((boolean) test.invokeExact(av)) ++ if ((Boolean) test.invokeExact(av)) + return target.invokeExact(av); + return fallback.invokeExact(av); + } + private Object invoke_L0() throws Throwable { +- if ((boolean) test.invokeExact()) ++ if ((Boolean) test.invokeExact()) + return target.invokeExact(); + return fallback.invokeExact(); + } + private Object invoke_L1(Object a0) throws Throwable { +- if ((boolean) test.invokeExact(a0)) ++ if ((Boolean) test.invokeExact(a0)) + return target.invokeExact(a0); + return fallback.invokeExact(a0); + } + private Object invoke_L2(Object a0, Object a1) throws Throwable { +- if ((boolean) test.invokeExact(a0, a1)) ++ if ((Boolean) test.invokeExact(a0, a1)) + return target.invokeExact(a0, a1); + return fallback.invokeExact(a0, a1); + } + private Object invoke_L3(Object a0, Object a1, Object a2) throws Throwable { +- if ((boolean) test.invokeExact(a0, a1, a2)) ++ if ((Boolean) test.invokeExact(a0, a1, a2)) + return target.invokeExact(a0, a1, a2); + return fallback.invokeExact(a0, a1, a2); + } + private Object invoke_L4(Object a0, Object a1, Object a2, Object a3) throws Throwable { +- if ((boolean) test.invokeExact(a0, a1, a2, a3)) ++ if ((Boolean) test.invokeExact(a0, a1, a2, a3)) + return target.invokeExact(a0, a1, a2, a3); + return fallback.invokeExact(a0, a1, a2, a3); + } + private Object invoke_L5(Object a0, Object a1, Object a2, Object a3, Object a4) throws Throwable { +- if ((boolean) test.invokeExact(a0, a1, a2, a3, a4)) ++ if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4)) + return target.invokeExact(a0, a1, a2, a3, a4); + return fallback.invokeExact(a0, a1, a2, a3, a4); + } + private Object invoke_L6(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5) throws Throwable { +- if ((boolean) test.invokeExact(a0, a1, a2, a3, a4, a5)) ++ if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4, a5)) + return target.invokeExact(a0, a1, a2, a3, a4, a5); + return fallback.invokeExact(a0, a1, a2, a3, a4, a5); + } + private Object invoke_L7(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6) throws Throwable { +- if ((boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6)) ++ if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6)) + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6); + return fallback.invokeExact(a0, a1, a2, a3, a4, a5, a6); + } + private Object invoke_L8(Object a0, Object a1, Object a2, Object a3, Object a4, Object a5, Object a6, Object a7) throws Throwable { +- if ((boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7)) ++ if ((Boolean) test.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7)) + return target.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7); + return fallback.invokeExact(a0, a1, a2, a3, a4, a5, a6, a7); + } +diff -r 1631a3dee8fc src/share/classes/java/lang/invoke/ToGeneric.java +--- openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java Wed Apr 20 04:38:36 2011 +0100 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/ToGeneric.java Sat Apr 30 02:38:41 2011 +0100 +@@ -390,10 +390,10 @@ + + // Code to run when the generic target has finished and produced a value. + protected Object return_L(Object res) throws Throwable { return (Object)convert.invokeExact(res); } +- protected int return_I(Object res) throws Throwable { return (int) convert.invokeExact(res); } +- protected long return_J(Object res) throws Throwable { return (long) convert.invokeExact(res); } +- protected float return_F(Object res) throws Throwable { return (float) convert.invokeExact(res); } +- protected double return_D(Object res) throws Throwable { return (double)convert.invokeExact(res); } ++ protected int return_I(Object res) throws Throwable { return (Integer) convert.invokeExact(res); } ++ protected long return_J(Object res) throws Throwable { return (Long) convert.invokeExact(res); } ++ protected float return_F(Object res) throws Throwable { return (Float) convert.invokeExact(res); } ++ protected double return_D(Object res) throws Throwable { return (Double)convert.invokeExact(res); } + + static private final String CLASS_PREFIX; // "java.lang.invoke.ToGeneric$" + static { diff -r 0f9261320112 -r e53fc64228c1 patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Thu Apr 21 20:12:07 2011 -0400 +++ b/patches/boot/ecj-diamond.patch Sun May 01 18:12:29 2011 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-11 12:34:30.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-13 15:10:03.590190441 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-14 01:29:58.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2011-04-28 17:28:50.894745825 +0100 @@ -104,9 +104,9 @@ return this.def.compareTo(that.def); } @@ -72,8 +72,8 @@ for (int i = 0; i < layout.length(); i++) { if (layout.charAt(i++) != '[') diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-04-12 00:18:33.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-04-13 15:10:03.606190699 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-04-28 17:10:59.000000000 +0100 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2011-04-28 17:28:50.902745957 +0100 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -83,7 +83,7 @@ for (int i = 0; i < basicCodings.length; i++) { Coding c = basicCodings[i]; if (c == null) continue; -@@ -1050,8 +1050,8 @@ +@@ -1068,8 +1068,8 @@ // Bootstrap support for CPRefBands. These are needed to record // intended CP indexes, before the CP has been created. @@ -94,7 +94,7 @@ int encodeRef(Entry e, Index ix) { -@@ -1686,7 +1686,7 @@ +@@ -1704,7 +1704,7 @@ protected int attrClassFileVersionMask; // Mapping from Attribute.Layout to Band[] (layout element bands). @@ -103,7 +103,7 @@ // Well-known attributes: protected final Attribute.Layout attrCodeEmpty; -@@ -1695,11 +1695,11 @@ +@@ -1713,11 +1713,11 @@ protected final Attribute.Layout attrConstantValue; // Mapping from Attribute.Layout to Integer (inverse of attrDefs) @@ -117,7 +117,7 @@ { for (int i = 0; i < ATTR_CONTEXT_LIMIT; i++) { assert(attrIndexLimit[i] == 0); -@@ -1894,7 +1894,7 @@ +@@ -1912,7 +1912,7 @@ protected List getPredefinedAttrs(int ctype) { assert(attrIndexLimit[ctype] != 0); @@ -126,7 +126,7 @@ // Remove nulls and non-predefs. for (int ai = 0; ai < attrIndexLimit[ctype]; ai++) { if (testBit(attrDefSeen[ctype], 1L< Hi all, I'm unable to build recent version of IcedTea7 HEAD on RHEL 5 using following GCC version: gcc (GCC) 4.1.2 20080704 Error message generated during build: /usr/bin/gcc -O3 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer -D_LITTLE_ENDIAN -g -Wno-clobbered -DNDEBUG -DARCH='"amd64"' -Damd64 -DLINUX -DRELEASE='"1.7.0_136-icedtea"' -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -D_LP64=1 -I. -I/jck/icedtea/openjdk.build/tmp/sun/sun.awt/jpeg/CClassHeaders -I../../../src/solaris/javavm/export -I../../../src/share/javavm/export -I../../../src/share/native/sun/awt/image/jpeg -I../../../src/share/native/common -I../../../src/solaris/native/common -I../../../src/share/native/sun/awt -I../../../src/solaris/native/sun/awt -c -o /jck/icedtea/openjdk.build/tmp/sun/sun.awt/jpeg/obj64/jpegdecoder.o ../../../src/share/native/sun/awt/image/jpeg/jpegdecoder.c cc1: error: unrecognized command line option "-Wno-clobbered" cc1: error: unrecognized command line option "-Wno-clobbered" make[6]: *** [/jck/icedtea/openjdk.build/tmp/sun/sun.awt/jpeg/obj64/imageioJPEG.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[6]: *** [/jck/icedtea/openjdk.build/tmp/sun/sun.awt/jpeg/obj64/jpegdecoder.o] Error 1 make[6]: Leaving directory `/jck/icedtea/openjdk/jdk/make/sun/jpeg' make[5]: *** [library_parallel_compile] Error 2 make[5]: Leaving directory `/jck/icedtea/openjdk/jdk/make/sun/jpeg' make[4]: *** [all] Error 1 make[4]: Leaving directory `/jck/icedtea/openjdk/jdk/make/sun' make[3]: *** [all] Error 1 make[3]: Leaving directory `/jck/icedtea/openjdk/jdk/make' make[2]: *** [jdk-build] Error 2 make[2]: Leaving directory `/jck/icedtea/openjdk' make[1]: *** [build_product_image] Error 2 make[1]: Leaving directory `/jck/icedtea/openjdk' make: *** [stamps/icedtea.stamp] Error 2 It seems that this issue is caused by latest Andrew's big changes done on 2011-04-29. Do anyone knows what's went wrong? ;-) Cheers Pavel From omajid at redhat.com Mon May 2 07:53:16 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 02 May 2011 10:53:16 -0400 Subject: Unable to build recent version IcedTea7 HEAD In-Reply-To: <4DBE8E82.6090002@redhat.com> References: <4DBE8E82.6090002@redhat.com> Message-ID: <4DBEC55C.8070302@redhat.com> On 05/02/2011 06:59 AM, Pavel Tisnovsky wrote: > Hi all, > > I'm unable to build recent version of IcedTea7 HEAD on RHEL 5 using > following GCC version: > gcc (GCC) 4.1.2 20080704 > > Error message generated during build: > > cc1: error: unrecognized command line option "-Wno-clobbered" > cc1: error: unrecognized command line option "-Wno-clobbered" > > Do anyone knows what's went wrong? ;-) > -Wno-clobbered is not recognized by gcc 4.1. This has been fixed upstream: http://hg.openjdk.java.net/jdk7/build/jdk/rev/b715eb9f3d99 changeset: 4031:b715eb9f3d99 parent: 3932:d80954a89b49 user: ohair date: Thu Apr 21 18:26:04 2011 -0700 summary: 7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber Cheers, Omair From ptisnovs at redhat.com Mon May 2 08:07:43 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 02 May 2011 17:07:43 +0200 Subject: Unable to build recent version IcedTea7 HEAD In-Reply-To: <4DBEC55C.8070302@redhat.com> References: <4DBE8E82.6090002@redhat.com> <4DBEC55C.8070302@redhat.com> Message-ID: <4DBEC8BF.8010108@redhat.com> Omair Majid wrote: > On 05/02/2011 06:59 AM, Pavel Tisnovsky wrote: >> Hi all, >> >> I'm unable to build recent version of IcedTea7 HEAD on RHEL 5 using >> following GCC version: >> gcc (GCC) 4.1.2 20080704 >> >> Error message generated during build: >> > >> cc1: error: unrecognized command line option "-Wno-clobbered" >> cc1: error: unrecognized command line option "-Wno-clobbered" > >> >> Do anyone knows what's went wrong? ;-) >> > > -Wno-clobbered is not recognized by gcc 4.1. This has been fixed > upstream: http://hg.openjdk.java.net/jdk7/build/jdk/rev/b715eb9f3d99 > > changeset: 4031:b715eb9f3d99 > parent: 3932:d80954a89b49 > user: ohair > date: Thu Apr 21 18:26:04 2011 -0700 > summary: 7038711: Fix CC_VER checks for compiler options, fix use of > -Wno-clobber > > Cheers, > Omair Hi Omair, thank you for this info. In the meantime I prepared simple patch which allows me to build IcedTea7 & run regression tests and benchmark, but the fix from upstream looks much better. Do you think it is worth to prepare patch for current IcedTea7 version? (I can do this, of course). Cheers, Pavel From omajid at redhat.com Mon May 2 08:10:49 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 02 May 2011 11:10:49 -0400 Subject: Unable to build recent version IcedTea7 HEAD In-Reply-To: <4DBEC8BF.8010108@redhat.com> References: <4DBE8E82.6090002@redhat.com> <4DBEC55C.8070302@redhat.com> <4DBEC8BF.8010108@redhat.com> Message-ID: <4DBEC979.3010704@redhat.com> On 05/02/2011 11:07 AM, Pavel Tisnovsky wrote: > Omair Majid wrote: >> On 05/02/2011 06:59 AM, Pavel Tisnovsky wrote: >>> Hi all, >>> >>> I'm unable to build recent version of IcedTea7 HEAD on RHEL 5 using >>> following GCC version: >>> gcc (GCC) 4.1.2 20080704 >>> >>> Error message generated during build: >>> >> >>> cc1: error: unrecognized command line option "-Wno-clobbered" >>> cc1: error: unrecognized command line option "-Wno-clobbered" >> >>> >>> Do anyone knows what's went wrong? ;-) >>> >> >> -Wno-clobbered is not recognized by gcc 4.1. This has been fixed >> upstream: http://hg.openjdk.java.net/jdk7/build/jdk/rev/b715eb9f3d99 >> >> changeset: 4031:b715eb9f3d99 >> parent: 3932:d80954a89b49 >> user: ohair >> date: Thu Apr 21 18:26:04 2011 -0700 >> summary: 7038711: Fix CC_VER checks for compiler options, fix use of >> -Wno-clobber >> > Do you think it is worth to prepare patch for current IcedTea7 version? > (I can do this, of course). > Yes, I think we should definitely address this problem. As for how to do it, I will let Andrew chime in. I suppose (havent tested this) the best way would be to import that changeset into icedtea/jdk7/hotspot repo. Cheers, Omair From dbhole at redhat.com Mon May 2 08:56:25 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 2 May 2011 11:56:25 -0400 Subject: [icedtea-web] RFC: Patch to fix applet exit Message-ID: <20110502155625.GB11271@redhat.com> Hi, This patch addresses an issue cause by the tg.stop() call in PluginAppletViewer.appletClose(). With the recent classloader sharing changes, applets from the same page have the same threadgroup. As a result if 2 copies are opened and one is closed, the other one stops too. With this patch, tg.stop() is no longer called and instead, the plugin will halt the VM after the last applet to guarantee that resources are freed eventually (the tg.stop was added because not all applets exit nicely on stop/dispose). ChangeLog: 2011-05-02 Deepak Bhole * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (appletClose): Do not try to stop threads, now that the loader is shared and the thread group for applets on a page is identical. Call dispose from invokeAndWait. (appletSystemExit): Exit the VM when called. Okay for HEAD and 1.1? Cheers, Deepak -------------- next part -------------- diff -r d57169ddb76a plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Apr 29 16:58:05 2011 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon May 02 11:40:55 2011 -0400 @@ -1625,11 +1625,17 @@ appletShutdown(p); appletPanels.removeElement(p); - dispose(); + + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + dispose(); + } + }); + } catch (Exception e) { // ignore, we are just disposing it + } - if (tg.activeCount() > 0) - tg.stop(); - + // If there are no more applets running, exit the VM if (countApplets() == 0) { appletSystemExit(); } @@ -1640,12 +1646,10 @@ } /** - * Exit the program. - * Exit from the program (if not stand alone) - do no clean-up + * This function should be called to halt the VM when all applets are destroyed. */ private void appletSystemExit() { - // Do nothing. Exit is handled by another - // block of code, called when _all_ applets are gone + System.exit(0); } /** From omajid at icedtea.classpath.org Mon May 2 09:06:39 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Mon, 02 May 2011 16:06:39 +0000 Subject: /hg/icedtea6: Backport S6986968: Crash on XIM server restart Message-ID: changeset 6b2f514d7874 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6b2f514d7874 author: Omair Majid date: Mon May 02 12:05:50 2011 -0400 Backport S6986968: Crash on XIM server restart diffstat: ChangeLog | 6 ++++++ Makefile.am | 3 ++- NEWS | 1 + patches/openjdk/6986968-crash_on_xim_restart.patch | 22 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletions(-) diffs (64 lines): diff -r c66866782611 -r 6b2f514d7874 ChangeLog --- a/ChangeLog Fri Apr 29 11:46:01 2011 -0400 +++ b/ChangeLog Mon May 02 12:05:50 2011 -0400 @@ -1,3 +1,9 @@ +2011-05-02 Omair Majid + + * NEWS: Update. + * Makefile.am (ICEDTEA_PATCHES): Add new patch. + * patches/openjdk/6986968-crash_on_xim_restart.patch: New file. + 2011-04-29 Omair Majid * NEWS: Update. diff -r c66866782611 -r 6b2f514d7874 Makefile.am --- a/Makefile.am Fri Apr 29 11:46:01 2011 -0400 +++ b/Makefile.am Mon May 02 12:05:50 2011 -0400 @@ -337,7 +337,8 @@ patches/revert-6885123.patch \ patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ - patches/shark-llvm-2.9.patch + patches/shark-llvm-2.9.patch \ + patches/openjdk/6986968-crash_on_xim_restart.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r c66866782611 -r 6b2f514d7874 NEWS --- a/NEWS Fri Apr 29 11:46:01 2011 -0400 +++ b/NEWS Mon May 02 12:05:50 2011 -0400 @@ -21,6 +21,7 @@ - S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal - S6708580: Java applications slow when EXA enabled - S7029905: demo applets missing some html files + - S6986968: Crash on XIM server restart * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - G356743: Support libpng 1.5. diff -r c66866782611 -r 6b2f514d7874 patches/openjdk/6986968-crash_on_xim_restart.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6986968-crash_on_xim_restart.patch Mon May 02 12:05:50 2011 -0400 @@ -0,0 +1,23 @@ +# HG changeset patch +# User omajid +# Date 1285601403 14400 +# Node ID bbadb9484f537ce1e6ecf6e0d1f130235367c7e4 +# Parent 278c8daa30750577cadb47f7c6c827d2dfb7d0bd +6986968: Crash on XIM server restart +Summary: Free XIM data structures on DestroyXIMCallback +Reviewed-by: naoto + +diff -r 278c8daa3075 -r bbadb9484f53 src/solaris/native/sun/awt/awt_InputMethod.c +--- openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c Mon Sep 27 13:38:49 2010 +0400 ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c Mon Sep 27 11:30:03 2010 -0400 +@@ -1473,6 +1473,10 @@ + static void DestroyXIMCallback(XIM im, XPointer client_data, XPointer call_data) { + /* mark that XIM server was destroyed */ + X11im = NULL; ++ JNIEnv* env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2); ++ /* free the old pX11IMData and set it to null. this also avoids crashing ++ * the jvm if the XIM server reappears */ ++ X11InputMethodData *pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance); + } + + /* From omajid at redhat.com Mon May 2 09:13:19 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 02 May 2011 12:13:19 -0400 Subject: Unable to build recent version IcedTea7 HEAD In-Reply-To: <4DBEC979.3010704@redhat.com> References: <4DBE8E82.6090002@redhat.com> <4DBEC55C.8070302@redhat.com> <4DBEC8BF.8010108@redhat.com> <4DBEC979.3010704@redhat.com> Message-ID: <4DBED81F.5060400@redhat.com> On 05/02/2011 11:10 AM, Omair Majid wrote: > On 05/02/2011 11:07 AM, Pavel Tisnovsky wrote: >> Omair Majid wrote: >>> On 05/02/2011 06:59 AM, Pavel Tisnovsky wrote: >>>> Hi all, >>>> >>>> I'm unable to build recent version of IcedTea7 HEAD on RHEL 5 using >>>> following GCC version: >>>> gcc (GCC) 4.1.2 20080704 >>>> >>>> Error message generated during build: >>>> >>> >>>> cc1: error: unrecognized command line option "-Wno-clobbered" >>>> cc1: error: unrecognized command line option "-Wno-clobbered" >>> >>>> >>>> Do anyone knows what's went wrong? ;-) >>>> >>> >>> -Wno-clobbered is not recognized by gcc 4.1. This has been fixed >>> upstream: http://hg.openjdk.java.net/jdk7/build/jdk/rev/b715eb9f3d99 >>> >>> changeset: 4031:b715eb9f3d99 >>> parent: 3932:d80954a89b49 >>> user: ohair >>> date: Thu Apr 21 18:26:04 2011 -0700 >>> summary: 7038711: Fix CC_VER checks for compiler options, fix use of >>> -Wno-clobber >>> >> Do you think it is worth to prepare patch for current IcedTea7 version? >> (I can do this, of course). >> > > Yes, I think we should definitely address this problem. As for how to do > it, I will let Andrew chime in. I suppose (havent tested this) the best > way would be to import that changeset into icedtea/jdk7/hotspot repo. > Hmm... a simple export/import wont work. 7038711 depends on 7030063: AWT support for SE-Embedded integration. This (as you can guess from the bug name) adds a whole lot of stuff. Andrew, how do you deal with this situation? Do we add a icedtea7 patch which is a modified version of 7038711? Or do we modify and commit 7038711 to the icedtea7 forest and later revert it? Thanks, Omair From omajid at redhat.com Mon May 2 10:04:22 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 02 May 2011 13:04:22 -0400 Subject: RFC: Drop references to plugin/webstart in icedtea7 Message-ID: <4DBEE416.1000503@redhat.com> Hi, The attached patch removes some leftover references to plugin/webstart in icedtea7. It's a port of parts of http://icedtea.classpath.org/hg/icedtea6/rev/5327c5405c78 Okay to commit? Thanks, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea7-drop-plugin-webstart-references.patch Type: text/x-patch Size: 4996 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110502/a9f3e7f7/icedtea7-drop-plugin-webstart-references.patch From omajid at redhat.com Mon May 2 10:21:34 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 02 May 2011 13:21:34 -0400 Subject: [icedtea-web] RFC: Patch to fix applet exit In-Reply-To: <20110502155625.GB11271@redhat.com> References: <20110502155625.GB11271@redhat.com> Message-ID: <4DBEE81E.7090003@redhat.com> On 05/02/2011 11:56 AM, Deepak Bhole wrote: > Hi, > > This patch addresses an issue cause by the tg.stop() call in > PluginAppletViewer.appletClose(). > > With the recent classloader sharing changes, applets from the same page > have the same threadgroup. As a result if 2 copies are opened and one is > closed, the other one stops too. > > With this patch, tg.stop() is no longer called and instead, the plugin > will halt the VM after the last applet to guarantee that resources are > freed eventually (the tg.stop was added because not all applets exit > nicely on stop/dispose). > It would be nice if this was improved so that threadgroups could be terminated when all applets belonging to the threadgroup have stopped. > ChangeLog: > 2011-05-02 Deepak Bhole > > * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > (appletClose): Do not try to stop threads, now that the loader is shared > and the thread group for applets on a page is identical. Call dispose from > invokeAndWait. > (appletSystemExit): Exit the VM when called. > > Okay for HEAD and 1.1? > The patch looks fine to me. I believe the appcontext/threadgroup changes were committed only to head. Is this patch needed for 1.1? Cheers, Omair From dlila at redhat.com Mon May 2 10:47:36 2011 From: dlila at redhat.com (Denis Lila) Date: Mon, 2 May 2011 13:47:36 -0400 (EDT) Subject: [icedtea-web] RFC: Patch to fix applet exit In-Reply-To: <20110502155625.GB11271@redhat.com> Message-ID: <1059709894.1305349.1304358456718.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> > This patch addresses an issue cause by the tg.stop() call in > PluginAppletViewer.appletClose(). > > With the recent classloader sharing changes, applets from the same > page > have the same threadgroup. As a result if 2 copies are opened and one > is > closed, the other one stops too. > > With this patch, tg.stop() is no longer called and instead, the plugin > will halt the VM after the last applet to guarantee that resources are > freed eventually (the tg.stop was added because not all applets exit > nicely on stop/dispose). Is it possible for an applet creation to be racing with the applet close? I'm thinking, what happens if we're handling an applet creation but we haven't called the PAV constructor yet? (so, suppose we're still in parse() and haven't called factory.createPanel yet). In that case, wouldn't we just shut down the vm, because we haven't added the PAV to appletPanels yet and so 0==countApplets()? Isn't this wrong? Regards, Denis. ----- Original Message ----- > Hi, > > ChangeLog: > 2011-05-02 Deepak Bhole > > * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > (appletClose): Do not try to stop threads, now that the loader is > shared > and the thread group for applets on a page is identical. Call dispose > from > invokeAndWait. > (appletSystemExit): Exit the VM when called. > > Okay for HEAD and 1.1? > > Cheers, > Deepak From dbhole at redhat.com Mon May 2 11:16:47 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 2 May 2011 14:16:47 -0400 Subject: [icedtea-web] RFC: Patch to fix applet exit In-Reply-To: <4DBEE81E.7090003@redhat.com> References: <20110502155625.GB11271@redhat.com> <4DBEE81E.7090003@redhat.com> Message-ID: <20110502181646.GD11271@redhat.com> * Omair Majid [2011-05-02 13:21]: > On 05/02/2011 11:56 AM, Deepak Bhole wrote: > >Hi, > > > >This patch addresses an issue cause by the tg.stop() call in > >PluginAppletViewer.appletClose(). > > > >With the recent classloader sharing changes, applets from the same page > >have the same threadgroup. As a result if 2 copies are opened and one is > >closed, the other one stops too. > > > >With this patch, tg.stop() is no longer called and instead, the plugin > >will halt the VM after the last applet to guarantee that resources are > >freed eventually (the tg.stop was added because not all applets exit > >nicely on stop/dispose). > > > > It would be nice if this was improved so that threadgroups could be > terminated when all applets belonging to the threadgroup have > stopped. > Yep, I completely agree. However that is not possible about some redesign, which I would like to avoid for 1.1 as it is already branched. Cheers, Deepak > >ChangeLog: > >2011-05-02 Deepak Bhole > > > > * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > > (appletClose): Do not try to stop threads, now that the loader is shared > > and the thread group for applets on a page is identical. Call dispose from > > invokeAndWait. > > (appletSystemExit): Exit the VM when called. > > > >Okay for HEAD and 1.1? > > > > The patch looks fine to me. I believe the appcontext/threadgroup > changes were committed only to head. Is this patch needed for 1.1? > > Cheers, > Omair From dbhole at redhat.com Mon May 2 11:15:48 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 2 May 2011 14:15:48 -0400 Subject: [icedtea-web] RFC: Patch to fix applet exit In-Reply-To: <1059709894.1305349.1304358456718.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <20110502155625.GB11271@redhat.com> <1059709894.1305349.1304358456718.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <20110502181547.GC11271@redhat.com> * Denis Lila [2011-05-02 13:47]: > > This patch addresses an issue cause by the tg.stop() call in > > PluginAppletViewer.appletClose(). > > > > With the recent classloader sharing changes, applets from the same > > page > > have the same threadgroup. As a result if 2 copies are opened and one > > is > > closed, the other one stops too. > > > > With this patch, tg.stop() is no longer called and instead, the plugin > > will halt the VM after the last applet to guarantee that resources are > > freed eventually (the tg.stop was added because not all applets exit > > nicely on stop/dispose). > > Is it possible for an applet creation to be racing with the > applet close? I'm thinking, what happens if we're handling an > applet creation but we haven't called the PAV constructor yet? > (so, suppose we're still in parse() and haven't called > factory.createPanel yet). > > In that case, wouldn't we just shut down the vm, because > we haven't added the PAV to appletPanels yet and so > 0==countApplets()? Isn't this wrong? > Yep, I thought about that case but the probability of that is very low. Between having the VM potentially shut down before an applet starts (fixable by refreshing) and having a running applet freeze (which could include unsaved work), the former sounds like the lesser of 2 evils and more acceptable in the short term. Omair's original comment about having a separate ThreadGroup is the correct approach, but is not easy to implement atm, especially within the 1.1 time frame. One thing we can do is add this to 1.1 only, but I really don't think the case of "VM shut down when another applet is starting" is worth worrying about for now, given how unlikely it is. Cheers, Deepak > Regards, > Denis. > > ----- Original Message ----- > > Hi, > > > > > ChangeLog: > > 2011-05-02 Deepak Bhole > > > > * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > > (appletClose): Do not try to stop threads, now that the loader is > > shared > > and the thread group for applets on a page is identical. Call dispose > > from > > invokeAndWait. > > (appletSystemExit): Exit the VM when called. > > > > Okay for HEAD and 1.1? > > > > Cheers, > > Deepak From omajid at redhat.com Mon May 2 11:19:55 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 02 May 2011 14:19:55 -0400 Subject: [icedtea-web] RFC: Patch to fix applet exit In-Reply-To: <20110502181646.GD11271@redhat.com> References: <20110502155625.GB11271@redhat.com> <4DBEE81E.7090003@redhat.com> <20110502181646.GD11271@redhat.com> Message-ID: <4DBEF5CB.6040006@redhat.com> On 05/02/2011 02:16 PM, Deepak Bhole wrote: > * Omair Majid [2011-05-02 13:21]: >> On 05/02/2011 11:56 AM, Deepak Bhole wrote: >>> Hi, >>> >>> This patch addresses an issue cause by the tg.stop() call in >>> PluginAppletViewer.appletClose(). >>> >>> With the recent classloader sharing changes, applets from the same page >>> have the same threadgroup. As a result if 2 copies are opened and one is >>> closed, the other one stops too. >>> >>> With this patch, tg.stop() is no longer called and instead, the plugin >>> will halt the VM after the last applet to guarantee that resources are >>> freed eventually (the tg.stop was added because not all applets exit >>> nicely on stop/dispose). >>> >> >> It would be nice if this was improved so that threadgroups could be >> terminated when all applets belonging to the threadgroup have >> stopped. >> > > Yep, I completely agree. However that is not possible about some > redesign, which I would like to avoid for 1.1 as it is already branched. > Sure. I am fine with the patch as a quick fix. I was just pointing out that we should aim for a better fix later. > >>> ChangeLog: >>> 2011-05-02 Deepak Bhole >>> >>> * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java >>> (appletClose): Do not try to stop threads, now that the loader is shared >>> and the thread group for applets on a page is identical. Call dispose from >>> invokeAndWait. >>> (appletSystemExit): Exit the VM when called. >>> >>> Okay for HEAD and 1.1? >>> >> >> The patch looks fine to me. I believe the appcontext/threadgroup >> changes were committed only to head. Is this patch needed for 1.1? >> Looks like you missed this part of the email. Is this patch needed for 1.1? Thanks, Omair From dlila at redhat.com Mon May 2 11:24:18 2011 From: dlila at redhat.com (Denis Lila) Date: Mon, 2 May 2011 14:24:18 -0400 (EDT) Subject: [icedtea-web] RFC: Patch to fix applet exit In-Reply-To: <20110502181547.GC11271@redhat.com> Message-ID: <438132942.1305940.1304360658203.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> > Yep, I thought about that case but the probability of that is very > low. > Between having the VM potentially shut down before an applet starts > (fixable by refreshing) and having a running applet freeze (which > could > include unsaved work), the former sounds like the lesser of 2 > evils and more acceptable in the short term. > > Omair's original comment about having a separate ThreadGroup is the > correct approach, but is not easy to implement atm, especially within > the 1.1 time frame. > > One thing we can do is add this to 1.1 only, but I really don't think > the case of "VM shut down when another applet is starting" is worth > worrying about for now, given how unlikely it is. I see. I assume this will be easier to fix after the security redesign, right? In any case, what you say makes sense, and it's true that all you have to do to make the applet work is to refresh the page, I say this is good to go for head and 1.1 (but maybe put a TODO in there? We should fix this eventually after all.). Regards, Denis. ----- Original Message ----- > * Denis Lila [2011-05-02 13:47]: > > > This patch addresses an issue cause by the tg.stop() call in > > > PluginAppletViewer.appletClose(). > > > > > > With the recent classloader sharing changes, applets from the same > > > page > > > have the same threadgroup. As a result if 2 copies are opened and > > > one > > > is > > > closed, the other one stops too. > > > > > > With this patch, tg.stop() is no longer called and instead, the > > > plugin > > > will halt the VM after the last applet to guarantee that resources > > > are > > > freed eventually (the tg.stop was added because not all applets > > > exit > > > nicely on stop/dispose). > > > > Is it possible for an applet creation to be racing with the > > applet close? I'm thinking, what happens if we're handling an > > applet creation but we haven't called the PAV constructor yet? > > (so, suppose we're still in parse() and haven't called > > factory.createPanel yet). > > > > In that case, wouldn't we just shut down the vm, because > > we haven't added the PAV to appletPanels yet and so > > 0==countApplets()? Isn't this wrong? > > > > > Cheers, > Deepak > > > Regards, > > Denis. > > > > ----- Original Message ----- > > > Hi, > > > > > > > > ChangeLog: > > > 2011-05-02 Deepak Bhole > > > > > > * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > > > (appletClose): Do not try to stop threads, now that the loader is > > > shared > > > and the thread group for applets on a page is identical. Call > > > dispose > > > from > > > invokeAndWait. > > > (appletSystemExit): Exit the VM when called. > > > > > > Okay for HEAD and 1.1? > > > > > > Cheers, > > > Deepak From dbhole at redhat.com Mon May 2 11:26:38 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 2 May 2011 14:26:38 -0400 Subject: [icedtea-web] RFC: Patch to fix applet exit In-Reply-To: <438132942.1305940.1304360658203.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <20110502181547.GC11271@redhat.com> <438132942.1305940.1304360658203.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <20110502182638.GA14450@redhat.com> * Denis Lila [2011-05-02 14:24]: > > Yep, I thought about that case but the probability of that is very > > low. > > Between having the VM potentially shut down before an applet starts > > (fixable by refreshing) and having a running applet freeze (which > > could > > include unsaved work), the former sounds like the lesser of 2 > > evils and more acceptable in the short term. > > > > Omair's original comment about having a separate ThreadGroup is the > > correct approach, but is not easy to implement atm, especially within > > the 1.1 time frame. > > > > One thing we can do is add this to 1.1 only, but I really don't think > > the case of "VM shut down when another applet is starting" is worth > > worrying about for now, given how unlikely it is. > > I see. > I assume this will be easier to fix after the security redesign, right? > In any case, what you say makes sense, and it's true that all you have > to do to make the applet work is to refresh the page, I say this is good to > go for head and 1.1 (but maybe put a TODO in there? We should fix this > eventually after all.). > Good point, I will add a TODO before committing. Thanks! Cheers, Deepak > Regards, > Denis. > > ----- Original Message ----- > > * Denis Lila [2011-05-02 13:47]: > > > > This patch addresses an issue cause by the tg.stop() call in > > > > PluginAppletViewer.appletClose(). > > > > > > > > With the recent classloader sharing changes, applets from the same > > > > page > > > > have the same threadgroup. As a result if 2 copies are opened and > > > > one > > > > is > > > > closed, the other one stops too. > > > > > > > > With this patch, tg.stop() is no longer called and instead, the > > > > plugin > > > > will halt the VM after the last applet to guarantee that resources > > > > are > > > > freed eventually (the tg.stop was added because not all applets > > > > exit > > > > nicely on stop/dispose). > > > > > > Is it possible for an applet creation to be racing with the > > > applet close? I'm thinking, what happens if we're handling an > > > applet creation but we haven't called the PAV constructor yet? > > > (so, suppose we're still in parse() and haven't called > > > factory.createPanel yet). > > > > > > In that case, wouldn't we just shut down the vm, because > > > we haven't added the PAV to appletPanels yet and so > > > 0==countApplets()? Isn't this wrong? > > > > > > > > > > Cheers, > > Deepak > > > > > Regards, > > > Denis. > > > > > > ----- Original Message ----- > > > > Hi, > > > > > > > > > > > ChangeLog: > > > > 2011-05-02 Deepak Bhole > > > > > > > > * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > > > > (appletClose): Do not try to stop threads, now that the loader is > > > > shared > > > > and the thread group for applets on a page is identical. Call > > > > dispose > > > > from > > > > invokeAndWait. > > > > (appletSystemExit): Exit the VM when called. > > > > > > > > Okay for HEAD and 1.1? > > > > > > > > Cheers, > > > > Deepak From dbhole at redhat.com Mon May 2 11:27:12 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 2 May 2011 14:27:12 -0400 Subject: [icedtea-web] RFC: Patch to fix applet exit In-Reply-To: <4DBEF5CB.6040006@redhat.com> References: <20110502155625.GB11271@redhat.com> <4DBEE81E.7090003@redhat.com> <20110502181646.GD11271@redhat.com> <4DBEF5CB.6040006@redhat.com> Message-ID: <20110502182712.GB14450@redhat.com> * Omair Majid [2011-05-02 14:19]: > On 05/02/2011 02:16 PM, Deepak Bhole wrote: > >* Omair Majid [2011-05-02 13:21]: > >>On 05/02/2011 11:56 AM, Deepak Bhole wrote: > >>>Hi, > >>> > >>>This patch addresses an issue cause by the tg.stop() call in > >>>PluginAppletViewer.appletClose(). > >>> > >>>With the recent classloader sharing changes, applets from the same page > >>>have the same threadgroup. As a result if 2 copies are opened and one is > >>>closed, the other one stops too. > >>> > >>>With this patch, tg.stop() is no longer called and instead, the plugin > >>>will halt the VM after the last applet to guarantee that resources are > >>>freed eventually (the tg.stop was added because not all applets exit > >>>nicely on stop/dispose). > >>> > >> > >>It would be nice if this was improved so that threadgroups could be > >>terminated when all applets belonging to the threadgroup have > >>stopped. > >> > > > >Yep, I completely agree. However that is not possible about some > >redesign, which I would like to avoid for 1.1 as it is already branched. > > > > Sure. I am fine with the patch as a quick fix. I was just pointing > out that we should aim for a better fix later. > Cool. Thanks for reviewing! Cheers, Deepak > > > >>>ChangeLog: > >>>2011-05-02 Deepak Bhole > >>> > >>> * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > >>> (appletClose): Do not try to stop threads, now that the loader is shared > >>> and the thread group for applets on a page is identical. Call dispose from > >>> invokeAndWait. > >>> (appletSystemExit): Exit the VM when called. > >>> > >>>Okay for HEAD and 1.1? > >>> > >> > >>The patch looks fine to me. I believe the appcontext/threadgroup > >>changes were committed only to head. Is this patch needed for 1.1? > >> > > Looks like you missed this part of the email. Is this patch needed for 1.1? > > Thanks, > Omair From dbhole at icedtea.classpath.org Mon May 2 11:32:32 2011 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Mon, 02 May 2011 18:32:32 +0000 Subject: /hg/icedtea-web: Prevent applet from shutting down down if anoth... Message-ID: changeset 6fe7281c17b7 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6fe7281c17b7 author: Deepak Bhole date: Mon May 02 14:33:32 2011 -0400 Prevent applet from shutting down down if another tab with the same page is opened and closed. diffstat: ChangeLog | 8 ++++ plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 27 ++++++++++----- 2 files changed, 26 insertions(+), 9 deletions(-) diffs (65 lines): diff -r d57169ddb76a -r 6fe7281c17b7 ChangeLog --- a/ChangeLog Fri Apr 29 16:58:05 2011 -0400 +++ b/ChangeLog Mon May 02 14:33:32 2011 -0400 @@ -1,3 +1,11 @@ +2011-05-02 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (appletClose): Do not try to stop threads, now that the loader is shared + and the thread group for applets on a page is identical. Call dispose from + invokeAndWait. + (appletSystemExit): Exit the VM when called. + 2011-04-28 Denis Lila * netx/net/sourceforge/jnlp/NetxPanel.java: diff -r d57169ddb76a -r 6fe7281c17b7 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Apr 29 16:58:05 2011 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon May 02 14:33:32 2011 -0400 @@ -1621,15 +1621,26 @@ if (cl instanceof JNLPClassLoader.CodeBaseClassLoader) cl = ((JNLPClassLoader.CodeBaseClassLoader) cl).getParentJNLPClassLoader(); - ThreadGroup tg = ((JNLPClassLoader) cl).getApplication().getThreadGroup(); - appletShutdown(p); appletPanels.removeElement(p); - dispose(); + + /* TODO: Applets don't always shut down nicely. We + * need to find a proper way to forcibly closing all threads + * an applet starts during its lifetime + */ - if (tg.activeCount() > 0) - tg.stop(); + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + dispose(); + } + }); + } catch (Exception e) { // ignore, we are just disposing it + } + // If there are no more applets running, exit the VM + // TODO: There is a possible race condition here as count + // can be 0 when an applet is in the initialization phase if (countApplets() == 0) { appletSystemExit(); } @@ -1640,12 +1651,10 @@ } /** - * Exit the program. - * Exit from the program (if not stand alone) - do no clean-up + * This function should be called to halt the VM when all applets are destroyed. */ private void appletSystemExit() { - // Do nothing. Exit is handled by another - // block of code, called when _all_ applets are gone + System.exit(0); } /** From dbhole at redhat.com Mon May 2 11:38:26 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 2 May 2011 14:38:26 -0400 Subject: [icedtea-web] RFC: Patch to fix applet exit In-Reply-To: <4DBEF5CB.6040006@redhat.com> References: <20110502155625.GB11271@redhat.com> <4DBEE81E.7090003@redhat.com> <20110502181646.GD11271@redhat.com> <4DBEF5CB.6040006@redhat.com> Message-ID: <20110502183826.GC14450@redhat.com> * Omair Majid [2011-05-02 14:19]: > On 05/02/2011 02:16 PM, Deepak Bhole wrote: > >* Omair Majid [2011-05-02 13:21]: > >>On 05/02/2011 11:56 AM, Deepak Bhole wrote: > >>>Hi, > >>> > >>>This patch addresses an issue cause by the tg.stop() call in > >>>PluginAppletViewer.appletClose(). > >>> > >>>With the recent classloader sharing changes, applets from the same page > >>>have the same threadgroup. As a result if 2 copies are opened and one is > >>>closed, the other one stops too. > >>> > >>>With this patch, tg.stop() is no longer called and instead, the plugin > >>>will halt the VM after the last applet to guarantee that resources are > >>>freed eventually (the tg.stop was added because not all applets exit > >>>nicely on stop/dispose). > >>> > >> > >>It would be nice if this was improved so that threadgroups could be > >>terminated when all applets belonging to the threadgroup have > >>stopped. > >> > > > >Yep, I completely agree. However that is not possible about some > >redesign, which I would like to avoid for 1.1 as it is already branched. > > > > Sure. I am fine with the patch as a quick fix. I was just pointing > out that we should aim for a better fix later. > > > > >>>ChangeLog: > >>>2011-05-02 Deepak Bhole > >>> > >>> * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > >>> (appletClose): Do not try to stop threads, now that the loader is shared > >>> and the thread group for applets on a page is identical. Call dispose from > >>> invokeAndWait. > >>> (appletSystemExit): Exit the VM when called. > >>> > >>>Okay for HEAD and 1.1? > >>> > >> > >>The patch looks fine to me. I believe the appcontext/threadgroup > >>changes were committed only to head. Is this patch needed for 1.1? > >> > > Looks like you missed this part of the email. Is this patch needed for 1.1? > Yep, it is needed for 1.1 too. The problem is due to shared classloaders (which by extension ultimately results in the same ThreadGroup per for all duplicate applet instances from the same page). Cheers, Deepak > Thanks, > Omair From asu at redhat.com Mon May 2 11:52:37 2011 From: asu at redhat.com (Andrew Su) Date: Mon, 2 May 2011 14:52:37 -0400 (EDT) Subject: [RFC][Icedtea6]: Update jpegclasses.patch In-Reply-To: <1149355053.284880.1304348121131.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <1457231452.290331.1304362357338.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Hello, In the patch in repo, it is missing a lot of the methods specified by the javadoc.[1] Thanks to Matthew Flaschen and marathon who posted some code at [2], but it was still missing a bunch of other stuff. I have taken the code posted and fixed it to match the specification by the javadoc as closely as possible, also adding proper documentations where possible, however there is still loads of stub methods, which needs implementation. What this patch will add: src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java : Signals that an Image Format exception of some sort has occurred. src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java: Factory class for getting the encoder, decoder, or parameter. src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java : Interface for decoder parameters. src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java : Interface for encoder parameters. src/share/classes/com/sun/image/codec/jpeg/JPEGHuffmanTable.java : Huffman table implementation for JPEG. [3] src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java : Interface for implementing JPEG decoder. src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java : Interface for implementing JPEG encoder. src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java : Quantization table implementation for JPEG. [3] src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java : Signals that a truncated file was detected. src/share/classes/sun/awt/image/codec/JPEGImageDecoderImpl.java : Actual implementation of decoder. src/share/classes/sun/awt/image/codec/JPEGImageEncoderImpl.java : Actual implementation of encoder. src/share/classes/sun/awt/image/codec/JPEGParam.java : Implementation for both encoder and decoder parameters. What it will do: Keep compatibility with older code that uses the com.sun.image.codec.jpeg.* classes. Allow users to encode and decode JPEG images with standard tables. What needs to be done: Add implementation for stubs. For implementation this should end up as a kind of wrapper for the Java Image I/O stuff. [4] Attached: changeset.patch : patch for updating jpegclasses.patch SampleMain.java : Sample for encoding JPEG image at 0.5 quality. I've tested building it on head and running a sample piece of code for encoding JPEG images. However testing with the encoding test file at [2] it doesn't seem to be able to do it for the buffered image provided. (This shows with his version as well, I haven't been able to pinpoint why..) But it's a start to have some basic functionality and a basis to work with. Cheers, Andrew [1] http://download.oracle.com/javase/1.5.0/docs/guide/2d/api-jpeg/com/sun/image/codec/jpeg/package-summary.html [2] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=192 [3] http://www.w3.org/Graphics/JPEG/itu-t81.pdf [4] http://download.oracle.com/javase/6/docs/technotes/guides/imageio/index.html -------------- next part -------------- A non-text attachment was scrubbed... Name: SampleMain.java Type: text/x-java Size: 1465 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110502/1551bc5c/SampleMain.java -------------- next part -------------- A non-text attachment was scrubbed... Name: changeset.patch Type: text/x-patch Size: 71544 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110502/1551bc5c/changeset.patch From omajid at redhat.com Mon May 2 12:08:17 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 02 May 2011 15:08:17 -0400 Subject: Problems pushing to icedtea7 forest Message-ID: <4DBF0121.50205@redhat.com> Hi, I am having problems pushing to the icedtea7 forest: $ hg out comparing with http://hg.openjdk.java.net/icedtea/jdk7/jdk searching for changes changeset: 3972:29ab858a0840 tag: tip user: Alexis Ballier date: Mon May 02 14:07:01 2011 -0400 summary: Support building against libpng 1.5 $ hg push ssh://omajid at hg.openjdk.java.net/icedtea/jdk7/jdk pushing to ssh://omajid at hg.openjdk.java.net/icedtea/jdk7/jdk Enter passphrase for key '/home/omajid/.ssh/id_rsa': searching for changes remote: abort: could not lock repository icedtea/jdk7/jdk: Read-only file system abort: unexpected response: empty string At first I thought it was because I did not push to the gate repository, but there is no gate repository for icedtea. Any thoughts? Thanks, Omair From dbhole at icedtea.classpath.org Mon May 2 12:33:38 2011 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Mon, 02 May 2011 19:33:38 +0000 Subject: /hg/release/icedtea-web-1.1: Prevent applet from shutting down d... Message-ID: changeset 0256de6a4bf6 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=0256de6a4bf6 author: Deepak Bhole date: Mon May 02 14:33:32 2011 -0400 Prevent applet from shutting down down if another tab with the same page is opened and closed. diffstat: ChangeLog | 8 ++++ plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 27 ++++++++++----- 2 files changed, 26 insertions(+), 9 deletions(-) diffs (65 lines): diff -r a0a061a0560d -r 0256de6a4bf6 ChangeLog --- a/ChangeLog Thu Apr 28 16:23:11 2011 -0400 +++ b/ChangeLog Mon May 02 14:33:32 2011 -0400 @@ -1,3 +1,11 @@ +2011-05-02 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (appletClose): Do not try to stop threads, now that the loader is shared + and the thread group for applets on a page is identical. Call dispose from + invokeAndWait. + (appletSystemExit): Exit the VM when called. + 2011-04-28 Omair Majid * Makefile.am (javaws, itweb_settings): New variables. diff -r a0a061a0560d -r 0256de6a4bf6 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu Apr 28 16:23:11 2011 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon May 02 14:33:32 2011 -0400 @@ -1605,15 +1605,26 @@ if (cl instanceof JNLPClassLoader.CodeBaseClassLoader) cl = ((JNLPClassLoader.CodeBaseClassLoader) cl).getParentJNLPClassLoader(); - ThreadGroup tg = ((JNLPClassLoader) cl).getApplication().getThreadGroup(); - appletShutdown(p); appletPanels.removeElement(p); - dispose(); + + /* TODO: Applets don't always shut down nicely. We + * need to find a proper way to forcibly closing all threads + * an applet starts during its lifetime + */ - if (tg.activeCount() > 0) - tg.stop(); + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + dispose(); + } + }); + } catch (Exception e) { // ignore, we are just disposing it + } + // If there are no more applets running, exit the VM + // TODO: There is a possible race condition here as count + // can be 0 when an applet is in the initialization phase if (countApplets() == 0) { appletSystemExit(); } @@ -1624,12 +1635,10 @@ } /** - * Exit the program. - * Exit from the program (if not stand alone) - do no clean-up + * This function should be called to halt the VM when all applets are destroyed. */ private void appletSystemExit() { - // Do nothing. Exit is handled by another - // block of code, called when _all_ applets are gone + System.exit(0); } /** From ahughes at redhat.com Mon May 2 13:37:32 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 2 May 2011 21:37:32 +0100 Subject: Problems pushing to icedtea7 forest In-Reply-To: <4DBF0121.50205@redhat.com> References: <4DBF0121.50205@redhat.com> Message-ID: <20110502203732.GB11659@rivendell.middle-earth.co.uk> On 15:08 Mon 02 May , Omair Majid wrote: > Hi, > > I am having problems pushing to the icedtea7 forest: > > $ hg out > comparing with http://hg.openjdk.java.net/icedtea/jdk7/jdk > searching for changes > changeset: 3972:29ab858a0840 > tag: tip > user: Alexis Ballier > date: Mon May 02 14:07:01 2011 -0400 > summary: Support building against libpng 1.5 > > $ hg push ssh://omajid at hg.openjdk.java.net/icedtea/jdk7/jdk > pushing to ssh://omajid at hg.openjdk.java.net/icedtea/jdk7/jdk > Enter passphrase for key '/home/omajid/.ssh/id_rsa': > searching for changes > remote: abort: could not lock repository icedtea/jdk7/jdk: Read-only > file system > abort: unexpected response: empty string > > At first I thought it was because I did not push to the gate repository, > but there is no gate repository for icedtea. Any thoughts? > > Thanks, > Omair Have you pushed to any other trees on the OpenJDK server? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at redhat.com Mon May 2 13:40:25 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 02 May 2011 16:40:25 -0400 Subject: Problems pushing to icedtea7 forest In-Reply-To: <20110502203732.GB11659@rivendell.middle-earth.co.uk> References: <4DBF0121.50205@redhat.com> <20110502203732.GB11659@rivendell.middle-earth.co.uk> Message-ID: <4DBF16B9.2040200@redhat.com> On 05/02/2011 04:37 PM, Dr Andrew John Hughes wrote: > On 15:08 Mon 02 May , Omair Majid wrote: >> Hi, >> >> I am having problems pushing to the icedtea7 forest: >> >> $ hg out >> comparing with http://hg.openjdk.java.net/icedtea/jdk7/jdk >> searching for changes >> changeset: 3972:29ab858a0840 >> tag: tip >> user: Alexis Ballier >> date: Mon May 02 14:07:01 2011 -0400 >> summary: Support building against libpng 1.5 >> >> $ hg push ssh://omajid at hg.openjdk.java.net/icedtea/jdk7/jdk >> pushing to ssh://omajid at hg.openjdk.java.net/icedtea/jdk7/jdk >> Enter passphrase for key '/home/omajid/.ssh/id_rsa': >> searching for changes >> remote: abort: could not lock repository icedtea/jdk7/jdk: Read-only >> file system >> abort: unexpected response: empty string >> >> At first I thought it was because I did not push to the gate repository, >> but there is no gate repository for icedtea. Any thoughts? >> >> Thanks, >> Omair > > Have you pushed to any other trees on the OpenJDK server? Not very recently, but I have pushed changesets previously. As an example, I pushed http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/4eed3d0d3293. Thanks, Omair From dlila at redhat.com Mon May 2 13:47:41 2011 From: dlila at redhat.com (Denis Lila) Date: Mon, 2 May 2011 16:47:41 -0400 (EDT) Subject: [RFC][netx]: fix memory leak introduced by my previous changeset. In-Reply-To: <80757904.1313494.1304369218534.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <1205202886.1313510.1304369261994.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Hi. I just realized that my previous changeset was not ideal. It created a new thread group object for every NetxPanel, but it only created any threads in that thread group if a thread group had not already been created for that panel. This can result in creating unused ThreadGroups. That's not a problem by itself - the problem is that they're not garbage collected even if they're unused (because they're created with a non null parent, and the parent keeps track of them in an internal list). This is effectively a (very small) memory leak. The patch to fix this is attached. It just replaces the concurrent map with synchronized statements. Ok to push? Regards, Denis. -------------- next part -------------- A non-text attachment was scrubbed... Name: mem-leak.patch Type: text/x-patch Size: 2528 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110502/1c4709bd/mem-leak.patch From ahughes at redhat.com Mon May 2 14:17:20 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 2 May 2011 22:17:20 +0100 Subject: RFC: Drop references to plugin/webstart in icedtea7 In-Reply-To: <4DBEE416.1000503@redhat.com> References: <4DBEE416.1000503@redhat.com> Message-ID: <20110502211720.GE11659@rivendell.middle-earth.co.uk> On 13:04 Mon 02 May , Omair Majid wrote: > Hi, > > The attached patch removes some leftover references to plugin/webstart > in icedtea7. It's a port of parts of > http://icedtea.classpath.org/hg/icedtea6/rev/5327c5405c78 > > Okay to commit? > > Thanks, > Omair Thought we'd got all these... Third time lucky. Approved. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at redhat.com Mon May 2 14:29:54 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 02 May 2011 17:29:54 -0400 Subject: [RFC][netx]: fix memory leak introduced by my previous changeset. In-Reply-To: <1205202886.1313510.1304369261994.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <1205202886.1313510.1304369261994.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <4DBF2252.6060705@redhat.com> On 05/02/2011 04:47 PM, Denis Lila wrote: > Hi. > > I just realized that my previous changeset was not ideal. > It created a new thread group object for every NetxPanel, > but it only created any threads in that thread group if > a thread group had not already been created for that panel. > > This can result in creating unused ThreadGroups. That's > not a problem by itself - the problem is that they're not > garbage collected even if they're unused (because they're > created with a non null parent, and the parent keeps track > of them in an internal list). This is effectively a (very small) > memory leak. > > The patch to fix this is attached. It just replaces the > concurrent map with synchronized statements. > > Ok to push? > Looks fine to me. Cheers, Omair From omajid at redhat.com Mon May 2 14:43:53 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 02 May 2011 17:43:53 -0400 Subject: Patch which fixes bug #6703377 (font outline transformation) In-Reply-To: <4CB86E2C.7000102@redhat.com> References: <4CB86E2C.7000102@redhat.com> Message-ID: <4DBF2599.6040906@redhat.com> On 10/15/2010 11:07 AM, Pavel Tisnovsky wrote: > Hi all, > > I prepared yet another patch for IcedTea6 HEAD. This patch refine > computation of x and y coordinates during font outline transformation > when negative values are used > (see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6703377) > > Attached files: > > 6703377-freetypescaler.patch - the patch itself > hg_export_icedtea6.diff - changes I would like to make in IcedTea > > Correct behaviour of outline transformation is (partially) checked by > regression test: > java/awt/font/Rotate/TranslatedOutlineTest.java > > Can anyone please review this patch? Upstream has resolved this bug using another method: http://hg.openjdk.java.net/jdk7/2d/jdk/rev/7fba83f5f5e0 Is your patch fixing the exact same problem? Do you think it might be worth it to switch to upstream's fix? Thanks, Omair From omajid at icedtea.classpath.org Mon May 2 15:03:56 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Mon, 02 May 2011 22:03:56 +0000 Subject: /hg/icedtea: Remove obsolete references to plugin and netx Message-ID: changeset 8234e55615a5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8234e55615a5 author: Omair Majid date: Mon May 02 18:03:39 2011 -0400 Remove obsolete references to plugin and netx diffstat: ChangeLog | 7 +++++++ INSTALL | 20 -------------------- README | 34 +++------------------------------- configure.ac | 8 -------- 4 files changed, 10 insertions(+), 59 deletions(-) diffs (134 lines): diff -r e53fc64228c1 -r 8234e55615a5 ChangeLog --- a/ChangeLog Sun May 01 18:12:29 2011 +0100 +++ b/ChangeLog Mon May 02 18:03:39 2011 -0400 @@ -1,3 +1,10 @@ +2011-05-02 Omair Majid + + Remove obsolete information about the plugin and netx + * INSTALL, + * README: Remove references to plugin and webstart. + * configure.ac: Do not check for plugin. + 2011-04-29 Andrew John Hughes * patches/boot/icedtea-dyn.patch: diff -r e53fc64228c1 -r 8234e55615a5 INSTALL --- a/INSTALL Sun May 01 18:12:29 2011 +0100 +++ b/INSTALL Mon May 02 18:03:39 2011 -0400 @@ -30,7 +30,6 @@ libpng-devel libjpeg-devel >= 6b zlib-devel -xulrunner-devel (can be disabled using --disable-plugin) rhino (can be disabled using --without-rhino) libffi (for --enable-zero or on archs other than x86/x86_64/sparc) pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java) @@ -172,8 +171,6 @@ * --enable-cacao: Replace HotSpot with the CACAO VM. * --enable-shark: Build the Shark LLVM-based JIT. * --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms. -* --disable-plugin: Don't build the browser plugin. -* --disable-npplugin: Build the old unsupported plugin rather than NPPlugin. * --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK. * --with-rhino: Include Javascript support using Rhino. * --with-additional-vms=vm-list: Additional VMs to build using the system described @@ -268,23 +265,6 @@ --enable-shark to configure. Please note that Shark is still in development and builds are still likely to fail at present. -The Browser Plugin -================== - -IcedTea7 contains a Free Software browser plugin based on NPRuntime -called NPPlugin. By default, this will be built, and it can be turned -off using the -disable-plugin option. - -A test suite is supplied for the browser plugin. It can be built -using 'make plugin-tests' and run by loading the HTML page specified -into a browser with the plugin installed. - -For debugging, the environment variable ICEDTEAPLUGIN_DEBUG should be -set to 'true'. This will produce output on the console from the C++ -side, and output from the Java side in $HOME/.icedteaplugin/java.stdout -and $HOME/.icedteaplugin/java.stderr. It also starts the debug server -on port 8787. - Support for Different Versions of HotSpot ========================================= diff -r e53fc64228c1 -r 8234e55615a5 README --- a/README Sun May 01 18:12:29 2011 +0100 +++ b/README Mon May 02 18:03:39 2011 -0400 @@ -5,10 +5,8 @@ openjdk.java.net using Free Software tools and dependencies. IcedTea addresses two problems: it eliminates the build requirement on -proprietary build tools and it provides implementations of Java Web -Start and the browser plugin which are missing from OpenJDK. It also -provides support for additional architectures via Zero/Shark or the -CACAO VM. +proprietary build tools and provides additional patches and features +(such as Javascript support via Rhino) not available in OpenJDK. IcedTea also provides build scripts and patches that fix a number of issues which are as yet unresolved upstream. @@ -42,10 +40,7 @@ subject to minor adjustments, major revisions, or even outright removal between now and the time that the Java SE 7 Platform Specification is finalized. Please take these facts into account -before depending upon IcedTea. IcedTea provides autotools support, a -portable interpreter (Zero) and LLVM-based JIT (Shark) for other -architectures beyond x86/x86_64/SPARC, plugin support and Web Start -support. +before depending upon IcedTea. A Note About License Headers ---------------------------- @@ -56,29 +51,6 @@ - We are assuming that these files are owned by Sun: openjdk/jdk/src/share/classes/**/resources/*.properties -Web Browser Plugin support -=========================== - -IcedTea adds a browser plugin to OpenJDK. The current version is a -rewrite, developed to support recent Mozilla API changes. It can be -enabled with the option --enable-plugin, and is based on -gcjwebplugin. - -NetX -==== - -NetX provides a drop-in replacement for javaws (Java Web Start). Since -upstream NetX is dormant, we will be hosting and modifying the sources -in the IcedTea repository, particularly in the netx/net/sourceforge/jnlp -directory. - -The NetX sources are built into rt.jar using the same method as -CORBA, JAXWS, JAXP and langtools. - -IcedTea's NetX currently supports verification of signed jars, trusted -certificate storing, system certificate store checking, and provides -the services specified by the jnlp API. - The Zero Assembler and Shark Ports ================================== diff -r e53fc64228c1 -r 8234e55615a5 configure.ac --- a/configure.ac Sun May 01 18:12:29 2011 +0100 +++ b/configure.ac Mon May 02 18:03:39 2011 -0400 @@ -59,14 +59,6 @@ AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], []) AC_SUBST(XVFB_RUN_CMD) -AC_MSG_CHECKING([whether to build the browser plugin]) -AC_ARG_ENABLE([plugin], - [AS_HELP_STRING([--disable-plugin], - [Disable compilation of browser plugin])], - [enable_plugin="${enableval}"], [enable_plugin="yes"]) -AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes") -AC_MSG_RESULT(${enable_plugin}) - AC_MSG_CHECKING([whether to include PulseAudio support]) AC_ARG_ENABLE([pulse-java], [AS_HELP_STRING([--enable-pulse-java], From bugzilla-daemon at icedtea.classpath.org Mon May 2 15:06:44 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 02 May 2011 22:06:44 +0000 Subject: [Bug 704] New: Bootstrap of ZeroVM: zip I/O error: No such file or directory Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=704 Summary: Bootstrap of ZeroVM: zip I/O error: No such file or directory Product: IcedTea Version: 7-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea7 AssignedTo: gnu_andrew at member.fsf.org ReportedBy: drazzib at drazzib.com CC: unassigned at icedtea.classpath.org Hi, I've found a new issue when trying to build ZeroVM. Error (just after starting build of Zero alt VM) : make[2]: Entering directory `/home/drazzib/Dev/debian-pkg/openjdk/openjdk-7-7~b136-1.14~pre0/build/zerovm' (set -e ; \ cd lib/rt ; \ for dirs in ; \ do \ destpath=`echo $dirs|sed -e 's#openjdk-boot/langtools/src/share/classes/##' -e 's#openjdk-boot/jdk/src/share/classes/##'` ; \ mkdir -p `dirname $destpath` ; \ cp -a ../../$dirs $destpath ; \ done ; \ /usr/bin/zip -qur /home/drazzib/Dev/debian-pkg/openjdk/openjdk-7-7~b136-1.14~pre0/build/zerovm/bootstrap/boot/jre/lib/rt.jar \ com java javax sun ); zip I/O error: No such file or directory zip error: Could not create output file (/home/drazzib/Dev/debian-pkg/openjdk/openjdk-7-7~b136-1.14~pre0/build/zerovm/bootstrap/boot/jre/lib/rt.jar) make[2]: *** [stamps/rt.stamp] Error 1 make[2]: Leaving directory `/home/drazzib/Dev/debian-pkg/openjdk/openjdk-7-7~b136-1.14~pre0/build/zerovm' make[1]: *** [stamps/add-zero.stamp] Error 2 make[1]: Leaving directory `/home/drazzib/Dev/debian-pkg/openjdk/openjdk-7-7~b136-1.14~pre0/build' make: *** [stamps/build] Erreur 1 Content of build/zerovm/bootstrap/ directory is : jdk1.6.0 -> /home/drazzib/Dev/debian-pkg/openjdk/openjdk-7-7~b136-1.14~pre0/build/openjdk.build/j2sdk-image In Makefile.am there seems to be two ways of handling bootstrap VM of Zero alt VM which clash together : 1) in stamps/bootstrap-directory-symlink-stage2.stamp : ln -sf $(ICEDTEA_HOME) $(BOOT_DIR) 2) in stamps/rt.stamp: $(ZIP) -qur $(STAGE1_BOOT_DIR)/jre/lib/rt.jar I've attached a part of the build log (only part regarding ZeroVM alt VM build). You can find the full build log here : http://people.debian.org/~drazzib/openjdk/openjdk-7_7~b136-1.14~pre0-1_amd64.build Regards, -- Damien Raude-Morvan -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Mon May 2 15:08:33 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 2 May 2011 18:08:33 -0400 Subject: [RFC][netx]: fix memory leak introduced by my previous changeset. In-Reply-To: <1205202886.1313510.1304369261994.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <80757904.1313494.1304369218534.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <1205202886.1313510.1304369261994.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <20110502220832.GD14450@redhat.com> * Denis Lila [2011-05-02 17:09]: > Hi. > > I just realized that my previous changeset was not ideal. > It created a new thread group object for every NetxPanel, > but it only created any threads in that thread group if > a thread group had not already been created for that panel. > > This can result in creating unused ThreadGroups. That's > not a problem by itself - the problem is that they're not > garbage collected even if they're unused (because they're > created with a non null parent, and the parent keeps track > of them in an internal list). This is effectively a (very small) > memory leak. > > The patch to fix this is attached. It just replaces the > concurrent map with synchronized statements. > > Ok to push? > Just a reminder that if you push this in HEAD, please do it in 1.1 as well, since it contains the previous patch. Thanks, Deepak > Regards, > Denis. > diff -r 6fe7281c17b7 ChangeLog > --- a/ChangeLog Mon May 02 14:33:32 2011 -0400 > +++ b/ChangeLog Mon May 02 16:40:48 2011 -0400 > @@ -1,3 +1,13 @@ > +2011-05-02 Denis Lila > + > + * netx/net/sourceforge/jnlp/NetxPanel.java: > + Add imports. > + (uKeyToTG): Change to HashMap. > + (TGMapMutex): New mutex to synchronize uKeyToTG. > + (getThreadGroup): Synchronize on TGMapMutex. > + (NetxPanel): Only create a new thread group if one doesn't already > + exist for the computed uKey. > + > 2011-05-02 Deepak Bhole > > * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > diff -r 6fe7281c17b7 netx/net/sourceforge/jnlp/NetxPanel.java > --- a/netx/net/sourceforge/jnlp/NetxPanel.java Mon May 02 14:33:32 2011 -0400 > +++ b/netx/net/sourceforge/jnlp/NetxPanel.java Mon May 02 16:40:48 2011 -0400 > @@ -27,7 +27,9 @@ > import net.sourceforge.jnlp.runtime.JNLPRuntime; > > import java.net.URL; > +import java.util.HashMap; > import java.util.Hashtable; > +import java.util.Map; > import java.util.concurrent.ConcurrentHashMap; > import java.util.concurrent.ConcurrentMap; > > @@ -49,8 +51,9 @@ > > // We use this so that we can create exactly one thread group > // for all panels with the same uKey. > - private static final ConcurrentMap uKeyToTG = > - new ConcurrentHashMap(); > + private static final Map uKeyToTG = > + new HashMap(); > + private static final Object TGMapMutex = new Object(); > > // This map is actually a set (unfortunately there is no ConcurrentSet > // in java.util.concurrent). If KEY is in this map, then we know that > @@ -95,8 +98,12 @@ > > // when this was being done (incorrectly) in Launcher, the call was > // new AppThreadGroup(mainGroup, file.getTitle()); > - ThreadGroup tg = new ThreadGroup(Launcher.mainGroup, this.documentURL.toString()); > - uKeyToTG.putIfAbsent(this.uKey, tg); > + synchronized(TGMapMutex) { > + if (!uKeyToTG.containsKey(this.uKey)) { > + ThreadGroup tg = new ThreadGroup(Launcher.mainGroup, this.documentURL.toString()); > + uKeyToTG.put(this.uKey, tg); > + } > + } > } > > // overloaded constructor, called when initialized via plugin > @@ -210,7 +217,9 @@ > } > > public ThreadGroup getThreadGroup() { > - return uKeyToTG.get(uKey); > + synchronized(TGMapMutex) { > + return uKeyToTG.get(uKey); > + } > } > > public void createNewAppContext() { From ahughes at redhat.com Mon May 2 15:18:24 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 2 May 2011 23:18:24 +0100 Subject: [RFC][Icedtea6]: Update jpegclasses.patch In-Reply-To: <1457231452.290331.1304362357338.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <1149355053.284880.1304348121131.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <1457231452.290331.1304362357338.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <20110502221824.GF11659@rivendell.middle-earth.co.uk> On 14:52 Mon 02 May , Andrew Su wrote: > Hello, > > In the patch in repo, it is missing a lot of the methods specified by the javadoc.[1] > Thanks to Matthew Flaschen and marathon who posted some code at [2], but it was still missing a bunch of other stuff. > I have taken the code posted and fixed it to match the specification by the javadoc as closely as possible, also adding proper documentations where possible, however there is still loads of stub methods, which needs implementation. > > What this patch will add: > src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java : Signals that an Image Format exception of some sort has occurred. > src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java: Factory class for getting the encoder, decoder, or parameter. > src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java : Interface for decoder parameters. > src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java : Interface for encoder parameters. > src/share/classes/com/sun/image/codec/jpeg/JPEGHuffmanTable.java : Huffman table implementation for JPEG. [3] > src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java : Interface for implementing JPEG decoder. > src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java : Interface for implementing JPEG encoder. > src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java : Quantization table implementation for JPEG. [3] > src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java : Signals that a truncated file was detected. > src/share/classes/sun/awt/image/codec/JPEGImageDecoderImpl.java : Actual implementation of decoder. > src/share/classes/sun/awt/image/codec/JPEGImageEncoderImpl.java : Actual implementation of encoder. > src/share/classes/sun/awt/image/codec/JPEGParam.java : Implementation for both encoder and decoder parameters. > > What it will do: > Keep compatibility with older code that uses the com.sun.image.codec.jpeg.* classes. > Allow users to encode and decode JPEG images with standard tables. > > What needs to be done: > Add implementation for stubs. > For implementation this should end up as a kind of wrapper for the Java Image I/O stuff. [4] > > Attached: > changeset.patch : patch for updating jpegclasses.patch > SampleMain.java : Sample for encoding JPEG image at 0.5 quality. > > I've tested building it on head and running a sample piece of code for encoding JPEG images. > However testing with the encoding test file at [2] it doesn't seem to be able to do it for the buffered image provided. (This shows with his version as well, I haven't been able to pinpoint why..) > But it's a start to have some basic functionality and a basis to work with. > > Cheers, > Andrew > > > [1] http://download.oracle.com/javase/1.5.0/docs/guide/2d/api-jpeg/com/sun/image/codec/jpeg/package-summary.html > [2] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=192 > [3] http://www.w3.org/Graphics/JPEG/itu-t81.pdf > [4] http://download.oracle.com/javase/6/docs/technotes/guides/imageio/index.html I haven't looked at the code itself, but I think this would be much more maintainable if it used the overlays mechanism instead, with possibly a minimal patch to enable building of the code. I assume the com.sun.image.codec.jpeg code is not present in the OpenJDK6 tarball? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From xiaoqiangnk at gmail.com Mon May 2 21:58:04 2011 From: xiaoqiangnk at gmail.com (Yongqiang Yang) Date: Tue, 3 May 2011 12:58:04 +0800 Subject: merging of Hotspot with MIPS support In-Reply-To: <4DB6813E.4050206@zafena.se> References: <4DB6813E.4050206@zafena.se> Message-ID: Hi Xerxes, When I built Icedtea on my machine with linux os and mips processor, I encountered an error like below. ====================================================== if ! test -d /mnt/yangyongqiang/icedtea6/build/bootstrap/jdk1.6.0 ; \ then \ /usr/bin/javac -J-Xmx2048m -g -d lib/hotspot-tools \ -source 1.5 \ -sourcepath \ 'hotspot-tools:openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openjdk/langtools/src/share/classes:openjdk/jaxp/src/share/classes:openjdk/corba/src/share/classes:openjdk/jaxws/src/share/classes:/mnt/yangyongqiang/icedtea6/build/generated:/mnt/yangyongqiang/icedtea6/build/rt:/mnt/yangyongqiang/icedtea6/build/../rt' \ -bootclasspath \'\' @hotspot-tools-source-files.txt ; \ else \ /mnt/yangyongqiang/icedtea6/build/bootstrap/jdk1.6.0/bin/javac -J-Xmx2048m -g \ -d lib/hotspot-tools \ -source 1.5 \ -sourcepath \ 'hotspot-tools:openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openjdk/langtools/src/share/classes:openjdk/jaxp/src/share/classes:openjdk/corba/src/share/classes:openjdk/jaxws/src/share/classes:/mnt/yangyongqiang/icedtea6/build/generated:/mnt/yangyongqiang/icedtea6/build/rt:/mnt/yangyongqiang/icedtea6/build/../rt' \ -bootclasspath \'\' @hotspot-tools-source-files.txt ; \ fi incorrect classpath: '' ========================================================= Is the message above normal? Are there some ENV to set? Exception in thread "main" java.lang.OutOfMemoryError: Java heap space at org.eclipse.jdt.internal.compiler.util.Util.getInputStreamAsCharArray(Util.java:398) at org.eclipse.jdt.internal.compiler.util.Util.getFileCharContent(Util.java:234) at org.eclipse.jdt.internal.compiler.batch.CompilationUnit.getContents(CompilationUnit.java:71) at org.eclipse.jdt.internal.compiler.batch.Main$3.acceptResult(Main.java:2706) at org.eclipse.jdt.internal.compiler.Compiler.handleInternalException(Compiler.java:603) at org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:518) at org.eclipse.jdt.internal.compiler.batch.Main.performCompilation(Main.java:3687) at org.eclipse.jdt.internal.compiler.batch.Main.compile(Main.java:1648) at org.eclipse.jdt.internal.compiler.batch.Main.main(Main.java:1361) Yongqiang, Thank you. -- Best Wishes Yongqiang Yang From xerxes at zafena.se Tue May 3 00:43:59 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Tue, 03 May 2011 09:43:59 +0200 Subject: merging of Hotspot with MIPS support In-Reply-To: References: <4DB6813E.4050206@zafena.se> Message-ID: <4DBFB23F.3000101@zafena.se> On 2011-05-03 06:58, Yongqiang Yang wrote: > Hi Xerxes, > > When I built Icedtea on my machine with linux os and mips processor, I > encountered an error like below. > > ====================================================== > if ! test -d /mnt/yangyongqiang/icedtea6/build/bootstrap/jdk1.6.0 ; \ > then \ > /usr/bin/javac -J-Xmx2048m -g -d lib/hotspot-tools \ > -source 1.5 \ > -sourcepath \ > 'hotspot-tools:openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openjdk/langtools/src/share/classes:openjdk/jaxp/src/share/classes:openjdk/corba/src/share/classes:openjdk/jaxws/src/share/classes:/mnt/yangyongqiang/icedtea6/build/generated:/mnt/yangyongqiang/icedtea6/build/rt:/mnt/yangyongqiang/icedtea6/build/../rt' > \ > -bootclasspath \'\' @hotspot-tools-source-files.txt ; \ > else \ > /mnt/yangyongqiang/icedtea6/build/bootstrap/jdk1.6.0/bin/javac > -J-Xmx2048m -g \ > -d lib/hotspot-tools \ > -source 1.5 \ > -sourcepath \ > 'hotspot-tools:openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openjdk/langtools/src/share/classes:openjdk/jaxp/src/share/classes:openjdk/corba/src/share/classes:openjdk/jaxws/src/share/classes:/mnt/yangyongqiang/icedtea6/build/generated:/mnt/yangyongqiang/icedtea6/build/rt:/mnt/yangyongqiang/icedtea6/build/../rt' > \ > -bootclasspath \'\' @hotspot-tools-source-files.txt ; \ > fi > > incorrect classpath: '' > ========================================================= > Is the message above normal? Are there some ENV to set? Historically, the above message was normal when using the old icedtea6-1.6 release and there are no extra ENV to set. In 2010-02-18 Andrew John Hughes have dropped the hotspot-tools targets to simplify bootstrapping OpenJDK and this change are part of the icedtea6-1.8 releasebranch. There are a glitch in the IcedTea6 hg tree http://icedtea.classpath.org/hg/icedtea6/rev/9358ce62acc9 the icedtea6-1.8 branch tag are pointing to the wrong change-set and are infarct pointing to the same change-set as icedtea6-1.6 branch-point, sorry. This explains why you are observing the above messages :/ You should use http://icedtea.classpath.org/hg/icedtea6/rev/9358ce62acc9 as it are close to the real (currently untagged) icedtea6-1.8 release branch point > > > Exception in thread "main" java.lang.OutOfMemoryError: Java heap space > at org.eclipse.jdt.internal.compiler.util.Util.getInputStreamAsCharArray(Util.java:398) > at org.eclipse.jdt.internal.compiler.util.Util.getFileCharContent(Util.java:234) > at org.eclipse.jdt.internal.compiler.batch.CompilationUnit.getContents(CompilationUnit.java:71) > at org.eclipse.jdt.internal.compiler.batch.Main$3.acceptResult(Main.java:2706) > at org.eclipse.jdt.internal.compiler.Compiler.handleInternalException(Compiler.java:603) > at org.eclipse.jdt.internal.compiler.Compiler.compile(Compiler.java:518) > at org.eclipse.jdt.internal.compiler.batch.Main.performCompilation(Main.java:3687) > at org.eclipse.jdt.internal.compiler.batch.Main.compile(Main.java:1648) > at org.eclipse.jdt.internal.compiler.batch.Main.main(Main.java:1361) Which JVM are you using to bootstrap your build? /mnt/yangyongqiang/icedtea6/build/bootstrap/jdk1.6.0/bin/java -version > > Yongqiang, > Thank you. > > Cheers Xerxes From bugzilla-daemon at icedtea.classpath.org Tue May 3 01:16:58 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 03 May 2011 08:16:58 +0000 Subject: [Bug 704] Bootstrap of ZeroVM: zip I/O error: No such file or directory In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=704 --- Comment #1 from Andrew John Hughes 2011-05-03 08:16:58 --- Does this happen if you build Zero normally with --enable-zero? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From xerxes at zafena.se Tue May 3 01:23:19 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Tue, 03 May 2011 10:23:19 +0200 Subject: icedtea6 hg tag icedtea6-1.8-branchpoint points to the icedtea-1.6-branchpoint changeset. Message-ID: <4DBFBB77.6060303@zafena.se> xranby at hp:~/icedtea6$ cat .hgtags 96e1bdfed80e258e0a82e19bde45c5c547c2552f icedtea-1.0 b639d73581e34a5db114ed5addfd84b093d00254 icedtea-1.1 1ce086327b07f17892cc351719de6897819e32fa icedtea-1.2 8ea2619c21cfea2611b44879aab0f781ffd3fd50 icedtea-1.3 cb78e0fccf14ed4a80b0ada2c98e4621479acbf5 icedtea-1.4 5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5 bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6 38e6eb354632588f5ac8dbcd69229ebd031f57cb icedtea6-1.0 a5c32475a2e87f0f3bd7af28e632e6bd4f724b04 icedtea6-1.1 871b70407a139c6bd42c200762ee1d302b31168f icedtea6-1.2 3ef9c9c4e70b8204b73fa9b88243f49f59c2a23f icedtea6-1.3 be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e icedtea6-1.3.1 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 07de70c5883a637ea2ef4aba3f8472edd7e12f1e icedtea6-1.5rc2 926c38e2b2830971f6ca0dff2ce25f78a694b178 icedtea6-1.5rc3 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea-1.6-branchpoint !!!! 8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea-1.7-branchpoint 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.8-branchpoint !!!! cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint From mjw at icedtea.classpath.org Tue May 3 02:05:56 2011 From: mjw at icedtea.classpath.org (mjw at icedtea.classpath.org) Date: Tue, 03 May 2011 09:05:56 +0000 Subject: /hg/buildbot: 2 new changesets Message-ID: changeset c1b784e9bafc in /hg/buildbot details: http://icedtea.classpath.org/hg/buildbot?cmd=changeset;node=c1b784e9bafc author: Mark Wielaard date: Tue May 03 10:44:14 2011 +0200 icedtea/build.sh: Select additional vms based on icedtea version. changeset 9b2f98d18770 in /hg/buildbot details: http://icedtea.classpath.org/hg/buildbot?cmd=changeset;node=9b2f98d18770 author: Mark Wielaard date: Tue May 03 10:45:42 2011 +0200 icedtea/master.cfg: icedtea6-squeeze-x86_64-full don't build cacao. diffstat: icedtea/build.sh | 9 ++++++++- icedtea/master.cfg | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diffs (38 lines): diff -r 47fe70931ef2 -r 9b2f98d18770 icedtea/build.sh --- a/icedtea/build.sh Tue Mar 15 11:24:00 2011 +0100 +++ b/icedtea/build.sh Tue May 03 10:45:42 2011 +0200 @@ -100,6 +100,13 @@ # Make sure a failure in any command in a pipe, fails the whole pipe command. set -o pipefail +# Some additional VMs only build against one or the other version. +if [ "$1" == "6"]; then + ICEDTEA_ADDITIONAL_VMS="cacao,jamvm,shark" +elif [ "$1" == "7" ]; then + ICEDTEA_ADDITIONAL_VMS="shark" +fi + # Build in separate dir. # Figure out a way to use local openjdk tar.gz files # maybe just copy to to an archive dir before cleanup and then copy back. @@ -108,7 +115,7 @@ && cd $ICEDTEA_BUILD_DIR \ && $ICEDTEA_DIR/configure \ --enable-nss \ - --with-additional-vms=cacao,shark \ + --with-additional-vms=$ICEDTEA_ADDITIONAL_VMS \ && make VERBOSE=true) 2>&1 | tee $BUILD_LOG_FILE BUILD_RESULT=$? diff -r 47fe70931ef2 -r 9b2f98d18770 icedtea/master.cfg --- a/icedtea/master.cfg Tue Mar 15 11:24:00 2011 +0100 +++ b/icedtea/master.cfg Tue May 03 10:45:42 2011 +0200 @@ -737,7 +737,7 @@ "--enable-optimizations", "--enable-docs", "--enable-nss", - "--with-additional-vms=cacao,shark", + "--with-additional-vms=shark", "--with-parallel-jobs=4", "--with-llvm-config=llvm-config-2.7"], workdir="build")) From mark at klomp.org Tue May 3 02:08:14 2011 From: mark at klomp.org (Mark Wielaard) Date: Tue, 03 May 2011 11:08:14 +0200 Subject: IcedTea7 buildbot [no more cacao] In-Reply-To: <201105030010.18234.drazzib@debian.org> References: <201105030010.18234.drazzib@debian.org> Message-ID: <1304413694.32294.11.camel@springer.wildebeest.org> Hi Damien (CC icedtea/cacao mailing-lists), On Tue, 2011-05-03 at 00:10 +0200, Damien Raude-Morvan wrote: > Regarding icedtea7-squeeze-x86_64-full buildbot configuration, I think you can > disable Cacao VM (but keep Zero/Shark enabled :) because Cacao FTBFS with >= > b128 OpenJDK because HPI API has been removed from OpenJDK (see #154 -> > http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=154) Yes, I am afraid you are right :{ I was hoping "someone" would be encouraged to fix it if I kept the buildbot up and failing. But clearly that was a little too optimistic. And it doesn't actually help people trying to get the icedtea7 tree up to date, since it fails way too early to get the tests running. Attached are the patches I installed for http://icedtea.classpath.org/hg/buildbot/ So now the old builder (build.sh), which reports by email to http://icedtea.classpath.org/mailman/listinfo/testresults and the new buildbot icedtea7-squeeze-x86_64-full builder at http://builder.classpath.org/icedtea/buildbot/builders/icedtea7-squeeze-x86_64-quick should no longer build cacao for icedtea7. Note that icedtea7 also doesn't support jamvm yet (which doesn't depend on HPI). Cheers, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: build.sh.patch Type: text/x-patch Size: 1150 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110503/dc72d127/build.sh.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: master.cfg.patch Type: text/x-patch Size: 900 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110503/dc72d127/master.cfg.patch From ptisnovs at redhat.com Tue May 3 02:10:55 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 03 May 2011 11:10:55 +0200 Subject: Patch which fixes bug #6703377 (font outline transformation) In-Reply-To: <4DBF2599.6040906@redhat.com> References: <4CB86E2C.7000102@redhat.com> <4DBF2599.6040906@redhat.com> Message-ID: <4DBFC69F.2090607@redhat.com> Omair Majid wrote: > On 10/15/2010 11:07 AM, Pavel Tisnovsky wrote: >> Hi all, >> >> I prepared yet another patch for IcedTea6 HEAD. This patch refine >> computation of x and y coordinates during font outline transformation >> when negative values are used >> (see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6703377) >> >> Attached files: >> >> 6703377-freetypescaler.patch - the patch itself >> hg_export_icedtea6.diff - changes I would like to make in IcedTea >> >> Correct behaviour of outline transformation is (partially) checked by >> regression test: >> java/awt/font/Rotate/TranslatedOutlineTest.java >> >> Can anyone please review this patch? > > Upstream has resolved this bug using another method: > http://hg.openjdk.java.net/jdk7/2d/jdk/rev/7fba83f5f5e0 > > Is your patch fixing the exact same problem? Do you think it might be > worth it to switch to upstream's fix? > > Thanks, > Omair Hi Omair, AFAIK the upstream patch you mentioned is already included in IcedTea6, but it is itself does not sufficient to resolve this bug when negative coordinates are used. Pavel From mjw at icedtea.classpath.org Tue May 3 02:16:43 2011 From: mjw at icedtea.classpath.org (mjw at icedtea.classpath.org) Date: Tue, 03 May 2011 09:16:43 +0000 Subject: /hg/buildbot: icedtea/master.cfg: icedtea7-squeeze-x86_64-quick ... Message-ID: changeset 4acf4a27e0fa in /hg/buildbot details: http://icedtea.classpath.org/hg/buildbot?cmd=changeset;node=4acf4a27e0fa author: Mark Wielaard date: Tue May 03 11:16:34 2011 +0200 icedtea/master.cfg: icedtea7-squeeze-x86_64-quick don't build cacao. diffstat: icedtea/master.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9b2f98d18770 -r 4acf4a27e0fa icedtea/master.cfg --- a/icedtea/master.cfg Tue May 03 10:45:42 2011 +0200 +++ b/icedtea/master.cfg Tue May 03 11:16:34 2011 +0200 @@ -269,7 +269,7 @@ "--disable-bootstrap", "--disable-optimizations", "--disable-docs", - "--with-additional-vms=cacao,shark", + "--with-additional-vms=shark", "--with-parallel-jobs=4", "--with-llvm-config=llvm-config-2.7"], workdir="build")) From mark at klomp.org Tue May 3 02:18:40 2011 From: mark at klomp.org (Mark Wielaard) Date: Tue, 03 May 2011 11:18:40 +0200 Subject: [cacao] IcedTea7 buildbot [no more cacao] In-Reply-To: <1304413694.32294.11.camel@springer.wildebeest.org> References: <201105030010.18234.drazzib@debian.org> <1304413694.32294.11.camel@springer.wildebeest.org> Message-ID: <1304414320.32294.13.camel@springer.wildebeest.org> On Tue, 2011-05-03 at 11:08 +0200, Mark Wielaard wrote: > and the new buildbot icedtea7-squeeze-x86_64-full builder at > http://builder.classpath.org/icedtea/buildbot/builders/icedtea7-squeeze-x86_64-quick > should no longer build cacao for icedtea7. Doh, I meant: http://builder.classpath.org/icedtea/buildbot/builders/icedtea7-squeeze-x86_64-full But the icedtea7 "quick" builder should also not build cacao anymore. Fixed as follows: # HG changeset patch # User Mark Wielaard # Date 1304414194 -7200 # Node ID 4acf4a27e0fa264b4dd6690264922b55467a8dc7 # Parent 9b2f98d18770fcbf527d52b007230c23b7dd2741 icedtea/master.cfg: icedtea7-squeeze-x86_64-quick don't build cacao. diff -r 9b2f98d18770 -r 4acf4a27e0fa icedtea/master.cfg --- a/icedtea/master.cfg Tue May 03 10:45:42 2011 +0200 +++ b/icedtea/master.cfg Tue May 03 11:16:34 2011 +0200 @@ -269,7 +269,7 @@ "--disable-bootstrap", "--disable-optimizations", "--disable-docs", - "--with-additional-vms=cacao,shark", + "--with-additional-vms=shark", "--with-parallel-jobs=4", "--with-llvm-config=llvm-config-2.7"], workdir="build")) From ptisnovs at redhat.com Tue May 3 03:41:40 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 03 May 2011 12:41:40 +0200 Subject: Unable to build recent version IcedTea7 HEAD In-Reply-To: <4DBED81F.5060400@redhat.com> References: <4DBE8E82.6090002@redhat.com> <4DBEC55C.8070302@redhat.com> <4DBEC8BF.8010108@redhat.com> <4DBEC979.3010704@redhat.com> <4DBED81F.5060400@redhat.com> Message-ID: <4DBFDBE4.7040609@redhat.com> Omair Majid wrote: > On 05/02/2011 11:10 AM, Omair Majid wrote: > > Hmm... a simple export/import wont work. 7038711 depends on 7030063: AWT > support for SE-Embedded integration. This (as you can guess from the bug > name) adds a whole lot of stuff. Andrew, how do you deal with this > situation? Do we add a icedtea7 patch which is a modified version of > 7038711? Or do we modify and commit 7038711 to the icedtea7 forest and > later revert it? I think that 7038711 can be applied alone without the needs to apply 7030063 too. So we could add new openjdk/7038711 patch to IcedTea7 - is it correct solution Andrew? > > Thanks, > Omair From aph at redhat.com Tue May 3 04:51:58 2011 From: aph at redhat.com (Andrew Haley) Date: Tue, 03 May 2011 12:51:58 +0100 Subject: icedtea6: fix "make distclean" Message-ID: <4DBFEC5E.2000809@redhat.com> "make distclean" fails if run more than once. Fixed thusly, committed as trivial/obvious. Andrew. changeset: 2540:6bf942777964 tag: tip user: aph date: Tue May 03 12:50:36 2011 +0100 summary: Don't fail if sed command to clean jvm.cfg fails. diff -r 6b2f514d7874 Makefile.am --- a/Makefile.am Mon May 02 12:05:50 2011 -0400 +++ b/Makefile.am Tue May 03 12:46:37 2011 +0100 @@ -1845,7 +1845,7 @@ clean-add-jamvm: rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm - sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg + -sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg rm -f stamps/add-jamvm.stamp stamps/add-jamvm-debug.stamp: stamps/icedtea-debug.stamp stamps/jamvm.stamp From aph at icedtea.classpath.org Tue May 3 04:53:07 2011 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Tue, 03 May 2011 11:53:07 +0000 Subject: /hg/icedtea6: Don't fail if sed command to clean jvm.cfg fails. Message-ID: changeset 6bf942777964 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6bf942777964 author: aph date: Tue May 03 12:50:36 2011 +0100 Don't fail if sed command to clean jvm.cfg fails. diffstat: Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6b2f514d7874 -r 6bf942777964 Makefile.am --- a/Makefile.am Mon May 02 12:05:50 2011 -0400 +++ b/Makefile.am Tue May 03 12:50:36 2011 +0100 @@ -1845,7 +1845,7 @@ clean-add-jamvm: rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm - sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg + -sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg rm -f stamps/add-jamvm.stamp stamps/add-jamvm-debug.stamp: stamps/icedtea-debug.stamp stamps/jamvm.stamp From ahughes at redhat.com Tue May 3 04:57:27 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 3 May 2011 12:57:27 +0100 Subject: IcedTea7 buildbot [no more cacao] In-Reply-To: <1304413694.32294.11.camel@springer.wildebeest.org> References: <201105030010.18234.drazzib@debian.org> <1304413694.32294.11.camel@springer.wildebeest.org> Message-ID: <20110503115727.GA26415@rivendell.middle-earth.co.uk> On 11:08 Tue 03 May , Mark Wielaard wrote: > Hi Damien (CC icedtea/cacao mailing-lists), > > On Tue, 2011-05-03 at 00:10 +0200, Damien Raude-Morvan wrote: > > Regarding icedtea7-squeeze-x86_64-full buildbot configuration, I think you can > > disable Cacao VM (but keep Zero/Shark enabled :) because Cacao FTBFS with >= > > b128 OpenJDK because HPI API has been removed from OpenJDK (see #154 -> > > http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=154) > > Yes, I am afraid you are right :{ > I was hoping "someone" would be encouraged to fix it if I kept the > buildbot up and failing. But clearly that was a little too optimistic. The CACAO bugzilla is here: http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/index.cgi Nagging unrelated parties with e-mails won't get you anywhere :-) -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From aph at icedtea.classpath.org Tue May 3 05:05:42 2011 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Tue, 03 May 2011 12:05:42 +0000 Subject: /hg/icedtea6: 2011-05-03 Andrew Haley Message-ID: changeset b6472fccd0ec in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b6472fccd0ec author: aph date: Tue May 03 13:05:05 2011 +0100 2011-05-03 Andrew Haley * Makefile.am: Don't fail if sed command to clean jvm.cfg fails. diffstat: ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 6bf942777964 -r b6472fccd0ec ChangeLog --- a/ChangeLog Tue May 03 12:50:36 2011 +0100 +++ b/ChangeLog Tue May 03 13:05:05 2011 +0100 @@ -1,3 +1,7 @@ +2011-05-03 Andrew Haley + + * Makefile.am: Don't fail if sed command to clean jvm.cfg fails. + 2011-05-02 Omair Majid * NEWS: Update. From mark at klomp.org Tue May 3 05:20:03 2011 From: mark at klomp.org (Mark Wielaard) Date: Tue, 03 May 2011 14:20:03 +0200 Subject: [cacao] IcedTea7 buildbot [no more cacao] In-Reply-To: <0a1c88d5ae7dfa8d4a8ab29c22211766@drazzib.com> References: <201105030010.18234.drazzib@debian.org> <1304413694.32294.11.camel@springer.wildebeest.org> <1304414320.32294.13.camel@springer.wildebeest.org> <0a1c88d5ae7dfa8d4a8ab29c22211766@drazzib.com> Message-ID: <1304425203.32294.33.camel@springer.wildebeest.org> Hi (adding icedtea mailinglist, so they know why the build triggered) On Tue, 2011-05-03 at 13:30 +0200, Damien Raude-Morvan wrote: > On Tue, 03 May 2011 11:18:40 +0200, Mark Wielaard wrote: > > On Tue, 2011-05-03 at 11:08 +0200, Mark Wielaard wrote: > >> and the new buildbot icedtea7-squeeze-x86_64-full builder at > >> > http://builder.classpath.org/icedtea/buildbot/builders/icedtea7-squeeze-x86_64-quick > >> should no longer build cacao for icedtea7. > > Is there a way to "submit" a job/builder for rebuild ? Not at the moment, sorry. I was afraid that people (or some robot crawler script) would keep hitting the rebuild button and overload the build slaves. But I can do it (and just have) by hand (by tricking it into thinking the last commit was done again). See the progress on the waterfall page: http://builder.wildebeest.org/icedtea/buildbot/waterfall (The full build is time triggered so will only be scheduled in some hours.) Cheers, Mark From stefan at complang.tuwien.ac.at Tue May 3 05:49:12 2011 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Tue, 3 May 2011 14:49:12 +0200 Subject: IcedTea7 buildbot [no more cacao] In-Reply-To: <20110503115727.GA26415@rivendell.middle-earth.co.uk> References: <201105030010.18234.drazzib@debian.org> <1304413694.32294.11.camel@springer.wildebeest.org> <20110503115727.GA26415@rivendell.middle-earth.co.uk> Message-ID: > The CACAO bugzilla is here: http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/index.cgi > > Nagging unrelated parties with e-mails won't get you anywhere :-) May be true, but I'm not sure what a bugzilla entry will do for us ;) Stefan From dlila at icedtea.classpath.org Tue May 3 06:15:49 2011 From: dlila at icedtea.classpath.org (dlila at icedtea.classpath.org) Date: Tue, 03 May 2011 13:15:49 +0000 Subject: /hg/icedtea-web: Fix useless thread group creation. Message-ID: changeset c4a58969d117 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c4a58969d117 author: Denis Lila date: Tue May 03 09:14:16 2011 -0400 Fix useless thread group creation. diffstat: ChangeLog | 10 ++++++++++ netx/net/sourceforge/jnlp/NetxPanel.java | 19 ++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diffs (68 lines): diff -r 6fe7281c17b7 -r c4a58969d117 ChangeLog --- a/ChangeLog Mon May 02 14:33:32 2011 -0400 +++ b/ChangeLog Tue May 03 09:14:16 2011 -0400 @@ -1,3 +1,13 @@ +2011-05-03 Denis Lila + + * netx/net/sourceforge/jnlp/NetxPanel.java: + Add imports. + (uKeyToTG): Change to HashMap. + (TGMapMutex): New mutex to synchronize uKeyToTG. + (getThreadGroup): Synchronize on TGMapMutex. + (NetxPanel): Only create a new thread group if one doesn't already + exist for the computed uKey. + 2011-05-02 Deepak Bhole * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java diff -r 6fe7281c17b7 -r c4a58969d117 netx/net/sourceforge/jnlp/NetxPanel.java --- a/netx/net/sourceforge/jnlp/NetxPanel.java Mon May 02 14:33:32 2011 -0400 +++ b/netx/net/sourceforge/jnlp/NetxPanel.java Tue May 03 09:14:16 2011 -0400 @@ -27,7 +27,9 @@ import net.sourceforge.jnlp.runtime.JNLPRuntime; import java.net.URL; +import java.util.HashMap; import java.util.Hashtable; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -49,8 +51,9 @@ // We use this so that we can create exactly one thread group // for all panels with the same uKey. - private static final ConcurrentMap uKeyToTG = - new ConcurrentHashMap(); + private static final Map uKeyToTG = + new HashMap(); + private static final Object TGMapMutex = new Object(); // This map is actually a set (unfortunately there is no ConcurrentSet // in java.util.concurrent). If KEY is in this map, then we know that @@ -95,8 +98,12 @@ // when this was being done (incorrectly) in Launcher, the call was // new AppThreadGroup(mainGroup, file.getTitle()); - ThreadGroup tg = new ThreadGroup(Launcher.mainGroup, this.documentURL.toString()); - uKeyToTG.putIfAbsent(this.uKey, tg); + synchronized(TGMapMutex) { + if (!uKeyToTG.containsKey(this.uKey)) { + ThreadGroup tg = new ThreadGroup(Launcher.mainGroup, this.documentURL.toString()); + uKeyToTG.put(this.uKey, tg); + } + } } // overloaded constructor, called when initialized via plugin @@ -210,7 +217,9 @@ } public ThreadGroup getThreadGroup() { - return uKeyToTG.get(uKey); + synchronized(TGMapMutex) { + return uKeyToTG.get(uKey); + } } public void createNewAppContext() { From andrew at icedtea.classpath.org Tue May 3 06:44:55 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 03 May 2011 13:44:55 +0000 Subject: /hg/icedtea: 2 new changesets Message-ID: changeset d7697037c191 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d7697037c191 author: Andrew John Hughes date: Tue May 03 14:44:03 2011 +0100 Apply 7038711 to fix build on RHEL5. 2011-05-03 Andrew John Hughes * Makefile.am: (JDK_CHANGESET): Bumped to include 7038711 which fixes build on RHEL5. (JDK_SHA256SUM): Likewise. changeset 0bf704349e89 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0bf704349e89 author: Andrew John Hughes date: Tue May 03 14:44:49 2011 +0100 Merge diffstat: ChangeLog | 14 ++++++++++++++ INSTALL | 20 -------------------- Makefile.am | 4 ++-- README | 34 +++------------------------------- configure.ac | 8 -------- 5 files changed, 19 insertions(+), 61 deletions(-) diffs (162 lines): diff -r e53fc64228c1 -r 0bf704349e89 ChangeLog --- a/ChangeLog Sun May 01 18:12:29 2011 +0100 +++ b/ChangeLog Tue May 03 14:44:49 2011 +0100 @@ -1,3 +1,17 @@ +2011-05-03 Andrew John Hughes + + * Makefile.am: + (JDK_CHANGESET): Bumped to include + 7038711 which fixes build on RHEL5. + (JDK_SHA256SUM): Likewise. + +2011-05-02 Omair Majid + + Remove obsolete information about the plugin and netx + * INSTALL, + * README: Remove references to plugin and webstart. + * configure.ac: Do not check for plugin. + 2011-04-29 Andrew John Hughes * patches/boot/icedtea-dyn.patch: diff -r e53fc64228c1 -r 0bf704349e89 INSTALL --- a/INSTALL Sun May 01 18:12:29 2011 +0100 +++ b/INSTALL Tue May 03 14:44:49 2011 +0100 @@ -30,7 +30,6 @@ libpng-devel libjpeg-devel >= 6b zlib-devel -xulrunner-devel (can be disabled using --disable-plugin) rhino (can be disabled using --without-rhino) libffi (for --enable-zero or on archs other than x86/x86_64/sparc) pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java) @@ -172,8 +171,6 @@ * --enable-cacao: Replace HotSpot with the CACAO VM. * --enable-shark: Build the Shark LLVM-based JIT. * --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms. -* --disable-plugin: Don't build the browser plugin. -* --disable-npplugin: Build the old unsupported plugin rather than NPPlugin. * --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK. * --with-rhino: Include Javascript support using Rhino. * --with-additional-vms=vm-list: Additional VMs to build using the system described @@ -268,23 +265,6 @@ --enable-shark to configure. Please note that Shark is still in development and builds are still likely to fail at present. -The Browser Plugin -================== - -IcedTea7 contains a Free Software browser plugin based on NPRuntime -called NPPlugin. By default, this will be built, and it can be turned -off using the -disable-plugin option. - -A test suite is supplied for the browser plugin. It can be built -using 'make plugin-tests' and run by loading the HTML page specified -into a browser with the plugin installed. - -For debugging, the environment variable ICEDTEAPLUGIN_DEBUG should be -set to 'true'. This will produce output on the console from the C++ -side, and output from the Java side in $HOME/.icedteaplugin/java.stdout -and $HOME/.icedteaplugin/java.stderr. It also starts the debug server -on port 8787. - Support for Different Versions of HotSpot ========================================= diff -r e53fc64228c1 -r 0bf704349e89 Makefile.am --- a/Makefile.am Sun May 01 18:12:29 2011 +0100 +++ b/Makefile.am Tue May 03 14:44:49 2011 +0100 @@ -6,7 +6,7 @@ HOTSPOT_CHANGESET = ef8632d52263 JAXP_CHANGESET = 1c2f25bf36b1 JAXWS_CHANGESET = 339c2d381d80 -JDK_CHANGESET = 1631a3dee8fc +JDK_CHANGESET = 8ae719dd77c0 LANGTOOLS_CHANGESET = 8e26c4aee63c OPENJDK_CHANGESET = d4aea1a51d62 @@ -14,7 +14,7 @@ HOTSPOT_SHA256SUM = 3868c969833dc3b88523d711fc21cfc2c57fea5b6f387a7082aff5634b35c0a1 JAXP_SHA256SUM = 91b65e352002079045dc1dee1c2a1af92db74a589b11b0a01777760adca80c64 JAXWS_SHA256SUM = 01747b77f40ffe554a3ee0ff8b902db0d743a1f8f6260c9141a1fb3d1c6cc230 -JDK_SHA256SUM = f08020de62bef31ff0a42564d06c84817150f943729132045e8af602c608467b +JDK_SHA256SUM = 7619cdfffd3dcba1275ab37546e89536ff93794ebd7022bf23c3123675cbf635 LANGTOOLS_SHA256SUM = e7384d93ac86c5b91b767bbbcb58a7037089446943935292d0d7706d16becc9f OPENJDK_SHA256SUM = 7143dc00cad9b7f8a653e8e22aec9fd3fa354325eaf79007326b16b887b6fbe6 diff -r e53fc64228c1 -r 0bf704349e89 README --- a/README Sun May 01 18:12:29 2011 +0100 +++ b/README Tue May 03 14:44:49 2011 +0100 @@ -5,10 +5,8 @@ openjdk.java.net using Free Software tools and dependencies. IcedTea addresses two problems: it eliminates the build requirement on -proprietary build tools and it provides implementations of Java Web -Start and the browser plugin which are missing from OpenJDK. It also -provides support for additional architectures via Zero/Shark or the -CACAO VM. +proprietary build tools and provides additional patches and features +(such as Javascript support via Rhino) not available in OpenJDK. IcedTea also provides build scripts and patches that fix a number of issues which are as yet unresolved upstream. @@ -42,10 +40,7 @@ subject to minor adjustments, major revisions, or even outright removal between now and the time that the Java SE 7 Platform Specification is finalized. Please take these facts into account -before depending upon IcedTea. IcedTea provides autotools support, a -portable interpreter (Zero) and LLVM-based JIT (Shark) for other -architectures beyond x86/x86_64/SPARC, plugin support and Web Start -support. +before depending upon IcedTea. A Note About License Headers ---------------------------- @@ -56,29 +51,6 @@ - We are assuming that these files are owned by Sun: openjdk/jdk/src/share/classes/**/resources/*.properties -Web Browser Plugin support -=========================== - -IcedTea adds a browser plugin to OpenJDK. The current version is a -rewrite, developed to support recent Mozilla API changes. It can be -enabled with the option --enable-plugin, and is based on -gcjwebplugin. - -NetX -==== - -NetX provides a drop-in replacement for javaws (Java Web Start). Since -upstream NetX is dormant, we will be hosting and modifying the sources -in the IcedTea repository, particularly in the netx/net/sourceforge/jnlp -directory. - -The NetX sources are built into rt.jar using the same method as -CORBA, JAXWS, JAXP and langtools. - -IcedTea's NetX currently supports verification of signed jars, trusted -certificate storing, system certificate store checking, and provides -the services specified by the jnlp API. - The Zero Assembler and Shark Ports ================================== diff -r e53fc64228c1 -r 0bf704349e89 configure.ac --- a/configure.ac Sun May 01 18:12:29 2011 +0100 +++ b/configure.ac Tue May 03 14:44:49 2011 +0100 @@ -59,14 +59,6 @@ AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], []) AC_SUBST(XVFB_RUN_CMD) -AC_MSG_CHECKING([whether to build the browser plugin]) -AC_ARG_ENABLE([plugin], - [AS_HELP_STRING([--disable-plugin], - [Disable compilation of browser plugin])], - [enable_plugin="${enableval}"], [enable_plugin="yes"]) -AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes") -AC_MSG_RESULT(${enable_plugin}) - AC_MSG_CHECKING([whether to include PulseAudio support]) AC_ARG_ENABLE([pulse-java], [AS_HELP_STRING([--enable-pulse-java], From omajid at redhat.com Tue May 3 07:34:19 2011 From: omajid at redhat.com (Omair Majid) Date: Tue, 03 May 2011 10:34:19 -0400 Subject: Patch which fixes bug #6703377 (font outline transformation) In-Reply-To: <4DBFC69F.2090607@redhat.com> References: <4CB86E2C.7000102@redhat.com> <4DBF2599.6040906@redhat.com> <4DBFC69F.2090607@redhat.com> Message-ID: <4DC0126B.7030606@redhat.com> On 05/03/2011 05:10 AM, Pavel Tisnovsky wrote: > Omair Majid wrote: >> On 10/15/2010 11:07 AM, Pavel Tisnovsky wrote: >>> Hi all, >>> >>> I prepared yet another patch for IcedTea6 HEAD. This patch refine >>> computation of x and y coordinates during font outline transformation >>> when negative values are used >>> (see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6703377) >>> >>> Attached files: >>> >>> 6703377-freetypescaler.patch - the patch itself >>> hg_export_icedtea6.diff - changes I would like to make in IcedTea >>> >>> Correct behaviour of outline transformation is (partially) checked by >>> regression test: >>> java/awt/font/Rotate/TranslatedOutlineTest.java >>> >>> Can anyone please review this patch? >> >> Upstream has resolved this bug using another method: >> http://hg.openjdk.java.net/jdk7/2d/jdk/rev/7fba83f5f5e0 >> >> Is your patch fixing the exact same problem? Do you think it might be >> worth it to switch to upstream's fix? >> >> Thanks, >> Omair > > Hi Omair, > > AFAIK the upstream patch you mentioned is already included in IcedTea6, > but it is itself does not sufficient to resolve this bug when negative > coordinates are used. > Ok. I was mislead because the icedtea patch was (re)using the same bug number. I have updated the jdk 6 patch web page [1] to reflect this. Any chance you could push this upstream? If this is a problem in IcedTea6, it will likely affect IcedTea7 (and IcedTea8 soon). Thanks, Omair http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches From ptisnovs at redhat.com Tue May 3 07:38:27 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 03 May 2011 16:38:27 +0200 Subject: Patch which fixes bug #6703377 (font outline transformation) In-Reply-To: <4DC0126B.7030606@redhat.com> References: <4CB86E2C.7000102@redhat.com> <4DBF2599.6040906@redhat.com> <4DBFC69F.2090607@redhat.com> <4DC0126B.7030606@redhat.com> Message-ID: <4DC01363.8010504@redhat.com> Omair Majid wrote: > On 05/03/2011 05:10 AM, Pavel Tisnovsky wrote: >> Omair Majid wrote: >>> On 10/15/2010 11:07 AM, Pavel Tisnovsky wrote: >>>> Hi all, >>>> >>>> I prepared yet another patch for IcedTea6 HEAD. This patch refine >>>> computation of x and y coordinates during font outline transformation >>>> when negative values are used >>>> (see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6703377) >>>> >>>> Attached files: >>>> >>>> 6703377-freetypescaler.patch - the patch itself >>>> hg_export_icedtea6.diff - changes I would like to make in IcedTea >>>> >>>> Correct behaviour of outline transformation is (partially) checked by >>>> regression test: >>>> java/awt/font/Rotate/TranslatedOutlineTest.java >>>> >>>> Can anyone please review this patch? >>> >>> Upstream has resolved this bug using another method: >>> http://hg.openjdk.java.net/jdk7/2d/jdk/rev/7fba83f5f5e0 >>> >>> Is your patch fixing the exact same problem? Do you think it might be >>> worth it to switch to upstream's fix? >>> >>> Thanks, >>> Omair >> >> Hi Omair, >> >> AFAIK the upstream patch you mentioned is already included in IcedTea6, >> but it is itself does not sufficient to resolve this bug when negative >> coordinates are used. >> > > Ok. I was mislead because the icedtea patch was (re)using the same bug > number. I have updated the jdk 6 patch web page [1] to reflect this. Any > chance you could push this upstream? If this is a problem in IcedTea6, > it will likely affect IcedTea7 (and IcedTea8 soon). Yeah, I'm going to look at it. Cheers, Pavel > > Thanks, > Omair > > http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches From doko at ubuntu.com Tue May 3 07:50:08 2011 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 03 May 2011 16:50:08 +0200 Subject: code without sources distributed in 7b130 Message-ID: <4DC01620.1040500@ubuntu.com> [resending, had the jdk email address wrong] The following code distributed in 7b130 doesn't have any source code, or at least nobody can find it. in langtools: test/tools/javac/T5090006/broken.jar could the source code be added to the test case? in jdk: test/sun/security/pkcs11/nss/lib/ various precompiled shared libraries. Is it necessary to distribute these with the jdk sources? Checked that these files are available on Debian and Ubuntu distributions libsoftokn3.so: in /usr/lib, package libnss3-1d/libnss3 libnss3.so: same libnssckbi.so: in /usr/lib/nss libnspr4.so: in /usr/lib, package libnspr4-0d/libnspr4 libplds4.so: same libplc4.so: same thanks, Matthias From bugzilla-daemon at icedtea.classpath.org Tue May 3 12:50:45 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 03 May 2011 19:50:45 +0000 Subject: [Bug 704] Bootstrap of ZeroVM: zip I/O error: No such file or directory In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=704 --- Comment #2 from Damien Raude-Morvan 2011-05-03 19:50:45 --- (In reply to comment #1) > Does this happen if you build Zero normally with --enable-zero? No, build went fine when removing --with-additional-vms option and using --enable-zero. -- Damien Raude-Morvan -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Tue May 3 14:34:13 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 3 May 2011 22:34:13 +0100 Subject: code without sources distributed in 7b130 In-Reply-To: <4DC01620.1040500@ubuntu.com> References: <4DC01620.1040500@ubuntu.com> Message-ID: <20110503213413.GB26415@rivendell.middle-earth.co.uk> On 16:50 Tue 03 May , Matthias Klose wrote: > [resending, had the jdk email address wrong] > > The following code distributed in 7b130 doesn't have any source code, or at > least nobody can find it. > > in langtools: > > test/tools/javac/T5090006/broken.jar > > could the source code be added to the test case? > > in jdk: > test/sun/security/pkcs11/nss/lib/ various precompiled shared libraries. Is it > necessary to distribute these with the jdk sources? Checked that these files are > available on Debian and Ubuntu distributions > > libsoftokn3.so: in /usr/lib, package libnss3-1d/libnss3 > libnss3.so: same > libnssckbi.so: in /usr/lib/nss > > libnspr4.so: in /usr/lib, package libnspr4-0d/libnspr4 > libplds4.so: same > libplc4.so: same > > thanks, Matthias I agree these binaries shouldn't be in the repositories. Seems things are slipping again. Thanks for spotting. Either hg is lying or these have been there since the start. $ hg log -R jdk jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so Worst case, we can hg rm these from the IcedTea forest. I've now made this accessible to all IcedTea committers on http://icedtea.classpath.org/hg/icedtea7-forest Could someone also explain 6581254: pkcs11 provider fails to parse configuration file contains windows short path which introduces a file with hardcoded Windows paths test/sun/security/pkcs11/Provider/csp.cfg ? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at icedtea.classpath.org Tue May 3 14:58:44 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 03 May 2011 21:58:44 +0000 Subject: /hg/icedtea6: Backport S7018387: Xrender pipeline may leak GC's Message-ID: changeset e12e69d3e09c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e12e69d3e09c author: Omair Majid date: Tue May 03 17:58:19 2011 -0400 Backport S7018387: Xrender pipeline may leak GC's Replace patches/xrender-gc-cleanup.patch with identical but upstreamed fix patches/openjdk/7018387-xrender_gc_leak.patch diffstat: ChangeLog | 9 +++++++++ Makefile.am | 2 +- NEWS | 1 + patches/openjdk/7018387-xrender_gc_leak.patch | 20 ++++++++++++++++++++ patches/xrender-gc-cleanup.patch | 11 ----------- 5 files changed, 31 insertions(+), 12 deletions(-) diffs (80 lines): diff -r b6472fccd0ec -r e12e69d3e09c ChangeLog --- a/ChangeLog Tue May 03 13:05:05 2011 +0100 +++ b/ChangeLog Tue May 03 17:58:19 2011 -0400 @@ -1,3 +1,12 @@ +2011-05-03 Omair Majid + + Replace xrender patch with (identical) upstream fix. + * NEWS: Document backport of S7018387. + * Makefile.am (ICEDTEA_PATCHES): Replace patches/xrender-gc-cleanup.patch + with patches/openjdk/7018387-xrender_gc_leak.patch. + * patches/openjdk/7018387-xrender_gc_leak.patch: New file. + * patches/xrender-gc-cleanup.patch: Remove. + 2011-05-03 Andrew Haley * Makefile.am: Don't fail if sed command to clean jvm.cfg fails. diff -r b6472fccd0ec -r e12e69d3e09c Makefile.am --- a/Makefile.am Tue May 03 13:05:05 2011 +0100 +++ b/Makefile.am Tue May 03 17:58:19 2011 -0400 @@ -384,7 +384,7 @@ if ENABLE_XRENDER ICEDTEA_PATCHES += patches/openjdk/6307603-xrender-01.patch \ patches/openjdk/6961633-xrender-02.patch \ - patches/xrender-gc-cleanup.patch + patches/openjdk/7018387-xrender_gc_leak.patch endif if ENABLE_NIO2 diff -r b6472fccd0ec -r e12e69d3e09c NEWS --- a/NEWS Tue May 03 13:05:05 2011 +0100 +++ b/NEWS Tue May 03 17:58:19 2011 -0400 @@ -22,6 +22,7 @@ - S6708580: Java applications slow when EXA enabled - S7029905: demo applets missing some html files - S6986968: Crash on XIM server restart + - S7018387: Xrender pipeline may leak GC's * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - G356743: Support libpng 1.5. diff -r b6472fccd0ec -r e12e69d3e09c patches/openjdk/7018387-xrender_gc_leak.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7018387-xrender_gc_leak.patch Tue May 03 17:58:19 2011 -0400 @@ -0,0 +1,21 @@ +# HG changeset patch +# User ceisserer +# Date 1297290844 28800 +# Node ID 37d20456c54c11402b4c62c6f4d7a50b563c1308 +# Parent d42ce0b309ae19742cd509dfbadba37d868b592f +7018387: Xrender pipeline may leak GC's +Reviewed-by: prr + +diff -r d42ce0b309ae -r 37d20456c54c src/solaris/classes/sun/java2d/xr/XRSurfaceData.java +--- openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java Wed Feb 09 22:24:42 2011 +0300 ++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java Wed Feb 09 14:34:04 2011 -0800 +@@ -479,8 +479,7 @@ + if (xrpipe == null) { + try { + SunToolkit.awtLock(); +- xgc = renderQueue.createGC(xid); // TODO: GC leak? where to +- // clean up? ++ xgc = XCreateGC(getNativeOps()); + + xrpipe = new XRRenderer(maskBuffer.getMaskBuffer()); + xrtxpipe = new PixelToShapeConverter(xrpipe); diff -r b6472fccd0ec -r e12e69d3e09c patches/xrender-gc-cleanup.patch --- a/patches/xrender-gc-cleanup.patch Tue May 03 13:05:05 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ ---- openjdk.orig/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 2010-10-22 19:59:12.530975783 +0200 -+++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java 2010-10-22 19:59:12.020734687 +0200 -@@ -479,8 +485,7 @@ - if (xrpipe == null) { - try { - SunToolkit.awtLock(); -- xgc = renderQueue.createGC(xid); // TODO: GC leak? where to -- // clean up? -+ xgc = XCreateGC(getNativeOps()); - - xrpipe = new XRRenderer(maskBuffer.getMaskBuffer()); - xrtxpipe = new PixelToShapeConverter(xrpipe); From omajid at redhat.com Tue May 3 15:01:18 2011 From: omajid at redhat.com (Omair Majid) Date: Tue, 03 May 2011 18:01:18 -0400 Subject: FYI: Replace an xrender patch with upstream's fix Message-ID: <4DC07B2E.5020409@redhat.com> Hi, I have just pushed a patch to icedtea6 that removes patches/xrender-gc-cleanup.patch and uses the backport from upstream (the new file patches/openjdk/7018387-xrender_gc_leak.patch) instead. The contents of the two patch files are the same and there should be no change in icedtea6's behaviour. Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-replace-xrender-patch-with-upstream-01.patch Type: text/x-patch Size: 2802 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110503/caaaa70a/icedtea6-replace-xrender-patch-with-upstream-01.patch From andrew at icedtea.classpath.org Wed May 4 00:46:19 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 04 May 2011 07:46:19 +0000 Subject: /hg/icedtea: 2 new changesets Message-ID: changeset 1d110524d034 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1d110524d034 author: Andrew John Hughes date: Tue May 03 22:38:46 2011 +0100 Remove 'icedtea-' prefix from patches. 2011-05-03 Andrew John Hughes * patches/boot/icedtea-jaxp-dependency.patch, * patches/boot/icedtea-jopt.patch, * patches/boot/icedtea-pr39408.patch, * patches/boot/icedtea-pr40188.patch, * patches/boot/icedtea-pr40616.patch, * patches/debian/icedtea-uname.patch, * patches/hotspot/default/icedtea-gcc-suffix.patch, * patches/hotspot/default/icedtea-headers.patch, * patches/hotspot/default/icedtea-memory-limits.patch, * patches/hotspot/default/icedtea-params-cast-size_t.patch, * patches/hotspot/default/icedtea-parisc-opt.patch, * patches/hotspot/default/icedtea-sparc-ptracefix.patch, * patches/hotspot/default/icedtea-sparc-trapsfix.patch, * patches/hotspot/default/icedtea-text-relocations.patch, * patches/hotspot/default/icedtea-use-idx_t.patch, * patches/icedtea-6592792.patch, * patches/icedtea-6733959.patch, * patches/icedtea-6755943.patch, * patches/icedtea-alpha-fixes.patch, * patches/icedtea-alt-jar.patch, * patches/icedtea-clean-crypto.patch, * patches/icedtea-demos.patch, * patches/icedtea-disable-intree-ec.patch, * patches/icedtea-gcc-suffix.patch, * patches/icedtea-headers.patch, * patches/icedtea-hotspot-gcc-pr36917.patch, * patches/icedtea-javafiles.patch, * patches/icedtea-jpegclasses.patch, * patches/icedtea-jvmtiEnv.patch, * patches/icedtea-lc_ctype.patch, * patches/icedtea-libraries.patch, * patches/icedtea-linker-libs-order.patch, * patches/icedtea-nss-config.patch, * patches/icedtea-nss-not-enabled-config.patch, * patches/icedtea-override-redirect-metacity.patch, * patches/icedtea-pr261.patch, * patches/icedtea-print-lsb-release.patch, * patches/icedtea-pulse-soundproperties.patch, * patches/icedtea-rhino.patch, * patches/icedtea-rmi_amd64.patch, * patches/icedtea-samejvm-safe.patch, * patches/icedtea-security-updates.patch, * patches/icedtea-signed-types.patch, * patches/icedtea-sources.patch, * patches/icedtea-sparc-trapsfix.patch, * patches/icedtea-sunsrc.patch, * patches/icedtea-systemtap.patch, * patches/icedtea-testenv.patch, * patches/icedtea-tests-jdk.patch, * patches/icedtea-text-relocations.patch, * patches/icedtea-update-bootclasspath.patch, * patches/security/icedtea-6592792.patch, * patches/security/icedtea-6733959.patch, * patches/security/icedtea-6755943.patch: Remove 'icedtea-' prefix. * Makefile.am: (ICEDTEA_PATCHES): Remove 'icedtea-' prefix. * patches/6592792.patch, * patches/6733959.patch, * patches/6755943.patch, * patches/alpha-fixes.patch, * patches/alt-jar.patch, * patches/boot/jaxp-dependency.patch, * patches/boot/jopt.patch, * patches/boot/pr39408.patch, * patches/boot/pr40188.patch, * patches/boot/pr40616.patch, * patches/clean-crypto.patch, * patches/debian/uname.patch, * patches/demos.patch, * patches/disable-intree-ec.patch, * patches/gcc-suffix.patch, * patches/headers.patch, * patches/hotspot-gcc-pr36917.patch, * patches/hotspot/default/gcc-suffix.patch, * patches/hotspot/default/headers.patch, * patches/hotspot/default/memory-limits.patch, * patches/hotspot/default/params-cast-size_t.patch, * patches/hotspot/default/parisc-opt.patch, * patches/hotspot/default/sparc-ptracefix.patch, * patches/hotspot/default/sparc-trapsfix.patch, * patches/hotspot/default/text-relocations.patch, * patches/hotspot/default/use-idx_t.patch, * patches/javafiles.patch, * patches/jpegclasses.patch, * patches/jvmtiEnv.patch, * patches/lc_ctype.patch, * patches/libraries.patch, * patches/linker-libs-order.patch, * patches/nss-config.patch, * patches/nss-not-enabled-config.patch, * patches/override-redirect-metacity.patch, * patches/pr261.patch, * patches/print-lsb-release.patch, * patches/pulse-soundproperties.patch, * patches/rhino.patch, * patches/rmi_amd64.patch, * patches/samejvm-safe.patch, * patches/security-updates.patch, * patches/security/6592792.patch, * patches/security/6733959.patch, * patches/security/6755943.patch, * patches/signed-types.patch, * patches/sources.patch, * patches/sparc-trapsfix.patch, * patches/sunsrc.patch, * patches/systemtap.patch, * patches/testenv.patch, * patches/tests-jdk.patch, * patches/text-relocations.patch, * patches/update-bootclasspath.patch: Relocated versions of above. changeset 8fa7f2649c4c in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8fa7f2649c4c author: Andrew John Hughes date: Wed May 04 08:46:05 2011 +0100 Remove unneeded hotspot/default placement of some patches. 2011-05-03 Andrew John Hughes * patches/hotspot/default/gcc-suffix.patch, * patches/hotspot/default/headers.patch, * patches/hotspot/default/memory-limits.patch, * patches/hotspot/default/params-cast-size_t.patch, * patches/hotspot/default/parisc-opt.patch, * patches/hotspot/default/sparc-ptracefix.patch, * patches/hotspot/default/sparc-trapsfix.patch, * patches/hotspot/default/text-relocations.patch, * patches/hotspot/default/use-idx_t.patch: Remove unneeded hotspot/default positioning. * Makefile.am: Remove $(HSBUILD) prefixing on patches. * patches/gcc-suffix.patch, * patches/headers.patch, * patches/memory-limits.patch, * patches/params-cast-size_t.patch, * patches/parisc-opt.patch, * patches/sparc-ptracefix.patch, * patches/sparc-trapsfix.patch, * patches/text-relocations.patch, * patches/use-idx_t.patch: Moved from hotspot/default or merged with existing patches. diffstat: ChangeLog | 141 + Makefile.am | 97 +- patches/6592792.patch | 290 +++ patches/6733959.patch | 222 ++ patches/6755943.patch | 372 ++++ patches/alpha-fixes.patch | 31 + patches/alt-jar.patch | 14 + patches/boot/icedtea-jaxp-dependency.patch | 23 - patches/boot/icedtea-jopt.patch | 24 - patches/boot/icedtea-pr39408.patch | 17 - patches/boot/icedtea-pr40188.patch | 14 - patches/boot/icedtea-pr40616.patch | 50 - patches/boot/jaxp-dependency.patch | 23 + patches/boot/jopt.patch | 24 + patches/boot/pr39408.patch | 17 + patches/boot/pr40188.patch | 14 + patches/boot/pr40616.patch | 50 + patches/clean-crypto.patch | 1072 +++++++++++ patches/debian/icedtea-uname.patch | 24 - patches/debian/uname.patch | 24 + patches/demos.patch | 309 +++ patches/disable-intree-ec.patch | 22 + patches/gcc-suffix.patch | 58 + patches/headers.patch | 49 + patches/hotspot-gcc-pr36917.patch | 8 + patches/hotspot/default/icedtea-gcc-suffix.patch | 33 - patches/hotspot/default/icedtea-headers.patch | 12 - patches/hotspot/default/icedtea-memory-limits.patch | 22 - patches/hotspot/default/icedtea-params-cast-size_t.patch | 97 - patches/hotspot/default/icedtea-parisc-opt.patch | 26 - patches/hotspot/default/icedtea-sparc-ptracefix.patch | 33 - patches/hotspot/default/icedtea-sparc-trapsfix.patch | 20 - patches/hotspot/default/icedtea-text-relocations.patch | 60 - patches/hotspot/default/icedtea-use-idx_t.patch | 43 - patches/icedtea-6592792.patch | 290 --- patches/icedtea-6733959.patch | 222 -- patches/icedtea-6755943.patch | 372 ---- patches/icedtea-alpha-fixes.patch | 31 - patches/icedtea-alt-jar.patch | 14 - patches/icedtea-clean-crypto.patch | 1072 ----------- patches/icedtea-demos.patch | 309 --- patches/icedtea-disable-intree-ec.patch | 22 - patches/icedtea-gcc-suffix.patch | 25 - patches/icedtea-headers.patch | 37 - patches/icedtea-hotspot-gcc-pr36917.patch | 8 - patches/icedtea-javafiles.patch | 157 - patches/icedtea-jpegclasses.patch | 639 ------- patches/icedtea-jvmtiEnv.patch | 11 - patches/icedtea-lc_ctype.patch | 30 - patches/icedtea-libraries.patch | 1257 -------------- patches/icedtea-linker-libs-order.patch | 52 - patches/icedtea-nss-config.patch | 9 - patches/icedtea-nss-not-enabled-config.patch | 12 - patches/icedtea-override-redirect-metacity.patch | 10 - patches/icedtea-pr261.patch | 38 - patches/icedtea-print-lsb-release.patch | 48 - patches/icedtea-pulse-soundproperties.patch | 15 - patches/icedtea-rhino.patch | 136 - patches/icedtea-rmi_amd64.patch | 14 - patches/icedtea-samejvm-safe.patch | 11 - patches/icedtea-security-updates.patch | 100 - patches/icedtea-signed-types.patch | 33 - patches/icedtea-sources.patch | 16 - patches/icedtea-sparc-trapsfix.patch | 11 - patches/icedtea-sunsrc.patch | 58 - patches/icedtea-systemtap.patch | 158 - patches/icedtea-testenv.patch | 45 - patches/icedtea-tests-jdk.patch | 13 - patches/icedtea-text-relocations.patch | 14 - patches/icedtea-update-bootclasspath.patch | 12 - patches/javafiles.patch | 157 + patches/jpegclasses.patch | 639 +++++++ patches/jvmtiEnv.patch | 11 + patches/lc_ctype.patch | 30 + patches/libraries.patch | 1257 ++++++++++++++ patches/linker-libs-order.patch | 52 + patches/memory-limits.patch | 22 + patches/nss-config.patch | 9 + patches/nss-not-enabled-config.patch | 12 + patches/override-redirect-metacity.patch | 10 + patches/params-cast-size_t.patch | 97 + patches/parisc-opt.patch | 26 + patches/pr261.patch | 38 + patches/print-lsb-release.patch | 48 + patches/pulse-soundproperties.patch | 15 + patches/rhino.patch | 136 + patches/rmi_amd64.patch | 14 + patches/samejvm-safe.patch | 11 + patches/security-updates.patch | 100 + patches/security/6592792.patch | 68 + patches/security/6733959.patch | 18 + patches/security/6755943.patch | 372 ++++ patches/security/icedtea-6592792.patch | 68 - patches/security/icedtea-6733959.patch | 18 - patches/security/icedtea-6755943.patch | 372 ---- patches/signed-types.patch | 33 + patches/sources.patch | 16 + patches/sparc-ptracefix.patch | 33 + patches/sparc-trapsfix.patch | 19 + patches/sunsrc.patch | 58 + patches/systemtap.patch | 158 + patches/testenv.patch | 45 + patches/tests-jdk.patch | 13 + patches/text-relocations.patch | 60 + patches/update-bootclasspath.patch | 12 + patches/use-idx_t.patch | 43 + 106 files changed, 6419 insertions(+), 6307 deletions(-) diffs (truncated from 13492 to 500 lines): diff -r 0bf704349e89 -r 8fa7f2649c4c ChangeLog --- a/ChangeLog Tue May 03 14:44:49 2011 +0100 +++ b/ChangeLog Wed May 04 08:46:05 2011 +0100 @@ -1,3 +1,144 @@ +2011-05-03 Andrew John Hughes + + * patches/hotspot/default/gcc-suffix.patch, + * patches/hotspot/default/headers.patch, + * patches/hotspot/default/memory-limits.patch, + * patches/hotspot/default/params-cast-size_t.patch, + * patches/hotspot/default/parisc-opt.patch, + * patches/hotspot/default/sparc-ptracefix.patch, + * patches/hotspot/default/sparc-trapsfix.patch, + * patches/hotspot/default/text-relocations.patch, + * patches/hotspot/default/use-idx_t.patch: + Remove unneeded hotspot/default positioning. + * Makefile.am: Remove $(HSBUILD) prefixing on + patches. + * patches/gcc-suffix.patch, + * patches/headers.patch, + * patches/memory-limits.patch, + * patches/params-cast-size_t.patch, + * patches/parisc-opt.patch, + * patches/sparc-ptracefix.patch, + * patches/sparc-trapsfix.patch, + * patches/text-relocations.patch, + * patches/use-idx_t.patch: + Moved from hotspot/default or merged with existing + patches. + +2011-05-03 Andrew John Hughes + + * patches/boot/icedtea-jaxp-dependency.patch, + * patches/boot/icedtea-jopt.patch, + * patches/boot/icedtea-pr39408.patch, + * patches/boot/icedtea-pr40188.patch, + * patches/boot/icedtea-pr40616.patch, + * patches/debian/icedtea-uname.patch, + * patches/hotspot/default/icedtea-gcc-suffix.patch, + * patches/hotspot/default/icedtea-headers.patch, + * patches/hotspot/default/icedtea-memory-limits.patch, + * patches/hotspot/default/icedtea-params-cast-size_t.patch, + * patches/hotspot/default/icedtea-parisc-opt.patch, + * patches/hotspot/default/icedtea-sparc-ptracefix.patch, + * patches/hotspot/default/icedtea-sparc-trapsfix.patch, + * patches/hotspot/default/icedtea-text-relocations.patch, + * patches/hotspot/default/icedtea-use-idx_t.patch, + * patches/icedtea-6592792.patch, + * patches/icedtea-6733959.patch, + * patches/icedtea-6755943.patch, + * patches/icedtea-alpha-fixes.patch, + * patches/icedtea-alt-jar.patch, + * patches/icedtea-clean-crypto.patch, + * patches/icedtea-demos.patch, + * patches/icedtea-disable-intree-ec.patch, + * patches/icedtea-gcc-suffix.patch, + * patches/icedtea-headers.patch, + * patches/icedtea-hotspot-gcc-pr36917.patch, + * patches/icedtea-javafiles.patch, + * patches/icedtea-jpegclasses.patch, + * patches/icedtea-jvmtiEnv.patch, + * patches/icedtea-lc_ctype.patch, + * patches/icedtea-libraries.patch, + * patches/icedtea-linker-libs-order.patch, + * patches/icedtea-nss-config.patch, + * patches/icedtea-nss-not-enabled-config.patch, + * patches/icedtea-override-redirect-metacity.patch, + * patches/icedtea-pr261.patch, + * patches/icedtea-print-lsb-release.patch, + * patches/icedtea-pulse-soundproperties.patch, + * patches/icedtea-rhino.patch, + * patches/icedtea-rmi_amd64.patch, + * patches/icedtea-samejvm-safe.patch, + * patches/icedtea-security-updates.patch, + * patches/icedtea-signed-types.patch, + * patches/icedtea-sources.patch, + * patches/icedtea-sparc-trapsfix.patch, + * patches/icedtea-sunsrc.patch, + * patches/icedtea-systemtap.patch, + * patches/icedtea-testenv.patch, + * patches/icedtea-tests-jdk.patch, + * patches/icedtea-text-relocations.patch, + * patches/icedtea-update-bootclasspath.patch, + * patches/security/icedtea-6592792.patch, + * patches/security/icedtea-6733959.patch, + * patches/security/icedtea-6755943.patch: + Remove 'icedtea-' prefix. + * Makefile.am: + (ICEDTEA_PATCHES): Remove 'icedtea-' prefix. + * patches/6592792.patch, + * patches/6733959.patch, + * patches/6755943.patch, + * patches/alpha-fixes.patch, + * patches/alt-jar.patch, + * patches/boot/jaxp-dependency.patch, + * patches/boot/jopt.patch, + * patches/boot/pr39408.patch, + * patches/boot/pr40188.patch, + * patches/boot/pr40616.patch, + * patches/clean-crypto.patch, + * patches/debian/uname.patch, + * patches/demos.patch, + * patches/disable-intree-ec.patch, + * patches/gcc-suffix.patch, + * patches/headers.patch, + * patches/hotspot-gcc-pr36917.patch, + * patches/hotspot/default/gcc-suffix.patch, + * patches/hotspot/default/headers.patch, + * patches/hotspot/default/memory-limits.patch, + * patches/hotspot/default/params-cast-size_t.patch, + * patches/hotspot/default/parisc-opt.patch, + * patches/hotspot/default/sparc-ptracefix.patch, + * patches/hotspot/default/sparc-trapsfix.patch, + * patches/hotspot/default/text-relocations.patch, + * patches/hotspot/default/use-idx_t.patch, + * patches/javafiles.patch, + * patches/jpegclasses.patch, + * patches/jvmtiEnv.patch, + * patches/lc_ctype.patch, + * patches/libraries.patch, + * patches/linker-libs-order.patch, + * patches/nss-config.patch, + * patches/nss-not-enabled-config.patch, + * patches/override-redirect-metacity.patch, + * patches/pr261.patch, + * patches/print-lsb-release.patch, + * patches/pulse-soundproperties.patch, + * patches/rhino.patch, + * patches/rmi_amd64.patch, + * patches/samejvm-safe.patch, + * patches/security-updates.patch, + * patches/security/6592792.patch, + * patches/security/6733959.patch, + * patches/security/6755943.patch, + * patches/signed-types.patch, + * patches/sources.patch, + * patches/sparc-trapsfix.patch, + * patches/sunsrc.patch, + * patches/systemtap.patch, + * patches/testenv.patch, + * patches/tests-jdk.patch, + * patches/text-relocations.patch, + * patches/update-bootclasspath.patch: + Relocated versions of above. + 2011-05-03 Andrew John Hughes * Makefile.am: diff -r 0bf704349e89 -r 8fa7f2649c4c Makefile.am --- a/Makefile.am Tue May 03 14:44:49 2011 +0100 +++ b/Makefile.am Wed May 04 08:46:05 2011 +0100 @@ -234,55 +234,52 @@ # Patch list ICEDTEA_PATCHES = \ - patches/hotspot/$(HSBUILD)/icedtea-text-relocations.patch \ - patches/icedtea-rmi_amd64.patch \ - patches/icedtea-demos.patch \ - patches/icedtea-headers.patch \ - patches/hotspot/$(HSBUILD)/icedtea-headers.patch \ - patches/icedtea-gcc-suffix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-gcc-suffix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-memory-limits.patch \ - patches/icedtea-sunsrc.patch \ - patches/icedtea-libraries.patch \ - patches/icedtea-print-lsb-release.patch \ - patches/icedtea-jpegclasses.patch \ - patches/debian/icedtea-uname.patch \ - patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \ - patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \ - patches/icedtea-override-redirect-metacity.patch \ - patches/icedtea-security-updates.patch \ - patches/icedtea-hotspot-gcc-pr36917.patch \ - patches/icedtea-alpha-fixes.patch \ - patches/icedtea-alt-jar.patch \ - patches/hotspot/$(HSBUILD)/icedtea-use-idx_t.patch \ - patches/hotspot/$(HSBUILD)/icedtea-params-cast-size_t.patch \ - patches/icedtea-clean-crypto.patch \ - $(GCC_PATCH) \ + patches/text-relocations.patch \ + patches/rmi_amd64.patch \ + patches/demos.patch \ + patches/headers.patch \ + patches/gcc-suffix.patch \ + patches/memory-limits.patch \ + patches/sunsrc.patch \ + patches/libraries.patch \ + patches/print-lsb-release.patch \ + patches/jpegclasses.patch \ + patches/debian/uname.patch \ + patches/sparc-ptracefix.patch \ + patches/sparc-trapsfix.patch \ + patches/override-redirect-metacity.patch \ + patches/security-updates.patch \ + patches/hotspot-gcc-pr36917.patch \ + patches/alpha-fixes.patch \ + patches/alt-jar.patch \ + patches/use-idx_t.patch \ + patches/params-cast-size_t.patch \ + patches/clean-crypto.patch \ patches/cacao/arch.patch \ - patches/icedtea-signed-types.patch \ - patches/icedtea-lc_ctype.patch \ - patches/icedtea-tests-jdk.patch \ - patches/icedtea-linker-libs-order.patch \ - patches/icedtea-testenv.patch \ - patches/icedtea-samejvm-safe.patch \ - patches/icedtea-pr261.patch \ - patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \ - patches/security/icedtea-6592792.patch \ - patches/security/icedtea-6733959.patch \ - patches/security/icedtea-6755943.patch \ - patches/icedtea-jvmtiEnv.patch \ - patches/icedtea-disable-intree-ec.patch \ - patches/icedtea-sources.patch \ + patches/signed-types.patch \ + patches/lc_ctype.patch \ + patches/tests-jdk.patch \ + patches/linker-libs-order.patch \ + patches/testenv.patch \ + patches/samejvm-safe.patch \ + patches/pr261.patch \ + patches/parisc-opt.patch \ + patches/security/6592792.patch \ + patches/security/6733959.patch \ + patches/security/6755943.patch \ + patches/jvmtiEnv.patch \ + patches/disable-intree-ec.patch \ + patches/sources.patch \ patches/parisc.patch \ patches/sh4-support.patch \ patches/jtreg-httpTest.patch \ - patches/icedtea-update-bootclasspath.patch + patches/update-bootclasspath.patch # Conditional patches if WITH_RHINO ICEDTEA_PATCHES += \ - patches/icedtea-rhino.patch + patches/rhino.patch endif if BUILD_CACAO @@ -302,24 +299,24 @@ if ENABLE_PULSE_JAVA ICEDTEA_PATCHES += \ - patches/icedtea-pulse-soundproperties.patch + patches/pulse-soundproperties.patch endif if !USE_CVMI ICEDTEA_PATCHES += \ - patches/icedtea-javafiles.patch + patches/javafiles.patch endif if ENABLE_SYSTEMTAP -ICEDTEA_PATCHES += patches/icedtea-systemtap.patch \ +ICEDTEA_PATCHES += patches/systemtap.patch \ patches/systemtap-gcc-4.5.patch \ patches/systemtap-alloc-size-workaround.patch endif if ENABLE_NSS -ICEDTEA_PATCHES += patches/icedtea-nss-config.patch +ICEDTEA_PATCHES += patches/nss-config.patch else -ICEDTEA_PATCHES += patches/icedtea-nss-not-enabled-config.patch +ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch endif ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) @@ -344,8 +341,8 @@ patches/boot/tobin.patch \ patches/boot/test_gamma.patch \ patches/boot/tools.jar.patch \ - patches/boot/icedtea-jopt.patch \ - patches/boot/icedtea-jaxp-dependency.patch \ + patches/boot/jopt.patch \ + patches/boot/jaxp-dependency.patch \ patches/boot/genstubs-nofork.patch \ patches/boot/getannotation-cast.patch \ patches/boot/break-processbuilder-dependency.patch \ @@ -362,15 +359,15 @@ patches/boot/ecj-autoboxing.patch if CP39408_JAVAH -ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr39408.patch +ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch endif if CP40188_JAVAH -ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr40188.patch +ICEDTEA_BOOT_PATCHES += patches/boot/pr40188.patch endif if CP40616 -ICEDTEA_BOOT_PATCHES += patches/boot/icedtea-pr40616.patch +ICEDTEA_BOOT_PATCHES += patches/boot/pr40616.patch endif # Patches for when java.util.Scanner is missing diff -r 0bf704349e89 -r 8fa7f2649c4c patches/6592792.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/6592792.patch Wed May 04 08:46:05 2011 +0100 @@ -0,0 +1,297 @@ +diff -Nru openjdk.orig/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java openjdk/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java +--- openjdk.orig/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java 2008-12-02 15:25:05.000000000 +0000 ++++ openjdk/jaxws/src/share/classes/javax/xml/bind/ContextFinder.java 2008-12-02 15:29:09.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. ++ * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -128,12 +128,7 @@ + throws JAXBException + { + try { +- Class spiClass; +- if (classLoader == null) { +- spiClass = Class.forName(className); +- } else { +- spiClass = classLoader.loadClass(className); +- } ++ Class spiClass = safeLoadClass(className,classLoader); + + /* + * javax.xml.bind.context.factory points to a class which has a +@@ -205,11 +200,7 @@ + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + Class spi; + try { +- logger.fine("Trying to load "+className); +- if (cl != null) +- spi = cl.loadClass(className); +- else +- spi = Class.forName(className); ++ spi = safeLoadClass(className,cl); + } catch (ClassNotFoundException e) { + throw new JAXBException(e); + } +@@ -483,4 +474,31 @@ + * For this reason, we have to hard-code the class name into the API. + */ + private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.internal.bind.v2.ContextFactory"; ++ ++ /** ++ * Loads the class, provided that the calling thread has an access to the class being loaded. ++ */ ++ private static Class safeLoadClass(String className, ClassLoader classLoader) throws ClassNotFoundException { ++ logger.fine("Trying to load "+className); ++ try { ++ // make sure that the current thread has an access to the package of the given name. ++ SecurityManager s = System.getSecurityManager(); ++ if (s != null) { ++ int i = className.lastIndexOf('.'); ++ if (i != -1) { ++ s.checkPackageAccess(className.substring(0,i)); ++ } ++ } ++ ++ if (classLoader == null) ++ return Class.forName(className); ++ else ++ return classLoader.loadClass(className); ++ } catch (SecurityException se) { ++ // anyone can access the platform default factory class without permission ++ if (PLATFORM_DEFAULT_FACTORY_CLASS.equals(className)) ++ return Class.forName(className); ++ throw se; ++ } ++ } + } +diff -Nru openjdk.orig/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java openjdk/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java +--- openjdk.orig/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java 2008-12-02 15:25:04.000000000 +0000 ++++ openjdk/jaxws/src/share/classes/javax/xml/ws/spi/FactoryFinder.java 2008-12-02 15:29:09.000000000 +0000 +@@ -1,5 +1,5 @@ + /* +- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved. ++ * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -47,12 +47,7 @@ + ClassLoader classLoader) + { + try { +- Class spiClass; +- if (classLoader == null) { +- spiClass = Class.forName(className); +- } else { +- spiClass = classLoader.loadClass(className); +- } ++ Class spiClass = safeLoadClass(className, classLoader); + return spiClass.newInstance(); + } catch (ClassNotFoundException x) { + throw new WebServiceException( +@@ -152,4 +147,33 @@ + + return newInstance(fallbackClassName, classLoader); + } ++ ++ ++ private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.internal.ws.spi.ProviderImpl"; ++ ++ /** ++ * Loads the class, provided that the calling thread has an access to the class being loaded. ++ */ ++ private static Class safeLoadClass(String className, ClassLoader classLoader) throws ClassNotFoundException { ++ try { ++ // make sure that the current thread has an access to the package of the given name. ++ SecurityManager s = System.getSecurityManager(); ++ if (s != null) { ++ int i = className.lastIndexOf('.'); ++ if (i != -1) { ++ s.checkPackageAccess(className.substring(0,i)); ++ } ++ } ++ ++ if (classLoader == null) ++ return Class.forName(className); ++ else ++ return classLoader.loadClass(className); ++ } catch (SecurityException se) { ++ // anyone can access the platform default factory class without permission ++ if (PLATFORM_DEFAULT_FACTORY_CLASS.equals(className)) ++ return Class.forName(className); ++ throw se; ++ } ++ } + } +diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security openjdk/jdk/src/share/lib/security/java.security +--- openjdk.orig/jdk/src/share/lib/security/java.security 2008-11-20 08:44:48.000000000 +0000 ++++ openjdk/jdk/src/share/lib/security/java.security 2008-12-02 15:29:09.000000000 +0000 +@@ -127,7 +127,7 @@ + # passed to checkPackageAccess unless the + # corresponding RuntimePermission ("accessClassInPackage."+package) has + # been granted. +-package.access=sun. ++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind. + + # + # List of comma-separated packages that start with or equal this string +diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-solaris openjdk/jdk/src/share/lib/security/java.security-solaris +--- openjdk.orig/jdk/src/share/lib/security/java.security-solaris 2008-11-20 08:44:48.000000000 +0000 ++++ openjdk/jdk/src/share/lib/security/java.security-solaris 2008-12-02 15:29:09.000000000 +0000 +@@ -128,7 +128,7 @@ + # passed to checkPackageAccess unless the + # corresponding RuntimePermission ("accessClassInPackage."+package) has + # been granted. +-package.access=sun. ++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind. + + # + # List of comma-separated packages that start with or equal this string +diff -Nru openjdk.orig/jdk/src/share/lib/security/java.security-windows openjdk/jdk/src/share/lib/security/java.security-windows +--- openjdk.orig/jdk/src/share/lib/security/java.security-windows 2008-11-20 08:44:48.000000000 +0000 ++++ openjdk/jdk/src/share/lib/security/java.security-windows 2008-12-02 15:29:09.000000000 +0000 +@@ -128,7 +128,7 @@ + # passed to checkPackageAccess unless the + # corresponding RuntimePermission ("accessClassInPackage."+package) has + # been granted. +-package.access=sun. ++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind. + + # + # List of comma-separated packages that start with or equal this string +diff -Nru openjdk.orig/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh openjdk/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh +--- openjdk.orig/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/test/com/sun/org/apache/xml/internal/ws/server/Test6592792.sh 2008-12-02 15:29:09.000000000 +0000 +@@ -0,0 +1,61 @@ ++#!/bin/sh ++ ++if [ "${TESTSRC}" = "" ] ++then TESTSRC=. ++fi ++ ++if [ "${TESTJAVA}" = "" ] ++then ++ PARENT=`dirname \`which java\`` ++ TESTJAVA=`dirname ${PARENT}` ++ echo "TESTJAVA not set, selecting " ${TESTJAVA} ++ echo "If this is incorrect, try setting the variable manually." ++fi ++ ++if [ "${TESTCLASSES}" = "" ] ++then ++ echo "TESTCLASSES not set. Test cannot execute. Failed." ++ exit 1 ++fi ++ ++BIT_FLAG="" ++ ++# set platform-dependent variables ++OS=`uname -s` ++case "$OS" in From xerxes at zafena.se Wed May 4 04:31:57 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Wed, 04 May 2011 13:31:57 +0200 Subject: RFC: patch Re: icedtea6 hg tag icedtea6-1.8-branchpoint points to the icedtea-1.6-branchpoint changeset. In-Reply-To: <4DBFBB77.6060303@zafena.se> References: <4DBFBB77.6060303@zafena.se> Message-ID: <4DC1392D.5050201@zafena.se> On 2011-05-03 10:23, Xerxes R?nby wrote: > xranby at hp:~/icedtea6$ cat .hgtags > 96e1bdfed80e258e0a82e19bde45c5c547c2552f icedtea-1.0 > b639d73581e34a5db114ed5addfd84b093d00254 icedtea-1.1 > 1ce086327b07f17892cc351719de6897819e32fa icedtea-1.2 > 8ea2619c21cfea2611b44879aab0f781ffd3fd50 icedtea-1.3 > cb78e0fccf14ed4a80b0ada2c98e4621479acbf5 icedtea-1.4 > 5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5 > bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6 > 38e6eb354632588f5ac8dbcd69229ebd031f57cb icedtea6-1.0 > a5c32475a2e87f0f3bd7af28e632e6bd4f724b04 icedtea6-1.1 > 871b70407a139c6bd42c200762ee1d302b31168f icedtea6-1.2 > 3ef9c9c4e70b8204b73fa9b88243f49f59c2a23f icedtea6-1.3 > be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e icedtea6-1.3.1 > 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre > 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 > a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 > 07de70c5883a637ea2ef4aba3f8472edd7e12f1e icedtea6-1.5rc2 > 926c38e2b2830971f6ca0dff2ce25f78a694b178 icedtea6-1.5rc3 > 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea-1.6-branchpoint !!!! > 8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea-1.7-branchpoint > 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.8-branchpoint !!!! > cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint > 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint Attached patch fix Ok to push? Cheers Xerxes -------------- next part -------------- A non-text attachment was scrubbed... Name: tags.patch Type: text/x-patch Size: 1536 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110504/d1d429d6/tags.patch From jvanek at redhat.com Wed May 4 04:29:22 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 04 May 2011 13:29:22 +0200 Subject: [icedtea-web] xml output for junit, transformation sheets for daily report In-Reply-To: <4DBC0E18.1060803@redhat.com> References: <4DBA8360.5020403@redhat.com> <4DBB2613.5070000@redhat.com> <4DBC0E18.1060803@redhat.com> Message-ID: <4DC13892.6090500@redhat.com> On 04/30/2011 03:26 PM, Jiri Vanek wrote: > On 04/29/2011 10:56 PM, Omair Majid wrote: >> On 04/29/2011 05:22 AM, Jiri Vanek wrote: >>> This patch add functionality to export xml report form junit testsuite, >>> provides some basic nice transformation for make xml fast readable and >>> navigation-able. Also add filtering of inner classes and jnlp from >>> tests-source package >>> >>> Pavel, is xml-content enough for you? >>> >> >> Looks like you forgot to attach the >> tests/junit-runner/XmlOutputListener.java file. The changes to >> CommandLine.java look fine to me, but I would like to see the rest of >> the patch ;) >> >> Is the xml schema based on an existing schema or is it completely new? >> > > No. it is minimalistic to our purposes. Should follow junit ant-xml > output? Or some else? > Refresh call for review:) As Omair suggested, i have added class which exports xml-output following junit-xml output. As I have not found official dtd or schmea, I was careful which elements/attributes to output as resources on the web were not united. Current resul is quit sufficient - the only thing I miss are by-class statistics and date. I would like to break "junit dtd" (as there is none) and add those elements from my previous xml output. This step will not break possible usage of tools working with ant-xml output. In this patch are both xml exporters so reviewer can judge weather to keep both, merge them all keep just one (probably junit-like). I think Pavel do not care which one will appears at the and:) Regards J -------------- next part -------------- A non-text attachment was scrubbed... Name: testsuite-xml-report.patch Type: text/x-patch Size: 26594 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110504/8935bd4c/testsuite-xml-report.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: outputExample.tar.gz Type: application/x-gzip Size: 6094 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110504/8935bd4c/outputExample.tar.gz From ahughes at redhat.com Wed May 4 06:19:28 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 4 May 2011 14:19:28 +0100 Subject: IcedTea7 buildbot [no more cacao] In-Reply-To: References: <201105030010.18234.drazzib@debian.org> <1304413694.32294.11.camel@springer.wildebeest.org> <20110503115727.GA26415@rivendell.middle-earth.co.uk> Message-ID: <20110504131928.GC26415@rivendell.middle-earth.co.uk> On 14:49 Tue 03 May , Stefan Ring wrote: > > The CACAO bugzilla is here: http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/index.cgi > > > > Nagging unrelated parties with e-mails won't get you anywhere :-) > > May be true, but I'm not sure what a bugzilla entry will do for us ;) > Prompt you to fix it? ;-) Or maybe utilise Bugzilla's new auto-bugfixing code? I wish... > Stefan -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From stefan at complang.tuwien.ac.at Wed May 4 06:21:40 2011 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Wed, 4 May 2011 15:21:40 +0200 Subject: IcedTea7 buildbot [no more cacao] In-Reply-To: <20110504131928.GC26415@rivendell.middle-earth.co.uk> References: <201105030010.18234.drazzib@debian.org> <1304413694.32294.11.camel@springer.wildebeest.org> <20110503115727.GA26415@rivendell.middle-earth.co.uk> <20110504131928.GC26415@rivendell.middle-earth.co.uk> Message-ID: > Or maybe utilise Bugzilla's new auto-bugfixing code? ?I wish... Ah, I should upgrade our Bugzilla then... :-) From bugzilla-daemon at icedtea.classpath.org Wed May 4 06:21:42 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 May 2011 13:21:42 +0000 Subject: [Bug 704] Bootstrap of ZeroVM: zip I/O error: No such file or directory In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=704 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Component|IcedTea7 |AddVM --- Comment #3 from Andrew John Hughes 2011-05-04 13:21:41 --- Ok, sounds like an addvm bug then. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Wed May 4 06:22:20 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 4 May 2011 14:22:20 +0100 Subject: RFC: patch Re: icedtea6 hg tag icedtea6-1.8-branchpoint points to the icedtea-1.6-branchpoint changeset. In-Reply-To: <4DC1392D.5050201@zafena.se> References: <4DBFBB77.6060303@zafena.se> <4DC1392D.5050201@zafena.se> Message-ID: <20110504132220.GD26415@rivendell.middle-earth.co.uk> On 13:31 Wed 04 May , Xerxes R?nby wrote: > On 2011-05-03 10:23, Xerxes R?nby wrote: > > xranby at hp:~/icedtea6$ cat .hgtags > > 96e1bdfed80e258e0a82e19bde45c5c547c2552f icedtea-1.0 > > b639d73581e34a5db114ed5addfd84b093d00254 icedtea-1.1 > > 1ce086327b07f17892cc351719de6897819e32fa icedtea-1.2 > > 8ea2619c21cfea2611b44879aab0f781ffd3fd50 icedtea-1.3 > > cb78e0fccf14ed4a80b0ada2c98e4621479acbf5 icedtea-1.4 > > 5ca86e9ca40533c48ca3445a10fd3b058ef94885 icedtea-1.5 > > bb3929528d3e9de0529da995c4b71975fd77fb5a icedtea-1.6 > > 38e6eb354632588f5ac8dbcd69229ebd031f57cb icedtea6-1.0 > > a5c32475a2e87f0f3bd7af28e632e6bd4f724b04 icedtea6-1.1 > > 871b70407a139c6bd42c200762ee1d302b31168f icedtea6-1.2 > > 3ef9c9c4e70b8204b73fa9b88243f49f59c2a23f icedtea6-1.3 > > be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e icedtea6-1.3.1 > > 6c02b699206db299c6bc96d97d31808bf84f042a icedtea6-1.4pre > > 2b1c03c1e9fa88e453da2ca774dc8900227a2e16 icedtea6-1.4 > > a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 > > 07de70c5883a637ea2ef4aba3f8472edd7e12f1e icedtea6-1.5rc2 > > 926c38e2b2830971f6ca0dff2ce25f78a694b178 icedtea6-1.5rc3 > > 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea-1.6-branchpoint !!!! > > 8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea-1.7-branchpoint > > 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.8-branchpoint !!!! > > cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint > > 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint > > Attached patch fix > Ok to push? > > Cheers > Xerxes Fine by me. > Index: icedtea6/.hgtags > =================================================================== > --- icedtea6.orig/.hgtags 2011-05-04 13:12:06.178850844 +0200 > +++ icedtea6/.hgtags 2011-05-04 13:23:10.970147365 +0200 > @@ -15,8 +15,8 @@ > a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 > 07de70c5883a637ea2ef4aba3f8472edd7e12f1e icedtea6-1.5rc2 > 926c38e2b2830971f6ca0dff2ce25f78a694b178 icedtea6-1.5rc3 > -9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea-1.6-branchpoint > -8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea-1.7-branchpoint > -9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.8-branchpoint > +9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.6-branchpoint > +8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea6-1.7-branchpoint > +1188b1a313b9e968d57ff44eb879d70f543b20fd icedtea6-1.8-branchpoint > cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint > 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint > Index: icedtea6/ChangeLog > =================================================================== > --- icedtea6.orig/ChangeLog 2011-05-04 13:23:32.866255940 +0200 > +++ icedtea6/ChangeLog 2011-05-04 13:29:13.995947516 +0200 > @@ -1,3 +1,10 @@ > +2011-05-04 Xerxes R??nby > + > + * .hgtags Update. > + icedtea6-1.6-branchpoint renamed from icedtea-1.6-branchpoint > + icedtea6-1.7-branchpoint renamed from icedtea-1.7-branchpoint > + icedtea6-1.8-branchpoint corrected to rev 1997:1188b1a313b9 > + > 2011-05-03 Omair Majid > > Replace xrender patch with (identical) upstream fix. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From xranby at icedtea.classpath.org Wed May 4 06:28:56 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Wed, 04 May 2011 13:28:56 +0000 Subject: /hg/icedtea6: .hgtags Update, icedtea6-1.8-branchpoint corrected... Message-ID: changeset 74bcdece2162 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=74bcdece2162 author: Xerxes R?nby date: Wed May 04 15:06:24 2011 +0200 .hgtags Update, icedtea6-1.8-branchpoint corrected to rev 1997:1188b1a313b9 2011-05-04 Xerxes R?nby * .hgtags Update. icedtea6-1.6-branchpoint renamed from icedtea-1.6-branchpoint icedtea6-1.7-branchpoint renamed from icedtea-1.7-branchpoint icedtea6-1.8-branchpoint corrected to rev 1997:1188b1a313b9 diffstat: .hgtags | 6 +++--- ChangeLog | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diffs (29 lines): diff -r e12e69d3e09c -r 74bcdece2162 .hgtags --- a/.hgtags Tue May 03 17:58:19 2011 -0400 +++ b/.hgtags Wed May 04 15:06:24 2011 +0200 @@ -15,8 +15,8 @@ a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 07de70c5883a637ea2ef4aba3f8472edd7e12f1e icedtea6-1.5rc2 926c38e2b2830971f6ca0dff2ce25f78a694b178 icedtea6-1.5rc3 -9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea-1.6-branchpoint -8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea-1.7-branchpoint -9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.8-branchpoint +9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.6-branchpoint +8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea6-1.7-branchpoint +1188b1a313b9e968d57ff44eb879d70f543b20fd icedtea6-1.8-branchpoint cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint diff -r e12e69d3e09c -r 74bcdece2162 ChangeLog --- a/ChangeLog Tue May 03 17:58:19 2011 -0400 +++ b/ChangeLog Wed May 04 15:06:24 2011 +0200 @@ -1,3 +1,10 @@ +2011-05-04 Xerxes R??nby + + * .hgtags Update. + icedtea6-1.6-branchpoint renamed from icedtea-1.6-branchpoint + icedtea6-1.7-branchpoint renamed from icedtea-1.7-branchpoint + icedtea6-1.8-branchpoint corrected to rev 1997:1188b1a313b9 + 2011-05-03 Omair Majid Replace xrender patch with (identical) upstream fix. From asu at redhat.com Wed May 4 06:33:09 2011 From: asu at redhat.com (Andrew Su) Date: Wed, 4 May 2011 09:33:09 -0400 (EDT) Subject: [RFC][Icedtea6]: Update jpegclasses.patch In-Reply-To: <20110502221824.GF11659@rivendell.middle-earth.co.uk> Message-ID: <356087934.28285.1304515989830.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > From: "Dr Andrew John Hughes" > To: "Andrew Su" > Cc: "IcedTea" > Sent: Monday, May 2, 2011 6:18:24 PM > Subject: Re: [RFC][Icedtea6]: Update jpegclasses.patch > On 14:52 Mon 02 May , Andrew Su wrote: > > Hello, --snip-- > I haven't looked at the code itself, but I think this would be much > more maintainable if it used the overlays > mechanism instead, with possibly a minimal patch to enable building of > the code. I assume the com.sun.image.codec.jpeg > code is not present in the OpenJDK6 tarball? That's right, neither com.sun.image.codec.jpeg and sun.awt.image.codec is in the openJDK6 tarball. I agree that having it in overlays would make it easier to maintain. I've moved it there. This patch now removes the jpegclasses.patch and adds the files to overlays/jpeg. Cheers, Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: latest_jpeg.patch Type: text/x-patch Size: 104167 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110504/fed33a66/latest_jpeg.patch From xerxes at zafena.se Wed May 4 06:35:56 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Wed, 04 May 2011 15:35:56 +0200 Subject: RFC: patch Re: icedtea6 hg tag icedtea6-1.8-branchpoint points to the icedtea-1.6-branchpoint changeset. In-Reply-To: <20110504132220.GD26415@rivendell.middle-earth.co.uk> References: <4DBFBB77.6060303@zafena.se> <4DC1392D.5050201@zafena.se> <20110504132220.GD26415@rivendell.middle-earth.co.uk> Message-ID: <4DC1563C.4050401@zafena.se> On 2011-05-04 15:22, Dr Andrew John Hughes wrote: > On 13:31 Wed 04 May , Xerxes R?nby wrote: >> On 2011-05-03 10:23, Xerxes R?nby wrote: >>> xranby at hp:~/icedtea6$ cat .hgtags ... >>> 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea-1.6-branchpoint !!!! >>> 8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea-1.7-branchpoint >>> 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.8-branchpoint !!!! ... >> Attached patch fix >> Ok to push? >> > Fine by me. > Done! http://icedtea.classpath.org/hg/icedtea6/rev/74bcdece2162 Cheers Xerxes From ahughes at redhat.com Wed May 4 06:58:46 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 4 May 2011 14:58:46 +0100 Subject: [RFC][icedtea6]: Backport - NaN in stroked quadratic paths. In-Reply-To: <771573572.1080029.1304002340421.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <1570068779.1079119.1304002151043.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <771573572.1080029.1304002340421.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <20110504135845.GE26415@rivendell.middle-earth.co.uk> On 10:52 Thu 28 Apr , Denis Lila wrote: > Hi. > > This is my latest bugfix for the openjdk7 2d forest. > I would like to backport it into icedtea6. > > Good to go? > > ChangeLog: > +2011-04-28 Denis Lila > + > + * Makefile.am: Apply patch. > + * NEWS: Update with backport. > + * patches/openjdk/7036754-stroker-nan.patch: New patch. Fix NaN > + quad stroking problem. > + > > Thank you, > Denis. Looks fine, but please don't include the ChangeLog in the patch itself; just in the email body. It makes the patch harder to apply. > diff -r ad45dd8bcf45 ChangeLog > --- a/ChangeLog Thu Apr 28 08:36:21 2011 -0400 > +++ b/ChangeLog Thu Apr 28 10:52:40 2011 -0400 > @@ -1,3 +1,10 @@ > +2011-04-28 Denis Lila > + > + * Makefile.am: Apply patch. > + * NEWS: Update with backport. > + * patches/openjdk/7036754-stroker-nan.patch: New patch. Fix NaN > + quad stroking problem. > + > 2011-04-28 Denis Lila > > * Makefile.am: Apply patches. > diff -r ad45dd8bcf45 Makefile.am > --- a/Makefile.am Thu Apr 28 08:36:21 2011 -0400 > +++ b/Makefile.am Thu Apr 28 10:52:40 2011 -0400 > @@ -338,7 +338,8 @@ > patches/revert-6885123.patch \ > patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ > patches/openjdk/7031385-gcc-register-allocation-fix.patch \ > - patches/shark-llvm-2.9.patch > + patches/shark-llvm-2.9.patch \ > + patches/openjdk/7036754-stroker-nan.patch > > if WITH_ALT_HSBUILD > ICEDTEA_PATCHES += \ > diff -r ad45dd8bcf45 NEWS > --- a/NEWS Thu Apr 28 08:36:21 2011 -0400 > +++ b/NEWS Thu Apr 28 10:52:40 2011 -0400 > @@ -20,6 +20,7 @@ > - S7032388, PR682: Make HotSpot work on machines without cmov instruction again > - S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal > - S6708580: Java applications slow when EXA enabled > + - S7036754: Stroked quads sometimes contain NaN > * Bug fixes > - PR637: make check should exit with an error code if any regression test failed. > - G356743: Support libpng 1.5. > diff -r ad45dd8bcf45 patches/openjdk/7036754-stroker-nan.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/openjdk/7036754-stroker-nan.patch Thu Apr 28 10:52:40 2011 -0400 > @@ -0,0 +1,490 @@ > +# HG changeset patch > +# User dlila > +# Date 1303995319 14400 > +# Node ID 24f474ad17038b0bef4686c79c8b8de25ab23723 > +# Parent a07c9e09b4caa5690209af460e8c9371b8384cb0 > +7036754: NaNs in stroked quadratics. > +Summary: Check for them and remove them. > +Reviewed-by: flar > + > +diff -r a07c9e09b4ca -r 24f474ad1703 src/share/classes/sun/java2d/pisces/Stroker.java > +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Stroker.java Wed Apr 27 12:15:34 2011 +0400 > ++++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Stroker.java Thu Apr 28 08:55:19 2011 -0400 > +@@ -27,6 +27,8 @@ > + > + import java.util.Arrays; > + import java.util.Iterator; > ++import static java.lang.Math.ulp; > ++import static java.lang.Math.sqrt; > + > + import sun.awt.geom.PathConsumer2D; > + > +@@ -130,7 +132,7 @@ > + private static void computeOffset(final float lx, final float ly, > + final float w, final float[] m) > + { > +- final float len = (float)Math.sqrt(lx*lx + ly*ly); > ++ final float len = (float) sqrt(lx*lx + ly*ly); > + if (len == 0) { > + m[0] = m[1] = 0; > + } else { > +@@ -217,7 +219,7 @@ > + // this normal's length is at least 0.5 and at most sqrt(2)/2 (because > + // we know the angle of the arc is > 90 degrees). > + float nx = my - omy, ny = omx - mx; > +- float nlen = (float)Math.sqrt(nx*nx + ny*ny); > ++ float nlen = (float) sqrt(nx*nx + ny*ny); > + float scale = lineWidth2/nlen; > + float mmx = nx * scale, mmy = ny * scale; > + > +@@ -246,8 +248,8 @@ > + // define the bezier curve we're computing. > + // It is computed using the constraints that P1-P0 and P3-P2 are parallel > + // to the arc tangents at the endpoints, and that |P1-P0|=|P3-P2|. > +- float cv = (float)((4.0 / 3.0) * Math.sqrt(0.5-cosext2) / > +- (1.0 + Math.sqrt(cosext2+0.5))); > ++ float cv = (float) ((4.0 / 3.0) * sqrt(0.5-cosext2) / > ++ (1.0 + sqrt(cosext2+0.5))); > + // if clockwise, we need to negate cv. > + if (rev) { // rev is equivalent to isCW(omx, omy, mx, my) > + cv = -cv; > +@@ -284,28 +286,20 @@ > + false); > + } > + > +- // Return the intersection point of the lines (x0, y0) -> (x1, y1) > +- // and (x0p, y0p) -> (x1p, y1p) in m[0] and m[1] > +- private void computeMiter(final float x0, final float y0, > +- final float x1, final float y1, > +- final float x0p, final float y0p, > +- final float x1p, final float y1p, > +- final float[] m, int off) > ++ // Put the intersection point of the lines (x0, y0) -> (x1, y1) > ++ // and (x0p, y0p) -> (x1p, y1p) in m[off] and m[off+1]. > ++ // If the lines are parallel, it will put a non finite number in m. > ++ private void computeIntersection(final float x0, final float y0, > ++ final float x1, final float y1, > ++ final float x0p, final float y0p, > ++ final float x1p, final float y1p, > ++ final float[] m, int off) > + { > + float x10 = x1 - x0; > + float y10 = y1 - y0; > + float x10p = x1p - x0p; > + float y10p = y1p - y0p; > + > +- // if this is 0, the lines are parallel. If they go in the > +- // same direction, there is no intersection so m[off] and > +- // m[off+1] will contain infinity, so no miter will be drawn. > +- // If they go in the same direction that means that the start of the > +- // current segment and the end of the previous segment have the same > +- // tangent, in which case this method won't even be involved in > +- // miter drawing because it won't be called by drawMiter (because > +- // (mx == omx && my == omy) will be true, and drawMiter will return > +- // immediately). > + float den = x10*y10p - x10p*y10; > + float t = x10p*(y0-y0p) - y10p*(x0-x0p); > + t /= den; > +@@ -321,7 +315,8 @@ > + { > + if ((mx == omx && my == omy) || > + (pdx == 0 && pdy == 0) || > +- (dx == 0 && dy == 0)) { > ++ (dx == 0 && dy == 0)) > ++ { > + return; > + } > + > +@@ -332,12 +327,17 @@ > + my = -my; > + } > + > +- computeMiter((x0 - pdx) + omx, (y0 - pdy) + omy, x0 + omx, y0 + omy, > +- (dx + x0) + mx, (dy + y0) + my, x0 + mx, y0 + my, > +- miter, 0); > ++ computeIntersection((x0 - pdx) + omx, (y0 - pdy) + omy, x0 + omx, y0 + omy, > ++ (dx + x0) + mx, (dy + y0) + my, x0 + mx, y0 + my, > ++ miter, 0); > + > + float lenSq = (miter[0]-x0)*(miter[0]-x0) + (miter[1]-y0)*(miter[1]-y0); > + > ++ // If the lines are parallel, lenSq will be either NaN or +inf > ++ // (actually, I'm not sure if the latter is possible. The important > ++ // thing is that -inf is not possible, because lenSq is a square). > ++ // For both of those values, the comparison below will fail and > ++ // no miter will be drawn, which is correct. > + if (lenSq < miterLimitSq) { > + emitLineTo(miter[0], miter[1], rev); > + } > +@@ -566,8 +566,8 @@ > + > + // if p1 == p2 && p3 == p4: draw line from p1->p4, unless p1 == p4, > + // in which case ignore if p1 == p2 > +- final boolean p1eqp2 = within(x1,y1,x2,y2, 6 * Math.ulp(y2)); > +- final boolean p3eqp4 = within(x3,y3,x4,y4, 6 * Math.ulp(y4)); > ++ final boolean p1eqp2 = within(x1,y1,x2,y2, 6 * ulp(y2)); > ++ final boolean p3eqp4 = within(x3,y3,x4,y4, 6 * ulp(y4)); > + if (p1eqp2 && p3eqp4) { > + getLineOffsets(x1, y1, x4, y4, leftOff, rightOff); > + return 4; > +@@ -583,7 +583,7 @@ > + float dotsq = (dx1 * dx4 + dy1 * dy4); > + dotsq = dotsq * dotsq; > + float l1sq = dx1 * dx1 + dy1 * dy1, l4sq = dx4 * dx4 + dy4 * dy4; > +- if (Helpers.within(dotsq, l1sq * l4sq, 4 * Math.ulp(dotsq))) { > ++ if (Helpers.within(dotsq, l1sq * l4sq, 4 * ulp(dotsq))) { > + getLineOffsets(x1, y1, x4, y4, leftOff, rightOff); > + return 4; > + } > +@@ -693,8 +693,6 @@ > + return 8; > + } > + > +- // compute offset curves using bezier spline through t=0.5 (i.e. > +- // ComputedCurve(0.5) == IdealParallelCurve(0.5)) > + // return the kind of curve in the right and left arrays. > + private int computeOffsetQuad(float[] pts, final int off, > + float[] leftOff, float[] rightOff) > +@@ -703,56 +701,67 @@ > + final float x2 = pts[off + 2], y2 = pts[off + 3]; > + final float x3 = pts[off + 4], y3 = pts[off + 5]; > + > +- float dx3 = x3 - x2; > +- float dy3 = y3 - y2; > +- float dx1 = x2 - x1; > +- float dy1 = y2 - y1; > ++ final float dx3 = x3 - x2; > ++ final float dy3 = y3 - y2; > ++ final float dx1 = x2 - x1; > ++ final float dy1 = y2 - y1; > + > +- // if p1=p2 or p3=p4 it means that the derivative at the endpoint > +- // vanishes, which creates problems with computeOffset. Usually > +- // this happens when this stroker object is trying to winden > +- // a curve with a cusp. What happens is that curveTo splits > +- // the input curve at the cusp, and passes it to this function. > +- // because of inaccuracies in the splitting, we consider points > +- // equal if they're very close to each other. > ++ // this computes the offsets at t = 0, 1 > ++ computeOffset(dx1, dy1, lineWidth2, offset[0]); > ++ computeOffset(dx3, dy3, lineWidth2, offset[1]); > + > +- // if p1 == p2 && p3 == p4: draw line from p1->p4, unless p1 == p4, > +- // in which case ignore. > +- final boolean p1eqp2 = within(x1,y1,x2,y2, 6 * Math.ulp(y2)); > +- final boolean p2eqp3 = within(x2,y2,x3,y3, 6 * Math.ulp(y3)); > +- if (p1eqp2 || p2eqp3) { > +- getLineOffsets(x1, y1, x3, y3, leftOff, rightOff); > +- return 4; > ++ leftOff[0] = x1 + offset[0][0]; leftOff[1] = y1 + offset[0][1]; > ++ leftOff[4] = x3 + offset[1][0]; leftOff[5] = y3 + offset[1][1]; > ++ rightOff[0] = x1 - offset[0][0]; rightOff[1] = y1 - offset[0][1]; > ++ rightOff[4] = x3 - offset[1][0]; rightOff[5] = y3 - offset[1][1]; > ++ > ++ float x1p = leftOff[0]; // start > ++ float y1p = leftOff[1]; // point > ++ float x3p = leftOff[4]; // end > ++ float y3p = leftOff[5]; // point > ++ > ++ // Corner cases: > ++ // 1. If the two control vectors are parallel, we'll end up with NaN's > ++ // in leftOff (and rightOff in the body of the if below), so we'll > ++ // do getLineOffsets, which is right. > ++ // 2. If the first or second two points are equal, then (dx1,dy1)==(0,0) > ++ // or (dx3,dy3)==(0,0), so (x1p, y1p)==(x1p+dx1, y1p+dy1) > ++ // or (x3p, y3p)==(x3p-dx3, y3p-dy3), which means that > ++ // computeIntersection will put NaN's in leftOff and right off, and > ++ // we will do getLineOffsets, which is right. > ++ computeIntersection(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, leftOff, 2); > ++ float cx = leftOff[2]; > ++ float cy = leftOff[3]; > ++ > ++ if (!(isFinite(cx) && isFinite(cy))) { > ++ // maybe the right path is not degenerate. > ++ x1p = rightOff[0]; > ++ y1p = rightOff[1]; > ++ x3p = rightOff[4]; > ++ y3p = rightOff[5]; > ++ computeIntersection(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, rightOff, 2); > ++ cx = rightOff[2]; > ++ cy = rightOff[3]; > ++ if (!(isFinite(cx) && isFinite(cy))) { > ++ // both are degenerate. This curve is a line. > ++ getLineOffsets(x1, y1, x3, y3, leftOff, rightOff); > ++ return 4; > ++ } > ++ // {left,right}Off[0,1,4,5] are already set to the correct values. > ++ leftOff[2] = 2*x2 - cx; > ++ leftOff[3] = 2*y2 - cy; > ++ return 6; > + } > + > +- // if p2-p1 and p4-p3 are parallel, that must mean this curve is a line > +- float dotsq = (dx1 * dx3 + dy1 * dy3); > +- dotsq = dotsq * dotsq; > +- float l1sq = dx1 * dx1 + dy1 * dy1, l3sq = dx3 * dx3 + dy3 * dy3; > +- if (Helpers.within(dotsq, l1sq * l3sq, 4 * Math.ulp(dotsq))) { > +- getLineOffsets(x1, y1, x3, y3, leftOff, rightOff); > +- return 4; > +- } > ++ // rightOff[2,3] = (x2,y2) - ((left_x2, left_y2) - (x2, y2)) > ++ // == 2*(x2, y2) - (left_x2, left_y2) > ++ rightOff[2] = 2*x2 - cx; > ++ rightOff[3] = 2*y2 - cy; > ++ return 6; > ++ } > + > +- // this computes the offsets at t=0, 0.5, 1, using the property that > +- // for any bezier curve the vectors p2-p1 and p4-p3 are parallel to > +- // the (dx/dt, dy/dt) vectors at the endpoints. > +- computeOffset(dx1, dy1, lineWidth2, offset[0]); > +- computeOffset(dx3, dy3, lineWidth2, offset[1]); > +- float x1p = x1 + offset[0][0]; // start > +- float y1p = y1 + offset[0][1]; // point > +- float x3p = x3 + offset[1][0]; // end > +- float y3p = y3 + offset[1][1]; // point > +- > +- computeMiter(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, leftOff, 2); > +- leftOff[0] = x1p; leftOff[1] = y1p; > +- leftOff[4] = x3p; leftOff[5] = y3p; > +- x1p = x1 - offset[0][0]; y1p = y1 - offset[0][1]; > +- x3p = x3 - offset[1][0]; y3p = y3 - offset[1][1]; > +- computeMiter(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, rightOff, 2); > +- rightOff[0] = x1p; rightOff[1] = y1p; > +- rightOff[4] = x3p; rightOff[5] = y3p; > +- return 6; > ++ private static boolean isFinite(float x) { > ++ return (Float.NEGATIVE_INFINITY < x && x < Float.POSITIVE_INFINITY); > + } > + > + // This is where the curve to be processed is put. We give it > +@@ -812,12 +821,12 @@ > + // if these vectors are too small, normalize them, to avoid future > + // precision problems. > + if (Math.abs(dxs) < 0.1f && Math.abs(dys) < 0.1f) { > +- float len = (float)Math.sqrt(dxs*dxs + dys*dys); > ++ float len = (float) sqrt(dxs*dxs + dys*dys); > + dxs /= len; > + dys /= len; > + } > + if (Math.abs(dxf) < 0.1f && Math.abs(dyf) < 0.1f) { > +- float len = (float)Math.sqrt(dxf*dxf + dyf*dyf); > ++ float len = (float) sqrt(dxf*dxf + dyf*dyf); > + dxf /= len; > + dyf /= len; > + } > +@@ -834,7 +843,6 @@ > + while(it.hasNext()) { > + int curCurveOff = it.next(); > + > +- kind = 0; > + switch (type) { > + case 8: > + kind = computeOffsetCubic(middle, curCurveOff, lp, rp); > +@@ -843,24 +851,22 @@ > + kind = computeOffsetQuad(middle, curCurveOff, lp, rp); > + break; > + } > +- if (kind != 0) { > +- emitLineTo(lp[0], lp[1]); > +- switch(kind) { > +- case 8: > +- emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false); > +- emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true); > +- break; > +- case 6: > +- emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false); > +- emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true); > +- break; > +- case 4: > +- emitLineTo(lp[2], lp[3]); > +- emitLineTo(rp[0], rp[1], true); > +- break; > +- } > +- emitLineTo(rp[kind - 2], rp[kind - 1], true); > ++ emitLineTo(lp[0], lp[1]); > ++ switch(kind) { > ++ case 8: > ++ emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false); > ++ emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true); > ++ break; > ++ case 6: > ++ emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false); > ++ emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true); > ++ break; > ++ case 4: > ++ emitLineTo(lp[2], lp[3]); > ++ emitLineTo(rp[0], rp[1], true); > ++ break; > + } > ++ emitLineTo(rp[kind - 2], rp[kind - 1], true); > + } > + > + this.cmx = (lp[kind - 2] - rp[kind - 2]) / 2; > +@@ -887,7 +893,7 @@ > + // we rotate it so that the first vector in the control polygon is > + // parallel to the x-axis. This will ensure that rotated quarter > + // circles won't be subdivided. > +- final float hypot = (float)Math.sqrt(x12 * x12 + y12 * y12); > ++ final float hypot = (float) sqrt(x12 * x12 + y12 * y12); > + final float cos = x12 / hypot; > + final float sin = y12 / hypot; > + final float x1 = cos * pts[0] + sin * pts[1]; > +@@ -976,12 +982,12 @@ > + // if these vectors are too small, normalize them, to avoid future > + // precision problems. > + if (Math.abs(dxs) < 0.1f && Math.abs(dys) < 0.1f) { > +- float len = (float)Math.sqrt(dxs*dxs + dys*dys); > ++ float len = (float) sqrt(dxs*dxs + dys*dys); > + dxs /= len; > + dys /= len; > + } > + if (Math.abs(dxf) < 0.1f && Math.abs(dyf) < 0.1f) { > +- float len = (float)Math.sqrt(dxf*dxf + dyf*dyf); > ++ float len = (float) sqrt(dxf*dxf + dyf*dyf); > + dxf /= len; > + dyf /= len; > + } > +@@ -999,20 +1005,18 @@ > + int curCurveOff = it.next(); > + > + kind = computeOffsetCubic(middle, curCurveOff, lp, rp); > +- if (kind != 0) { > +- emitLineTo(lp[0], lp[1]); > +- switch(kind) { > +- case 8: > +- emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false); > +- emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true); > +- break; > +- case 4: > +- emitLineTo(lp[2], lp[3]); > +- emitLineTo(rp[0], rp[1], true); > +- break; > +- } > +- emitLineTo(rp[kind - 2], rp[kind - 1], true); > ++ emitLineTo(lp[0], lp[1]); > ++ switch(kind) { > ++ case 8: > ++ emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false); > ++ emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true); > ++ break; > ++ case 4: > ++ emitLineTo(lp[2], lp[3]); > ++ emitLineTo(rp[0], rp[1], true); > ++ break; > + } > ++ emitLineTo(rp[kind - 2], rp[kind - 1], true); > + } > + > + this.cmx = (lp[kind - 2] - rp[kind - 2]) / 2; > +@@ -1050,12 +1054,12 @@ > + // if these vectors are too small, normalize them, to avoid future > + // precision problems. > + if (Math.abs(dxs) < 0.1f && Math.abs(dys) < 0.1f) { > +- float len = (float)Math.sqrt(dxs*dxs + dys*dys); > ++ float len = (float) sqrt(dxs*dxs + dys*dys); > + dxs /= len; > + dys /= len; > + } > + if (Math.abs(dxf) < 0.1f && Math.abs(dyf) < 0.1f) { > +- float len = (float)Math.sqrt(dxf*dxf + dyf*dyf); > ++ float len = (float) sqrt(dxf*dxf + dyf*dyf); > + dxf /= len; > + dyf /= len; > + } > +@@ -1073,20 +1077,18 @@ > + int curCurveOff = it.next(); > + > + kind = computeOffsetQuad(middle, curCurveOff, lp, rp); > +- if (kind != 0) { > +- emitLineTo(lp[0], lp[1]); > +- switch(kind) { > +- case 6: > +- emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false); > +- emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true); > +- break; > +- case 4: > +- emitLineTo(lp[2], lp[3]); > +- emitLineTo(rp[0], rp[1], true); > +- break; > +- } > +- emitLineTo(rp[kind - 2], rp[kind - 1], true); > ++ emitLineTo(lp[0], lp[1]); > ++ switch(kind) { > ++ case 6: > ++ emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false); > ++ emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true); > ++ break; > ++ case 4: > ++ emitLineTo(lp[2], lp[3]); > ++ emitLineTo(rp[0], rp[1], true); > ++ break; > + } > ++ emitLineTo(rp[kind - 2], rp[kind - 1], true); > + } > + > + this.cmx = (lp[kind - 2] - rp[kind - 2]) / 2; > +diff -r a07c9e09b4ca -r 24f474ad1703 test/sun/java2d/pisces/Test7036754.java > +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 > ++++ openjdk/jdk/test/sun/java2d/pisces/Test7036754.java Thu Apr 28 08:55:19 2011 -0400 > +@@ -0,0 +1,58 @@ > ++/* > ++ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. > ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > ++ * > ++ * This code is free software; you can redistribute it and/or modify it > ++ * under the terms of the GNU General Public License version 2 only, as > ++ * published by the Free Software Foundation. > ++ * > ++ * This code 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 > ++ * version 2 for more details (a copy is included in the LICENSE file that > ++ * accompanied this code). > ++ * > ++ * You should have received a copy of the GNU General Public License version > ++ * 2 along with this work; if not, write to the Free Software Foundation, > ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. > ++ * > ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA > ++ * or visit www.oracle.com if you need additional information or have any > ++ * questions. > ++ */ > ++ > ++/** > ++ * @test > ++ * @bug 7036754 > ++ * > ++ * @summary Verifies that there are no non-finite numbers when stroking > ++ * certain quadratic curves. > ++ * > ++ * @author Jim Graham > ++ * @run main Test7036754 > ++ */ > ++ > ++import java.awt.*; > ++import java.awt.geom.*; > ++ > ++public class Test7036754 { > ++ public static void main(String argv[]) { > ++ Shape s = new QuadCurve2D.Float(839.24677f, 508.97888f, > ++ 839.2953f, 508.97122f, > ++ 839.3438f, 508.96353f); > ++ s = new BasicStroke(10f).createStrokedShape(s); > ++ float nsegs[] = {2, 2, 4, 6, 0}; > ++ float coords[] = new float[6]; > ++ PathIterator pi = s.getPathIterator(null); > ++ while (!pi.isDone()) { > ++ int type = pi.currentSegment(coords); > ++ for (int i = 0; i < nsegs[type]; i++) { > ++ float c = coords[i]; > ++ if (Float.isNaN(c) || Float.isInfinite(c)) { > ++ throw new RuntimeException("bad value in stroke"); > ++ } > ++ } > ++ pi.next(); > ++ } > ++ } > ++} > +exporting patch: > + -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From dlila at icedtea.classpath.org Wed May 4 07:22:19 2011 From: dlila at icedtea.classpath.org (dlila at icedtea.classpath.org) Date: Wed, 04 May 2011 14:22:19 +0000 Subject: /hg/icedtea6: Fix problem where NaNs could appear in stroked qua... Message-ID: changeset b71a752b9762 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b71a752b9762 author: Denis Lila date: Wed May 04 10:09:47 2011 -0400 Fix problem where NaNs could appear in stroked quad paths. Improve performance of quad stroking. diffstat: ChangeLog | 7 + Makefile.am | 3 +- NEWS | 1 + patches/openjdk/7036754-stroker-nan.patch | 488 ++++++++++++++++++++++++++++++ 4 files changed, 498 insertions(+), 1 deletions(-) diffs (truncated from 532 to 500 lines): diff -r 74bcdece2162 -r b71a752b9762 ChangeLog --- a/ChangeLog Wed May 04 15:06:24 2011 +0200 +++ b/ChangeLog Wed May 04 10:09:47 2011 -0400 @@ -1,3 +1,10 @@ +2011-05-04 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/7036754-stroker-nan.patch: New patch. Fix NaN + quad stroking problem. + 2011-05-04 Xerxes R??nby * .hgtags Update. diff -r 74bcdece2162 -r b71a752b9762 Makefile.am --- a/Makefile.am Wed May 04 15:06:24 2011 +0200 +++ b/Makefile.am Wed May 04 10:09:47 2011 -0400 @@ -338,7 +338,8 @@ patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ patches/shark-llvm-2.9.patch \ - patches/openjdk/6986968-crash_on_xim_restart.patch + patches/openjdk/6986968-crash_on_xim_restart.patch \ + patches/openjdk/7036754-stroker-nan.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 74bcdece2162 -r b71a752b9762 NEWS --- a/NEWS Wed May 04 15:06:24 2011 +0200 +++ b/NEWS Wed May 04 10:09:47 2011 -0400 @@ -23,6 +23,7 @@ - S7029905: demo applets missing some html files - S6986968: Crash on XIM server restart - S7018387: Xrender pipeline may leak GC's + - S7036754: Stroked quads sometimes contain NaN * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - G356743: Support libpng 1.5. diff -r 74bcdece2162 -r b71a752b9762 patches/openjdk/7036754-stroker-nan.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7036754-stroker-nan.patch Wed May 04 10:09:47 2011 -0400 @@ -0,0 +1,490 @@ +# HG changeset patch +# User dlila +# Date 1303995319 14400 +# Node ID 24f474ad17038b0bef4686c79c8b8de25ab23723 +# Parent a07c9e09b4caa5690209af460e8c9371b8384cb0 +7036754: NaNs in stroked quadratics. +Summary: Check for them and remove them. +Reviewed-by: flar + +diff -r a07c9e09b4ca -r 24f474ad1703 src/share/classes/sun/java2d/pisces/Stroker.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Stroker.java Wed Apr 27 12:15:34 2011 +0400 ++++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Stroker.java Thu Apr 28 08:55:19 2011 -0400 +@@ -27,6 +27,8 @@ + + import java.util.Arrays; + import java.util.Iterator; ++import static java.lang.Math.ulp; ++import static java.lang.Math.sqrt; + + import sun.awt.geom.PathConsumer2D; + +@@ -130,7 +132,7 @@ + private static void computeOffset(final float lx, final float ly, + final float w, final float[] m) + { +- final float len = (float)Math.sqrt(lx*lx + ly*ly); ++ final float len = (float) sqrt(lx*lx + ly*ly); + if (len == 0) { + m[0] = m[1] = 0; + } else { +@@ -217,7 +219,7 @@ + // this normal's length is at least 0.5 and at most sqrt(2)/2 (because + // we know the angle of the arc is > 90 degrees). + float nx = my - omy, ny = omx - mx; +- float nlen = (float)Math.sqrt(nx*nx + ny*ny); ++ float nlen = (float) sqrt(nx*nx + ny*ny); + float scale = lineWidth2/nlen; + float mmx = nx * scale, mmy = ny * scale; + +@@ -246,8 +248,8 @@ + // define the bezier curve we're computing. + // It is computed using the constraints that P1-P0 and P3-P2 are parallel + // to the arc tangents at the endpoints, and that |P1-P0|=|P3-P2|. +- float cv = (float)((4.0 / 3.0) * Math.sqrt(0.5-cosext2) / +- (1.0 + Math.sqrt(cosext2+0.5))); ++ float cv = (float) ((4.0 / 3.0) * sqrt(0.5-cosext2) / ++ (1.0 + sqrt(cosext2+0.5))); + // if clockwise, we need to negate cv. + if (rev) { // rev is equivalent to isCW(omx, omy, mx, my) + cv = -cv; +@@ -284,28 +286,20 @@ + false); + } + +- // Return the intersection point of the lines (x0, y0) -> (x1, y1) +- // and (x0p, y0p) -> (x1p, y1p) in m[0] and m[1] +- private void computeMiter(final float x0, final float y0, +- final float x1, final float y1, +- final float x0p, final float y0p, +- final float x1p, final float y1p, +- final float[] m, int off) ++ // Put the intersection point of the lines (x0, y0) -> (x1, y1) ++ // and (x0p, y0p) -> (x1p, y1p) in m[off] and m[off+1]. ++ // If the lines are parallel, it will put a non finite number in m. ++ private void computeIntersection(final float x0, final float y0, ++ final float x1, final float y1, ++ final float x0p, final float y0p, ++ final float x1p, final float y1p, ++ final float[] m, int off) + { + float x10 = x1 - x0; + float y10 = y1 - y0; + float x10p = x1p - x0p; + float y10p = y1p - y0p; + +- // if this is 0, the lines are parallel. If they go in the +- // same direction, there is no intersection so m[off] and +- // m[off+1] will contain infinity, so no miter will be drawn. +- // If they go in the same direction that means that the start of the +- // current segment and the end of the previous segment have the same +- // tangent, in which case this method won't even be involved in +- // miter drawing because it won't be called by drawMiter (because +- // (mx == omx && my == omy) will be true, and drawMiter will return +- // immediately). + float den = x10*y10p - x10p*y10; + float t = x10p*(y0-y0p) - y10p*(x0-x0p); + t /= den; +@@ -321,7 +315,8 @@ + { + if ((mx == omx && my == omy) || + (pdx == 0 && pdy == 0) || +- (dx == 0 && dy == 0)) { ++ (dx == 0 && dy == 0)) ++ { + return; + } + +@@ -332,12 +327,17 @@ + my = -my; + } + +- computeMiter((x0 - pdx) + omx, (y0 - pdy) + omy, x0 + omx, y0 + omy, +- (dx + x0) + mx, (dy + y0) + my, x0 + mx, y0 + my, +- miter, 0); ++ computeIntersection((x0 - pdx) + omx, (y0 - pdy) + omy, x0 + omx, y0 + omy, ++ (dx + x0) + mx, (dy + y0) + my, x0 + mx, y0 + my, ++ miter, 0); + + float lenSq = (miter[0]-x0)*(miter[0]-x0) + (miter[1]-y0)*(miter[1]-y0); + ++ // If the lines are parallel, lenSq will be either NaN or +inf ++ // (actually, I'm not sure if the latter is possible. The important ++ // thing is that -inf is not possible, because lenSq is a square). ++ // For both of those values, the comparison below will fail and ++ // no miter will be drawn, which is correct. + if (lenSq < miterLimitSq) { + emitLineTo(miter[0], miter[1], rev); + } +@@ -566,8 +566,8 @@ + + // if p1 == p2 && p3 == p4: draw line from p1->p4, unless p1 == p4, + // in which case ignore if p1 == p2 +- final boolean p1eqp2 = within(x1,y1,x2,y2, 6 * Math.ulp(y2)); +- final boolean p3eqp4 = within(x3,y3,x4,y4, 6 * Math.ulp(y4)); ++ final boolean p1eqp2 = within(x1,y1,x2,y2, 6 * ulp(y2)); ++ final boolean p3eqp4 = within(x3,y3,x4,y4, 6 * ulp(y4)); + if (p1eqp2 && p3eqp4) { + getLineOffsets(x1, y1, x4, y4, leftOff, rightOff); + return 4; +@@ -583,7 +583,7 @@ + float dotsq = (dx1 * dx4 + dy1 * dy4); + dotsq = dotsq * dotsq; + float l1sq = dx1 * dx1 + dy1 * dy1, l4sq = dx4 * dx4 + dy4 * dy4; +- if (Helpers.within(dotsq, l1sq * l4sq, 4 * Math.ulp(dotsq))) { ++ if (Helpers.within(dotsq, l1sq * l4sq, 4 * ulp(dotsq))) { + getLineOffsets(x1, y1, x4, y4, leftOff, rightOff); + return 4; + } +@@ -693,8 +693,6 @@ + return 8; + } + +- // compute offset curves using bezier spline through t=0.5 (i.e. +- // ComputedCurve(0.5) == IdealParallelCurve(0.5)) + // return the kind of curve in the right and left arrays. + private int computeOffsetQuad(float[] pts, final int off, + float[] leftOff, float[] rightOff) +@@ -703,56 +701,67 @@ + final float x2 = pts[off + 2], y2 = pts[off + 3]; + final float x3 = pts[off + 4], y3 = pts[off + 5]; + +- float dx3 = x3 - x2; +- float dy3 = y3 - y2; +- float dx1 = x2 - x1; +- float dy1 = y2 - y1; ++ final float dx3 = x3 - x2; ++ final float dy3 = y3 - y2; ++ final float dx1 = x2 - x1; ++ final float dy1 = y2 - y1; + +- // if p1=p2 or p3=p4 it means that the derivative at the endpoint +- // vanishes, which creates problems with computeOffset. Usually +- // this happens when this stroker object is trying to winden +- // a curve with a cusp. What happens is that curveTo splits +- // the input curve at the cusp, and passes it to this function. +- // because of inaccuracies in the splitting, we consider points +- // equal if they're very close to each other. ++ // this computes the offsets at t = 0, 1 ++ computeOffset(dx1, dy1, lineWidth2, offset[0]); ++ computeOffset(dx3, dy3, lineWidth2, offset[1]); + +- // if p1 == p2 && p3 == p4: draw line from p1->p4, unless p1 == p4, +- // in which case ignore. +- final boolean p1eqp2 = within(x1,y1,x2,y2, 6 * Math.ulp(y2)); +- final boolean p2eqp3 = within(x2,y2,x3,y3, 6 * Math.ulp(y3)); +- if (p1eqp2 || p2eqp3) { +- getLineOffsets(x1, y1, x3, y3, leftOff, rightOff); +- return 4; ++ leftOff[0] = x1 + offset[0][0]; leftOff[1] = y1 + offset[0][1]; ++ leftOff[4] = x3 + offset[1][0]; leftOff[5] = y3 + offset[1][1]; ++ rightOff[0] = x1 - offset[0][0]; rightOff[1] = y1 - offset[0][1]; ++ rightOff[4] = x3 - offset[1][0]; rightOff[5] = y3 - offset[1][1]; ++ ++ float x1p = leftOff[0]; // start ++ float y1p = leftOff[1]; // point ++ float x3p = leftOff[4]; // end ++ float y3p = leftOff[5]; // point ++ ++ // Corner cases: ++ // 1. If the two control vectors are parallel, we'll end up with NaN's ++ // in leftOff (and rightOff in the body of the if below), so we'll ++ // do getLineOffsets, which is right. ++ // 2. If the first or second two points are equal, then (dx1,dy1)==(0,0) ++ // or (dx3,dy3)==(0,0), so (x1p, y1p)==(x1p+dx1, y1p+dy1) ++ // or (x3p, y3p)==(x3p-dx3, y3p-dy3), which means that ++ // computeIntersection will put NaN's in leftOff and right off, and ++ // we will do getLineOffsets, which is right. ++ computeIntersection(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, leftOff, 2); ++ float cx = leftOff[2]; ++ float cy = leftOff[3]; ++ ++ if (!(isFinite(cx) && isFinite(cy))) { ++ // maybe the right path is not degenerate. ++ x1p = rightOff[0]; ++ y1p = rightOff[1]; ++ x3p = rightOff[4]; ++ y3p = rightOff[5]; ++ computeIntersection(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, rightOff, 2); ++ cx = rightOff[2]; ++ cy = rightOff[3]; ++ if (!(isFinite(cx) && isFinite(cy))) { ++ // both are degenerate. This curve is a line. ++ getLineOffsets(x1, y1, x3, y3, leftOff, rightOff); ++ return 4; ++ } ++ // {left,right}Off[0,1,4,5] are already set to the correct values. ++ leftOff[2] = 2*x2 - cx; ++ leftOff[3] = 2*y2 - cy; ++ return 6; + } + +- // if p2-p1 and p4-p3 are parallel, that must mean this curve is a line +- float dotsq = (dx1 * dx3 + dy1 * dy3); +- dotsq = dotsq * dotsq; +- float l1sq = dx1 * dx1 + dy1 * dy1, l3sq = dx3 * dx3 + dy3 * dy3; +- if (Helpers.within(dotsq, l1sq * l3sq, 4 * Math.ulp(dotsq))) { +- getLineOffsets(x1, y1, x3, y3, leftOff, rightOff); +- return 4; +- } ++ // rightOff[2,3] = (x2,y2) - ((left_x2, left_y2) - (x2, y2)) ++ // == 2*(x2, y2) - (left_x2, left_y2) ++ rightOff[2] = 2*x2 - cx; ++ rightOff[3] = 2*y2 - cy; ++ return 6; ++ } + +- // this computes the offsets at t=0, 0.5, 1, using the property that +- // for any bezier curve the vectors p2-p1 and p4-p3 are parallel to +- // the (dx/dt, dy/dt) vectors at the endpoints. +- computeOffset(dx1, dy1, lineWidth2, offset[0]); +- computeOffset(dx3, dy3, lineWidth2, offset[1]); +- float x1p = x1 + offset[0][0]; // start +- float y1p = y1 + offset[0][1]; // point +- float x3p = x3 + offset[1][0]; // end +- float y3p = y3 + offset[1][1]; // point +- +- computeMiter(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, leftOff, 2); +- leftOff[0] = x1p; leftOff[1] = y1p; +- leftOff[4] = x3p; leftOff[5] = y3p; +- x1p = x1 - offset[0][0]; y1p = y1 - offset[0][1]; +- x3p = x3 - offset[1][0]; y3p = y3 - offset[1][1]; +- computeMiter(x1p, y1p, x1p+dx1, y1p+dy1, x3p, y3p, x3p-dx3, y3p-dy3, rightOff, 2); +- rightOff[0] = x1p; rightOff[1] = y1p; +- rightOff[4] = x3p; rightOff[5] = y3p; +- return 6; ++ private static boolean isFinite(float x) { ++ return (Float.NEGATIVE_INFINITY < x && x < Float.POSITIVE_INFINITY); + } + + // This is where the curve to be processed is put. We give it +@@ -812,12 +821,12 @@ + // if these vectors are too small, normalize them, to avoid future + // precision problems. + if (Math.abs(dxs) < 0.1f && Math.abs(dys) < 0.1f) { +- float len = (float)Math.sqrt(dxs*dxs + dys*dys); ++ float len = (float) sqrt(dxs*dxs + dys*dys); + dxs /= len; + dys /= len; + } + if (Math.abs(dxf) < 0.1f && Math.abs(dyf) < 0.1f) { +- float len = (float)Math.sqrt(dxf*dxf + dyf*dyf); ++ float len = (float) sqrt(dxf*dxf + dyf*dyf); + dxf /= len; + dyf /= len; + } +@@ -834,7 +843,6 @@ + while(it.hasNext()) { + int curCurveOff = it.next(); + +- kind = 0; + switch (type) { + case 8: + kind = computeOffsetCubic(middle, curCurveOff, lp, rp); +@@ -843,24 +851,22 @@ + kind = computeOffsetQuad(middle, curCurveOff, lp, rp); + break; + } +- if (kind != 0) { +- emitLineTo(lp[0], lp[1]); +- switch(kind) { +- case 8: +- emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false); +- emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true); +- break; +- case 6: +- emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false); +- emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true); +- break; +- case 4: +- emitLineTo(lp[2], lp[3]); +- emitLineTo(rp[0], rp[1], true); +- break; +- } +- emitLineTo(rp[kind - 2], rp[kind - 1], true); ++ emitLineTo(lp[0], lp[1]); ++ switch(kind) { ++ case 8: ++ emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false); ++ emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true); ++ break; ++ case 6: ++ emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false); ++ emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true); ++ break; ++ case 4: ++ emitLineTo(lp[2], lp[3]); ++ emitLineTo(rp[0], rp[1], true); ++ break; + } ++ emitLineTo(rp[kind - 2], rp[kind - 1], true); + } + + this.cmx = (lp[kind - 2] - rp[kind - 2]) / 2; +@@ -887,7 +893,7 @@ + // we rotate it so that the first vector in the control polygon is + // parallel to the x-axis. This will ensure that rotated quarter + // circles won't be subdivided. +- final float hypot = (float)Math.sqrt(x12 * x12 + y12 * y12); ++ final float hypot = (float) sqrt(x12 * x12 + y12 * y12); + final float cos = x12 / hypot; + final float sin = y12 / hypot; + final float x1 = cos * pts[0] + sin * pts[1]; +@@ -976,12 +982,12 @@ + // if these vectors are too small, normalize them, to avoid future + // precision problems. + if (Math.abs(dxs) < 0.1f && Math.abs(dys) < 0.1f) { +- float len = (float)Math.sqrt(dxs*dxs + dys*dys); ++ float len = (float) sqrt(dxs*dxs + dys*dys); + dxs /= len; + dys /= len; + } + if (Math.abs(dxf) < 0.1f && Math.abs(dyf) < 0.1f) { +- float len = (float)Math.sqrt(dxf*dxf + dyf*dyf); ++ float len = (float) sqrt(dxf*dxf + dyf*dyf); + dxf /= len; + dyf /= len; + } +@@ -999,20 +1005,18 @@ + int curCurveOff = it.next(); + + kind = computeOffsetCubic(middle, curCurveOff, lp, rp); +- if (kind != 0) { +- emitLineTo(lp[0], lp[1]); +- switch(kind) { +- case 8: +- emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false); +- emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true); +- break; +- case 4: +- emitLineTo(lp[2], lp[3]); +- emitLineTo(rp[0], rp[1], true); +- break; +- } +- emitLineTo(rp[kind - 2], rp[kind - 1], true); ++ emitLineTo(lp[0], lp[1]); ++ switch(kind) { ++ case 8: ++ emitCurveTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], lp[6], lp[7], false); ++ emitCurveTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], rp[6], rp[7], true); ++ break; ++ case 4: ++ emitLineTo(lp[2], lp[3]); ++ emitLineTo(rp[0], rp[1], true); ++ break; + } ++ emitLineTo(rp[kind - 2], rp[kind - 1], true); + } + + this.cmx = (lp[kind - 2] - rp[kind - 2]) / 2; +@@ -1050,12 +1054,12 @@ + // if these vectors are too small, normalize them, to avoid future + // precision problems. + if (Math.abs(dxs) < 0.1f && Math.abs(dys) < 0.1f) { +- float len = (float)Math.sqrt(dxs*dxs + dys*dys); ++ float len = (float) sqrt(dxs*dxs + dys*dys); + dxs /= len; + dys /= len; + } + if (Math.abs(dxf) < 0.1f && Math.abs(dyf) < 0.1f) { +- float len = (float)Math.sqrt(dxf*dxf + dyf*dyf); ++ float len = (float) sqrt(dxf*dxf + dyf*dyf); + dxf /= len; + dyf /= len; + } +@@ -1073,20 +1077,18 @@ + int curCurveOff = it.next(); + + kind = computeOffsetQuad(middle, curCurveOff, lp, rp); +- if (kind != 0) { +- emitLineTo(lp[0], lp[1]); +- switch(kind) { +- case 6: +- emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false); +- emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true); +- break; +- case 4: +- emitLineTo(lp[2], lp[3]); +- emitLineTo(rp[0], rp[1], true); +- break; +- } +- emitLineTo(rp[kind - 2], rp[kind - 1], true); ++ emitLineTo(lp[0], lp[1]); ++ switch(kind) { ++ case 6: ++ emitQuadTo(lp[0], lp[1], lp[2], lp[3], lp[4], lp[5], false); ++ emitQuadTo(rp[0], rp[1], rp[2], rp[3], rp[4], rp[5], true); ++ break; ++ case 4: ++ emitLineTo(lp[2], lp[3]); ++ emitLineTo(rp[0], rp[1], true); ++ break; + } ++ emitLineTo(rp[kind - 2], rp[kind - 1], true); + } + + this.cmx = (lp[kind - 2] - rp[kind - 2]) / 2; +diff -r a07c9e09b4ca -r 24f474ad1703 test/sun/java2d/pisces/Test7036754.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/sun/java2d/pisces/Test7036754.java Thu Apr 28 08:55:19 2011 -0400 +@@ -0,0 +1,58 @@ ++/* ++ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code 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 ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++/** ++ * @test ++ * @bug 7036754 ++ * ++ * @summary Verifies that there are no non-finite numbers when stroking From aph at redhat.com Wed May 4 07:49:50 2011 From: aph at redhat.com (Andrew Haley) Date: Wed, 04 May 2011 15:49:50 +0100 Subject: Patch: improve huge page support Message-ID: <4DC1678E.30402@redhat.com> My big patch to improve huge page support in now in HotSpot upstream. This is a backport. The question is: to what branches should we apply this? It makes the use of huge pages much, much easier. You no longer need root access for anything except setting the size of the huge page pool, and the huge pages aren't locked in memory, so it's a big improvement for usability. If the new huge page support doesn't work in the kernel, it falls back to the old SysV-style huge page allocator. Thoughts? Andrew. 2011-05-04 Andrew Haley * NEWS: Add S7037939, S7034464. * patches/icedtea-hugepage.patch: Support transparent huge pages on Linux available since 2.6.38 Disable adaptive resizing if SHM large pages are used. # HG changeset patch # User iveresov # Date 1303344724 25200 # Node ID 139667d9836ae218ab06a74d5813a5a700a076c9 # Parent 49a67202bc671d23d719c9e14752d80295a9e8f6 7034464: Support transparent large pages on Linux Summary: Support transparent huge pages on Linux available since 2.6.38 Reviewed-by: iveresov, ysr Contributed-by: aph at redhat.com # HG changeset patch # User iveresov # Date 1303843594 25200 # Node ID c303b3532d4ada074facc42292219952c2a4204e # Parent d6cdc6c77582408f6450bdda3ffc831d44298714 7037939: NUMA: Disable adaptive resizing if SHM large pages are used Summary: Make the NUMA allocator behave properly with SHM and ISM large pages. Reviewed-by: ysr diff -r -u openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp --- openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp 2011-03-16 02:30:16.000000000 +0000 +++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2011-05-03 15:28:57.506395330 +0100 @@ -29,13 +29,19 @@ // Defines Linux specific flags. They are not available on other platforms. // #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \ - product(bool, UseOprofile, false, \ - "enable support for Oprofile profiler") \ - \ - product(bool, UseLinuxPosixThreadCPUClocks, true, \ - "enable fast Linux Posix clocks where available") -// NB: The default value of UseLinuxPosixThreadCPUClocks may be -// overridden in Arguments::parse_each_vm_init_arg. + product(bool, UseOprofile, false, \ + "enable support for Oprofile profiler") \ + \ + product(bool, UseLinuxPosixThreadCPUClocks, true, \ + "enable fast Linux Posix clocks where available") \ +/* NB: The default value of UseLinuxPosixThreadCPUClocks may be \ + overridden in Arguments::parse_each_vm_init_arg. */ \ + \ + product(bool, UseHugeTLBFS, false, \ + "Use MAP_HUGETLB for large pages") \ + \ + product(bool, UseSHM, false, \ + "Use SYSV shared memory for large pages") // // Defines Linux-specific default values. The flags are available on all diff -r -u openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp --- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-03 14:32:54.285722656 +0100 +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-04 11:54:46.645813794 +0100 @@ -2495,16 +2495,40 @@ return res != (uintptr_t) MAP_FAILED; } +// Define MAP_HUGETLB here so we can build HotSpot on old systems. +#ifndef MAP_HUGETLB +#define MAP_HUGETLB 0x40000 +#endif + +// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. +#ifndef MADV_HUGEPAGE +#define MADV_HUGEPAGE 14 +#endif + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, bool exec) { + if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { + int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; + uintptr_t res = + (uintptr_t) ::mmap(addr, size, prot, + MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, + -1, 0); + return res != (uintptr_t) MAP_FAILED; + } + return commit_memory(addr, size, exec); } -void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } +void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { + if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { + // We don't check the return value: madvise(MADV_HUGEPAGE) may not + // be supported or the memory may already be backed by huge pages. + ::madvise(addr, bytes, MADV_HUGEPAGE); + } +} void os::free_memory(char *addr, size_t bytes) { - ::mmap(addr, bytes, PROT_READ | PROT_WRITE, - MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); + ::madvise(addr, bytes, MADV_DONTNEED); } void os::numa_make_global(char *addr, size_t bytes) { @@ -2870,7 +2894,16 @@ static size_t _large_page_size = 0; bool os::large_page_init() { - if (!UseLargePages) return false; + if (!UseLargePages) { + UseHugeTLBFS = false; + UseSHM = false; + return false; + } + + if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { + // Our user has not expressed a preference, so we'll try both. + UseHugeTLBFS = UseSHM = true; + } if (LargePageSizeInBytes) { _large_page_size = LargePageSizeInBytes; @@ -2915,6 +2948,9 @@ } } + // print a warning if any large page related flag is specified on command line + bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); + const size_t default_page_size = (size_t)Linux::page_size(); if (_large_page_size > default_page_size) { _page_sizes[0] = _large_page_size; @@ -2922,6 +2958,14 @@ _page_sizes[2] = 0; } + UseHugeTLBFS = UseHugeTLBFS && + Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); + + if (UseHugeTLBFS) + UseSHM = false; + + UseLargePages = UseHugeTLBFS || UseSHM; + // Large page support is available on 2.6 or newer kernel, some vendors // (e.g. Redhat) have backported it to their 2.4 based distributions. // We optimistically assume the support is available. If later it turns out @@ -2936,7 +2980,7 @@ char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { // "exec" is passed in but not used. Creating the shared image for // the code cache doesn't have an SHM_X executable permission to check. - assert(UseLargePages, "only for large pages"); + assert(UseLargePages && UseSHM, "only for SHM large pages"); key_t key = IPC_PRIVATE; char *addr; @@ -3003,19 +3047,19 @@ return _large_page_size; } -// Linux does not support anonymous mmap with large page memory. The only way -// to reserve large page memory without file backing is through SysV shared -// memory API. The entire memory region is committed and pinned upfront. -// Hopefully this will change in the future... +// HugeTLBFS allows application to commit large page memory on demand; +// with SysV SHM the entire memory region must be allocated as shared +// memory. bool os::can_commit_large_page_memory() { - return false; + return UseHugeTLBFS; } bool os::can_execute_large_page_memory() { - return false; + return UseHugeTLBFS; } // Reserve memory at an arbitrary address, only if that area is +// Reserve memory at an arbitrary address, only if that area is // available (and not reserved for something else). char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { @@ -4104,6 +4148,23 @@ UseNUMA = false; } } + // With SHM large pages we cannot uncommit a page, so there's not way + // we can make the adaptive lgrp chunk resizing work. If the user specified + // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and + // disable adaptive resizing. + if (UseNUMA && UseLargePages && UseSHM) { + if (!FLAG_IS_DEFAULT(UseNUMA)) { + if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { + UseLargePages = false; + } else { + warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); + UseAdaptiveSizePolicy = false; + UseAdaptiveNUMAChunkSizing = false; + } + } else { + UseNUMA = false; + } + } if (!UseNUMA && ForceNUMA) { UseNUMA = true; } @@ -5009,6 +5070,43 @@ // JSR166 // ------------------------------------------------------- +bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { + bool result = false; + void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, + MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, + -1, 0); + + if (p != (void *) -1) { + // We don't know if this really is a huge page or not. + FILE *fp = fopen("/proc/self/maps", "r"); + if (fp) { + while (!feof(fp)) { + char chars[257]; + long x = 0; + if (fgets(chars, sizeof(chars), fp)) { + if (sscanf(chars, "%lx-%*lx", &x) == 1 + && x == (long)p) { + if (strstr (chars, "hugepage")) { + result = true; + break; + } + } + } + } + fclose(fp); + } + munmap (p, page_size); + if (result) + return true; + } + + if (warn) { + warning("HugeTLBFS is not supported by the operating system."); + } + + return result; +} + /* * The solaris and linux implementations of park/unpark are fairly * conservative for now, but can be improved. They currently use a diff -r -u openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig --- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 14:32:53.972649764 +0100 +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 15:28:57.508395796 +0100 @@ -117,6 +117,10 @@ # include # include +#if __x86_64__ +#include +#endif + #define MAX_PATH (2 * K) // for timer info max values which include all bits @@ -2491,16 +2495,40 @@ return res != (uintptr_t) MAP_FAILED; } +// Define MAP_HUGETLB here so we can build HotSpot on old systems. +#ifndef MAP_HUGETLB +#define MAP_HUGETLB 0x40000 +#endif + +// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. +#ifndef MADV_HUGEPAGE +#define MADV_HUGEPAGE 14 +#endif + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, bool exec) { + if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { + int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; + uintptr_t res = + (uintptr_t) ::mmap(addr, size, prot, + MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, + -1, 0); + return res != (uintptr_t) MAP_FAILED; + } + return commit_memory(addr, size, exec); } -void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } +void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { + if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { + // We don't check the return value: madvise(MADV_HUGEPAGE) may not + // be supported or the memory may already be backed by huge pages. + ::madvise(addr, bytes, MADV_HUGEPAGE); + } +} void os::free_memory(char *addr, size_t bytes) { - ::mmap(addr, bytes, PROT_READ | PROT_WRITE, - MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); + ::madvise(addr, bytes, MADV_DONTNEED); } void os::numa_make_global(char *addr, size_t bytes) { @@ -2544,6 +2572,21 @@ return end; } +static int sched_getcpu_syscall(void) { + unsigned int cpu; + int retval = -1; + +#if __x86_64__ + typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); + vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); + retval = vgetcpu(&cpu, NULL, NULL); +#elif __i386__ + retval = syscall(SYS_getcpu, &cpu, NULL, NULL); +#endif + + return (retval == -1) ? retval : cpu; +} + extern "C" void numa_warn(int number, char *where, ...) { } extern "C" void numa_error(char *where) { } @@ -2565,6 +2608,10 @@ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, dlsym(RTLD_DEFAULT, "sched_getcpu"))); + // If it's not, try a direct syscall. + if (sched_getcpu() == -1) + set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall)); + if (sched_getcpu() != -1) { // Does it work? void *handle = dlopen("libnuma.so.1", RTLD_LAZY); if (handle != NULL) { @@ -2847,7 +2894,16 @@ static size_t _large_page_size = 0; bool os::large_page_init() { - if (!UseLargePages) return false; + if (!UseLargePages) { + UseHugeTLBFS = false; + UseSHM = false; + return false; + } + + if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { + // Our user has not expressed a preference, so we'll try both. + UseHugeTLBFS = UseSHM = true; + } if (LargePageSizeInBytes) { _large_page_size = LargePageSizeInBytes; @@ -2892,6 +2948,9 @@ } } + // print a warning if any large page related flag is specified on command line + bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); + const size_t default_page_size = (size_t)Linux::page_size(); if (_large_page_size > default_page_size) { _page_sizes[0] = _large_page_size; @@ -2899,6 +2958,14 @@ _page_sizes[2] = 0; } + UseHugeTLBFS = UseHugeTLBFS && + Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); + + if (UseHugeTLBFS) + UseSHM = false; + + UseLargePages = UseHugeTLBFS || UseSHM; + // Large page support is available on 2.6 or newer kernel, some vendors // (e.g. Redhat) have backported it to their 2.4 based distributions. // We optimistically assume the support is available. If later it turns out @@ -2913,7 +2980,7 @@ char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { // "exec" is passed in but not used. Creating the shared image for // the code cache doesn't have an SHM_X executable permission to check. - assert(UseLargePages, "only for large pages"); + assert(UseLargePages && UseSHM, "only for SHM large pages"); key_t key = IPC_PRIVATE; char *addr; @@ -2980,18 +3047,18 @@ return _large_page_size; } -// Linux does not support anonymous mmap with large page memory. The only way -// to reserve large page memory without file backing is through SysV shared -// memory API. The entire memory region is committed and pinned upfront. -// Hopefully this will change in the future... +// HugeTLBFS allows application to commit large page memory on demand; +// with SysV SHM the entire memory region must be allocated as shared +// memory. bool os::can_commit_large_page_memory() { - return false; + return UseHugeTLBFS; } bool os::can_execute_large_page_memory() { - return false; + return UseHugeTLBFS; } + // Reserve memory at an arbitrary address, only if that area is // Reserve memory at an arbitrary address, only if that area is // available (and not reserved for something else). @@ -4986,6 +5053,43 @@ // JSR166 // ------------------------------------------------------- +bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { + bool result = false; + void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, + MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, + -1, 0); + + if (p != (void *) -1) { + // We don't know if this really is a huge page or not. + FILE *fp = fopen("/proc/self/maps", "r"); + if (fp) { + while (!feof(fp)) { + char chars[257]; + long x = 0; + if (fgets(chars, sizeof(chars), fp)) { + if (sscanf(chars, "%lx-%*lx", &x) == 1 + && x == (long)p) { + if (strstr (chars, "hugepage")) { + result = true; + break; + } + } + } + } + fclose(fp); + } + munmap (p, page_size); + if (result) + return true; + } + + if (warn) { + warning("HugeTLBFS is not supported by the operating system."); + } + + return result; +} + /* * The solaris and linux implementations of park/unpark are fairly * conservative for now, but can be improved. They currently use a Only in openjdk/hotspot/src/os/linux/vm: os_linux.cpp~ diff -r -u openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp --- openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp 2011-03-16 02:30:16.000000000 +0000 +++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp 2011-05-03 15:28:57.509396029 +0100 @@ -86,6 +86,9 @@ static void rebuild_cpu_to_node_map(); static GrowableArray* cpu_to_node() { return _cpu_to_node; } + + static bool hugetlbfs_sanity_check(bool warn, size_t page_size); + public: static void init_thread_fpu_state(); static int get_fpu_control_word(); diff -r -u openjdk.patched/hotspot/src/os/solaris/vm/os_solaris.cpp openjdk/hotspot/src/os/solaris/vm/os_solaris.cpp --- openjdk.patched/hotspot/src/os/solaris/vm/os_solaris.cpp 2011-03-16 02:30:16.000000000 +0000 +++ openjdk/hotspot/src/os/solaris/vm/os_solaris.cpp 2011-05-04 11:53:24.342596468 +0100 @@ -2826,7 +2826,9 @@ void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { assert((intptr_t)addr % alignment_hint == 0, "Address should be aligned."); assert((intptr_t)(addr + bytes) % alignment_hint == 0, "End should be aligned."); - Solaris::set_mpss_range(addr, bytes, alignment_hint); + if (UseLargePages && UseMPSS) { + Solaris::set_mpss_range(addr, bytes, alignment_hint); + } } // Tell the OS to make the range local to the first-touching LWP @@ -5042,6 +5044,20 @@ UseNUMA = false; } } + // ISM is not compatible with the NUMA allocator - it always allocates + // pages round-robin across the lgroups. + if (UseNUMA && UseLargePages && UseISM) { + if (!FLAG_IS_DEFAULT(UseNUMA)) { + if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseISM)) { + UseLargePages = false; + } else { + warning("UseNUMA is not compatible with ISM large pages, disabling NUMA allocator"); + UseNUMA = false; + } + } else { + UseNUMA = false; + } + } if (!UseNUMA && ForceNUMA) { UseNUMA = true; } diff -r b6472fccd0ec NEWS --- a/NEWS Tue May 03 13:05:05 2011 +0100 +++ b/NEWS Wed May 04 15:49:23 2011 +0100 @@ -22,6 +22,8 @@ - S6708580: Java applications slow when EXA enabled - S7029905: demo applets missing some html files - S6986968: Crash on XIM server restart + - S7034464: Support transparent large pages on Linux + - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - G356743: Support libpng 1.5. From bugzilla-daemon at icedtea.classpath.org Wed May 4 08:33:30 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 May 2011 15:33:30 +0000 Subject: [Bug 698] Zero fails to build on bytecodeInterpreter.cpp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=698 --- Comment #2 from Andrew John Hughes 2011-05-04 15:33:30 --- Can you please retry this with current HEAD? We are now using b136. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 4 08:47:41 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 May 2011 15:47:41 +0000 Subject: [Bug 705] New: [TRACKER] IcedTea6 1.11 Release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=705 Summary: [TRACKER] IcedTea6 1.11 Release Product: IcedTea Version: 6-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: gnu_andrew at member.fsf.org Metabug for issues blocking the 1.11 release of IcedTea6. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 4 08:48:27 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 May 2011 15:48:27 +0000 Subject: [Bug 705] [TRACKER] IcedTea6 1.11 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=705 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |6-1.11 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 4 08:48:41 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 May 2011 15:48:41 +0000 Subject: [Bug 705] [TRACKER] IcedTea6 1.11 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=705 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|gnu_andrew at member.fsf.org |.org | Status|ASSIGNED |NEW -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From omajid at icedtea.classpath.org Wed May 4 08:49:35 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Wed, 04 May 2011 15:49:35 +0000 Subject: /hg/icedtea6: Remove unapplied/upstreamed patch nss-debug.patch Message-ID: changeset 45472ac9981b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=45472ac9981b author: Omair Majid date: Wed May 04 10:11:54 2011 -0400 Remove unapplied/upstreamed patch nss-debug.patch This patch was pushed upstream some time ago. The patch has not been applied since changeset e545400a3022. Drop it completely. diffstat: ChangeLog | 5 ++++ patches/nss-debug.patch | 54 ------------------------------------------------- 2 files changed, 5 insertions(+), 54 deletions(-) diffs (72 lines): diff -r b71a752b9762 -r 45472ac9981b ChangeLog --- a/ChangeLog Wed May 04 10:09:47 2011 -0400 +++ b/ChangeLog Wed May 04 10:11:54 2011 -0400 @@ -1,3 +1,8 @@ +2011-05-04 Omair Majid + + * patches/nss-debug.patch: Remove file. It was upstreamed and was not + being applied locally. + 2011-05-04 Denis Lila * Makefile.am: Apply patch. diff -r b71a752b9762 -r 45472ac9981b patches/nss-debug.patch --- a/patches/nss-debug.patch Wed May 04 10:09:47 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -diff -r 5b407bce9940 src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java ---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java Fri Apr 09 01:08:35 2010 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Exception.java Mon Apr 12 20:55:39 2010 +0100 -@@ -148,6 +148,7 @@ - 0x00000115, - 0x00000120, - 0x00000121, -+ 0x00000130, - 0x00000150, - 0x00000160, - 0x00000170, -@@ -156,6 +157,7 @@ - 0x00000191, - 0x000001A0, - 0x000001A1, -+ 0x00000200, - 0x80000000, - }; - String[] errorMessages = new String[] { -@@ -234,6 +236,7 @@ - "CKR_WRAPPING_KEY_TYPE_INCONSISTENT", - "CKR_RANDOM_SEED_NOT_SUPPORTED", - "CKR_RANDOM_NO_RNG", -+ "CKR_DOMAIN_PARAMS_INVALID", - "CKR_BUFFER_TOO_SMALL", - "CKR_SAVED_STATE_INVALID", - "CKR_INFORMATION_SENSITIVE", -@@ -242,6 +245,7 @@ - "CKR_CRYPTOKI_ALREADY_INITIALIZED", - "CKR_MUTEX_BAD", - "CKR_MUTEX_NOT_LOCKED", -+ "CKR_FUNCTION_REJECTED", - "CKR_VENDOR_DEFINED", - }; - errorMap = new HashMap(); -diff -r 5b407bce9940 src/share/classes/sun/security/x509/X509Key.java ---- openjdk.orig/jdk/src/share/classes/sun/security/x509/X509Key.java Fri Apr 09 01:08:35 2010 +0100 -+++ openjdk/jdk/src/share/classes/sun/security/x509/X509Key.java Mon Apr 12 20:55:39 2010 +0100 -@@ -171,7 +171,7 @@ - in.data.getUnalignedBitString()); - - } catch (InvalidKeyException e) { -- throw new IOException("subject key, " + e.getMessage()); -+ throw new IOException("subject key, " + e.getMessage(), e); - } - - if (in.data.available() != 0) -@@ -224,7 +224,7 @@ - } catch (NoSuchAlgorithmException e) { - // Return generic X509Key with opaque key data (see below) - } catch (InvalidKeySpecException e) { -- throw new InvalidKeyException(e.getMessage()); -+ throw new InvalidKeyException(e.getMessage(), e); - } - - /* From omajid at redhat.com Wed May 4 08:53:03 2011 From: omajid at redhat.com (Omair Majid) Date: Wed, 04 May 2011 11:53:03 -0400 Subject: RFC: drop nss-debug.patch in icedtea6 In-Reply-To: <4DB20334.20706@redhat.com> References: <4DB20334.20706@redhat.com> Message-ID: <4DC1765F.1080400@redhat.com> On 04/22/2011 06:37 PM, Omair Majid wrote: > Hi, > > The file patches/nss-debug.patch was upstreamed a while back [1]. As a > result this patch has been sitting in icedtea6 repo unused. The attached > patch drops it. > > [1] http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/c3a035784a3a I have pushed this changeset to icedtea6. Cheers, Omair From ahughes at redhat.com Wed May 4 08:53:16 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 4 May 2011 16:53:16 +0100 Subject: Patch: improve huge page support In-Reply-To: <4DC1678E.30402@redhat.com> References: <4DC1678E.30402@redhat.com> Message-ID: <20110504155316.GF26415@rivendell.middle-earth.co.uk> On 15:49 Wed 04 May , Andrew Haley wrote: > My big patch to improve huge page support in now in HotSpot upstream. > This is a backport. > > The question is: to what branches should we apply this? It makes the > use of huge pages much, much easier. You no longer need root access > for anything except setting the size of the huge page pool, and the > huge pages aren't locked in memory, so it's a big improvement for > usability. If the new huge page support doesn't work in the kernel, > it falls back to the old SysV-style huge page allocator. > > Thoughts? > I notice this doesn't actually enable the patch in the Makefile.am. Have you built this on any version of IcedTea yet? I would prefer that this was two separate patches, corresponding to each upstream changeset. It makes it easier to just delete the patch file when it gets backported upstream in OpenJDK6 (and, prior to that, makes it easier to see what we need to request for backport). As to branches, things could get tricky, as each of the currently supported branches has two HotSpot variants as follows: 1.8: hs14 & hs16 1.9: hs17 (default) & hs19 1.10: hs19 (default) & hs20 1.11 (HEAD): hs19 & hs20 (default) So that's potentially five versions of HotSpot to patch (hs14, hs16, hs17, hs19, hs20) but it may be that this code has changed little and the same patch can be applied to several versions. 1.8 is due to become obsolete when we ship 1.11 (according to our 3-release policy [1]), but that won't be until July and there will be a security update before that on the 7th of June [2]. So I'll leave the call on 1.8 to you, but I'd expect we at least want this in 1.9, 1.10 and HEAD. 1. http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-March/013215.html 2. http://www.oracle.com/technetwork/topics/security/alerts-086861.html > Andrew. > > > 2011-05-04 Andrew Haley > > * NEWS: Add S7037939, S7034464. > * patches/icedtea-hugepage.patch: Support transparent huge pages > on Linux available since 2.6.38 > Disable adaptive resizing if SHM large pages are used. > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Wed May 4 09:13:52 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 May 2011 16:13:52 +0000 Subject: [Bug 701] Shark hs19 assert(Thread::current()->is_VM_thread()) failed: must be called by VM thread In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=701 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |705 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 4 09:24:36 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 May 2011 16:24:36 +0000 Subject: [Bug 701] Shark hs19 assert(Thread::current()->is_VM_thread()) failed: must be called by VM thread In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=701 --- Comment #5 from Xerxes R?nby 2011-05-04 16:24:36 --- http://bugs.sun.com/view_bug.do?bug_id=6950075 introduced this bug it changed the nmethod sweeper to operate concurrently -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From xerxes at zafena.se Wed May 4 09:40:20 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Wed, 04 May 2011 18:40:20 +0200 Subject: RFC: icedtea6-1.9: PR632: 6878713.patch breaks shark zero build In-Reply-To: <4DAF7E19.10505@zafena.se> References: <4DAF69E1.8000704@zafena.se> <20110421000626.GE29985@rivendell.middle-earth.co.uk> <4DAF7E19.10505@zafena.se> Message-ID: <4DC18174.5040901@zafena.se> On 2011-04-21 02:45, Xerxes R?nby wrote: > On 2011-04-21 02:06, Dr Andrew John Hughes wrote: >> On 01:18 Thu 21 Apr , Xerxes R?nby wrote: >>> Hi team >>> >>> Here are the missing review to add PR632 to the icedtea6-1.9 release branch. >>> >>> Ok to push? >>> >> >> Does this apply fine with both HotSpots in 1.9? > Applies fine using (default)hs17 and hs19 in 1.9. > >> >> I take it the other branches were done and this got missed? > Yes this got missed. > 1.8, 1.10 and trunk have all-ready been patched. start of thread: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-April/013800.html ping From ahughes at redhat.com Wed May 4 09:49:20 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 4 May 2011 17:49:20 +0100 Subject: /hg/icedtea6: Remove unapplied/upstreamed patch nss-debug.patch In-Reply-To: References: Message-ID: <20110504164920.GM26415@rivendell.middle-earth.co.uk> On 15:49 Wed 04 May , omajid at icedtea.classpath.org wrote: > changeset 45472ac9981b in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=45472ac9981b > author: Omair Majid > date: Wed May 04 10:11:54 2011 -0400 > > Remove unapplied/upstreamed patch nss-debug.patch > > This patch was pushed upstream some time ago. The patch has not been > applied since changeset e545400a3022. Drop it completely. > > My bad. I'll have turned it off and not hg rmed it. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Wed May 4 10:02:34 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 May 2011 17:02:34 +0000 Subject: [Bug 559] shark + hs19 crashes in building docs In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=559 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |701 --- Comment #13 from Xerxes R?nby 2011-05-04 17:02:34 --- we need to fix pr701 before we can know if we hit any asserts while building docs. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 4 10:02:34 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 May 2011 17:02:34 +0000 Subject: [Bug 701] Shark hs19 assert(Thread::current()->is_VM_thread()) failed: must be called by VM thread In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=701 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |559 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From omajid at redhat.com Wed May 4 11:21:37 2011 From: omajid at redhat.com (Omair Majid) Date: Wed, 04 May 2011 14:21:37 -0400 Subject: RFC: Replace gcc-stack-markings.patch in icedtea6 with upstream's fix Message-ID: <4DC19931.8070701@redhat.com> Hi, The attached patch for icedtea6 replaces patches/gcc-stack-markings.patch with the fix applied upstream [1]. Instead of adding an elf section named .note.GNU-stack, upstream chose to explicitly indicate to the linker that the stack should be marked as non-executable. There should be no functional change as a result of applying this patch (well, unless your linker doesnt support -z noexecstack ...). The reason I am applying this is to remove custom patches from icedtea6 and to bring icedtea6 and icedtea7 closer together. Any thoughts or comments? doko, since you committed the original patch, do you have any particular concerns? Cheers, Omair [1] http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/dddc5753c53a -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-replace-gcc-stack-markings.patch Type: text/x-patch Size: 2971 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110504/719ebb93/icedtea6-replace-gcc-stack-markings.patch From andrew at icedtea.classpath.org Wed May 4 11:59:37 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 04 May 2011 18:59:37 +0000 Subject: /hg/icedtea: Use the IcedTea servers for the forest. Message-ID: changeset e019c260e5e5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e019c260e5e5 author: Andrew John Hughes date: Wed May 04 19:59:30 2011 +0100 Use the IcedTea servers for the forest. 2011-05-04 Andrew John Hughes Move to using icedtea servers. * Makefile.am: (CORBA_SHA256SUM): Updated. (HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (ICEDTEA_PREFIX): Added to avoid hardcoding the prefix for the root directory. (ICEDTEA_HG_URL): Updated to use icedtea.classpath.org (extract-openjdk): Use $(ICEDTEA_PREFIX) in place of 'jdk7'. diffstat: ChangeLog | 17 +++++++++++++++++ Makefile.am | 19 ++++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) diffs (67 lines): diff -r 8fa7f2649c4c -r e019c260e5e5 ChangeLog --- a/ChangeLog Wed May 04 08:46:05 2011 +0100 +++ b/ChangeLog Wed May 04 19:59:30 2011 +0100 @@ -1,3 +1,20 @@ +2011-05-04 Andrew John Hughes + + Move to using icedtea servers. + * Makefile.am: + (CORBA_SHA256SUM): Updated. + (HOTSPOT_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + (ICEDTEA_PREFIX): Added to avoid hardcoding + the prefix for the root directory. + (ICEDTEA_HG_URL): Updated to use icedtea.classpath.org + (extract-openjdk): Use $(ICEDTEA_PREFIX) in + place of 'jdk7'. + 2011-05-03 Andrew John Hughes * patches/hotspot/default/gcc-suffix.patch, diff -r 8fa7f2649c4c -r e019c260e5e5 Makefile.am --- a/Makefile.am Wed May 04 08:46:05 2011 +0100 +++ b/Makefile.am Wed May 04 19:59:30 2011 +0100 @@ -10,13 +10,13 @@ LANGTOOLS_CHANGESET = 8e26c4aee63c OPENJDK_CHANGESET = d4aea1a51d62 -CORBA_SHA256SUM = 82eebaa8a248e18a4e4a0552716453c1f7877135ea73b51f3056fdec850267f9 -HOTSPOT_SHA256SUM = 3868c969833dc3b88523d711fc21cfc2c57fea5b6f387a7082aff5634b35c0a1 -JAXP_SHA256SUM = 91b65e352002079045dc1dee1c2a1af92db74a589b11b0a01777760adca80c64 -JAXWS_SHA256SUM = 01747b77f40ffe554a3ee0ff8b902db0d743a1f8f6260c9141a1fb3d1c6cc230 -JDK_SHA256SUM = 7619cdfffd3dcba1275ab37546e89536ff93794ebd7022bf23c3123675cbf635 -LANGTOOLS_SHA256SUM = e7384d93ac86c5b91b767bbbcb58a7037089446943935292d0d7706d16becc9f -OPENJDK_SHA256SUM = 7143dc00cad9b7f8a653e8e22aec9fd3fa354325eaf79007326b16b887b6fbe6 +CORBA_SHA256SUM = 60f8494b1ebf58db75fe8871dcbee1f6e4bd1d8d6c9b6ce49dad7a6a6340c4ac +HOTSPOT_SHA256SUM = d939f29993a75c263b9b0bed8ccb74340860681ec8be1a62a76946ca9502255d +JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0 +JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c +JDK_SHA256SUM = b73bde3576c83439dcb141bc94a9257fe495dcbd1892bbf7700c8b1bcb51636e +LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39 +OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d CACAO_VERSION = e321b101a9ee CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444 @@ -34,7 +34,8 @@ JAXP_DROP_ZIP = jaxp-1_4_5-dev1.zip JAXP_DROP_SHA256SUM = 050cba755c2632dc5ec5ffcdb17f2f4d36a018306c357fdd5c8996d877954de5 -ICEDTEA_HG_URL = http://hg.openjdk.java.net/icedtea/jdk7 +ICEDTEA_PREFIX = icedtea7-forest +ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX) OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7 CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/ CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/ @@ -1086,7 +1087,7 @@ *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \ esac; \ - mv jdk7-$(OPENJDK_CHANGESET) openjdk ; \ + mv $(ICEDTEA_PREFIX)-$(OPENJDK_CHANGESET) openjdk ; \ if test "x${HSBUILD}" != "xdefault"; then \ rm -rf openjdk/hotspot ; \ fi ; \ From ahughes at redhat.com Wed May 4 12:23:57 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 4 May 2011 20:23:57 +0100 Subject: RFC: Replace gcc-stack-markings.patch in icedtea6 with upstream's fix In-Reply-To: <4DC19931.8070701@redhat.com> References: <4DC19931.8070701@redhat.com> Message-ID: <20110504192357.GV26415@rivendell.middle-earth.co.uk> On 14:21 Wed 04 May , Omair Majid wrote: > Hi, > > The attached patch for icedtea6 replaces > patches/gcc-stack-markings.patch with the fix applied upstream [1]. > Instead of adding an elf section named .note.GNU-stack, upstream chose > to explicitly indicate to the linker that the stack should be marked as > non-executable. There should be no functional change as a result of > applying this patch (well, unless your linker doesnt support -z > noexecstack ...). > > The reason I am applying this is to remove custom patches from icedtea6 > and to bring icedtea6 and icedtea7 closer together. > > Any thoughts or comments? doko, since you committed the original patch, > do you have any particular concerns? > > Cheers, > Omair > > [1] http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/dddc5753c53a I vaguely recall the upstream fix now. Please commit this. > diff -r 45472ac9981b Makefile.am > --- a/Makefile.am Wed May 04 10:11:54 2011 -0400 > +++ b/Makefile.am Wed May 04 14:15:37 2011 -0400 > @@ -263,7 +263,7 @@ > patches/dnd-filelists.patch \ > patches/disable-cc-incompatible-sanity-checks.patch \ > patches/explicit-target-arch.patch \ > - patches/gcc-stack-markings.patch \ > + patches/openjdk/7019808-stack_noexec.patch \ > patches/parisc.patch \ > patches/sh4-support.patch \ > patches/policy-evaluation.patch \ > diff -r 45472ac9981b NEWS > --- a/NEWS Wed May 04 10:11:54 2011 -0400 > +++ b/NEWS Wed May 04 14:15:37 2011 -0400 > @@ -24,6 +24,7 @@ > - S6986968: Crash on XIM server restart > - S7018387: Xrender pipeline may leak GC's > - S7036754: Stroked quads sometimes contain NaN > + - S7019808: build fails on Fedora 14: SELinux run-time check: execution of stack in libjvm.so > * Bug fixes > - PR637: make check should exit with an error code if any regression test failed. > - G356743: Support libpng 1.5. > diff -r 45472ac9981b patches/gcc-stack-markings.patch > --- a/patches/gcc-stack-markings.patch Wed May 04 10:11:54 2011 -0400 > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > @@ -1,14 +0,0 @@ > ---- openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s~ 2009-08-06 01:08:57.000000000 -0700 > -+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s 2009-08-06 01:09:27.000000000 -0700 > -@@ -650,3 +650,4 @@ _Atomic_cmpxchg_long: > - popl %ebx > - ret > - > -+.section .note.GNU-stack, "", @progbits > ---- openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s~ 2009-08-06 01:08:57.000000000 -0700 > -+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s 2009-08-06 01:09:27.000000000 -0700 > -@@ -400,3 +400,4 @@ _Atomic_cmpxchg_long: > - addq $4,%rdx > - jg 4b > - ret > -+.section .note.GNU-stack, "", @progbits > diff -r 45472ac9981b patches/openjdk/7019808-stack_noexec.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/openjdk/7019808-stack_noexec.patch Wed May 04 14:15:37 2011 -0400 > @@ -0,0 +1,23 @@ > +# HG changeset patch > +# User dsamersoff > +# Date 1304097180 -14400 > +# Node ID dddc5753c53a063c94c9949c623babe4f946c7e6 > +# Parent 0cddebc420d8b0fff85f4e0071d531e966372b80 > +7019808: build fails on Fedora 14: SELinux run-time check: execution of stack in libjvm.so > +Summary: executable flag is set in the elf header of libjvm.so during build, instruct ld to don't do it. > +Reviewed-by: acorn, phh > + > +diff -r 0cddebc420d8 -r dddc5753c53a make/linux/makefiles/vm.make > +--- openjdk/hotspot/make/linux/makefiles/vm.make Thu Apr 28 08:24:46 2011 -0700 > ++++ openjdk/hotspot/make/linux/makefiles/vm.make Fri Apr 29 21:13:00 2011 +0400 > +@@ -102,6 +102,10 @@ > + CFLAGS += $(EXTRA_CFLAGS) > + LFLAGS += $(EXTRA_CFLAGS) > + > ++# Don't set excutable bit on stack segment > ++# the same could be done by separate execstack command > ++LFLAGS += -Xlinker -z -Xlinker noexecstack > ++ > + LIBS += -lm -ldl -lpthread > + > + # By default, link the *.o into the library, not the executable. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at redhat.com Wed May 4 12:58:07 2011 From: omajid at redhat.com (Omair Majid) Date: Wed, 04 May 2011 15:58:07 -0400 Subject: RFC: Replace patches/pr633-no_javaws_man_page.patch with upstream's fix Message-ID: <4DC1AFCF.1080000@redhat.com> Hi, The patch patches/pr633-no_javaws_man_page.patch was accepted upstream a while back. The attached patch replaces it with a version exported from OpenJDK7 hg and moves it to its proper location under patches/openjdk. Any comments? Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-replace-javaws-patch-with-upstream-01.patch Type: text/x-patch Size: 2568 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110504/b985687d/icedtea6-replace-javaws-patch-with-upstream-01.patch From omajid at icedtea.classpath.org Wed May 4 13:57:48 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Wed, 04 May 2011 20:57:48 +0000 Subject: /hg/icedtea6: Drop bytebuffer-compact.patch; it serves no purpose Message-ID: changeset 2afcd8dd14a0 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2afcd8dd14a0 author: Omair Majid date: Wed May 04 16:22:47 2011 -0400 Drop bytebuffer-compact.patch; it serves no purpose 2011-05-04 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Drop bytebuffer-compact.patch. The original issue this patch used to address was fixed upstream. Now this patch just adds another method clearMark in addition to upstream's discardMark. * generated/java/nio/DirectByteBuffer.java, * generated/java/nio/DirectCharBufferS.java, * generated/java/nio/DirectCharBufferU.java, * generated/java/nio/DirectDoubleBufferS.java, * generated/java/nio/DirectDoubleBufferU.java, * generated/java/nio/DirectFloatBufferS.java, * generated/java/nio/DirectFloatBufferU.java, * generated/java/nio/DirectIntBufferS.java, * generated/java/nio/DirectIntBufferU.java, * generated/java/nio/DirectLongBufferS.java, * generated/java/nio/DirectLongBufferU.java, * generated/java/nio/DirectShortBufferS.java, * generated/java/nio/DirectShortBufferU.java, * generated/java/nio/HeapByteBuffer.java, * generated/java/nio/HeapCharBuffer.java, * generated/java/nio/HeapDoubleBuffer.java, * generated/java/nio/HeapFloatBuffer.java, * generated/java/nio/HeapIntBuffer.java, * generated/java/nio/HeapLongBuffer.java, * generated/java/nio/HeapShortBuffer.java: Replace all uses of clearMark with discardMark. * patches/bytebuffer-compact.patch: Remove. diffstat: ChangeLog | 29 +++++++++++++ Makefile.am | 1 - generated/java/nio/DirectByteBuffer.java | 2 +- generated/java/nio/DirectCharBufferS.java | 2 +- generated/java/nio/DirectCharBufferU.java | 2 +- generated/java/nio/DirectDoubleBufferS.java | 2 +- generated/java/nio/DirectDoubleBufferU.java | 2 +- generated/java/nio/DirectFloatBufferS.java | 2 +- generated/java/nio/DirectFloatBufferU.java | 2 +- generated/java/nio/DirectIntBufferS.java | 2 +- generated/java/nio/DirectIntBufferU.java | 2 +- generated/java/nio/DirectLongBufferS.java | 2 +- generated/java/nio/DirectLongBufferU.java | 2 +- generated/java/nio/DirectShortBufferS.java | 2 +- generated/java/nio/DirectShortBufferU.java | 2 +- generated/java/nio/HeapByteBuffer.java | 2 +- generated/java/nio/HeapCharBuffer.java | 2 +- generated/java/nio/HeapDoubleBuffer.java | 2 +- generated/java/nio/HeapFloatBuffer.java | 2 +- generated/java/nio/HeapIntBuffer.java | 2 +- generated/java/nio/HeapLongBuffer.java | 2 +- generated/java/nio/HeapShortBuffer.java | 2 +- patches/bytebuffer-compact.patch | 61 ----------------------------- 23 files changed, 49 insertions(+), 82 deletions(-) diffs (353 lines): diff -r 45472ac9981b -r 2afcd8dd14a0 ChangeLog --- a/ChangeLog Wed May 04 10:11:54 2011 -0400 +++ b/ChangeLog Wed May 04 16:22:47 2011 -0400 @@ -1,3 +1,32 @@ +2011-05-04 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Drop bytebuffer-compact.patch. The + original issue this patch used to address was fixed upstream. Now this + patch just adds another method clearMark in addition to upstream's + discardMark. + * generated/java/nio/DirectByteBuffer.java, + * generated/java/nio/DirectCharBufferS.java, + * generated/java/nio/DirectCharBufferU.java, + * generated/java/nio/DirectDoubleBufferS.java, + * generated/java/nio/DirectDoubleBufferU.java, + * generated/java/nio/DirectFloatBufferS.java, + * generated/java/nio/DirectFloatBufferU.java, + * generated/java/nio/DirectIntBufferS.java, + * generated/java/nio/DirectIntBufferU.java, + * generated/java/nio/DirectLongBufferS.java, + * generated/java/nio/DirectLongBufferU.java, + * generated/java/nio/DirectShortBufferS.java, + * generated/java/nio/DirectShortBufferU.java, + * generated/java/nio/HeapByteBuffer.java, + * generated/java/nio/HeapCharBuffer.java, + * generated/java/nio/HeapDoubleBuffer.java, + * generated/java/nio/HeapFloatBuffer.java, + * generated/java/nio/HeapIntBuffer.java, + * generated/java/nio/HeapLongBuffer.java, + * generated/java/nio/HeapShortBuffer.java: Replace all uses of clearMark + with discardMark. + * patches/bytebuffer-compact.patch: Remove. + 2011-05-04 Omair Majid * patches/nss-debug.patch: Remove file. It was upstreamed and was not diff -r 45472ac9981b -r 2afcd8dd14a0 Makefile.am --- a/Makefile.am Wed May 04 10:11:54 2011 -0400 +++ b/Makefile.am Wed May 04 16:22:47 2011 -0400 @@ -224,7 +224,6 @@ patches/headers-hotspot.patch \ patches/gcc-suffix.patch \ patches/hotspot/$(HSBUILD)/gcc-suffix.patch \ - patches/bytebuffer-compact.patch \ patches/memory-limits.patch \ patches/libraries.patch \ patches/javafiles.patch \ diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectByteBuffer.java --- a/generated/java/nio/DirectByteBuffer.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectByteBuffer.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 0); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectCharBufferS.java --- a/generated/java/nio/DirectCharBufferS.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectCharBufferS.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 1); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectCharBufferU.java --- a/generated/java/nio/DirectCharBufferU.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectCharBufferU.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 1); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectDoubleBufferS.java --- a/generated/java/nio/DirectDoubleBufferS.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectDoubleBufferS.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 3); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectDoubleBufferU.java --- a/generated/java/nio/DirectDoubleBufferU.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectDoubleBufferU.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 3); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectFloatBufferS.java --- a/generated/java/nio/DirectFloatBufferS.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectFloatBufferS.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 2); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectFloatBufferU.java --- a/generated/java/nio/DirectFloatBufferU.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectFloatBufferU.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 2); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectIntBufferS.java --- a/generated/java/nio/DirectIntBufferS.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectIntBufferS.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 2); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectIntBufferU.java --- a/generated/java/nio/DirectIntBufferU.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectIntBufferU.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 2); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectLongBufferS.java --- a/generated/java/nio/DirectLongBufferS.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectLongBufferS.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 3); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectLongBufferU.java --- a/generated/java/nio/DirectLongBufferU.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectLongBufferU.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 3); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectShortBufferS.java --- a/generated/java/nio/DirectShortBufferS.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectShortBufferS.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 1); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/DirectShortBufferU.java --- a/generated/java/nio/DirectShortBufferU.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/DirectShortBufferU.java Wed May 04 16:22:47 2011 -0400 @@ -354,7 +354,7 @@ unsafe.copyMemory(ix(pos), ix(0), rem << 1); position(rem); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapByteBuffer.java --- a/generated/java/nio/HeapByteBuffer.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/HeapByteBuffer.java Wed May 04 16:22:47 2011 -0400 @@ -222,7 +222,7 @@ System.arraycopy(hb, ix(position()), hb, ix(0), remaining()); position(remaining()); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapCharBuffer.java --- a/generated/java/nio/HeapCharBuffer.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/HeapCharBuffer.java Wed May 04 16:22:47 2011 -0400 @@ -222,7 +222,7 @@ System.arraycopy(hb, ix(position()), hb, ix(0), remaining()); position(remaining()); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapDoubleBuffer.java --- a/generated/java/nio/HeapDoubleBuffer.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/HeapDoubleBuffer.java Wed May 04 16:22:47 2011 -0400 @@ -222,7 +222,7 @@ System.arraycopy(hb, ix(position()), hb, ix(0), remaining()); position(remaining()); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapFloatBuffer.java --- a/generated/java/nio/HeapFloatBuffer.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/HeapFloatBuffer.java Wed May 04 16:22:47 2011 -0400 @@ -222,7 +222,7 @@ System.arraycopy(hb, ix(position()), hb, ix(0), remaining()); position(remaining()); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapIntBuffer.java --- a/generated/java/nio/HeapIntBuffer.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/HeapIntBuffer.java Wed May 04 16:22:47 2011 -0400 @@ -222,7 +222,7 @@ System.arraycopy(hb, ix(position()), hb, ix(0), remaining()); position(remaining()); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapLongBuffer.java --- a/generated/java/nio/HeapLongBuffer.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/HeapLongBuffer.java Wed May 04 16:22:47 2011 -0400 @@ -222,7 +222,7 @@ System.arraycopy(hb, ix(position()), hb, ix(0), remaining()); position(remaining()); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 generated/java/nio/HeapShortBuffer.java --- a/generated/java/nio/HeapShortBuffer.java Wed May 04 10:11:54 2011 -0400 +++ b/generated/java/nio/HeapShortBuffer.java Wed May 04 16:22:47 2011 -0400 @@ -222,7 +222,7 @@ System.arraycopy(hb, ix(position()), hb, ix(0), remaining()); position(remaining()); limit(capacity()); - clearMark(); + discardMark(); return this; diff -r 45472ac9981b -r 2afcd8dd14a0 patches/bytebuffer-compact.patch --- a/patches/bytebuffer-compact.patch Wed May 04 10:11:54 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ ---- ../openjdkb23/openjdk.old/jdk/src/share/classes/java/nio/Buffer.java 2007-10-30 04:36:08.000000000 -0400 -+++ openjdk/jdk/src/share/classes/java/nio/Buffer.java 2007-11-13 13:33:28.000000000 -0500 -@@ -234,8 +234,8 @@ - if ((newPosition > limit) || (newPosition < 0)) - throw new IllegalArgumentException(); - position = newPosition; -- if (mark > position) mark = -1; -- return this; -+ if (mark > position) clearMark(); -+ return this; - } - - /** -@@ -266,8 +266,8 @@ - throw new IllegalArgumentException(); - limit = newLimit; - if (position > limit) position = limit; -- if (mark > limit) mark = -1; -- return this; -+ if (mark > position) clearMark(); -+ return this; - } - - /** -@@ -319,8 +319,8 @@ - public final Buffer clear() { - position = 0; - limit = capacity; -- mark = -1; -- return this; -+ clearMark(); -+ return this; - } - - /** -@@ -347,7 +347,7 @@ - public final Buffer flip() { - limit = position; - position = 0; -- mark = -1; -+ clearMark(); - return this; - } - -@@ -368,7 +368,7 @@ - */ - public final Buffer rewind() { - position = 0; -- mark = -1; -+ clearMark(); - return this; - } - -@@ -547,4 +547,8 @@ - throw new IndexOutOfBoundsException(); - } - -+ final void clearMark() { // package-private -+ mark = -1; -+ } -+ - } From omajid at redhat.com Wed May 4 13:58:28 2011 From: omajid at redhat.com (Omair Majid) Date: Wed, 04 May 2011 16:58:28 -0400 Subject: IcedTea6 build failed for 92ce3a01d889 In-Reply-To: <4DB74A38.7090106@redhat.com> References: <4DB19767.9020102@redhat.com> <4DB1F4D0.2000200@redhat.com> <4DB74A38.7090106@redhat.com> Message-ID: <4DC1BDF4.8000909@redhat.com> On 04/26/2011 06:42 PM, Omair Majid wrote: > On 04/22/2011 05:36 PM, Omair Majid wrote: >> On 04/22/2011 10:57 AM, Omair Majid wrote: >> >>> >>> Meanwhile, should I add back the bytebuffer-compact patch to un-break >>> the build? Sorry about the breakage. >> >> I have reverted the patch. >> > > Updated patch attached. It updates classes under generated/nio/ to use > discardMark() instead of clearMark(), and drops the bytebuffer-compact > patch which was introducing the new clearMark() method. > > I was thinking of just updating the contents of generated/nio/*, but > Andrew Hughes pointed out on IRC that we dont need stuff under generated > to be up-to-date. > I have pushed this fix. Thanks, Omair From ahughes at redhat.com Wed May 4 14:41:23 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 4 May 2011 22:41:23 +0100 Subject: RFC: Replace patches/pr633-no_javaws_man_page.patch with upstream's fix In-Reply-To: <4DC1AFCF.1080000@redhat.com> References: <4DC1AFCF.1080000@redhat.com> Message-ID: <20110504214123.GY26415@rivendell.middle-earth.co.uk> On 15:58 Wed 04 May , Omair Majid wrote: > Hi, > > The patch patches/pr633-no_javaws_man_page.patch was accepted upstream a > while back. The attached patch replaces it with a version exported from > OpenJDK7 hg and moves it to its proper location under patches/openjdk. > > Any comments? > > Cheers, > Omair Yeah, I pushed it, probably for 7. Did we not already mention this in NEWS for 1.10? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Wed May 4 14:46:03 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 4 May 2011 22:46:03 +0100 Subject: Patch which fixes bug #6703377 (font outline transformation) In-Reply-To: <4DC0126B.7030606@redhat.com> References: <4CB86E2C.7000102@redhat.com> <4DBF2599.6040906@redhat.com> <4DBFC69F.2090607@redhat.com> <4DC0126B.7030606@redhat.com> Message-ID: <20110504214603.GA26415@rivendell.middle-earth.co.uk> snip... > >> Upstream has resolved this bug using another method: > >> http://hg.openjdk.java.net/jdk7/2d/jdk/rev/7fba83f5f5e0 > >> > >> Is your patch fixing the exact same problem? Do you think it might be > >> worth it to switch to upstream's fix? > >> > >> Thanks, > >> Omair > > > > Hi Omair, > > > > AFAIK the upstream patch you mentioned is already included in IcedTea6, > > but it is itself does not sufficient to resolve this bug when negative > > coordinates are used. > > > > Ok. I was mislead because the icedtea patch was (re)using the same bug > number. I have updated the jdk 6 patch web page [1] to reflect this. Any > chance you could push this upstream? If this is a problem in IcedTea6, > it will likely affect IcedTea7 (and IcedTea8 soon). > Yes I've mentioned this before with a previous patch Pavel added. Please do not use OpenJDK bug IDs unless it is actually a backport of *that exact fix*. If you really have to refer to the bug ID, make it clear in the naming of the patch and in the ChangeLog. > Thanks, > Omair > > http://icedtea.classpath.org/wiki/IcedTea_JDK6_Patches -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From andrew at icedtea.classpath.org Wed May 4 17:17:40 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 05 May 2011 00:17:40 +0000 Subject: /hg/icedtea: Support building with the system LCMS. Message-ID: changeset 5ffa85bf891c in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5ffa85bf891c author: Andrew John Hughes date: Thu May 05 01:17:33 2011 +0100 Support building with the system LCMS. 2011-05-04 Andrew John Hughes * remove-intree-libraries.sh: Renamed. * INSTALL: Updated with new option. * Makefile.am: (JDK_CHANGESET): Updated to get LCMS patches. (JDK_SHA256SUM): Likewise. (ICEDTEA_ENV): Set USE_SYSTEM_LCMS, LCMS_LIBS and LCMS_CFLAGS if building with system LCMS. * acinclude.m4: (IT_CHECK_FOR_LCMS): Provide the --enable- system-lcms option, enabled by default. * configure.ac: Call IT_CHECK_FOR_LCMS. * remove-intree-libraries.sh.in: Delete LCMS source code only if system version is being used. diffstat: ChangeLog | 18 ++++++++ INSTALL | 2 + Makefile.am | 13 ++++- acinclude.m4 | 25 +++++++++++ configure.ac | 3 + remove-intree-libraries.sh | 60 --------------------------- remove-intree-libraries.sh.in | 93 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 151 insertions(+), 63 deletions(-) diffs (288 lines): diff -r e019c260e5e5 -r 5ffa85bf891c ChangeLog --- a/ChangeLog Wed May 04 19:59:30 2011 +0100 +++ b/ChangeLog Thu May 05 01:17:33 2011 +0100 @@ -1,3 +1,21 @@ +2011-05-04 Andrew John Hughes + + * remove-intree-libraries.sh: Renamed. + * INSTALL: Updated with new option. + * Makefile.am: + (JDK_CHANGESET): Updated to get LCMS patches. + (JDK_SHA256SUM): Likewise. + (ICEDTEA_ENV): Set USE_SYSTEM_LCMS, LCMS_LIBS + and LCMS_CFLAGS if building with system LCMS. + * acinclude.m4: + (IT_CHECK_FOR_LCMS): Provide the --enable-system-lcms + option, enabled by default. + * configure.ac: + Call IT_CHECK_FOR_LCMS. + * remove-intree-libraries.sh.in: + Delete LCMS source code only if system version is + being used. + 2011-05-04 Andrew John Hughes Move to using icedtea servers. diff -r e019c260e5e5 -r 5ffa85bf891c INSTALL --- a/INSTALL Wed May 04 19:59:30 2011 +0100 +++ b/INSTALL Thu May 05 01:17:33 2011 +0100 @@ -87,6 +87,8 @@ * --disable-optimizations: Build with -O0. * --enable-hg: Checkout the OpenJDK tree from Mercurial, rather than downloading and extracting a tarball. +* --enable-system-lcms: Build using the system installation of LCMS2, not + the version in-tree. * --with-gcj: Compile ecj to native code with gcj prior to building. * --with-parallel-jobs: Run the specified number of parallel jobs when building HotSpot and the JDK. If this option is passed without an diff -r e019c260e5e5 -r 5ffa85bf891c Makefile.am --- a/Makefile.am Wed May 04 19:59:30 2011 +0100 +++ b/Makefile.am Thu May 05 01:17:33 2011 +0100 @@ -6,7 +6,7 @@ HOTSPOT_CHANGESET = ef8632d52263 JAXP_CHANGESET = 1c2f25bf36b1 JAXWS_CHANGESET = 339c2d381d80 -JDK_CHANGESET = 8ae719dd77c0 +JDK_CHANGESET = 6a3e0bc5471d LANGTOOLS_CHANGESET = 8e26c4aee63c OPENJDK_CHANGESET = d4aea1a51d62 @@ -14,7 +14,7 @@ HOTSPOT_SHA256SUM = d939f29993a75c263b9b0bed8ccb74340860681ec8be1a62a76946ca9502255d JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0 JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c -JDK_SHA256SUM = b73bde3576c83439dcb141bc94a9257fe495dcbd1892bbf7700c8b1bcb51636e +JDK_SHA256SUM = 278edd55e7dacb51a4b2411f17f437f7bf54acae468c6f63804e485bd192aa93 LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39 OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d @@ -495,6 +495,13 @@ RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar" endif +if USE_SYSTEM_LCMS +ICEDTEA_ENV += \ + USE_SYSTEM_LCMS="true" \ + LCMS_LIBS="${LCMS2_LIBS}" \ + LCMS_CFLAGS="${LCMS2_CFLAGS}" +endif + # OpenJDK boot build environment. ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \ BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \ @@ -1234,7 +1241,7 @@ rm -f stamps/extract-jaxws.stamp stamps/remove-intree-libraries.stamp: stamps/extract-openjdk.stamp - sh $(srcdir)/remove-intree-libraries.sh + sh $(abs_top_builddir)/remove-intree-libraries.sh touch stamps/remove-intree-libraries.stamp clean-remove-intree-libraries: diff -r e019c260e5e5 -r 5ffa85bf891c acinclude.m4 --- a/acinclude.m4 Wed May 04 19:59:30 2011 +0100 +++ b/acinclude.m4 Thu May 05 01:17:33 2011 +0100 @@ -1856,3 +1856,28 @@ AM_CONDITIONAL([DISABLE_JDK_TESTS], test x"${disable_jdk_tests}" = "xyes") ]) +AC_DEFUN_ONCE([IT_CHECK_FOR_LCMS], +[ + AC_MSG_CHECKING([whether to use the system LCMS install]) + AC_ARG_ENABLE([system-lcms], + [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])], + [ + ENABLE_SYSTEM_LCMS="${enableval}" + ], + [ + ENABLE_SYSTEM_LCMS="yes" + ]) + AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS}) + if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then + dnl Check for LCMS2 headers and libraries. + PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no]) + if test "x${LCMS2_FOUND}" = xno + then + AC_MSG_ERROR([Could not find LCMS2; install LCMS2 or build with --disable-system-lcms to use the in-tree copy.]) + fi + AC_SUBST(LCMS2_CFLAGS) + AC_SUBST(LCMS2_LIBS) + fi + AM_CONDITIONAL(USE_SYSTEM_LCMS, test x"${ENABLE_SYSTEM_LCMS}" = "xyes") + AC_SUBST(ENABLE_SYSTEM_LCMS) +]) \ No newline at end of file diff -r e019c260e5e5 -r 5ffa85bf891c configure.ac --- a/configure.ac Wed May 04 19:59:30 2011 +0100 +++ b/configure.ac Thu May 05 01:17:33 2011 +0100 @@ -451,6 +451,9 @@ AC_SUBST(LLVM_LDFLAGS) AC_SUBST(LLVM_LIBS) +IT_CHECK_FOR_LCMS +AC_CONFIG_FILES([remove-intree-libraries.sh]) + # Arguments passed to configure. AC_SUBST(CONFIGURE_ARGS) CONFIGURE_ARGS="$ac_configure_args" diff -r e019c260e5e5 -r 5ffa85bf891c remove-intree-libraries.sh --- a/remove-intree-libraries.sh Wed May 04 19:59:30 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -#!/bin/sh - -ZLIB_VERSION=1.2.3 -ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib-${ZLIB_VERSION} -JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg -GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib -PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng - -echo "Removing zlib" -rm -rvf ${ZIP_SRC} -echo "Removing libjpeg" -rm -vf ${JPEG_SRC}/jcomapi.c -rm -vf ${JPEG_SRC}/jdapimin.c -rm -vf ${JPEG_SRC}/jdapistd.c -rm -vf ${JPEG_SRC}/jdcoefct.c -rm -vf ${JPEG_SRC}/jdcolor.c -rm -vf ${JPEG_SRC}/jddctmgr.c -rm -vf ${JPEG_SRC}/jdhuff.c -rm -vf ${JPEG_SRC}/jdinput.c -rm -vf ${JPEG_SRC}/jdmainct. -rm -vf ${JPEG_SRC}/jdmarker.c -rm -vf ${JPEG_SRC}/jdmaster.c -rm -vf ${JPEG_SRC}/jdmerge.c -rm -vf ${JPEG_SRC}/jdphuff.c -rm -vf ${JPEG_SRC}/jdpostct.c -rm -vf ${JPEG_SRC}/jdsample.c -rm -vf ${JPEG_SRC}/jerror.c -rm -vf ${JPEG_SRC}/jidctflt.c -rm -vf ${JPEG_SRC}/jidctfst.c -rm -vf ${JPEG_SRC}/jidctint.c -rm -vf ${JPEG_SRC}/jidctred.c -rm -vf ${JPEG_SRC}/jmemmgr.c -rm -vf ${JPEG_SRC}/jmemnobs.c -rm -vf ${JPEG_SRC}/jquant1.c -rm -vf ${JPEG_SRC}/jquant2.c -rm -vf ${JPEG_SRC}/jutils.c -rm -vf ${JPEG_SRC}/jcapimin.c -rm -vf ${JPEG_SRC}/jcapistd.c -rm -vf ${JPEG_SRC}/jccoefct.c -rm -vf ${JPEG_SRC}/jccolor.c -rm -vf ${JPEG_SRC}/jcdctmgr.c -rm -vf ${JPEG_SRC}/jchuff.c -rm -vf ${JPEG_SRC}/jcinit.c -rm -vf ${JPEG_SRC}/jcmainct.c -rm -vf ${JPEG_SRC}/jcmarker.c -rm -vf ${JPEG_SRC}/jcmaster.c -rm -vf ${JPEG_SRC}/jcparam.c -rm -vf ${JPEG_SRC}/jcphuff.c -rm -vf ${JPEG_SRC}/jcprepct.c -rm -vf ${JPEG_SRC}/jcsample.c -rm -vf ${JPEG_SRC}/jctrans.c -rm -vf ${JPEG_SRC}/jdtrans.c -rm -vf ${JPEG_SRC}/jfdctflt.c -rm -vf ${JPEG_SRC}/jfdctfst.c -rm -vf ${JPEG_SRC}/jfdctint.c -rm -vf ${JPEG_SRC}/README -echo "Removing giflib" -rm -rvf ${GIF_SRC} -echo "Removing libpng" -rm -rvf ${PNG_SRC} diff -r e019c260e5e5 -r 5ffa85bf891c remove-intree-libraries.sh.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/remove-intree-libraries.sh.in Thu May 05 01:17:33 2011 +0100 @@ -0,0 +1,93 @@ +#!/bin/sh + +ZLIB_VERSION=1.2.3 +ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib-${ZLIB_VERSION} +JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg +GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib +PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng +LCMS_SRC=openjdk/jdk/src/share/native/sun/java2d/cmm/lcms + +echo "Removing zlib" +rm -rvf ${ZIP_SRC} +echo "Removing libjpeg" +rm -vf ${JPEG_SRC}/jcomapi.c +rm -vf ${JPEG_SRC}/jdapimin.c +rm -vf ${JPEG_SRC}/jdapistd.c +rm -vf ${JPEG_SRC}/jdcoefct.c +rm -vf ${JPEG_SRC}/jdcolor.c +rm -vf ${JPEG_SRC}/jddctmgr.c +rm -vf ${JPEG_SRC}/jdhuff.c +rm -vf ${JPEG_SRC}/jdinput.c +rm -vf ${JPEG_SRC}/jdmainct. +rm -vf ${JPEG_SRC}/jdmarker.c +rm -vf ${JPEG_SRC}/jdmaster.c +rm -vf ${JPEG_SRC}/jdmerge.c +rm -vf ${JPEG_SRC}/jdphuff.c +rm -vf ${JPEG_SRC}/jdpostct.c +rm -vf ${JPEG_SRC}/jdsample.c +rm -vf ${JPEG_SRC}/jerror.c +rm -vf ${JPEG_SRC}/jidctflt.c +rm -vf ${JPEG_SRC}/jidctfst.c +rm -vf ${JPEG_SRC}/jidctint.c +rm -vf ${JPEG_SRC}/jidctred.c +rm -vf ${JPEG_SRC}/jmemmgr.c +rm -vf ${JPEG_SRC}/jmemnobs.c +rm -vf ${JPEG_SRC}/jquant1.c +rm -vf ${JPEG_SRC}/jquant2.c +rm -vf ${JPEG_SRC}/jutils.c +rm -vf ${JPEG_SRC}/jcapimin.c +rm -vf ${JPEG_SRC}/jcapistd.c +rm -vf ${JPEG_SRC}/jccoefct.c +rm -vf ${JPEG_SRC}/jccolor.c +rm -vf ${JPEG_SRC}/jcdctmgr.c +rm -vf ${JPEG_SRC}/jchuff.c +rm -vf ${JPEG_SRC}/jcinit.c +rm -vf ${JPEG_SRC}/jcmainct.c +rm -vf ${JPEG_SRC}/jcmarker.c +rm -vf ${JPEG_SRC}/jcmaster.c +rm -vf ${JPEG_SRC}/jcparam.c +rm -vf ${JPEG_SRC}/jcphuff.c +rm -vf ${JPEG_SRC}/jcprepct.c +rm -vf ${JPEG_SRC}/jcsample.c +rm -vf ${JPEG_SRC}/jctrans.c +rm -vf ${JPEG_SRC}/jdtrans.c +rm -vf ${JPEG_SRC}/jfdctflt.c +rm -vf ${JPEG_SRC}/jfdctfst.c +rm -vf ${JPEG_SRC}/jfdctint.c +rm -vf ${JPEG_SRC}/README +echo "Removing giflib" +rm -rvf ${GIF_SRC} +echo "Removing libpng" +rm -rvf ${PNG_SRC} + +if test "x at ENABLE_SYSTEM_LCMS@" = "xyes"; then + echo "Removing lcms" + rm -vf ${LCMS_SRC}/cmscam02.c + rm -vf ${LCMS_SRC}/cmscgats.c + rm -vf ${LCMS_SRC}/cmscnvrt.c + rm -vf ${LCMS_SRC}/cmserr.c + rm -vf ${LCMS_SRC}/cmsgamma.c + rm -vf ${LCMS_SRC}/cmsgmt.c + rm -vf ${LCMS_SRC}/cmsintrp.c + rm -vf ${LCMS_SRC}/cmsio0.c + rm -vf ${LCMS_SRC}/cmsio1.c + rm -vf ${LCMS_SRC}/cmslut.c + rm -vf ${LCMS_SRC}/cmsmd5.c + rm -vf ${LCMS_SRC}/cmsmtrx.c + rm -vf ${LCMS_SRC}/cmsnamed.c + rm -vf ${LCMS_SRC}/cmsopt.c + rm -vf ${LCMS_SRC}/cmspack.c + rm -vf ${LCMS_SRC}/cmspcs.c + rm -vf ${LCMS_SRC}/cmsplugin.c + rm -vf ${LCMS_SRC}/cmsps2.c + rm -vf ${LCMS_SRC}/cmssamp.c + rm -vf ${LCMS_SRC}/cmssm.c + rm -vf ${LCMS_SRC}/cmstypes.c + rm -vf ${LCMS_SRC}/cmsvirt.c + rm -vf ${LCMS_SRC}/cmswtpnt.c + rm -vf ${LCMS_SRC}/cmsxform.c + rm -vf ${LCMS_SRC}/lcms2.h + rm -vf ${LCMS_SRC}/lcms2_internal.h + rm -vf ${LCMS_SRC}/lcms2_plugin.h +fi + From bugzilla-daemon at icedtea.classpath.org Thu May 5 00:19:45 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 05 May 2011 07:19:45 +0000 Subject: [Bug 698] Zero fails to build on bytecodeInterpreter.cpp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=698 --- Comment #3 from Damien Raude-Morvan 2011-05-05 07:19:45 --- Hi, At least, with --enable-zero, it seems to work now on b136 (see #704 for my issues on --with-additional-vms) Regards, -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ptisnovs at redhat.com Thu May 5 01:55:49 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 05 May 2011 10:55:49 +0200 Subject: /hg/icedtea: Support building with the system LCMS. In-Reply-To: References: Message-ID: <4DC26615.9020109@redhat.com> Heh, that's the reason why by builds failed on RHELs ;-) Ok, trying to add configure option --disable-system-lcms Pavel andrew at icedtea.classpath.org wrote: > changeset 5ffa85bf891c in /hg/icedtea > details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5ffa85bf891c > author: Andrew John Hughes > date: Thu May 05 01:17:33 2011 +0100 > > Support building with the system LCMS. > > 2011-05-04 Andrew John Hughes > > * remove-intree-libraries.sh: Renamed. > * INSTALL: Updated with new option. > * Makefile.am: (JDK_CHANGESET): Updated to get LCMS patches. > (JDK_SHA256SUM): Likewise. (ICEDTEA_ENV): Set > USE_SYSTEM_LCMS, LCMS_LIBS and LCMS_CFLAGS if building with > system LCMS. > * acinclude.m4: (IT_CHECK_FOR_LCMS): Provide the --enable- > system-lcms option, enabled by default. > * configure.ac: Call IT_CHECK_FOR_LCMS. > * remove-intree-libraries.sh.in: Delete LCMS source code only > if system version is being used. > > > diffstat: > > ChangeLog | 18 ++++++++ > INSTALL | 2 + > Makefile.am | 13 ++++- > acinclude.m4 | 25 +++++++++++ > configure.ac | 3 + > remove-intree-libraries.sh | 60 --------------------------- > remove-intree-libraries.sh.in | 93 +++++++++++++++++++++++++++++++++++++++++++ > 7 files changed, 151 insertions(+), 63 deletions(-) > > diffs (288 lines): > > diff -r e019c260e5e5 -r 5ffa85bf891c ChangeLog > --- a/ChangeLog Wed May 04 19:59:30 2011 +0100 > +++ b/ChangeLog Thu May 05 01:17:33 2011 +0100 > @@ -1,3 +1,21 @@ > +2011-05-04 Andrew John Hughes > + > + * remove-intree-libraries.sh: Renamed. > + * INSTALL: Updated with new option. > + * Makefile.am: > + (JDK_CHANGESET): Updated to get LCMS patches. > + (JDK_SHA256SUM): Likewise. > + (ICEDTEA_ENV): Set USE_SYSTEM_LCMS, LCMS_LIBS > + and LCMS_CFLAGS if building with system LCMS. > + * acinclude.m4: > + (IT_CHECK_FOR_LCMS): Provide the --enable-system-lcms > + option, enabled by default. > + * configure.ac: > + Call IT_CHECK_FOR_LCMS. > + * remove-intree-libraries.sh.in: > + Delete LCMS source code only if system version is > + being used. > + > 2011-05-04 Andrew John Hughes > > Move to using icedtea servers. > diff -r e019c260e5e5 -r 5ffa85bf891c INSTALL > --- a/INSTALL Wed May 04 19:59:30 2011 +0100 > +++ b/INSTALL Thu May 05 01:17:33 2011 +0100 > @@ -87,6 +87,8 @@ > * --disable-optimizations: Build with -O0. > * --enable-hg: Checkout the OpenJDK tree from Mercurial, rather than > downloading and extracting a tarball. > +* --enable-system-lcms: Build using the system installation of LCMS2, not > + the version in-tree. > * --with-gcj: Compile ecj to native code with gcj prior to building. > * --with-parallel-jobs: Run the specified number of parallel jobs when > building HotSpot and the JDK. If this option is passed without an > diff -r e019c260e5e5 -r 5ffa85bf891c Makefile.am > --- a/Makefile.am Wed May 04 19:59:30 2011 +0100 > +++ b/Makefile.am Thu May 05 01:17:33 2011 +0100 > @@ -6,7 +6,7 @@ > HOTSPOT_CHANGESET = ef8632d52263 > JAXP_CHANGESET = 1c2f25bf36b1 > JAXWS_CHANGESET = 339c2d381d80 > -JDK_CHANGESET = 8ae719dd77c0 > +JDK_CHANGESET = 6a3e0bc5471d > LANGTOOLS_CHANGESET = 8e26c4aee63c > OPENJDK_CHANGESET = d4aea1a51d62 > > @@ -14,7 +14,7 @@ > HOTSPOT_SHA256SUM = d939f29993a75c263b9b0bed8ccb74340860681ec8be1a62a76946ca9502255d > JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0 > JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c > -JDK_SHA256SUM = b73bde3576c83439dcb141bc94a9257fe495dcbd1892bbf7700c8b1bcb51636e > +JDK_SHA256SUM = 278edd55e7dacb51a4b2411f17f437f7bf54acae468c6f63804e485bd192aa93 > LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39 > OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d > > @@ -495,6 +495,13 @@ > RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar" > endif > > +if USE_SYSTEM_LCMS > +ICEDTEA_ENV += \ > + USE_SYSTEM_LCMS="true" \ > + LCMS_LIBS="${LCMS2_LIBS}" \ > + LCMS_CFLAGS="${LCMS2_CFLAGS}" > +endif > + > # OpenJDK boot build environment. > ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \ > BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \ > @@ -1234,7 +1241,7 @@ > rm -f stamps/extract-jaxws.stamp > > stamps/remove-intree-libraries.stamp: stamps/extract-openjdk.stamp > - sh $(srcdir)/remove-intree-libraries.sh > + sh $(abs_top_builddir)/remove-intree-libraries.sh > touch stamps/remove-intree-libraries.stamp > > clean-remove-intree-libraries: > diff -r e019c260e5e5 -r 5ffa85bf891c acinclude.m4 > --- a/acinclude.m4 Wed May 04 19:59:30 2011 +0100 > +++ b/acinclude.m4 Thu May 05 01:17:33 2011 +0100 > @@ -1856,3 +1856,28 @@ > AM_CONDITIONAL([DISABLE_JDK_TESTS], test x"${disable_jdk_tests}" = "xyes") > ]) > > +AC_DEFUN_ONCE([IT_CHECK_FOR_LCMS], > +[ > + AC_MSG_CHECKING([whether to use the system LCMS install]) > + AC_ARG_ENABLE([system-lcms], > + [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])], > + [ > + ENABLE_SYSTEM_LCMS="${enableval}" > + ], > + [ > + ENABLE_SYSTEM_LCMS="yes" > + ]) > + AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS}) > + if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then > + dnl Check for LCMS2 headers and libraries. > + PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no]) > + if test "x${LCMS2_FOUND}" = xno > + then > + AC_MSG_ERROR([Could not find LCMS2; install LCMS2 or build with --disable-system-lcms to use the in-tree copy.]) > + fi > + AC_SUBST(LCMS2_CFLAGS) > + AC_SUBST(LCMS2_LIBS) > + fi > + AM_CONDITIONAL(USE_SYSTEM_LCMS, test x"${ENABLE_SYSTEM_LCMS}" = "xyes") > + AC_SUBST(ENABLE_SYSTEM_LCMS) > +]) > \ No newline at end of file > diff -r e019c260e5e5 -r 5ffa85bf891c configure.ac > --- a/configure.ac Wed May 04 19:59:30 2011 +0100 > +++ b/configure.ac Thu May 05 01:17:33 2011 +0100 > @@ -451,6 +451,9 @@ > AC_SUBST(LLVM_LDFLAGS) > AC_SUBST(LLVM_LIBS) > > +IT_CHECK_FOR_LCMS > +AC_CONFIG_FILES([remove-intree-libraries.sh]) > + > # Arguments passed to configure. > AC_SUBST(CONFIGURE_ARGS) > CONFIGURE_ARGS="$ac_configure_args" > diff -r e019c260e5e5 -r 5ffa85bf891c remove-intree-libraries.sh > --- a/remove-intree-libraries.sh Wed May 04 19:59:30 2011 +0100 > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > @@ -1,60 +0,0 @@ > -#!/bin/sh > - > -ZLIB_VERSION=1.2.3 > -ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib-${ZLIB_VERSION} > -JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg > -GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib > -PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng > - > -echo "Removing zlib" > -rm -rvf ${ZIP_SRC} > -echo "Removing libjpeg" > -rm -vf ${JPEG_SRC}/jcomapi.c > -rm -vf ${JPEG_SRC}/jdapimin.c > -rm -vf ${JPEG_SRC}/jdapistd.c > -rm -vf ${JPEG_SRC}/jdcoefct.c > -rm -vf ${JPEG_SRC}/jdcolor.c > -rm -vf ${JPEG_SRC}/jddctmgr.c > -rm -vf ${JPEG_SRC}/jdhuff.c > -rm -vf ${JPEG_SRC}/jdinput.c > -rm -vf ${JPEG_SRC}/jdmainct. > -rm -vf ${JPEG_SRC}/jdmarker.c > -rm -vf ${JPEG_SRC}/jdmaster.c > -rm -vf ${JPEG_SRC}/jdmerge.c > -rm -vf ${JPEG_SRC}/jdphuff.c > -rm -vf ${JPEG_SRC}/jdpostct.c > -rm -vf ${JPEG_SRC}/jdsample.c > -rm -vf ${JPEG_SRC}/jerror.c > -rm -vf ${JPEG_SRC}/jidctflt.c > -rm -vf ${JPEG_SRC}/jidctfst.c > -rm -vf ${JPEG_SRC}/jidctint.c > -rm -vf ${JPEG_SRC}/jidctred.c > -rm -vf ${JPEG_SRC}/jmemmgr.c > -rm -vf ${JPEG_SRC}/jmemnobs.c > -rm -vf ${JPEG_SRC}/jquant1.c > -rm -vf ${JPEG_SRC}/jquant2.c > -rm -vf ${JPEG_SRC}/jutils.c > -rm -vf ${JPEG_SRC}/jcapimin.c > -rm -vf ${JPEG_SRC}/jcapistd.c > -rm -vf ${JPEG_SRC}/jccoefct.c > -rm -vf ${JPEG_SRC}/jccolor.c > -rm -vf ${JPEG_SRC}/jcdctmgr.c > -rm -vf ${JPEG_SRC}/jchuff.c > -rm -vf ${JPEG_SRC}/jcinit.c > -rm -vf ${JPEG_SRC}/jcmainct.c > -rm -vf ${JPEG_SRC}/jcmarker.c > -rm -vf ${JPEG_SRC}/jcmaster.c > -rm -vf ${JPEG_SRC}/jcparam.c > -rm -vf ${JPEG_SRC}/jcphuff.c > -rm -vf ${JPEG_SRC}/jcprepct.c > -rm -vf ${JPEG_SRC}/jcsample.c > -rm -vf ${JPEG_SRC}/jctrans.c > -rm -vf ${JPEG_SRC}/jdtrans.c > -rm -vf ${JPEG_SRC}/jfdctflt.c > -rm -vf ${JPEG_SRC}/jfdctfst.c > -rm -vf ${JPEG_SRC}/jfdctint.c > -rm -vf ${JPEG_SRC}/README > -echo "Removing giflib" > -rm -rvf ${GIF_SRC} > -echo "Removing libpng" > -rm -rvf ${PNG_SRC} > diff -r e019c260e5e5 -r 5ffa85bf891c remove-intree-libraries.sh.in > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/remove-intree-libraries.sh.in Thu May 05 01:17:33 2011 +0100 > @@ -0,0 +1,93 @@ > +#!/bin/sh > + > +ZLIB_VERSION=1.2.3 > +ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib-${ZLIB_VERSION} > +JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg > +GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib > +PNG_SRC=openjdk/jdk/src/share/native/sun/awt/libpng > +LCMS_SRC=openjdk/jdk/src/share/native/sun/java2d/cmm/lcms > + > +echo "Removing zlib" > +rm -rvf ${ZIP_SRC} > +echo "Removing libjpeg" > +rm -vf ${JPEG_SRC}/jcomapi.c > +rm -vf ${JPEG_SRC}/jdapimin.c > +rm -vf ${JPEG_SRC}/jdapistd.c > +rm -vf ${JPEG_SRC}/jdcoefct.c > +rm -vf ${JPEG_SRC}/jdcolor.c > +rm -vf ${JPEG_SRC}/jddctmgr.c > +rm -vf ${JPEG_SRC}/jdhuff.c > +rm -vf ${JPEG_SRC}/jdinput.c > +rm -vf ${JPEG_SRC}/jdmainct. > +rm -vf ${JPEG_SRC}/jdmarker.c > +rm -vf ${JPEG_SRC}/jdmaster.c > +rm -vf ${JPEG_SRC}/jdmerge.c > +rm -vf ${JPEG_SRC}/jdphuff.c > +rm -vf ${JPEG_SRC}/jdpostct.c > +rm -vf ${JPEG_SRC}/jdsample.c > +rm -vf ${JPEG_SRC}/jerror.c > +rm -vf ${JPEG_SRC}/jidctflt.c > +rm -vf ${JPEG_SRC}/jidctfst.c > +rm -vf ${JPEG_SRC}/jidctint.c > +rm -vf ${JPEG_SRC}/jidctred.c > +rm -vf ${JPEG_SRC}/jmemmgr.c > +rm -vf ${JPEG_SRC}/jmemnobs.c > +rm -vf ${JPEG_SRC}/jquant1.c > +rm -vf ${JPEG_SRC}/jquant2.c > +rm -vf ${JPEG_SRC}/jutils.c > +rm -vf ${JPEG_SRC}/jcapimin.c > +rm -vf ${JPEG_SRC}/jcapistd.c > +rm -vf ${JPEG_SRC}/jccoefct.c > +rm -vf ${JPEG_SRC}/jccolor.c > +rm -vf ${JPEG_SRC}/jcdctmgr.c > +rm -vf ${JPEG_SRC}/jchuff.c > +rm -vf ${JPEG_SRC}/jcinit.c > +rm -vf ${JPEG_SRC}/jcmainct.c > +rm -vf ${JPEG_SRC}/jcmarker.c > +rm -vf ${JPEG_SRC}/jcmaster.c > +rm -vf ${JPEG_SRC}/jcparam.c > +rm -vf ${JPEG_SRC}/jcphuff.c > +rm -vf ${JPEG_SRC}/jcprepct.c > +rm -vf ${JPEG_SRC}/jcsample.c > +rm -vf ${JPEG_SRC}/jctrans.c > +rm -vf ${JPEG_SRC}/jdtrans.c > +rm -vf ${JPEG_SRC}/jfdctflt.c > +rm -vf ${JPEG_SRC}/jfdctfst.c > +rm -vf ${JPEG_SRC}/jfdctint.c > +rm -vf ${JPEG_SRC}/README > +echo "Removing giflib" > +rm -rvf ${GIF_SRC} > +echo "Removing libpng" > +rm -rvf ${PNG_SRC} > + > +if test "x at ENABLE_SYSTEM_LCMS@" = "xyes"; then > + echo "Removing lcms" > + rm -vf ${LCMS_SRC}/cmscam02.c > + rm -vf ${LCMS_SRC}/cmscgats.c > + rm -vf ${LCMS_SRC}/cmscnvrt.c > + rm -vf ${LCMS_SRC}/cmserr.c > + rm -vf ${LCMS_SRC}/cmsgamma.c > + rm -vf ${LCMS_SRC}/cmsgmt.c > + rm -vf ${LCMS_SRC}/cmsintrp.c > + rm -vf ${LCMS_SRC}/cmsio0.c > + rm -vf ${LCMS_SRC}/cmsio1.c > + rm -vf ${LCMS_SRC}/cmslut.c > + rm -vf ${LCMS_SRC}/cmsmd5.c > + rm -vf ${LCMS_SRC}/cmsmtrx.c > + rm -vf ${LCMS_SRC}/cmsnamed.c > + rm -vf ${LCMS_SRC}/cmsopt.c > + rm -vf ${LCMS_SRC}/cmspack.c > + rm -vf ${LCMS_SRC}/cmspcs.c > + rm -vf ${LCMS_SRC}/cmsplugin.c > + rm -vf ${LCMS_SRC}/cmsps2.c > + rm -vf ${LCMS_SRC}/cmssamp.c > + rm -vf ${LCMS_SRC}/cmssm.c > + rm -vf ${LCMS_SRC}/cmstypes.c > + rm -vf ${LCMS_SRC}/cmsvirt.c > + rm -vf ${LCMS_SRC}/cmswtpnt.c > + rm -vf ${LCMS_SRC}/cmsxform.c > + rm -vf ${LCMS_SRC}/lcms2.h > + rm -vf ${LCMS_SRC}/lcms2_internal.h > + rm -vf ${LCMS_SRC}/lcms2_plugin.h > +fi > + From aph at redhat.com Thu May 5 05:00:26 2011 From: aph at redhat.com (Andrew Haley) Date: Thu, 05 May 2011 13:00:26 +0100 Subject: Patch: improve huge page support In-Reply-To: <20110504155316.GF26415@rivendell.middle-earth.co.uk> References: <4DC1678E.30402@redhat.com> <20110504155316.GF26415@rivendell.middle-earth.co.uk> Message-ID: <4DC2915A.2070304@redhat.com> On 05/04/2011 04:53 PM, Dr Andrew John Hughes wrote: > On 15:49 Wed 04 May , Andrew Haley wrote: >> My big patch to improve huge page support in now in HotSpot upstream. >> This is a backport. >> >> The question is: to what branches should we apply this? It makes the >> use of huge pages much, much easier. You no longer need root access >> for anything except setting the size of the huge page pool, and the >> huge pages aren't locked in memory, so it's a big improvement for >> usability. If the new huge page support doesn't work in the kernel, >> it falls back to the old SysV-style huge page allocator. >> >> Thoughts? >> > > I notice this doesn't actually enable the patch in the Makefile.am. Have > you built this on any version of IcedTea yet? Yes, but it's missing from the email, that's all. > I would prefer that this was two separate patches, corresponding to each > upstream changeset. It makes it easier to just delete the patch file > when it gets backported upstream in OpenJDK6 (and, prior to that, makes > it easier to see what we need to request for backport). The patches aren't separate, and shouldn't be applied separately. There are no circumstances in which it's appropriate to apply just one, IMO. > As to branches, things could get tricky, as each of the currently supported > branches has two HotSpot variants as follows: > > 1.8: hs14 & hs16 > 1.9: hs17 (default) & hs19 > 1.10: hs19 (default) & hs20 > 1.11 (HEAD): hs19 & hs20 (default) > > So that's potentially five versions of HotSpot to patch (hs14, hs16, hs17, hs19, hs20) > but it may be that this code has changed little and the same patch can be applied to > several versions. I suspect so, but I had to do a fair bit of work on the backport, as this file has some churn. > 1.8 is due to become obsolete when we ship 1.11 (according to our 3-release policy [1]), > but that won't be until July and there will be a security update before that on the 7th > of June [2]. > > So I'll leave the call on 1.8 to you, but I'd expect we at least want this in 1.9, > 1.10 and HEAD. > > 1. http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-March/013215.html > 2. http://www.oracle.com/technetwork/topics/security/alerts-086861.html OK, I see. Andrew. From xerxes at zafena.se Thu May 5 05:33:32 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Thu, 05 May 2011 14:33:32 +0200 Subject: RFC: CACAO threadlist & threadobject improvements. Message-ID: <4DC2991C.7010900@zafena.se> CACAO upstream have made threadlist & threadobject improvements. http://mips.complang.tuwien.ac.at/hg/cacao/rev/d6264eb66506 The attached patch updates CACAO in Icedtea6 head to use it so that the new implementation can get some proper testing. Ok to push? Cheers Xerxes -------------- next part -------------- A non-text attachment was scrubbed... Name: cacao-d6264eb66506.patch Type: text/x-patch Size: 1946 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110505/6a1b531c/cacao-d6264eb66506.patch From stefan at complang.tuwien.ac.at Thu May 5 05:42:47 2011 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Thu, 5 May 2011 14:42:47 +0200 Subject: RFC: CACAO threadlist & threadobject improvements. In-Reply-To: <4DC2991C.7010900@zafena.se> References: <4DC2991C.7010900@zafena.se> Message-ID: On Thu, May 5, 2011 at 2:33 PM, Xerxes R?nby wrote: > CACAO upstream have made threadlist & threadobject improvements. > http://mips.complang.tuwien.ac.at/hg/cacao/rev/d6264eb66506 > > The attached patch updates CACAO in Icedtea6 head to use it so that the new implementation can get some proper testing. > > Ok to push? I'm fine with it. No that I have any say in this matter... Stefan From xranby at icedtea.classpath.org Thu May 5 05:49:01 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Thu, 05 May 2011 12:49:01 +0000 Subject: /hg/icedtea6: CACAO threadlist & threadobject improvements. Message-ID: changeset 50ed8053ec2f in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=50ed8053ec2f author: Xerxes R?nby date: Thu May 05 14:26:49 2011 +0200 CACAO threadlist & threadobject improvements. 2011-05-05 Xerxes R?nby CACAO threadlist & threadobject improvements. * NEWS: Updated. * Makefile.am (CACAO_VERSION): Updated to latest CACAO revision. (CACAO_SHA256SUM): Updated. diffstat: ChangeLog | 8 ++++++++ Makefile.am | 4 ++-- NEWS | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diffs (40 lines): diff -r 2afcd8dd14a0 -r 50ed8053ec2f ChangeLog --- a/ChangeLog Wed May 04 16:22:47 2011 -0400 +++ b/ChangeLog Thu May 05 14:26:49 2011 +0200 @@ -1,3 +1,11 @@ +2011-05-05 Xerxes R??nby + + CACAO threadlist & threadobject improvements. + * NEWS: Updated. + * Makefile.am + (CACAO_VERSION): Updated to latest CACAO revision. + (CACAO_SHA256SUM): Updated. + 2011-05-04 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Drop bytebuffer-compact.patch. The diff -r 2afcd8dd14a0 -r 50ed8053ec2f Makefile.am --- a/Makefile.am Wed May 04 16:22:47 2011 -0400 +++ b/Makefile.am Thu May 05 14:26:49 2011 +0200 @@ -5,8 +5,8 @@ OPENJDK_VERSION = b22 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ -CACAO_VERSION = c7bf150bfa46 -CACAO_SHA256SUM = 73629f5ac9514afbcf63b6cdf58556e889a5f6a22d4bd70de1dd2816c6500aee +CACAO_VERSION = d6264eb66506 +CACAO_SHA256SUM = 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz diff -r 2afcd8dd14a0 -r 50ed8053ec2f NEWS --- a/NEWS Wed May 04 16:22:47 2011 -0400 +++ b/NEWS Thu May 05 14:26:49 2011 +0200 @@ -30,6 +30,7 @@ - S7031385, PR680: Incorrect register allocation in orderAccess_linux_x86.inline.hpp * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * CACAO + - Threadlist & threadobject improvements. - Ignore all unknown options, but report them. - Fixes build for newer gcc (at least 4.4) on PPC64, breaks older gcc. - CA123: LD_LIBRARY_PATH and java.library.path. From xerxes at zafena.se Thu May 5 05:55:25 2011 From: xerxes at zafena.se (=?UTF-8?B?WGVyeGVzIFLDpW5ieQ==?=) Date: Thu, 05 May 2011 14:55:25 +0200 Subject: RFC: CACAO threadlist & threadobject improvements. In-Reply-To: References: <4DC2991C.7010900@zafena.se> Message-ID: <4DC29E3D.3000609@zafena.se> On 2011-05-05 14:42, Stefan Ring wrote: > On Thu, May 5, 2011 at 2:33 PM, Xerxes R?nby wrote: >> CACAO upstream have made threadlist & threadobject improvements. >> http://mips.complang.tuwien.ac.at/hg/cacao/rev/d6264eb66506 >> >> The attached patch updates CACAO in Icedtea6 head to use it so that the new implementation can get some proper testing. >> >> Ok to push? > > I'm fine with it. No that I have any say in this matter... > > Stefan Thank you Stefan for the review, your opinion are most qualified. Anyone can help with the Icedtea6 code review and we do appreciate it. I have pushed the improvements to: http://icedtea.classpath.org/hg/icedtea6/rev/50ed8053ec2f I will suggest that we now let the icedtea builders test these new thread implementation for a while before we propose them to be back-ported to the icedtea6-1.10 release-branch. Cheers Xerxes From stefan at complang.tuwien.ac.at Thu May 5 05:57:41 2011 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Thu, 5 May 2011 14:57:41 +0200 Subject: RFC: CACAO threadlist & threadobject improvements. In-Reply-To: <4DC29E3D.3000609@zafena.se> References: <4DC2991C.7010900@zafena.se> <4DC29E3D.3000609@zafena.se> Message-ID: > Thank you Stefan for the review, your opinion are most qualified. ... if a tad biased because I like the idea of having my code tested automatically ;). Stefan From ahughes at redhat.com Thu May 5 06:16:09 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 5 May 2011 14:16:09 +0100 Subject: /hg/icedtea: Support building with the system LCMS. In-Reply-To: <4DC26615.9020109@redhat.com> References: <4DC26615.9020109@redhat.com> Message-ID: <20110505131609.GE26415@rivendell.middle-earth.co.uk> On 10:55 Thu 05 May , Pavel Tisnovsky wrote: > Heh, that's the reason why by builds failed on RHELs ;-) Ok, trying to > add configure option --disable-system-lcms > > Pavel Well it should give you a nice message and tell you... -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From xerxes at zafena.se Thu May 5 06:42:24 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Thu, 05 May 2011 15:42:24 +0200 Subject: RFC: JamVM sync with upstream 2011-04-28 Message-ID: <4DC2A940.2010209@zafena.se> Hi the attached patch updates Icedtea6 to stay in sync with JamVM upstream. http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=2e52a601883dda84c824b43363c02881def3e06d I have made the ChangeLog more verbose to make it obvious which new JamVM improvements that have got included by this update. Ok to push? Cheers Xerxes -------------- next part -------------- A non-text attachment was scrubbed... Name: jamvm-2e52a601883dda84c824b43363c02881def3e06d.patch Type: text/x-patch Size: 2354 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110505/28df0811/jamvm-2e52a601883dda84c824b43363c02881def3e06d.patch From ptisnovs at icedtea.classpath.org Thu May 5 07:07:01 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 05 May 2011 14:07:01 +0000 Subject: /hg/buildbot: Added --disable-system-lcms to IcedTea7 configurat... Message-ID: changeset d3a4c323b594 in /hg/buildbot details: http://icedtea.classpath.org/hg/buildbot?cmd=changeset;node=d3a4c323b594 author: ptisnovs date: Thu May 05 11:25:39 2011 +0200 Added --disable-system-lcms to IcedTea7 configuration parameters. diffstat: icedtea/build.sh | 3 +++ icedtea/master.cfg | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diffs (35 lines): diff -r 4acf4a27e0fa -r d3a4c323b594 icedtea/build.sh --- a/icedtea/build.sh Tue May 03 11:16:34 2011 +0200 +++ b/icedtea/build.sh Thu May 05 11:25:39 2011 +0200 @@ -103,8 +103,10 @@ # Some additional VMs only build against one or the other version. if [ "$1" == "6"]; then ICEDTEA_ADDITIONAL_VMS="cacao,jamvm,shark" + ADDITIONAL_OPTIONS="" elif [ "$1" == "7" ]; then ICEDTEA_ADDITIONAL_VMS="shark" + ADDITIONAL_OPTIONS="--disable-system-lcms" fi # Build in separate dir. @@ -115,6 +117,7 @@ && cd $ICEDTEA_BUILD_DIR \ && $ICEDTEA_DIR/configure \ --enable-nss \ + $ADDITIONAL_OPTIONS \ --with-additional-vms=$ICEDTEA_ADDITIONAL_VMS \ && make VERBOSE=true) 2>&1 | tee $BUILD_LOG_FILE BUILD_RESULT=$? diff -r 4acf4a27e0fa -r d3a4c323b594 icedtea/master.cfg --- a/icedtea/master.cfg Tue May 03 11:16:34 2011 +0200 +++ b/icedtea/master.cfg Thu May 05 11:25:39 2011 +0200 @@ -271,7 +271,8 @@ "--disable-docs", "--with-additional-vms=shark", "--with-parallel-jobs=4", - "--with-llvm-config=llvm-config-2.7"], + "--with-llvm-config=llvm-config-2.7", + "--disable-system-lcms"], workdir="build")) f3s7.addStep(Compile(workdir="build")) f3s7.addStep(JTRegCheck(command=["make", "check-hotspot"], From omajid at redhat.com Thu May 5 07:36:38 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 05 May 2011 10:36:38 -0400 Subject: RFC: Replace patches/pr633-no_javaws_man_page.patch with upstream's fix In-Reply-To: <20110504214123.GY26415@rivendell.middle-earth.co.uk> References: <4DC1AFCF.1080000@redhat.com> <20110504214123.GY26415@rivendell.middle-earth.co.uk> Message-ID: <4DC2B5F6.9080907@redhat.com> On 05/04/2011 05:41 PM, Dr Andrew John Hughes wrote: > On 15:58 Wed 04 May , Omair Majid wrote: >> Hi, >> >> The patch patches/pr633-no_javaws_man_page.patch was accepted upstream a >> while back. The attached patch replaces it with a version exported from >> OpenJDK7 hg and moves it to its proper location under patches/openjdk. >> >> Any comments? >> >> Cheers, >> Omair > > Yeah, I pushed it, probably for 7. Did we not already mention this in NEWS > for 1.10? > Yeah, we did. I just wasn't sure if the NEWS entry should be added or not - we didn't list a sun bug id last time (just PR633). Can I commit this patch after I remove the NEWS change? Thanks, Omair From jvanek at redhat.com Thu May 5 09:05:21 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 05 May 2011 18:05:21 +0200 Subject: [icedtea-web] reviewer needed - added engine for lunching reproducers Message-ID: <4DC2CAC1.7070802@redhat.com> Makefile - automated compile and copy for most of reproducers, with possibility to add more complex reproducers which will take care of compiling themselves (I have in this way also "repaired" your reproducers you send me, but because this patch is about engine itself they are not commited - but are working quite fine :) ) When all reproducers are prepared, junit testsuite is lunched - after program is "installed". junit takes location of installed javaws and location of prepared reproducers (directory jars, jnlps and other resources). Inside junit suite virtual server is lunched and serves all resources. During the testsuite individual jnlps are executed, and their stderr/out/return code can be asserted. (There are helepers method for this in used virtual server which provides to tester exactly std out/err return code). Also possibility to timeout process is added. At the end the report - same as was for unit tests - is generated (if my previous patch is used :). There is also possibility of including stdout/err of tests into xml-report files. Regards J. -------------- next part -------------- A non-text attachment was scrubbed... Name: add_reproducers_engine.patch Type: text/x-patch Size: 26661 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110505/53f96b10/add_reproducers_engine.patch From omajid at redhat.com Thu May 5 14:28:42 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 05 May 2011 17:28:42 -0400 Subject: RFC: Drop upstreamed/unapplied shark patches Message-ID: <4DC3168A.8050906@redhat.com> Hi, The three patches: patches/shark-build-hotspot.patch patches/shark-debug-option.patch patches/shark_do_nothing_on_stub_frame.patch were all accepted upstream as "6976186: integrate Shark HotSpot changes" and are included in hotspot b19 [1] and later. The patch files are still in icedtea6 (must have been a mistake). The attached patch deletes them. Okay to commit? Thanks, Omair [1] http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/d2ede61b7a12 -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-drop-upstreamed-shark-patches-01.patch Type: text/x-patch Size: 13140 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110505/c4ab5297/icedtea6-drop-upstreamed-shark-patches-01.patch From omajid at redhat.com Thu May 5 14:43:41 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 05 May 2011 17:43:41 -0400 Subject: RFC: Replace gcc-stack-markings.patch in icedtea6 with upstream's fix In-Reply-To: <20110504192357.GV26415@rivendell.middle-earth.co.uk> References: <4DC19931.8070701@redhat.com> <20110504192357.GV26415@rivendell.middle-earth.co.uk> Message-ID: <4DC31A0D.5000800@redhat.com> On 05/04/2011 03:23 PM, Dr Andrew John Hughes wrote: > On 14:21 Wed 04 May , Omair Majid wrote: >> The attached patch for icedtea6 replaces >> patches/gcc-stack-markings.patch with the fix applied upstream [1]. >> Instead of adding an elf section named .note.GNU-stack, upstream chose >> to explicitly indicate to the linker that the stack should be marked as >> non-executable. There should be no functional change as a result of >> applying this patch (well, unless your linker doesnt support -z >> noexecstack ...). >> >> The reason I am applying this is to remove custom patches from icedtea6 >> and to bring icedtea6 and icedtea7 closer together. >> >> Any thoughts or comments? doko, since you committed the original patch, >> do you have any particular concerns? >> I pinged doko on IRC and he is fine with this change too. >> [1] http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/dddc5753c53a > > I vaguely recall the upstream fix now. Please commit this. > Vaguely recall? It was just a few days ago ;) Also, since it's just replacing one patch with another, do you think we should have a NEWS entry? Thanks, Omair From omajid at icedtea.classpath.org Thu May 5 14:58:12 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 05 May 2011 21:58:12 +0000 Subject: /hg/icedtea6: Backport S7019808. Replace gcc-stack-markings.patc... Message-ID: changeset 012505ce3d0d in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=012505ce3d0d author: Omair Majid date: Thu May 05 17:57:53 2011 -0400 Backport S7019808. Replace gcc-stack-markings.patch with upstream's fix 2011-05-05 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace patches/gcc-stack- markings.patch with patches/openjdk/7019808-stack_noexec.patch. * patches/gcc-stack-markings.patch: Remove * patches/openjdk/7019808-stack_noexec.patch: Fix from upstream. diffstat: ChangeLog | 7 +++++++ Makefile.am | 2 +- patches/gcc-stack-markings.patch | 12 ------------ patches/openjdk/7019808-stack_noexec.patch | 22 ++++++++++++++++++++++ 4 files changed, 30 insertions(+), 13 deletions(-) diffs (71 lines): diff -r 50ed8053ec2f -r 012505ce3d0d ChangeLog --- a/ChangeLog Thu May 05 14:26:49 2011 +0200 +++ b/ChangeLog Thu May 05 17:57:53 2011 -0400 @@ -1,3 +1,10 @@ +2011-05-05 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Replace patches/gcc-stack-markings.patch + with patches/openjdk/7019808-stack_noexec.patch. + * patches/gcc-stack-markings.patch: Remove + * patches/openjdk/7019808-stack_noexec.patch: Fix from upstream. + 2011-05-05 Xerxes R??nby CACAO threadlist & threadobject improvements. diff -r 50ed8053ec2f -r 012505ce3d0d Makefile.am --- a/Makefile.am Thu May 05 14:26:49 2011 +0200 +++ b/Makefile.am Thu May 05 17:57:53 2011 -0400 @@ -262,7 +262,7 @@ patches/dnd-filelists.patch \ patches/disable-cc-incompatible-sanity-checks.patch \ patches/explicit-target-arch.patch \ - patches/gcc-stack-markings.patch \ + patches/openjdk/7019808-stack_noexec.patch \ patches/parisc.patch \ patches/sh4-support.patch \ patches/policy-evaluation.patch \ diff -r 50ed8053ec2f -r 012505ce3d0d patches/gcc-stack-markings.patch --- a/patches/gcc-stack-markings.patch Thu May 05 14:26:49 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ ---- openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s~ 2009-08-06 01:08:57.000000000 -0700 -+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.s 2009-08-06 01:09:27.000000000 -0700 -@@ -650,3 +650,4 @@ _Atomic_cmpxchg_long: - popl %ebx - ret - -+.section .note.GNU-stack, "", @progbits ---- openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s~ 2009-08-06 01:08:57.000000000 -0700 -+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.s 2009-08-06 01:09:27.000000000 -0700 -@@ -400,3 +400,4 @@ _Atomic_cmpxchg_long: - addq $4,%rdx - jg 4b - ret -+.section .note.GNU-stack, "", @progbits diff -r 50ed8053ec2f -r 012505ce3d0d patches/openjdk/7019808-stack_noexec.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7019808-stack_noexec.patch Thu May 05 17:57:53 2011 -0400 @@ -0,0 +1,23 @@ +# HG changeset patch +# User dsamersoff +# Date 1304097180 -14400 +# Node ID dddc5753c53a063c94c9949c623babe4f946c7e6 +# Parent 0cddebc420d8b0fff85f4e0071d531e966372b80 +7019808: build fails on Fedora 14: SELinux run-time check: execution of stack in libjvm.so +Summary: executable flag is set in the elf header of libjvm.so during build, instruct ld to don't do it. +Reviewed-by: acorn, phh + +diff -r 0cddebc420d8 -r dddc5753c53a make/linux/makefiles/vm.make +--- openjdk/hotspot/make/linux/makefiles/vm.make Thu Apr 28 08:24:46 2011 -0700 ++++ openjdk/hotspot/make/linux/makefiles/vm.make Fri Apr 29 21:13:00 2011 +0400 +@@ -102,6 +102,10 @@ + CFLAGS += $(EXTRA_CFLAGS) + LFLAGS += $(EXTRA_CFLAGS) + ++# Don't set excutable bit on stack segment ++# the same could be done by separate execstack command ++LFLAGS += -Xlinker -z -Xlinker noexecstack ++ + LIBS += -lm -ldl -lpthread + + # By default, link the *.o into the library, not the executable. From ahughes at redhat.com Thu May 5 15:12:30 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 5 May 2011 23:12:30 +0100 Subject: RFC: Drop upstreamed/unapplied shark patches In-Reply-To: <4DC3168A.8050906@redhat.com> References: <4DC3168A.8050906@redhat.com> Message-ID: <20110505221230.GF26415@rivendell.middle-earth.co.uk> On 17:28 Thu 05 May , Omair Majid wrote: > Hi, > > The three patches: > patches/shark-build-hotspot.patch > patches/shark-debug-option.patch > patches/shark_do_nothing_on_stub_frame.patch > were all accepted upstream as "6976186: integrate Shark HotSpot changes" > and are included in hotspot b19 [1] and later. The patch files are still > in icedtea6 (must have been a mistake). The attached patch deletes them. > Okay to commit? > > Thanks, > Omair > > [1] http://hg.openjdk.java.net/jdk7/jdk7/hotspot/rev/d2ede61b7a12 As there aren't used in the Makefile.am, you can clearly just delete them. For future reference, please include the ChangeLog in the body of the e-mail, not the patch itself. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 5 15:15:56 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 5 May 2011 23:15:56 +0100 Subject: RFC: CACAO threadlist & threadobject improvements. In-Reply-To: References: <4DC2991C.7010900@zafena.se> Message-ID: <20110505221556.GG26415@rivendell.middle-earth.co.uk> On 14:42 Thu 05 May , Stefan Ring wrote: > On Thu, May 5, 2011 at 2:33 PM, Xerxes R?nby wrote: > > CACAO upstream have made threadlist & threadobject improvements. > > http://mips.complang.tuwien.ac.at/hg/cacao/rev/d6264eb66506 > > > > The attached patch updates CACAO in Icedtea6 head to use it so that the new implementation can get some proper testing. > > > > Ok to push? > > I'm fine with it. No that I have any say in this matter... > On the contrary, you're the best qualified to know what the hell this does... ;-) > Stefan -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at redhat.com Thu May 5 15:29:17 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 05 May 2011 18:29:17 -0400 Subject: RFC: move patches/headers-hotspot.patch to patches/ecj/ Message-ID: <4DC324BD.1050509@redhat.com> Hi, From what I can tell, patches/headers-hotspot.patch and the associated Makefile.am declerations are only needed during bootstrap (to make sure a proper XML implementation is available). After OpenJDK has been built once, the JDK's build-in implementation should be more than sufficient to perform needed tasks. I have been testing the attached patch and it works fine with and without --disable bootstrap. Does anyone have any thoughts about this? ChangeLog: 2011-05-05 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Move headers-hotspot.patch to ... (ICEDTEA_ECJ_PATCHES): Here. (ICEDTEA_ENV): Moves endorsed dir varaibles to ... (ICEDTEA_ENV_ECJ): Here. * patches/headers-hotspot.patch: Move to ... * patches/ecj/headers-hotspot.patch: New file. Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-move-jmvti-to-boot-01.patch Type: text/x-patch Size: 2852 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110505/fb7777a8/icedtea6-move-jmvti-to-boot-01.patch From omajid at icedtea.classpath.org Thu May 5 15:40:17 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 05 May 2011 22:40:17 +0000 Subject: /hg/icedtea6: Drop shark patches already in hotspot 19 (and later) Message-ID: changeset 90783fa340bb in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=90783fa340bb author: Omair Majid date: Thu May 05 18:40:02 2011 -0400 Drop shark patches already in hotspot 19 (and later) These patches were not being applied. 2011-05-05 Omair Majid * patches/shark-build-hotspot.patch, * patches/shark-debug-option.patch, * patches/shark_do_nothing_on_stub_frame.patch: Drop upstreamed/unapplied patches. These were not being applied. diffstat: ChangeLog | 7 + patches/shark-build-hotspot.patch | 260 --------------------------- patches/shark-debug-option.patch | 28 -- patches/shark_do_nothing_on_stub_frame.patch | 13 - 4 files changed, 7 insertions(+), 301 deletions(-) diffs (336 lines): diff -r 012505ce3d0d -r 90783fa340bb ChangeLog --- a/ChangeLog Thu May 05 17:57:53 2011 -0400 +++ b/ChangeLog Thu May 05 18:40:02 2011 -0400 @@ -1,3 +1,10 @@ +2011-05-05 Omair Majid + + * patches/shark-build-hotspot.patch, + * patches/shark-debug-option.patch, + * patches/shark_do_nothing_on_stub_frame.patch: Drop upstreamed/unapplied + patches. These were not being applied. + 2011-05-05 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace patches/gcc-stack-markings.patch diff -r 012505ce3d0d -r 90783fa340bb patches/shark-build-hotspot.patch --- a/patches/shark-build-hotspot.patch Thu May 05 17:57:53 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,266 +0,0 @@ -diff -Nru openjdk.orig/hotspot/make/linux/Makefile openjdk/hotspot/make/linux/Makefile ---- openjdk.orig/hotspot/make/linux/Makefile 2008-07-03 08:39:52.000000000 +0100 -+++ openjdk/hotspot/make/linux/Makefile 2008-07-13 00:59:03.000000000 +0100 -@@ -168,6 +168,13 @@ - # profiledzero zero __zero/profiled - # productzero zero __zero/product - # -+# debugshark shark __shark/debug -+# fastdebugshark shark __shark/fastdebug -+# jvmgshark shark __shark/jvmg -+# optimizedshark shark __shark/optimized -+# profiledshark shark __shark/profiled -+# productshark shark __shark/product -+# - # What you get with each target: - # - # debug* - "thin" libjvm_g - debug info linked into the gamma_g launcher -@@ -191,12 +198,14 @@ - SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS)) - SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS)) - SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS)) -+SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS)) - - TARGETS_C2 = $(TARGETS) - TARGETS_C1 = $(addsuffix 1,$(TARGETS)) - TARGETS_TIERED = $(addsuffix tiered,$(TARGETS)) - TARGETS_CORE = $(addsuffix core,$(TARGETS)) - TARGETS_ZERO = $(addsuffix zero,$(TARGETS)) -+TARGETS_SHARK = $(addsuffix shark,$(TARGETS)) - - BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make - BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) -@@ -213,6 +222,7 @@ - @echo " $(TARGETS_C1)" - @echo " $(TARGETS_CORE)" - @echo " $(TARGETS_ZERO)" -+ @echo " $(TARGETS_SHARK)" - - checks: check_os_version check_j2se_version - -@@ -266,6 +276,10 @@ - $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks - $(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH) - -+$(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero -+ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks -+ $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH) -+ - platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in - $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@ - -@@ -306,11 +320,19 @@ - cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install - endif - -+$(TARGETS_SHARK): $(SUBDIRS_SHARK) -+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) -+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma -+ifdef INSTALL -+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install -+endif -+ - # Just build the tree, and nothing else: - tree: $(SUBDIRS_C2) - tree1: $(SUBDIRS_C1) - treecore: $(SUBDIRS_CORE) - treezero: $(SUBDIRS_ZERO) -+treeshark: $(SUBDIRS_SHARK) - - # Doc target. This is the same for all build options. - # Hence create a docs directory beside ...$(ARCH)_[...] -@@ -327,20 +349,22 @@ - - zero: jvmgzero productzero - -+shark: jvmgshark productshark -+ - clean_docs: - rm -rf $(SUBDIR_DOCS) - --clean_compiler1 clean_compiler2 clean_core clean_zero: -+clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark: - rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@) - --clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_docs -+clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_docs - - include $(GAMMADIR)/make/$(OSNAME)/makefiles/cscope.make - - #------------------------------------------------------------------------------- - --.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) --.PHONY: tree tree1 treecore treezero --.PHONY: all compiler1 compiler2 core zero --.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero docs clean_docs -+.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK) -+.PHONY: tree tree1 treecore treezero treeshark -+.PHONY: all compiler1 compiler2 core zero shark -+.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs - .PHONY: checks check_os_version check_j2se_version -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make ---- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make 2008-07-13 00:38:03.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/buildtree.make 2008-07-13 00:59:03.000000000 +0100 -@@ -215,8 +215,8 @@ - - ../shared_dirs.lst: $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm - @echo Creating directory list $@ -- $(QUIETLY) find $(GAMMADIR)/src/share/vm/* -prune \ -- -type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find {} \ -+ $(QUIETLY) find -L $(GAMMADIR)/src/share/vm/* -prune \ -+ -type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find -L {} \ - \( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; > $@ - - Makefile: $(BUILDTREE_MAKE) -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make ---- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2008-07-13 00:38:03.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/gcc.make 2008-07-13 00:59:03.000000000 +0100 -@@ -64,6 +64,9 @@ - ifdef ICEDTEA_ZERO_BUILD - CFLAGS += $(LIBFFI_CFLAGS) - endif -+ifeq ($(SHARK_BUILD), true) -+CFLAGS += $(LLVM_CFLAGS) -+endif - CFLAGS += $(VM_PICFLAG) - CFLAGS += -fno-rtti - CFLAGS += -fno-exceptions -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/top.make openjdk/hotspot/make/linux/makefiles/top.make ---- openjdk.orig/hotspot/make/linux/makefiles/top.make 2008-07-03 08:39:53.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/top.make 2008-07-13 00:59:03.000000000 +0100 -@@ -75,6 +75,7 @@ - Include_DBs/COMPILER2 = $(Include_DBs/CORE) $(VM)/includeDB_compiler2 - Include_DBs/TIERED = $(Include_DBs/CORE) $(VM)/includeDB_compiler1 $(VM)/includeDB_compiler2 - Include_DBs/ZERO = $(Include_DBs/CORE) $(VM)/includeDB_zero -+Include_DBs/SHARK = $(Include_DBs/ZERO) $(VM)/includeDB_shark - Include_DBs = $(Include_DBs/$(TYPE)) - - Cached_plat = $(GENERATED)/platform.current -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make ---- openjdk.orig/hotspot/make/linux/makefiles/vm.make 2008-07-13 00:38:03.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/vm.make 2008-07-13 00:59:03.000000000 +0100 -@@ -126,10 +126,14 @@ - - STATIC_CXX = true - --ifeq ($(ZERO_LIBARCH), ppc64) -+ifeq ($(SHARK_BUILD), true) - STATIC_CXX = false - else -- STATIC_CXX = true -+ ifeq ($(ZERO_LIBARCH), ppc64) -+ STATIC_CXX = false -+ else -+ STATIC_CXX = true -+ endif - endif - - ifeq ($(LINK_INTO),AOUT) -@@ -157,6 +161,10 @@ - ifdef ICEDTEA_ZERO_BUILD - LIBS_VM += $(LIBFFI_LIBS) - endif -+ifeq ($(SHARK_BUILD), true) -+LFLAGS_VM += $(LLVM_LDFLAGS) -+LIBS_VM += $(LLVM_LIBS) -+endif - - LINK_VM = $(LINK_LIB.c) - -diff -Nru openjdk.orig/hotspot/make/Makefile openjdk/hotspot/make/Makefile ---- openjdk.orig/hotspot/make/Makefile 2008-07-13 00:38:02.000000000 +0100 -+++ openjdk/hotspot/make/Makefile 2008-07-13 00:59:03.000000000 +0100 -@@ -85,6 +85,7 @@ - C2_VM_TARGETS=product fastdebug optimized jvmg - KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel - ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero -+SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark - - # JDK directory list - JDK_DIRS=bin include jre lib demo -@@ -101,6 +102,12 @@ - all_debugzero: jvmgzero docs export_debug - all_optimizedzero: optimizedzero docs export_optimized - -+allshark: all_productshark all_fastdebugshark -+all_productshark: productshark docs export_product -+all_fastdebugshark: fastdebugshark docs export_fastdebug -+all_debugshark: jvmgshark docs export_debug -+all_optimizedshark: optimizedshark docs export_optimized -+ - # Do everything - world: all create_jdk - -@@ -131,6 +138,10 @@ - $(CD) $(GAMMADIR)/make; \ - $(MAKE) VM_TARGET=$@ generic_buildzero $(ALT_OUT) - -+$(SHARK_VM_TARGETS): -+ $(CD) $(GAMMADIR)/make; \ -+ $(MAKE) VM_TARGET=$@ generic_buildshark $(ALT_OUT) -+ - # Build compiler1 (client) rule, different for platforms - generic_build1: - $(MKDIR) -p $(OUTPUTDIR) -@@ -197,6 +208,12 @@ - $(MAKE) -f $(ABS_OS_MAKEFILE) \ - $(MAKE_ARGS) $(VM_TARGET) - -+generic_buildshark: -+ $(MKDIR) -p $(OUTPUTDIR) -+ $(CD) $(OUTPUTDIR); \ -+ $(MAKE) -f $(ABS_OS_MAKEFILE) \ -+ $(MAKE_ARGS) $(VM_TARGET) -+ - # Export file rule - generic_export: $(EXPORT_LIST) - export_product: -@@ -228,15 +245,22 @@ - C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 - KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel - ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero -+SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark - C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR) - C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR) - KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR) - ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR) -+SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR) - - # Misc files and generated files need to come from C1 or C2 area - ifeq ($(ZERO_BUILD), true) -+ifeq ($(SHARK_BUILD), true) -+ MISC_DIR=$(SHARK_DIR) -+ GEN_DIR=$(SHARK_BASE_DIR)/generated -+else - MISC_DIR=$(ZERO_DIR) - GEN_DIR=$(ZERO_BASE_DIR)/generated -+endif - else - ifeq ($(ARCH_DATA_MODEL), 32) - MISC_DIR=$(C1_DIR) -@@ -290,10 +314,17 @@ - # Shared Library - ifneq ($(OSNAME),windows) - ifeq ($(ZERO_BUILD), true) -+ ifeq ($(SHARK_BUILD), true) -+$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so -+ $(install-file) -+$(EXPORT_SERVER_DIR)/%.so: $(SHARK_DIR)/%.so -+ $(install-file) -+ else - $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so - $(install-file) - $(EXPORT_SERVER_DIR)/%.so: $(ZERO_DIR)/%.so - $(install-file) -+ endif - else - $(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so - $(install-file) -@@ -345,6 +376,7 @@ - $(RM) -r $(C2_DIR) - $(RM) -r $(KERNEL_DIR) - $(RM) -r $(ZERO_DIR) -+ $(RM) -r $(SHARK_DIR) - clean_export: - $(RM) -r $(EXPORT_PATH) - clean_jdk: diff -r 012505ce3d0d -r 90783fa340bb patches/shark-debug-option.patch --- a/patches/shark-debug-option.patch Thu May 05 17:57:53 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/disassembler_zero.hpp openjdk/hotspot/src/cpu/zero/vm/disassembler_zero.hpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/disassembler_zero.hpp 2010-05-28 11:10:31.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/disassembler_zero.hpp 2010-06-17 19:29:24.000000000 +0100 -@@ -23,13 +23,10 @@ - * - */ - --// The disassembler prints out zero code annotated --// with Java specific information. -- - static int pd_instruction_alignment() { -- ShouldNotCallThis(); -+ return 1; - } - - static const char* pd_cpu_opts() { -- ShouldNotCallThis(); -+ return ""; - } -diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/globals_zero.hpp openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp ---- openjdk.orig/hotspot/src/cpu/zero/vm/globals_zero.hpp 2010-05-28 11:10:31.000000000 +0100 -+++ openjdk/hotspot/src/cpu/zero/vm/globals_zero.hpp 2010-06-17 19:29:07.000000000 +0100 -@@ -35,6 +35,7 @@ - define_pd_global(bool, UncommonNullCast, true); - - define_pd_global(intx, CodeEntryAlignment, 32); -+define_pd_global(intx, OptoLoopAlignment, 16); - define_pd_global(intx, InlineFrequencyCount, 100); - define_pd_global(intx, PreInflateSpin, 10); - diff -r 012505ce3d0d -r 90783fa340bb patches/shark_do_nothing_on_stub_frame.patch --- a/patches/shark_do_nothing_on_stub_frame.patch Thu May 05 17:57:53 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/frame.cpp openjdk/hotspot/src/share/vm/runtime/frame.cpp ---- openjdk.orig/hotspot/src/share/vm/runtime/frame.cpp 2010-04-17 02:15:34.000000000 +0100 -+++ openjdk/hotspot/src/share/vm/runtime/frame.cpp 2010-04-18 17:37:54.000000000 +0100 -@@ -1212,6 +1212,10 @@ - oops_entry_do(f, map); - } else if (CodeCache::contains(pc())) { - oops_code_blob_do(f, cf, map); -+#ifdef SHARK -+ } else if (is_fake_stub_frame()) { -+ // nothing to do -+#endif // SHARK - } else { - ShouldNotReachHere(); - } From omajid at redhat.com Thu May 5 16:51:36 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 05 May 2011 19:51:36 -0400 Subject: RFC: Replace patches/rh676659-gcc-export-dynamic.patch with upstream version Message-ID: <4DC33808.5070101@redhat.com> Hi, The attached patch replaces patches/rh676659-gcc-export-dynamic.patch with the almost-identical fix from OpenJDK7. Okay to commit? ChangeLog: 2011-05-05 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace old patch name with new. * patches/openjdk/7041156-gcc_export_dynamic.patch: New file. Export from OpenJDK7. * patches/rh676659-gcc-export-dynamic.patch: Remove. Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-replace-gcc-export-dynamic.patch Type: text/x-patch Size: 2327 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110505/3e54a8a8/icedtea6-replace-gcc-export-dynamic.patch From ahughes at redhat.com Thu May 5 17:53:17 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 May 2011 01:53:17 +0100 Subject: RFC: move patches/headers-hotspot.patch to patches/ecj/ In-Reply-To: <4DC324BD.1050509@redhat.com> References: <4DC324BD.1050509@redhat.com> Message-ID: <20110506005316.GI26415@rivendell.middle-earth.co.uk> On 18:29 Thu 05 May , Omair Majid wrote: > Hi, > > From what I can tell, patches/headers-hotspot.patch and the associated > Makefile.am declerations are only needed during bootstrap (to make sure > a proper XML implementation is available). After OpenJDK has been built > once, the JDK's build-in implementation should be more than sufficient > to perform needed tasks. I have been testing the attached patch and it > works fine with and without --disable bootstrap. > > Does anyone have any thoughts about this? > > ChangeLog: > 2011-05-05 Omair Majid > > * Makefile.am > (ICEDTEA_PATCHES): Move headers-hotspot.patch to ... > (ICEDTEA_ECJ_PATCHES): Here. > (ICEDTEA_ENV): Moves endorsed dir varaibles to ... > (ICEDTEA_ENV_ECJ): Here. > * patches/headers-hotspot.patch: Move to ... > * patches/ecj/headers-hotspot.patch: New file. > > Cheers, > Omair Yes, these look like bootstrap patches that have been wrongly placed eons ago. Please apply this. Can you also do a similar change for 7? The fragment is part of headers.patch there and needs to be split and placed in patches/boot. > diff -r 2afcd8dd14a0 Makefile.am > --- a/Makefile.am Wed May 04 16:22:47 2011 -0400 > +++ b/Makefile.am Thu May 05 18:15:05 2011 -0400 > @@ -221,7 +221,6 @@ > patches/tools.patch \ > patches/use-system-tzdata.patch \ > patches/headers.patch \ > - patches/headers-hotspot.patch \ > patches/gcc-suffix.patch \ > patches/hotspot/$(HSBUILD)/gcc-suffix.patch \ > patches/memory-limits.patch \ > @@ -414,6 +413,7 @@ > > ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \ > patches/ecj/hotspot.patch \ > + patches/ecj/headers-hotspot.patch \ > patches/ecj/spp.patch \ > patches/ecj/jopt.patch \ > patches/ecj/jaxp-dependency.patch \ > @@ -474,8 +474,6 @@ > ALT_BOOTDIR="$(BOOT_DIR)" \ > BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \ > ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR)" \ > - ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \ > - ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \ > CLASSPATH="" \ > LD_LIBRARY_PATH="" \ > ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \ > @@ -557,6 +555,8 @@ > BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \ > BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(RUNTIME)" \ > CLASSPATH="" \ > + ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \ > + ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \ > LD_LIBRARY_PATH="" \ > GENSRCDIR="$(abs_top_builddir)/generated" \ > JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ > diff -r 2afcd8dd14a0 patches/ecj/headers-hotspot.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/ecj/headers-hotspot.patch Thu May 05 18:15:05 2011 -0400 > @@ -0,0 +1,13 @@ > +diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jvmti.make openjdk/hotspot/make/linux/makefiles/jvmti.make > +--- openjdk-ecj.orig/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:51:14.000000000 +0100 > ++++ openjdk-ecj/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:54:13.000000000 +0100 > +@@ -59,7 +59,7 @@ > + > + JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%) > + > +-XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen > ++XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) $(ENDORSED) -classpath $(JvmtiOutDir) jvmtiGen > + > + .PHONY: all jvmtidocs clean cleanall > + > + > diff -r 2afcd8dd14a0 patches/headers-hotspot.patch > --- a/patches/headers-hotspot.patch Wed May 04 16:22:47 2011 -0400 > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > @@ -1,13 +0,0 @@ > -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jvmti.make openjdk/hotspot/make/linux/makefiles/jvmti.make > ---- openjdk.orig/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:51:14.000000000 +0100 > -+++ openjdk/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:54:13.000000000 +0100 > -@@ -59,7 +59,7 @@ > - > - JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%) > - > --XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen > -+XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) $(ENDORSED) -classpath $(JvmtiOutDir) jvmtiGen > - > - .PHONY: all jvmtidocs clean cleanall > - > - -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Fri May 6 04:53:41 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 May 2011 12:53:41 +0100 Subject: RFC: Replace patches/rh676659-gcc-export-dynamic.patch with upstream version In-Reply-To: <4DC33808.5070101@redhat.com> References: <4DC33808.5070101@redhat.com> Message-ID: <20110506115341.GA11612@rivendell.middle-earth.co.uk> On 19:51 Thu 05 May , Omair Majid wrote: > Hi, > > The attached patch replaces patches/rh676659-gcc-export-dynamic.patch > with the almost-identical fix from OpenJDK7. > > Okay to commit? > > ChangeLog: > 2011-05-05 Omair Majid > > * Makefile.am (ICEDTEA_PATCHES): Replace old patch name with new. > * patches/openjdk/7041156-gcc_export_dynamic.patch: New file. Export > from OpenJDK7. > * patches/rh676659-gcc-export-dynamic.patch: Remove. > > Cheers, > Omair Fine. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Fri May 6 05:13:42 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 May 2011 13:13:42 +0100 Subject: FOSDEM 2011 Free Java Movies Message-ID: <20110506121342.GB11612@rivendell.middle-earth.co.uk> They're finally appearing online. Keep an eye on: http://fuseyism.com/#movies -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From xerxes at zafena.se Fri May 6 05:42:58 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Fri, 06 May 2011 14:42:58 +0200 Subject: FOSDEM 2011 Free Java Movies In-Reply-To: <20110506121342.GB11612@rivendell.middle-earth.co.uk> References: <20110506121342.GB11612@rivendell.middle-earth.co.uk> Message-ID: <4DC3ECD2.8070207@zafena.se> On 2011-05-06 14:13, Dr Andrew John Hughes wrote: > They're finally appearing online. Keep an eye on: > > http://fuseyism.com/#movies Thanks! If you use the Banshee mediaplayer then you can stream all of Andrews Fosdem movies by searching for "Fosdem" inside the Banshee "Internet Archive" plugin. Cheers Xerxes From bugzilla-daemon at icedtea.classpath.org Fri May 6 05:45:13 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 May 2011 12:45:13 +0000 Subject: [Bug 706] New: b136 fails to build with gas trunk 20110501 on ix86 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=706 Summary: b136 fails to build with gas trunk 20110501 on ix86 Product: IcedTea Version: 7-hg Platform: all URL: https://buildd.debian.org/status/fetch.php?pkg=openjdk- 7&arch=i386&ver=7%7Eb136-1.14%7Epre0-1&stamp=1304638796 OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea7 AssignedTo: gnu_andrew at member.fsf.org ReportedBy: doko at ubuntu.com CC: unassigned at icedtea.classpath.org g++-4.6 -DLINUX -D_GNU_SOURCE -DIA32 -DPRODUCT -I. -I/build/buildd-openjdk-7_7~b136-1.14~pre0-1-i386-W80qKo/openjdk-7-7~b136-1.14~pre0/build/openjdk-boot/hotspot/src/share/vm/prims -I/build/buildd-openjdk-7_7~b136-1.14~pre0-1-i386-W80qKo/openjdk-7-7~b136-1.14~pre0/build/openjdk-boot/hotspot/src/share/vm -I/build/buildd-openjdk-7_7~b136-1.14~pre0-1-i386-W80qKo/openjdk-7-7~b136-1.14~pre0/build/openjdk-boot/hotspot/src/cpu/x86/vm -I/build/buildd-openjdk-7_7~b136-1.14~pre0-1-i386-W80qKo/openjdk-7-7~b136-1.14~pre0/build/openjdk-boot/hotspot/src/os_cpu/linux_x86/vm -I/build/buildd-openjdk-7_7~b136-1.14~pre0-1-i386-W80qKo/openjdk-7-7~b136-1.14~pre0/build/openjdk-boot/hotspot/src/os/linux/vm -I/build/buildd-openjdk-7_7~b136-1.14~pre0-1-i386-W80qKo/openjdk-7-7~b136-1.14~pre0/build/openjdk-boot/hotspot/src/os/posix/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"21.0-b07\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"buildd\"" -DHOTSPOT_LIB_ARCH=\"i386\" -DJRE_RELEASE_VERSION="\"1.7.0_136-b136\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea7 1.14-pre\"" -DDEB_MULTIARCH="\"i386-linux-gnu\"" -DDISTRIBUTION_ID="\"Debian GNU/Linux unstable (sid), package 7~b136-1.14~pre0-1\"" -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_x86 -DTARGET_ARCH_MODEL_x86_32 -DTARGET_OS_ARCH_linux_x86 -DTARGET_OS_ARCH_MODEL_linux_x86_32 -DTARGET_COMPILER_gcc -DCOMPILER2 -DCOMPILER1 -fpic -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -m32 -march=i586 -pipe -g -O3 -fno-strict-aliasing -DVM_LITTLE_ENDIAN -Werror -Wpointer-arith -Wsign-compare -c -MMD -MP -MF ../generated/dependencies/verificationType.o.d -o verificationType.o /build/buildd-openjdk-7_7~b136-1.14~pre0-1-i386-W80qKo/openjdk-7-7~b136-1.14~pre0/build/openjdk-boot/hotspot/src/share/vm/classfile/verificationType.cpp /build/buildd-openjdk-7_7~b136-1.14~pre0-1-i386-W80qKo/openjdk-7-7~b136-1.14~pre0/build/openjdk-boot/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp: Assembler messages: /build/buildd-openjdk-7_7~b136-1.14~pre0-1-i386-W80qKo/openjdk-7-7~b136-1.14~pre0/build/openjdk-boot/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp:160: Error: bad register name `%bpl' /build/buildd-openjdk-7_7~b136-1.14~pre0-1-i386-W80qKo/openjdk-7-7~b136-1.14~pre0/build/openjdk-boot/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp:160: Error: bad register name `%bpl' -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri May 6 07:50:42 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 May 2011 14:50:42 +0000 Subject: [Bug 706] b136 fails to build with gas trunk 20110501 on ix86 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=706 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |omajid at redhat.com --- Comment #1 from Omair Majid 2011-05-06 14:50:41 --- This was also reported back in March: http://mail.openjdk.java.net/pipermail/hotspot-dev/2011-March/003991.html Fixed in OpenJDK b138 (hs21b09): http://hg.openjdk.java.net/jdk7/hotspot-rt/hotspot/rev/da880ba4edf9 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at icedtea.classpath.org Fri May 6 08:01:20 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Fri, 06 May 2011 15:01:20 +0000 Subject: /hg/icedtea6: Replace rh676659-gcc-export-dynamic.patch with ups... Message-ID: changeset 9f374bb0cb94 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9f374bb0cb94 author: Omair Majid date: Fri May 06 10:59:07 2011 -0400 Replace rh676659-gcc-export-dynamic.patch with upstream's fix. 2011-05-06 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace patches/rh676659-gcc-export-dynamic.patch with the upstream fix patches/openjdk/7041156-gcc_export_dynamic.patch. * patches/openjdk/7041156-gcc_export_dynamic.patch: New file. * patches/rh676659-gcc-export-dynamic.patch: Remove file. diffstat: ChangeLog | 8 ++++++++ Makefile.am | 2 +- patches/openjdk/7041156-gcc_export_dynamic.patch | 21 +++++++++++++++++++++ patches/rh676659-gcc-export-dynamic.patch | 11 ----------- 4 files changed, 30 insertions(+), 12 deletions(-) diffs (69 lines): diff -r 90783fa340bb -r 9f374bb0cb94 ChangeLog --- a/ChangeLog Thu May 05 18:40:02 2011 -0400 +++ b/ChangeLog Fri May 06 10:59:07 2011 -0400 @@ -1,3 +1,11 @@ +2011-05-06 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Replace + patches/rh676659-gcc-export-dynamic.patch with the upstream fix + patches/openjdk/7041156-gcc_export_dynamic.patch. + * patches/openjdk/7041156-gcc_export_dynamic.patch: New file. + * patches/rh676659-gcc-export-dynamic.patch: Remove file. + 2011-05-05 Omair Majid * patches/shark-build-hotspot.patch, diff -r 90783fa340bb -r 9f374bb0cb94 Makefile.am --- a/Makefile.am Thu May 05 18:40:02 2011 -0400 +++ b/Makefile.am Fri May 06 10:59:07 2011 -0400 @@ -305,7 +305,7 @@ patches/openjdk/4493128-CubicCurve2D.patch \ patches/openjdk/4645692-CubicCurve2D.solveCubic.patch \ patches/no-static-linking.patch \ - patches/rh676659-gcc-export-dynamic.patch \ + patches/openjdk/7041156-gcc_export_dynamic.patch \ patches/g344659-sparc_fix.patch \ patches/openjdk/6728834-blurred-lcd-aa-text.patch \ patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch \ diff -r 90783fa340bb -r 9f374bb0cb94 patches/openjdk/7041156-gcc_export_dynamic.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7041156-gcc_export_dynamic.patch Fri May 06 10:59:07 2011 -0400 @@ -0,0 +1,22 @@ +# HG changeset patch +# User dsamersoff +# Date 1304432695 -14400 +# Node ID 250642c729b42043ea99e5e4e27d153b0c766da0 +# Parent 405c634f4aaa2e91cc87598c60a4ece6e345e5b1 +7041156: gcc 4.6 doesn't recognise -export-dynamic option +Summary: Since -export-dynamic is a linker option, the correct way to pass it is -Xlinker -export-dynamic +Reviewed-by: dsamersoff, dholmes +Contributed-by: omajid at redhat.com + +diff -r 405c634f4aaa -r 250642c729b4 make/linux/makefiles/gcc.make +--- openjdk/hotspot/make/linux/makefiles/gcc.make Mon May 02 14:53:49 2011 -0700 ++++ openjdk/hotspot/make/linux/makefiles/gcc.make Tue May 03 18:24:55 2011 +0400 +@@ -205,7 +205,7 @@ + SHARED_FLAG = -shared + + # Keep symbols even they are not used +-AOUT_FLAGS += -export-dynamic ++AOUT_FLAGS += -Xlinker -export-dynamic + + #------------------------------------------------------------------------ + # Debug flags diff -r 90783fa340bb -r 9f374bb0cb94 patches/rh676659-gcc-export-dynamic.patch --- a/patches/rh676659-gcc-export-dynamic.patch Thu May 05 18:40:02 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -r 55b9f498dbce make/linux/makefiles/gcc.make ---- openjdk/hotspot/make/linux/makefiles/gcc.make Thu Feb 10 16:24:29 2011 -0800 -+++ openjdk/hotspot/make/linux/makefiles/gcc.make Fri Feb 11 18:09:21 2011 -0500 -@@ -196,7 +196,7 @@ - SHARED_FLAG = -shared - - # Keep symbols even they are not used --AOUT_FLAGS += -export-dynamic -+AOUT_FLAGS += -Wl,-export-dynamic - - #------------------------------------------------------------------------ - # Debug flags From bugzilla-daemon at icedtea.classpath.org Fri May 6 12:57:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 May 2011 19:57:18 +0000 Subject: [Bug 707] New: You can open windows with JAVA but you can't close them Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=707 Summary: You can open windows with JAVA but you can't close them Product: IcedTea-Web Version: unspecified Platform: all URL: http://gaychat.cl/ OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: maximi89 at gmail.com CC: unassigned at icedtea.classpath.org You can open and receive text messages, but then you can't close.... i need to do a xkill to close the windows... this happens with Chronium and Firefox, tested in java version "1.6.0_22" OpenJDK Runtime Environment (IcedTea6 1.10.1) (6b22-1.10.1-1) OpenJDK 64-Bit Server VM (build 20.0-b11, mixed mode) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Fri May 6 14:56:02 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 6 May 2011 17:56:02 -0400 Subject: IcedTea-Web 1.1 release status Message-ID: <20110506215601.GC2485@redhat.com> Hi, Over the past few days I have found some rather important issues in the plugin that I feel need to be fixed. Due to me being at the Red Hat Summit over most of this week I've only now been able to start looking into them. I think it would be best to push the release to some time next week. I will send another update on Monday/Tuesday on the status of the fixes. The issues that need addressing are: - NPN_getURL attempts recursive action and hangs (FF4 only) - FF randomly crashes due to calls from incorrect (non-main) threads to NP* functions ... the cause was unknown to me until early this week.. only now found a better reproducer I'd rather see us release a good product slightly late than a bad one early :) Cheers, Deepak From omajid at redhat.com Fri May 6 15:37:05 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 06 May 2011 18:37:05 -0400 Subject: RFC: drop patches/tools.patch from icedtea6 Message-ID: <4DC47811.6090405@redhat.com> Hi, The attached patch drops patches/tools.patch from icedtea6. tools.patch consists of 2 parts: the first part modifies jdk/make/tools/sharing/classlist.$(PLATFORM) and the other modifies jdk/make/java/awt/Makefile. As described in jdk/make/tools/sharing/README.txt, classlist.$(PLATFORM) is the class list used in class data sharing (-Xshare). The patch removes DebugHelper and DebugHelperStub classes, but leaves many other classes which are not present in IcedTea6 (for example java/util/Hashtable$EmptyEnumerator). In fact, a large changeset went into OpenJDK7 to update this classlist [1]. As such, this part of tools.patch is not necessary (otherwise we would see more build errors) nor sufficient (since it leaves many other removed classes alone). The second part of the patch adds a phony target sources which is not used anywhere. I have done a bootstrap build without a patches/tools.patch and I have not seen any problems. Any thoughts on dropping the patch? Matthias, I see that this patch was dropped once (icedtea6 changeset 2855ab5fe0e7) but you reverted it. Do you know if the problems were caused by this patch, or was it one of the other patches that was dropped? Cheers, Omair [1] http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/da5e33af0e61 -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-drop-tools.patch Type: text/x-patch Size: 3393 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110506/732d36ff/icedtea6-drop-tools.patch From omajid at redhat.com Fri May 6 16:13:39 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 06 May 2011 19:13:39 -0400 Subject: RFC: move patches/headers-hotspot.patch to patches/ecj/ In-Reply-To: <20110506005316.GI26415@rivendell.middle-earth.co.uk> References: <4DC324BD.1050509@redhat.com> <20110506005316.GI26415@rivendell.middle-earth.co.uk> Message-ID: <4DC480A3.8090504@redhat.com> On 05/05/2011 08:53 PM, Dr Andrew John Hughes wrote: > On 18:29 Thu 05 May , Omair Majid wrote: >> Hi, >> >> From what I can tell, patches/headers-hotspot.patch and the associated >> Makefile.am declerations are only needed during bootstrap (to make sure >> a proper XML implementation is available). After OpenJDK has been built >> once, the JDK's build-in implementation should be more than sufficient >> to perform needed tasks. I have been testing the attached patch and it >> works fine with and without --disable bootstrap. >> >> Does anyone have any thoughts about this? >> >> ChangeLog: >> 2011-05-05 Omair Majid >> >> * Makefile.am >> (ICEDTEA_PATCHES): Move headers-hotspot.patch to ... >> (ICEDTEA_ECJ_PATCHES): Here. >> (ICEDTEA_ENV): Moves endorsed dir varaibles to ... >> (ICEDTEA_ENV_ECJ): Here. >> * patches/headers-hotspot.patch: Move to ... >> * patches/ecj/headers-hotspot.patch: New file. >> >> Cheers, >> Omair > > Yes, these look like bootstrap patches that have been wrongly placed eons > ago. Please apply this. On looking at this again, I am slightly confused as to how it was working at all originally (and I know it was working originally because fedora carries a custom patch [1] that adds another file to the endorsed directory and the build picks it up). ICEDTEA_ENV is inherited by ICEDTEA_ENV_ECJ but the patches are not. So the headers-hotspot.patch was applied to only second stage of a bootstrap build. At that point, the just-built icedtea6 (built using gcj) should have all the XML API/implementation needed (and the custom fedora patch would not have made any difference). I am probably missing something here. > Can you also do a similar change for 7? The fragment > is part of headers.patch there and needs to be split and placed in patches/boot. > Yeah, I was going to this for IcedTea7 after the fix for IcedTea6 had gone through. Thanks for reminding me. Patch for IcedTea7 attached. Thanks, Omair [1] http://pkgs.fedoraproject.org/gitweb/?p=java-1.6.0-openjdk.git;a=commitdiff;h=1a4e9b3b26466723002599803257bf51c350b825;hp=d5040e6da68dcbf73ff15df67c28e4fef517a373 -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea7-move-jvmti-endorsed-to-boot-01.patch Type: text/x-patch Size: 2839 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110506/db90b922/icedtea7-move-jvmti-endorsed-to-boot-01.patch From omajid at redhat.com Fri May 6 16:32:10 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 06 May 2011 19:32:10 -0400 Subject: [icedtea-web] reviewer needed - added engine for lunching reproducers In-Reply-To: <4DC2CAC1.7070802@redhat.com> References: <4DC2CAC1.7070802@redhat.com> Message-ID: <4DC484FA.1030208@redhat.com> Hi Jiri, On 05/05/2011 12:05 PM, Jiri Vanek wrote: > Makefile - automated compile and copy for most of reproducers, with > possibility to add more complex reproducers which will take care of > compiling themselves (I have in this way also "repaired" your > reproducers you send me, but because this patch is about engine itself > they are not commited - but are working quite fine :) ) > When all reproducers are prepared, junit testsuite is lunched - after > program is "installed". junit takes location of installed javaws and > location of prepared reproducers (directory jars, jnlps and other > resources). > > Inside junit suite virtual server is lunched and serves all resources. > During the testsuite individual jnlps are executed, and their > stderr/out/return code can be asserted. (There are helepers method for > this in used virtual server which provides to tester exactly std out/err > return code). Also possibility to timeout process is added. > At the end the report - same as was for unit tests - is generated (if my > previous patch is used :). There is also possibility of including > stdout/err of tests into xml-report files. > Sorry for taking so long to respond to this. I have got to admit, this is great! I have lots of little nitpicks [1], but we can argue about those _after_ you commit an initial version. I only thing I dont like is how test information is spread out. I would love if this was more jtreg-like: you place everything (jnlp file and the associated java file (and possibly a makefile or other meta information)) in one directory. I dont like that you have to add junit test methods (to another location). You have a big thumbs up from me if you can fix this. Thanks again for doing this! Cheers, Omair [1] including file paths/names, variable names, spacing and other details ;) From omajid at redhat.com Fri May 6 17:21:24 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 06 May 2011 20:21:24 -0400 Subject: [icedtea-web] xml output for junit, transformation sheets for daily report In-Reply-To: <4DC13892.6090500@redhat.com> References: <4DBA8360.5020403@redhat.com> <4DBB2613.5070000@redhat.com> <4DBC0E18.1060803@redhat.com> <4DC13892.6090500@redhat.com> Message-ID: <4DC49084.9090900@redhat.com> On 05/04/2011 07:29 AM, Jiri Vanek wrote: > On 04/30/2011 03:26 PM, Jiri Vanek wrote: >> On 04/29/2011 10:56 PM, Omair Majid wrote: >>> On 04/29/2011 05:22 AM, Jiri Vanek wrote: >>>> This patch add functionality to export xml report form junit testsuite, >>>> provides some basic nice transformation for make xml fast readable and >>>> navigation-able. Also add filtering of inner classes and jnlp from >>>> tests-source package >>>> >>>> Pavel, is xml-content enough for you? >>>> >>> >>> Looks like you forgot to attach the >>> tests/junit-runner/XmlOutputListener.java file. The changes to >>> CommandLine.java look fine to me, but I would like to see the rest of >>> the patch ;) >>> >>> Is the xml schema based on an existing schema or is it completely new? >>> >> >> No. it is minimalistic to our purposes. Should follow junit ant-xml >> output? Or some else? >> > > Refresh call for review:) > Let me being by saying that I don't know enough about Javascript/XML/XSLT to offer good criticism. I will try my best though. > As Omair suggested, i have added class which exports xml-output > following junit-xml output. As I have not found official dtd or schmea, > I was careful which elements/attributes to output as resources on the > web were not united. Current resul is quit sufficient - the only thing I > miss are by-class statistics and date. I would like to break "junit > dtd" (as there is none) and add those elements from my previous xml > output. This step will not break possible usage of tools working with > ant-xml output. > It's really up to you. I thought junit-like xml might be better since we could reuse tools for junit. But since you are already writing html reports and everything, I dont think it matters too much. Breaking junit's dtd (even if you know exactly what it is) is fine too. > In this patch are both xml exporters so reviewer can judge weather to > keep both, merge them all keep just one (probably junit-like). > > I think Pavel do not care which one will appears at the and:) > I will leave it to others (especially you and ptisnovs) to judge that. I am fine with keeping both (if you want to maintain it, that is), though I would like the default output to be just one format (with a switch for the other format). > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/index.html Wed May 04 13:16:27 2011 +0200 > @@ -0,0 +1,35 @@ > + > + > + > + > + > + > + > +
Is there a way to avoid hardcoding these paths? This html file is placed in the source directory, I think it breaks with out-of-tree builds. Perhaps this file should be stored in $(abs_top_srcdir)/tests/ and after the tests are run, an updated version is placed in $(abs_top_builddir)/ ($(abs_top_builddir)/tests.build)). > diff -r a9729e1bb762 styles/index.js > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/styles/index.js Wed May 04 13:16:27 2011 +0200 > @@ -0,0 +1,67 @@ > + > +if(typeof String.prototype.trim !== 'function') { String.prototype.trim = function() { return this.replace(/^\s+|\s+$/g, ''); } } > + > + > +function negateId(which){ > + var e = document.getElementById(which); > + if (e.style.display=="block") { > + e.style.display="none" > + }else{ > + e.style.display="block" > + } > + } > + > + > + function setClass(which,what) { Perhaps setDisplay might be a better name? > + var e = document.getElementsByClassName(which); > + for ( var i = 0; i< e.length; i++ ){ > + e[i].style.display=what > + } > + } > + > + > + > + > + function xslt(sheet,data,dest) { > + var sheetName=sheet; > + var xmlName=data; > + var htmlDest=dest; > + // code for IE > + if (window.ActiveXObject) { > + var XML = new ActiveXObject("MSXML2.FreeThreadedDomDocument"); > + XML.async = "false"; > + XML.load(xmlName); > + var XSL = new ActiveXObject("MSXML2.FreeThreadedDomDocument"); > + XSL.async = "false"; > + XSL.load(sheetName); > + var XSLTCompiled = new ActiveXObject("MSXML2.XSLTemplate"); > + //Add the stylesheet information > + XSLTCompiled.stylesheet = XSL.documentElement; > + //Create the XSLT processor > + var msShit = XSLTCompiled.createProcessor(); > + msShit.input = XML This is the funniest thing I saw today :) Still, I dont think this is appropriate. Please rename this variable. Personally, I am just fine with leaving out the entire "if IE" block. > diff -r a9729e1bb762 tests/junit-runner/JunitLikeXmlOutputListener.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/junit-runner/JunitLikeXmlOutputListener.java Wed May 04 13:16:27 2011 +0200 > diff -r a9729e1bb762 tests/junit-runner/XmlOutputListener.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/junit-runner/XmlOutputListener.java Wed May 04 13:16:27 2011 +0200 Two comments on the files above: please add a little more documentation, and please use System.nanoTime() which is more resistant to change in clock times. Everything else looks good enough to me (though I am quite unfamiliar with most of the things here). Cheers, Omair From omajid at redhat.com Fri May 6 17:43:48 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 06 May 2011 20:43:48 -0400 Subject: [icedtea-web] RFC: PR618 - Can't install OpenDJ, JavaWebStart fails with Input stream is null error. In-Reply-To: <20110421215942.GJ29985@rivendell.middle-earth.co.uk> References: <4D3F27BE.9060300@redhat.com> <20110126000318.GF18564@rivendell.middle-earth.co.uk> <4D4095C8.4020603@redhat.com> <4D7E2F47.2050807@redhat.com> <20110316204054.GH29289@rivendell.middle-earth.co.uk> <4D822201.7000906@redhat.com> <4DA878AE.8080301@redhat.com> <20110415205544.GI29287@rivendell.middle-earth.co.uk> <4DA8B3FD.1020002@redhat.com> <20110421215942.GJ29985@rivendell.middle-earth.co.uk> Message-ID: <4DC495C4.7070803@redhat.com> On 04/21/2011 05:59 PM, Dr Andrew John Hughes wrote: > On 17:09 Fri 15 Apr , Omair Majid wrote: >> > On 04/15/2011 04:55 PM, Dr Andrew John Hughes wrote: >>> > > >>> > > Can you start a clean thread with the current version of the patch? >>> > > The previous e-mail was pretty unreadable for me. >> > >> > Here you go. Attached. >> > >> > As explained earlier, it fixes PR618, buy allowing lazy loading to work >> > when trying to find resources using getResource(s)/findResource(s). >> > >> > Any thoughts or comments? >> > >> > Cheers, >> > Omair Updated patch attached. > >> > diff -r 5454292b3fae netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java >> > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Mar 10 15:42:01 2011 -0500 >> > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon Mar 14 11:07:15 2011 -0400 >> > @@ -40,7 +40,6 @@ >> > import java.util.List; >> > import java.util.Map; >> > import java.util.TreeSet; >> > -import java.util.Vector; >> > import java.util.jar.JarEntry; >> > import java.util.jar.JarFile; >> > >> > @@ -1123,31 +1122,54 @@ >> > /** >> > * Finds the resource in this, the parent, or the extension >> > * class loaders. >> > + * >> > + * @return aURL for the resource, ornull >> > + * if the resource could not be found. >> > */ >> > - public URL getResource(String name) { >> > - URL result = super.getResource(name); >> > + @Override >> > + public URL findResource(String name) { >> > + URL result = null; >> > >> > - for (int i = 1; i< loaders.length; i++) >> > - if (result == null) >> > - result = loaders[i].getResource(name); >> > + try { >> > + Enumeration e = findResources(name); > Just a stylistic thing, but it's usually Enumeration without the space. > Fixed. >> > + if (e.hasMoreElements()) { >> > + result = e.nextElement(); >> > + } >> > + } catch (IOException e) { >> > + // continue > Should we not at least log this if debugging mode is on? Done. > >> > + private Enumeration findResourcesBySearching(String name) throws IOException { >> > + List resources = new ArrayList(); >> > Enumeration e; >> > >> > for (int i = 0; i< loaders.length; i++) { >> > + // TODO check if this will blow up or not >> > + // if loaders[1].getResource() is called, wont it call getResource() on >> > + // the original caller? infinite recursion? >> > >> > if (loaders[i] == this) >> > e = super.findResources(name); >> > @@ -1166,7 +1188,7 @@ >> > resources.add(e.nextElement()); >> > } >> > >> > - return resources.elements(); >> > + return Collections.enumeration(resources); >> > } >> > > Probably asked this last time, but remind why we return an Enumeration and not an Iterator when > resources is a List? fineResources, which overrides a method with the same name in ClassLoader and calls findResourcesBySearching, has to return an Enumeration. To avoid conversions from an iterator to enumeration, I am making findResourcesBySearching return an enumeration. I can change it if you insist. Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: lazy-load-resources-05.patch Type: text/x-patch Size: 3456 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110506/f7257cd6/lazy-load-resources-05.patch From bugzilla-daemon at icedtea.classpath.org Sat May 7 20:44:38 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 08 May 2011 03:44:38 +0000 Subject: [Bug 708] New: can't copy or paste text in the text areas Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=708 Summary: can't copy or paste text in the text areas Product: IcedTea-Web Version: unspecified Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: maximi89 at gmail.com CC: unassigned at icedtea.classpath.org well, just that simply, in a chat you can't copy or paste text. tested on Firefox 6.0a1 java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8.7) (6b18-1.8.7-3) OpenJDK 64-Bit Server VM (build 16.0-b13, mixed mode) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Sat May 7 21:13:54 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 08 May 2011 04:13:54 +0000 Subject: [Bug 708] can't copy or paste text in the text areas In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=708 Andrew Su changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |asu at redhat.com --- Comment #1 from Andrew Su 2011-05-08 04:13:53 --- Hi, Do you have a specific URL for us to test this with? --Andrew -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Sun May 8 00:10:20 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 08 May 2011 07:10:20 +0000 Subject: [Bug 708] can't copy or paste text in the text areas In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=708 --- Comment #2 from Maximiliano Casta??n Araneda 2011-05-08 07:10:19 --- http://www.chatzone.de/quickchat.jsp?language=english&channel=en.General can't paste anything or copy in there -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Sun May 8 06:14:12 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 08 May 2011 13:14:12 +0000 Subject: [Bug 709] New: Crash in native code, problematic frame: libfreetype.so.6 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=709 Summary: Crash in native code, problematic frame: libfreetype.so.6 Product: IcedTea Version: unspecified Platform: all OS/Version: Linux Status: NEW Severity: critical Priority: P5 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: reinout at gmail.com Accoring to ABRT this bug is also filed downstream as https://bugzilla.redhat.com/show_bug.cgi?id=700979 [reinout at elmont taverna-workbench-2.2.0]$ ./taverna.sh WARN 2011-05-08 14:30:53,833 (net.sf.taverna.raven.repository.impl.ArtifactImpl:85) - Unable to find a version for the dependency log4j:log4j - skipping WARN 2011-05-08 14:30:53,861 (net.sf.taverna.raven.repository.impl.ArtifactImpl:85) - Unable to find a version for the dependency junit:junit - skipping ERROR 2011-05-08 14:30:57,958 (System.err:139) - Central class is org.biomoby.client.CentralDigestCachedImpl ERROR 2011-05-08 14:31:23,849 (net.sf.taverna.t2.workbench.ui.impl.Workbench:117) - Uncaught exception in Thread[BioMOBY GetOntologyThread,1,Service description providers] java.lang.InternalError at sun.misc.URLClassPath$JarLoader.getResource(URLClassPath.java:769) at sun.misc.URLClassPath.getResource(URLClassPath.java:185) at java.net.URLClassLoader$1.run(URLClassLoader.java:209) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:205) at java.lang.ClassLoader.loadClass(ClassLoader.java:321) at java.lang.ClassLoader.loadClass(ClassLoader.java:314) at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:294) at java.lang.ClassLoader.loadClass(ClassLoader.java:314) at java.lang.ClassLoader.loadClass(ClassLoader.java:266) at java.util.ResourceBundle$RBClassLoader.loadClass(ResourceBundle.java:463) at java.util.ResourceBundle$Control.newBundle(ResourceBundle.java:2401) at java.util.ResourceBundle.loadBundle(ResourceBundle.java:1424) at java.util.ResourceBundle.findBundle(ResourceBundle.java:1383) at java.util.ResourceBundle.findBundle(ResourceBundle.java:1310) at java.util.ResourceBundle.getBundleImpl(ResourceBundle.java:1252) at java.util.ResourceBundle.getBundle(ResourceBundle.java:733) at java.util.logging.Level.getLocalizedName(Level.java:240) at java.util.logging.SimpleFormatter.format(SimpleFormatter.java:86) at java.util.logging.StreamHandler.publish(StreamHandler.java:196) at java.util.logging.ConsoleHandler.publish(ConsoleHandler.java:105) at java.util.logging.Logger.log(Logger.java:498) at java.util.logging.Logger.doLog(Logger.java:520) at java.util.logging.Logger.log(Logger.java:543) at org.biomoby.shared.MobyDataType.getDataType(MobyDataType.java:122) at net.sf.taverna.t2.activities.biomoby.BiomobyCache.cacheForRegistry(BiomobyCache.java:51) at net.sf.taverna.t2.activities.biomoby.BiomobyCache.cacheForRegistryEndpoint(BiomobyCache.java:75) at net.sf.taverna.t2.activities.biomoby.GetOntologyThread.run(GetOntologyThread.java:57) Caused by: java.util.zip.ZipException: error in opening zip file at java.util.zip.ZipFile.open(Native Method) at java.util.zip.ZipFile.(ZipFile.java:131) at java.util.jar.JarFile.(JarFile.java:150) at java.util.jar.JarFile.(JarFile.java:87) at sun.misc.URLClassPath$JarLoader.getJarFile(URLClassPath.java:660) at sun.misc.URLClassPath$JarLoader.access$600(URLClassPath.java:555) at sun.misc.URLClassPath$JarLoader$1.run(URLClassPath.java:622) at java.security.AccessController.doPrivileged(Native Method) at sun.misc.URLClassPath$JarLoader.ensureOpen(URLClassPath.java:614) at sun.misc.URLClassPath$JarLoader.getResource(URLClassPath.java:767) ... 27 more ERROR 2011-05-08 14:31:23,849 (System.err:139) - Error while executing main() of net.sf.taverna.t2.workbench.ui.impl.WorkbenchLauncher ERROR 2011-05-08 14:31:23,853 (System.err:139) - java.lang.NullPointerException ERROR 2011-05-08 14:31:23,854 (System.err:139) - at sun.font.TrueTypeGlyphMapper.(TrueTypeGlyphMapper.java:62) ERROR 2011-05-08 14:31:23,854 (System.err:139) - at sun.font.TrueTypeFont.getMapper(TrueTypeFont.java:1219) ERROR 2011-05-08 14:31:23,854 (System.err:139) - at sun.font.CompositeGlyphMapper.getSlotMapper(CompositeGlyphMapper.java:114) ERROR 2011-05-08 14:31:23,855 (System.err:139) - at sun.font.CompositeGlyphMapper.convertToGlyph(CompositeGlyphMapper.java:124) ERROR 2011-05-08 14:31:23,855 (System.err:139) - at sun.font.CompositeGlyphMapper.charToGlyph(CompositeGlyphMapper.java:162) ERROR 2011-05-08 14:31:23,855 (System.err:139) - at sun.font.CompositeStrike.getCodePointAdvance(CompositeStrike.java:158) ERROR 2011-05-08 14:31:23,855 (System.err:139) - at sun.font.FontDesignMetrics.handleCharWidth(FontDesignMetrics.java:415) ERROR 2011-05-08 14:31:23,856 (System.err:139) - at sun.font.FontDesignMetrics.getWidths(FontDesignMetrics.java:537) ERROR 2011-05-08 14:31:23,856 (System.err:139) - at javax.swing.text.WrappedPlainView.getDefaultSpan(WrappedPlainView.java:344) ERROR 2011-05-08 14:31:23,856 (System.err:139) - at javax.swing.text.WrappedPlainView.access$000(WrappedPlainView.java:55) ERROR 2011-05-08 14:31:23,856 (System.err:139) - at javax.swing.text.WrappedPlainView$WrappedLine.getPreferredSpan(WrappedPlainView.java:608) ERROR 2011-05-08 14:31:23,857 (System.err:139) - at javax.swing.text.View.getMinimumSpan(View.java:251) ERROR 2011-05-08 14:31:23,857 (System.err:139) - at javax.swing.text.BoxView.calculateMinorAxisRequirements(BoxView.java:903) ERROR 2011-05-08 14:31:23,857 (System.err:139) - at javax.swing.text.BoxView.checkRequests(BoxView.java:935) ERROR 2011-05-08 14:31:23,858 (System.err:139) - at javax.swing.text.BoxView.setSpanOnAxis(BoxView.java:343) ERROR 2011-05-08 14:31:23,858 (System.err:139) - at javax.swing.text.BoxView.layout(BoxView.java:708) ERROR 2011-05-08 14:31:23,860 (System.err:139) - at javax.swing.text.BoxView.setSize(BoxView.java:397) ERROR 2011-05-08 14:31:23,861 (System.err:139) - at javax.swing.text.WrappedPlainView.setSize(WrappedPlainView.java:440) ERROR 2011-05-08 14:31:23,861 (System.err:139) - at javax.swing.plaf.basic.BasicTextUI$RootView.setSize(BasicTextUI.java:1719) ERROR 2011-05-08 14:31:23,860 (net.sf.taverna.t2.workbench.ui.impl.Workbench:117) - Uncaught exception in Thread[AWT-EventQueue-0,6,main] java.lang.NullPointerException at sun.font.TrueTypeGlyphMapper.(TrueTypeGlyphMapper.java:62) at sun.font.TrueTypeFont.getMapper(TrueTypeFont.java:1219) at sun.font.CompositeGlyphMapper.getSlotMapper(CompositeGlyphMapper.java:114) at sun.font.CompositeGlyphMapper.convertToGlyph(CompositeGlyphMapper.java:124) at sun.font.CompositeGlyphMapper.charToGlyph(CompositeGlyphMapper.java:162) at sun.font.CompositeStrike.getCodePointAdvance(CompositeStrike.java:158) at sun.font.FontDesignMetrics.handleCharWidth(FontDesignMetrics.java:415) at sun.font.FontDesignMetrics.getWidths(FontDesignMetrics.java:537) at javax.swing.text.WrappedPlainView.getDefaultSpan(WrappedPlainView.java:344) at javax.swing.text.WrappedPlainView.access$000(WrappedPlainView.java:55) at javax.swing.text.WrappedPlainView$WrappedLine.getPreferredSpan(WrappedPlainView.java:608) at javax.swing.text.View.getMinimumSpan(View.java:251) at javax.swing.text.BoxView.calculateMinorAxisRequirements(BoxView.java:903) at javax.swing.text.BoxView.checkRequests(BoxView.java:935) at javax.swing.text.BoxView.setSpanOnAxis(BoxView.java:343) at javax.swing.text.BoxView.layout(BoxView.java:708) at javax.swing.text.BoxView.setSize(BoxView.java:397) at javax.swing.text.WrappedPlainView.setSize(WrappedPlainView.java:440) at javax.swing.plaf.basic.BasicTextUI$RootView.setSize(BasicTextUI.java:1719) at javax.swing.plaf.basic.BasicTextUI.getPreferredSize(BasicTextUI.java:922) at javax.swing.plaf.basic.BasicTextAreaUI.getPreferredSize(BasicTextAreaUI.java:120) at javax.swing.JComponent.getPreferredSize(JComponent.java:1634) at javax.swing.JTextArea.getPreferredSize(JTextArea.java:634) at java.awt.GridBagLayout.GetLayoutInfo(GridBagLayout.java:1109) at java.awt.GridBagLayout.getLayoutInfo(GridBagLayout.java:910) at java.awt.GridBagLayout.preferredLayoutSize(GridBagLayout.java:730) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at javax.swing.ViewportLayout.preferredLayoutSize(ViewportLayout.java:95) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at javax.swing.ScrollPaneLayout.preferredLayoutSize(ScrollPaneLayout.java:492) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at javax.swing.plaf.basic.BasicTabbedPaneUI$TabbedPaneLayout.calculateSize(BasicTabbedPaneUI.java:2304) at javax.swing.plaf.basic.BasicTabbedPaneUI$TabbedPaneLayout.preferredLayoutSize(BasicTabbedPaneUI.java:2278) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at java.awt.GridLayout.preferredLayoutSize(GridLayout.java:341) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at javax.swing.plaf.basic.BasicTabbedPaneUI$TabbedPaneLayout.calculateSize(BasicTabbedPaneUI.java:2304) at javax.swing.plaf.basic.BasicTabbedPaneUI$TabbedPaneLayout.preferredLayoutSize(BasicTabbedPaneUI.java:2278) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at javax.swing.plaf.basic.BasicSplitPaneUI$BasicHorizontalLayoutManager.preferredLayoutSize(BasicSplitPaneUI.java:1486) at javax.swing.plaf.basic.BasicSplitPaneUI.getPreferredSize(BasicSplitPaneUI.java:1082) at javax.swing.JComponent.getPreferredSize(JComponent.java:1634) at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at javax.swing.plaf.basic.BasicSplitPaneUI$BasicHorizontalLayoutManager.preferredLayoutSize(BasicSplitPaneUI.java:1486) at javax.swing.plaf.basic.BasicSplitPaneUI.getPreferredSize(BasicSplitPaneUI.java:1082) at javax.swing.JComponent.getPreferredSize(JComponent.java:1634) at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) at java.awt.Container.preferredSize(Container.java:1605) at java.awt.Container.getPreferredSize(Container.java:1590) at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) at java.awt.GridBagLayout.GetLayoutInfo(GridBagLayout.java:1109) at java.awt.GridBagLayout.getLayoutInfo(GridBagLayout.java:910) at java.awt.GridBagLayout.ArrangeGrid(GridBagLayout.java:2065) at java.awt.GridBagLayout.arrangeGrid(GridBagLayout.java:2025) at java.awt.GridBagLayout.layoutContainer(GridBagLayout.java:806) at java.awt.Container.layout(Container.java:1427) at java.awt.Container.doLayout(Container.java:1416) at java.awt.Container.validateTree(Container.java:1513) at java.awt.Container.validateTree(Container.java:1519) at java.awt.Container.validateTree(Container.java:1519) at java.awt.Container.validateTree(Container.java:1519) at java.awt.Container.validate(Container.java:1486) at java.awt.Window.dispatchEventImpl(Window.java:2515) at java.awt.Component.dispatchEvent(Component.java:4455) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:649) at java.awt.EventQueue.access$000(EventQueue.java:96) at java.awt.EventQueue$1.run(EventQueue.java:608) at java.awt.EventQueue$1.run(EventQueue.java:606) at java.security.AccessController.doPrivileged(Native Method) at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:105) at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:116) at java.awt.EventQueue$2.run(EventQueue.java:622) at java.awt.EventQueue$2.run(EventQueue.java:620) at java.security.AccessController.doPrivileged(Native Method) at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:105) at java.awt.EventQueue.dispatchEvent(EventQueue.java:619) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:275) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:200) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:185) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:177) at java.awt.EventDispatchThread.run(EventDispatchThread.java:138) WARN 2011-05-08 14:31:23,863 (net.sf.taverna.t2.workbench.ui.impl.WorkbenchPerspectives:568) - Could not save perspectives java.io.FileNotFoundException: /home/reinout/.taverna-2.2.0/conf/user_perpectives.xml (Too many open files) at java.io.FileOutputStream.open(Native Method) at java.io.FileOutputStream.(FileOutputStream.java:209) at java.io.FileOutputStream.(FileOutputStream.java:160) at net.sf.taverna.t2.ui.perspectives.CustomPerspectiveFactory.saveAll(CustomPerspectiveFactory.java:104) at net.sf.taverna.t2.workbench.ui.impl.WorkbenchPerspectives.saveAll(WorkbenchPerspectives.java:213) at net.sf.taverna.t2.workbench.ui.impl.WorkbenchPerspectives$RefreshRunner.run(WorkbenchPerspectives.java:566) at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:226) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:647) at java.awt.EventQueue.access$000(EventQueue.java:96) at java.awt.EventQueue$1.run(EventQueue.java:608) at java.awt.EventQueue$1.run(EventQueue.java:606) at java.security.AccessController.doPrivileged(Native Method) at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:105) at java.awt.EventQueue.dispatchEvent(EventQueue.java:617) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:275) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:200) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:185) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:177) at java.awt.EventDispatchThread.run(EventDispatchThread.java:138) ERROR 2011-05-08 14:31:23,861 (System.err:139) - at javax.swing.plaf.basic.BasicTextUI.getPreferredSize(BasicTextUI.java:922) ERROR 2011-05-08 14:31:24,027 (System.err:139) - at javax.swing.plaf.basic.BasicTextAreaUI.getPreferredSize(BasicTextAreaUI.java:120) ERROR 2011-05-08 14:31:24,028 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1634) ERROR 2011-05-08 14:31:24,028 (System.err:139) - at javax.swing.JTextArea.getPreferredSize(JTextArea.java:634) ERROR 2011-05-08 14:31:24,028 (System.err:139) - at java.awt.GridBagLayout.GetLayoutInfo(GridBagLayout.java:1109) ERROR 2011-05-08 14:31:24,028 (System.err:139) - at java.awt.GridBagLayout.getLayoutInfo(GridBagLayout.java:910) ERROR 2011-05-08 14:31:24,029 (System.err:139) - at java.awt.GridBagLayout.preferredLayoutSize(GridBagLayout.java:730) ERROR 2011-05-08 14:31:24,029 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,029 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,029 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,029 (System.err:139) - at javax.swing.ViewportLayout.preferredLayoutSize(ViewportLayout.java:95) ERROR 2011-05-08 14:31:24,030 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,030 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,030 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,030 (System.err:139) - at javax.swing.ScrollPaneLayout.preferredLayoutSize(ScrollPaneLayout.java:492) ERROR 2011-05-08 14:31:24,030 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,031 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,031 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,031 (System.err:139) - at javax.swing.plaf.basic.BasicTabbedPaneUI$TabbedPaneLayout.calculateSize(BasicTabbedPaneUI.java:2304) ERROR 2011-05-08 14:31:24,040 (System.err:139) - at javax.swing.plaf.basic.BasicTabbedPaneUI$TabbedPaneLayout.preferredLayoutSize(BasicTabbedPaneUI.java:2278) ERROR 2011-05-08 14:31:24,041 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,041 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,041 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,042 (System.err:139) - at java.awt.GridLayout.preferredLayoutSize(GridLayout.java:341) ERROR 2011-05-08 14:31:24,042 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,042 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,043 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,043 (System.err:139) - at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) ERROR 2011-05-08 14:31:24,043 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,043 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,044 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,044 (System.err:139) - at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) ERROR 2011-05-08 14:31:24,044 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,045 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,045 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,045 (System.err:139) - at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) ERROR 2011-05-08 14:31:24,045 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,046 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,046 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,046 (System.err:139) - at javax.swing.plaf.basic.BasicTabbedPaneUI$TabbedPaneLayout.calculateSize(BasicTabbedPaneUI.java:2304) ERROR 2011-05-08 14:31:24,047 (System.err:139) - at javax.swing.plaf.basic.BasicTabbedPaneUI$TabbedPaneLayout.preferredLayoutSize(BasicTabbedPaneUI.java:2278) ERROR 2011-05-08 14:31:24,047 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,047 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,047 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,048 (System.err:139) - at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) ERROR 2011-05-08 14:31:24,048 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,048 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,048 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,049 (System.err:139) - at javax.swing.plaf.basic.BasicSplitPaneUI$BasicHorizontalLayoutManager.preferredLayoutSize(BasicSplitPaneUI.java:1486) ERROR 2011-05-08 14:31:24,049 (System.err:139) - at javax.swing.plaf.basic.BasicSplitPaneUI.getPreferredSize(BasicSplitPaneUI.java:1082) ERROR 2011-05-08 14:31:24,049 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1634) ERROR 2011-05-08 14:31:24,050 (System.err:139) - at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) ERROR 2011-05-08 14:31:24,050 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,050 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,051 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,051 (System.err:139) - at javax.swing.plaf.basic.BasicSplitPaneUI$BasicHorizontalLayoutManager.preferredLayoutSize(BasicSplitPaneUI.java:1486) ERROR 2011-05-08 14:31:24,051 (System.err:139) - at javax.swing.plaf.basic.BasicSplitPaneUI.getPreferredSize(BasicSplitPaneUI.java:1082) ERROR 2011-05-08 14:31:24,052 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1634) ERROR 2011-05-08 14:31:24,052 (System.err:139) - at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) ERROR 2011-05-08 14:31:24,052 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,052 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,053 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,053 (System.err:139) - at java.awt.BorderLayout.preferredLayoutSize(BorderLayout.java:719) ERROR 2011-05-08 14:31:24,053 (System.err:139) - at java.awt.Container.preferredSize(Container.java:1605) ERROR 2011-05-08 14:31:24,053 (System.err:139) - at java.awt.Container.getPreferredSize(Container.java:1590) ERROR 2011-05-08 14:31:24,054 (System.err:139) - at javax.swing.JComponent.getPreferredSize(JComponent.java:1636) ERROR 2011-05-08 14:31:24,054 (System.err:139) - at java.awt.GridBagLayout.GetLayoutInfo(GridBagLayout.java:1109) ERROR 2011-05-08 14:31:24,054 (System.err:139) - at java.awt.GridBagLayout.getLayoutInfo(GridBagLayout.java:910) ERROR 2011-05-08 14:31:24,055 (System.err:139) - at java.awt.GridBagLayout.ArrangeGrid(GridBagLayout.java:2065) ERROR 2011-05-08 14:31:24,055 (System.err:139) - at java.awt.GridBagLayout.arrangeGrid(GridBagLayout.java:2025) ERROR 2011-05-08 14:31:24,055 (System.err:139) - at java.awt.GridBagLayout.layoutContainer(GridBagLayout.java:806) ERROR 2011-05-08 14:31:24,055 (System.err:139) - at java.awt.Container.layout(Container.java:1427) ERROR 2011-05-08 14:31:24,056 (System.err:139) - at java.awt.Container.doLayout(Container.java:1416) ERROR 2011-05-08 14:31:24,056 (System.err:139) - at java.awt.Container.validateTree(Container.java:1513) ERROR 2011-05-08 14:31:24,056 (System.err:139) - at java.awt.Container.validateTree(Container.java:1519) ERROR 2011-05-08 14:31:24,056 (System.err:139) - at java.awt.Container.validateTree(Container.java:1519) ERROR 2011-05-08 14:31:24,057 (System.err:139) - at java.awt.Container.validateTree(Container.java:1519) ERROR 2011-05-08 14:31:24,057 (System.err:139) - at java.awt.Container.validate(Container.java:1486) ERROR 2011-05-08 14:31:24,057 (System.err:139) - at java.awt.Window.show(Window.java:900) ERROR 2011-05-08 14:31:24,058 (System.err:139) - at java.awt.Component.show(Component.java:1551) ERROR 2011-05-08 14:31:24,058 (System.err:139) - at java.awt.Component.setVisible(Component.java:1503) ERROR 2011-05-08 14:31:24,058 (System.err:139) - at java.awt.Window.setVisible(Window.java:881) ERROR 2011-05-08 14:31:24,058 (System.err:139) - at net.sf.taverna.t2.workbench.ui.impl.WorkbenchLauncher.launch(WorkbenchLauncher.java:29) ERROR 2011-05-08 14:31:24,059 (System.err:139) - at net.sf.taverna.raven.launcher.Launcher.launchMain(Launcher.java:150) ERROR 2011-05-08 14:31:24,059 (System.err:139) - at net.sf.taverna.raven.launcher.Launcher.main(Launcher.java:66) ERROR 2011-05-08 14:31:24,059 (System.err:139) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ERROR 2011-05-08 14:31:24,060 (System.err:139) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) ERROR 2011-05-08 14:31:24,060 (System.err:139) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ERROR 2011-05-08 14:31:24,060 (System.err:139) - at java.lang.reflect.Method.invoke(Method.java:616) ERROR 2011-05-08 14:31:24,060 (System.err:139) - at net.sf.taverna.raven.prelauncher.PreLauncher.runLauncher(PreLauncher.java:115) ERROR 2011-05-08 14:31:24,061 (System.err:139) - at net.sf.taverna.raven.prelauncher.PreLauncher.launchArgs(PreLauncher.java:69) ERROR 2011-05-08 14:31:24,061 (System.err:139) - at net.sf.taverna.raven.prelauncher.PreLauncher.main(PreLauncher.java:47) ERROR 2011-05-08 14:31:24,127 (net.sf.taverna.t2.workbench.ui.impl.WorkbenchPerspectives:182) - Error reading user perspectives java.io.FileNotFoundException: /home/reinout/.taverna-2.2.0/conf/user_perpectives.xml (Too many open files) at java.io.FileInputStream.open(Native Method) at java.io.FileInputStream.(FileInputStream.java:137) at java.io.FileInputStream.(FileInputStream.java:96) at sun.net.www.protocol.file.FileURLConnection.connect(FileURLConnection.java:87) at sun.net.www.protocol.file.FileURLConnection.getInputStream(FileURLConnection.java:178) at org.apache.xerces.impl.XMLEntityManager.setupCurrentEntity(Unknown Source) at org.apache.xerces.impl.XMLVersionDetector.determineDocVersion(Unknown Source) at org.apache.xerces.parsers.XML11Configuration.parse(Unknown Source) at org.apache.xerces.parsers.XML11Configuration.parse(Unknown Source) at org.apache.xerces.parsers.XMLParser.parse(Unknown Source) at org.apache.xerces.parsers.AbstractSAXParser.parse(Unknown Source) at org.apache.xerces.jaxp.SAXParserImpl$JAXPSAXParser.parse(Unknown Source) at org.jdom.input.SAXBuilder.build(SAXBuilder.java:453) at org.jdom.input.SAXBuilder.build(SAXBuilder.java:810) at org.jdom.input.SAXBuilder.build(SAXBuilder.java:789) at net.sf.taverna.t2.ui.perspectives.CustomPerspectiveFactory.getAll(CustomPerspectiveFactory.java:65) at net.sf.taverna.t2.workbench.ui.impl.WorkbenchPerspectives.initialisePerspectives(WorkbenchPerspectives.java:179) at net.sf.taverna.t2.workbench.ui.impl.WorkbenchPerspectives.access$1100(WorkbenchPerspectives.java:83) at net.sf.taverna.t2.workbench.ui.impl.WorkbenchPerspectives$RefreshRunner.run(WorkbenchPerspectives.java:572) at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:226) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:647) at java.awt.EventQueue.access$000(EventQueue.java:96) at java.awt.EventQueue$1.run(EventQueue.java:608) at java.awt.EventQueue$1.run(EventQueue.java:606) at java.security.AccessController.doPrivileged(Native Method) at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:105) at java.awt.EventQueue.dispatchEvent(EventQueue.java:617) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:275) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:200) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:185) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:177) at java.awt.EventDispatchThread.run(EventDispatchThread.java:138) # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x0000003b4901ee00, pid=7130, tid=140340163417856 # # JRE version: 6.0_22-b22 # Java VM: OpenJDK 64-Bit Server VM (20.0-b11 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea6 1.10.1 # Distribution: Fedora release 15 (Lovelock), package fedora-57.1.10.1.fc15-x86_64 # Problematic frame: # C [libfreetype.so.6+0x1ee00] # # Can not save log file, dump to screen.. # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x0000003b4901ee00, pid=7130, tid=140340163417856 # # JRE version: 6.0_22-b22 # Java VM: OpenJDK 64-Bit Server VM (20.0-b11 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea6 1.10.1 # Distribution: Fedora release 15 (Lovelock), package fedora-57.1.10.1.fc15-x86_64 # Problematic frame: # C [libfreetype.so.6+0x1ee00] # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # --------------- T H R E A D --------------- Current thread (0x00007fa330478800): JavaThread "AWT-EventQueue-0" [_thread_in_native, id=7312, stack(0x00007fa37d869000,0x00007fa37d96a000)] siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR), si_addr=0x0000000000000000 Registers: RAX=0x0000000000000014, RBX=0x00007fa37d966820, RCX=0x000000000000000a, RDX=0x0000000000000000 RSP=0x00007fa37d966648, RBP=0x00007fa3300872c0, RSI=0x00007fa3300a29b0, RDI=0x00007fa37d966820 R8 =0x0000000040000000, R9 =0x0000000000000000, R10=0x00007fa38d93a5a0, R11=0x0000003b42961e10 R12=0x0000000000000000, R13=0x0000000000000000, R14=0x0000000000000038, R15=0x0000000000000000 RIP=0x0000003b4901ee00, EFLAGS=0x0000000000010212, CSGSFS=0x0000000000000033, ERR=0x0000000000000004 TRAPNO=0x000000000000000e Top of Stack: (sp=0x00007fa37d966648) 0x00007fa37d966648: 0000003b49024899 00007fa385000438 0x00007fa37d966658: 00007fa330136b90 0000000041880000 0x00007fa37d966668: 0000000000005000 0000000000005000 0x00007fa37d966678: 0000003b49022849 00007fa330124b20 0x00007fa37d966688: 0000003b490285d4 00007fa300000000 0x00007fa37d966698: 732e6975c1148000 0000007300000000 0x00007fa37d9666a8: 00000000fd5745b8 00007fa330124ba8 0x00007fa37d9666b8: 00007fa330124d3a 00007fa330124be8 0x00007fa37d9666c8: 00007fa330124d36 00007fa330478800 0x00007fa37d9666d8: 00007fa3305396b8 00007fa37d966750 0x00007fa37d9666e8: 00007fa37d9669f8 0000000000000000 0x00007fa37d9666f8: 00007fa330478800 00007fa37d9669f0 0x00007fa37d966708: 00007fa3300a2dc0 0000000000000055 0x00007fa37d966718: 00007fa330124920 0000000000030004 0x00007fa37d966728: 00007fa3300a2dc0 000000000000c9bc 0x00007fa37d966738: 0000003b49012974 00007fa330136c50 0x00007fa37d966748: 00007fa3300872c0 00007fa37d966820 0x00007fa37d966758: 0000003b49028cf7 00007fa330124b20 0x00007fa37d966768: 00007fa330136b90 00007fa37d966820 0x00007fa37d966778: 0000000000000000 00007fa300030004 0x00007fa37d966788: 000001a37d9669f0 00007fa330478800 0x00007fa37d966798: 080005db000000b2 00007fa330539650 0x00007fa37d9667a8: 00007fa330124920 0000000000030004 0x00007fa37d9667b8: 0000000000000000 00007fa330136c50 0x00007fa37d9667c8: 0000000000000000 0000000000000038 0x00007fa37d9667d8: 0000003b49029751 00007fa37d966970 0x00007fa37d9667e8: 00007fa38d24eba0 00007fa37d966810 0x00007fa37d9667f8: 00007fa38d22c455 00007fa3305396b8 0x00007fa37d966808: 00007fa33042beb0 00007fa37d966950 0x00007fa37d966818: 00007fa38d2380e0 00007fa3300872c0 0x00007fa37d966828: 00007fa330136c50 00007fa330124920 0x00007fa37d966838: 00007fa330136b90 0000000000030004 Instructions: (pc=0x0000003b4901ee00) 0x0000003b4901ede0: 48 8b 97 60 01 00 00 b8 14 00 00 00 48 8d 4a 0a 0x0000003b4901edf0: 48 39 8f 68 01 00 00 73 07 f3 c3 0f 1f 44 00 00 0x0000003b4901ee00: 0f be 32 0f b6 42 01 c1 e6 08 09 f0 66 89 47 3c 0x0000003b4901ee10: 0f be 72 02 0f b6 42 03 c1 e6 08 09 f0 48 0f bf Register to memory mapping: RAX=0x0000000000000014 is an unknown value RBX=0x00007fa37d966820 is pointing into the stack for thread: 0x00007fa330478800 RCX=0x000000000000000a is an unknown value RDX=0x0000000000000000 is an unknown value RSP=0x00007fa37d966648 is pointing into the stack for thread: 0x00007fa330478800 RBP=0x00007fa3300872c0 is an unknown value RSI=0x00007fa3300a29b0 is an unknown value RDI=0x00007fa37d966820 is pointing into the stack for thread: 0x00007fa330478800 R8 =0x0000000040000000 is an unknown value R9 =0x0000000000000000 is an unknown value R10=0x00007fa38d93a5a0: in /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server/libjvm.so at 0x00007fa38cd7e000 R11=0x0000003b42961e10: in /lib64/libc.so.6 at 0x0000003b42800000 R12=0x0000000000000000 is an unknown value R13=0x0000000000000000 is an unknown value R14=0x0000000000000038 is an unknown value R15=0x0000000000000000 is an unknown value Stack: [0x00007fa37d869000,0x00007fa37d96a000], sp=0x00007fa37d966648, free space=1013k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [libfreetype.so.6+0x1ee00] Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j sun.font.FreetypeFontScaler.getGlyphImageNative(Lsun/font/Font2D;JJI)J+0 j sun.font.FreetypeFontScaler.getGlyphImage(JI)J+26 j sun.font.FileFont.getGlyphImage(JI)J+6 j sun.font.FileFontStrike.getGlyphImagePtr(I)J+49 j sun.font.FileFontStrike.getGlyphAdvance(I)F+109 j sun.font.CompositeStrike.getGlyphAdvance(I)F+11 j sun.font.CompositeStrike.getCodePointAdvance(I)F+12 j sun.font.FontDesignMetrics.handleCharWidth(I)F+5 j sun.font.FontDesignMetrics.getLatinCharWidth(C)F+16 j sun.font.FontDesignMetrics.charsWidth([CII)I+121 j javax.swing.text.Utilities.getTabbedTextWidth(Ljavax/swing/text/View;Ljavax/swing/text/Segment;Ljava/awt/FontMetrics;ILjavax/swing/text/TabExpander;I[I)I+337 j javax.swing.text.GlyphPainter1.getSpan(Ljavax/swing/text/GlyphView;IILjavax/swing/text/TabExpander;F)F+35 j javax.swing.text.GlyphView.getPreferredSpan(I)F+77 j javax.swing.text.FlowView$LogicalView.getPreferredSpan(I)F+32 j javax.swing.text.FlowView.calculateMinorAxisRequirements(ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;+17 j javax.swing.text.html.ParagraphView.calculateMinorAxisRequirements(ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;+3 j javax.swing.text.BoxView.checkRequests(I)V+86 j javax.swing.text.BoxView.getMinimumSpan(I)F+2 j javax.swing.text.html.ParagraphView.getMinimumSpan(I)F+11 j javax.swing.text.BoxView.calculateMinorAxisRequirements(ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;+36 j javax.swing.text.html.BlockView.calculateMinorAxisRequirements(ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;+31 j javax.swing.text.BoxView.checkRequests(I)V+86 j javax.swing.text.BoxView.getMinimumSpan(I)F+2 j javax.swing.text.html.BlockView.getMinimumSpan(I)F+2 j javax.swing.text.BoxView.calculateMinorAxisRequirements(ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;+36 j javax.swing.text.html.BlockView.calculateMinorAxisRequirements(ILjavax/swing/SizeRequirements;)Ljavax/swing/SizeRequirements;+31 j javax.swing.text.BoxView.checkRequests(I)V+86 j javax.swing.text.BoxView.getPreferredSpan(I)F+2 j javax.swing.text.html.BlockView.getPreferredSpan(I)F+2 j javax.swing.plaf.basic.BasicHTML$Renderer.(Ljavax/swing/JComponent;Ljavax/swing/text/ViewFactory;Ljavax/swing/text/View;)V+34 j javax.swing.plaf.basic.BasicHTML.createHTMLView(Ljavax/swing/JComponent;Ljava/lang/String;)Ljavax/swing/text/View;+98 j javax.swing.plaf.basic.BasicHTML.updateRenderer(Ljavax/swing/JComponent;Ljava/lang/String;)V+40 j javax.swing.plaf.basic.BasicLabelUI.propertyChange(Ljava/beans/PropertyChangeEvent;)V+40 j javax.swing.plaf.synth.SynthLabelUI.propertyChange(Ljava/beans/PropertyChangeEvent;)V+2 J java.beans.PropertyChangeSupport.fire([Ljava/beans/PropertyChangeListener;Ljava/beans/PropertyChangeEvent;)V j java.beans.PropertyChangeSupport.firePropertyChange(Ljava/beans/PropertyChangeEvent;)V+73 j java.beans.PropertyChangeSupport.firePropertyChange(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V+32 j java.awt.Component.firePropertyChange(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V+55 j javax.swing.JLabel.setText(Ljava/lang/String;)V+32 j net.sf.taverna.t2.workbench.ui.servicepanel.ServicePanel$1.run()V+19 j java.awt.event.InvocationEvent.dispatch()V+47 j java.awt.EventQueue.dispatchEventImpl(Ljava/awt/AWTEvent;Ljava/lang/Object;)V+21 j java.awt.EventQueue.access$000(Ljava/awt/EventQueue;Ljava/awt/AWTEvent;Ljava/lang/Object;)V+3 j java.awt.EventQueue$1.run()Ljava/lang/Void;+12 j java.awt.EventQueue$1.run()Ljava/lang/Object;+1 v ~StubRoutines::call_stub J java.security.AccessController.doPrivileged(Ljava/security/PrivilegedAction;Ljava/security/AccessControlContext;)Ljava/lang/Object; j java.security.AccessControlContext$1.doIntersectionPrivilege(Ljava/security/PrivilegedAction;Ljava/security/AccessControlContext;Ljava/security/AccessControlContext;)Ljava/lang/Object;+28 j java.awt.EventQueue.dispatchEvent(Ljava/awt/AWTEvent;)V+46 j java.awt.EventDispatchThread.pumpOneEventForFilters(I)Z+192 j java.awt.EventDispatchThread.pumpEventsForFilter(ILjava/awt/Conditional;Ljava/awt/EventFilter;)V+30 j java.awt.EventDispatchThread.pumpEventsForHierarchy(ILjava/awt/Conditional;Ljava/awt/Component;)V+11 j java.awt.EventDispatchThread.pumpEvents(ILjava/awt/Conditional;)V+4 j java.awt.EventDispatchThread.pumpEvents(Ljava/awt/Conditional;)V+3 j java.awt.EventDispatchThread.run()V+9 v ~StubRoutines::call_stub --------------- P R O C E S S --------------- Java Threads: ( => current thread ) 0x00007fa388613000 JavaThread "Thread-4" [_thread_blocked, id=7315, stack(0x00007fa37c859000,0x00007fa37c95a000)] 0x00007fa3281c7800 JavaThread "Image Fetcher 0" daemon [_thread_blocked, id=7313, stack(0x00007fa37eb6c000,0x00007fa37ec6d000)] =>0x00007fa330478800 JavaThread "AWT-EventQueue-0" [_thread_in_native, id=7312, stack(0x00007fa37d869000,0x00007fa37d96a000)] 0x00007fa3305ea000 JavaThread "pool-1-thread-1" [_thread_blocked, id=7302, stack(0x00007fa37d061000,0x00007fa37d162000)] 0x00007fa330556000 JavaThread "Thread-9" [_thread_blocked, id=7301, stack(0x00007fa37d162000,0x00007fa37d263000)] 0x00007fa330584000 JavaThread "SVG Graph controller timer" daemon [_thread_blocked, id=7293, stack(0x00007fa37d263000,0x00007fa37d364000)] 0x00007fa330549800 JavaThread "GraphAutoScrollTimer" daemon [_thread_blocked, id=7291, stack(0x00007fa37cb5c000,0x00007fa37cc5d000)] 0x00007fa328010000 JavaThread "derby.rawStoreDaemon" daemon [_thread_blocked, id=7290, stack(0x00007fa37c24f000,0x00007fa37c350000)] 0x00007fa328273000 JavaThread "Timer-2" daemon [_thread_blocked, id=7287, stack(0x00007fa37cd5e000,0x00007fa37ce5f000)] 0x00007fa304010000 JavaThread "Keep-Alive-Timer" daemon [_thread_blocked, id=7285, stack(0x00007fa37d465000,0x00007fa37d566000)] 0x00007fa3282b9800 JavaThread "Timer-1" daemon [_thread_blocked, id=7284, stack(0x00007fa37ce5f000,0x00007fa37cf60000)] 0x00007fa32825f000 JavaThread "derby.antiGC" daemon [_thread_blocked, id=7283, stack(0x00007fa37c758000,0x00007fa37c859000)] 0x00007fa318052000 JavaThread "Find service descriptions from Biomoby service http://moby.ucalgary.ca/moby/MOBY-Central.pl" daemon [_thread_in_native, id=7274, stack(0x00007fa37ca5b000,0x00007fa37cb5c000)] 0x00007fa31801f000 JavaThread "Find service descriptions from Biomart service http://www.biomart.org/biomart/martservice" daemon [_thread_in_native, id=7269, stack(0x00007fa37cf60000,0x00007fa37d061000)] 0x00007fa3304f3000 JavaThread "TimerQueue" daemon [_thread_blocked, id=7265, stack(0x00007fa37d364000,0x00007fa37d465000)] 0x00007fa33041f800 JavaThread "Clear status line" daemon [_thread_blocked, id=7263, stack(0x00007fa37d566000,0x00007fa37d667000)] 0x00007fa3304c2800 JavaThread "Search field timer" daemon [_thread_blocked, id=7262, stack(0x00007fa37d667000,0x00007fa37d768000)] 0x00007fa330446000 JavaThread "Check for updates thread" daemon [_thread_blocked, id=7261, stack(0x00007fa37d768000,0x00007fa37d869000)] 0x00007fa3882f1800 JavaThread "AWT-Shutdown" [_thread_blocked, id=7159, stack(0x00007fa37ec6d000,0x00007fa37ed6e000)] 0x00007fa3882bc000 JavaThread "AWT-XAWT" daemon [_thread_in_native, id=7152, stack(0x00007fa37ee70000,0x00007fa37ef71000)] 0x00007fa38821e800 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=7151, stack(0x00007fa37f487000,0x00007fa37f588000)] 0x00007fa3880b8000 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=7149, stack(0x00007fa37feff000,0x00007fa380000000)] 0x00007fa3880b6000 JavaThread "C2 CompilerThread1" daemon [_thread_in_native, id=7148, stack(0x00007fa384062000,0x00007fa384163000)] 0x00007fa3880b3000 JavaThread "C2 CompilerThread0" daemon [_thread_blocked, id=7147, stack(0x00007fa384163000,0x00007fa384264000)] 0x00007fa3880ad000 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=7146, stack(0x00007fa384264000,0x00007fa384365000)] 0x00007fa388079800 JavaThread "Finalizer" daemon [_thread_blocked, id=7143, stack(0x00007fa384365000,0x00007fa384466000)] 0x00007fa388077800 JavaThread "Reference Handler" daemon [_thread_blocked, id=7142, stack(0x00007fa384466000,0x00007fa384567000)] 0x00007fa388007800 JavaThread "main" [_thread_blocked, id=7134, stack(0x00007fa38cc7d000,0x00007fa38cd7e000)] Other Threads: 0x00007fa388070800 VMThread [stack: 0x00007fa384567000,0x00007fa384668000] [id=7141] 0x00007fa3880bd000 WatcherThread [stack: 0x00007fa37fdfe000,0x00007fa37feff000] [id=7150] VM state:not at safepoint (normal execution) VM Mutex/Monitor currently owned by a thread: None Heap PSYoungGen total 120448K, used 102977K [0x00000000f7ab0000, 0x0000000100000000, 0x0000000100000000) eden space 106048K, 87% used [0x00000000f7ab0000,0x00000000fd5830f0,0x00000000fe240000) from space 14400K, 69% used [0x00000000ff140000,0x00000000ffafd528,0x00000000fff50000) to space 15232K, 0% used [0x00000000fe240000,0x00000000fe240000,0x00000000ff120000) PSOldGen total 91840K, used 79151K [0x00000000e7000000, 0x00000000ec9b0000, 0x00000000f7ab0000) object space 91840K, 86% used [0x00000000e7000000,0x00000000ebd4bf60,0x00000000ec9b0000) PSPermGen total 103424K, used 71956K [0x00000000de400000, 0x00000000e4900000, 0x00000000e7000000) object space 103424K, 69% used [0x00000000de400000,0x00000000e2a45318,0x00000000e4900000) Code Cache [0x00007fa385000000, 0x00007fa385480000, 0x00007fa388000000) total_blobs=1902 nmethods=1106 adapters=749 free_code_cache=45739200 largest_free_block=31744 Dynamic libraries: Can not get library information for pid = 7312 VM Arguments: jvm_args: -Xmx400m -XX:MaxPermSize=140m -Draven.profile=file:///home/reinout/devel/taverna-workbench-2.2.0/conf/current-profile.xml -Dtaverna.startup=/home/reinout/devel/taverna-workbench-2.2.0 -Djava.system.class.loader=net.sf.taverna.raven.prelauncher.BootstrapClassLoader -Dapple.laf.useScreenMenuBar=true -Dapple.awt.graphics.UseQuartz=false -Dsun.swing.enableImprovedDragGesture java_command: /home/reinout/devel/taverna-workbench-2.2.0/lib/prelauncher-2.2.jar Launcher Type: SUN_STANDARD Environment Variables: PATH=/usr/lib64/qt-3.3/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/reinout/bin USERNAME=reinout LD_LIBRARY_PATH=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/../lib/amd64 SHELL=/bin/bash DISPLAY=:0 Signal Handlers: SIGSEGV: [libjvm.so+0x785b60], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGBUS: [libjvm.so+0x785b60], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGFPE: [libjvm.so+0x64aaf0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGPIPE: [libjvm.so+0x64aaf0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGXFSZ: [libjvm.so+0x64aaf0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGILL: [libjvm.so+0x64aaf0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGUSR2: [libjvm.so+0x64ac80], sa_mask[0]=0x00000000, sa_flags=0x10000004 SIGHUP: [libjvm.so+0x64d620], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGINT: [libjvm.so+0x64d620], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGTERM: [libjvm.so+0x64d620], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGQUIT: [libjvm.so+0x64d620], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 --------------- S Y S T E M --------------- OS:Linux uname:Linux 2.6.38.5-22.fc15.x86_64 #1 SMP Mon May 2 19:28:55 UTC 2011 x86_64 libc:glibc 2.13.90 NPTL 2.13.90 rlimit: STACK 8192k, CORE 0k, NPROC 1024, NOFILE 1024, AS infinity load average:-nan 0.00 0.00 /proc/meminfo: CPU:total 4 (2 cores per cpu, 2 threads per core) family 6 model 37 stepping 5, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, ht Memory: 4k page, physical 3899968k(108248k free), swap 5996540k(5450560k free) vm_info: OpenJDK 64-Bit Server VM (20.0-b11) for linux-amd64 JRE (1.6.0_22-b22), built on Apr 19 2011 21:02:21 by "mockbuild" with gcc 4.6.0 20110413 (Red Hat 4.6.0-4) time: Sun May 8 14:31:24 2011 elapsed time: 88 seconds -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Sun May 8 10:31:04 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 08 May 2011 17:31:04 +0000 Subject: [Bug 710] New: configure: syntax error near unexpected token `NSS,' Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=710 Summary: configure: syntax error near unexpected token `NSS,' Product: IcedTea Version: 6-1.10.1 Platform: all OS/Version: Linux Status: NEW Severity: blocker Priority: P5 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mike.werner at brain-child.de Hi, I've downloaded icedtea6-1.10.1 and tried to build it under Kubuntu 11.04, but "configure" stops with the following error: ./configure: line 7269: syntax error near unexpected token `NSS,' ./configure: line 7269: `PKG_CHECK_MODULES(NSS, nss, NSS_FOUND=yes, NSS_FOUND=no)' Procedure to reproduce the problem: ./autogen.sh ./configure checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking how to create a pax tar archive... gnutar checking build system type... i686-pc-linux-gnu checking host system type... i686-pc-linux-gnu checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking for style of include used by make... GNU checking dependency style of gcc... none checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... none checking for make... /usr/bin/make checking for gzip... /bin/gzip checking for ant... /usr/bin/ant checking for find... /usr/bin/find checking for patch... /usr/bin/patch checking for tar... /bin/tar checking for chmod... /bin/chmod checking for md5sum... /usr/bin/md5sum checking for sha256sum... /usr/bin/sha256sum checking for wget... /usr/bin/wget checking for zip... /usr/bin/zip checking for unzip... /usr/bin/unzip checking for cpio... /bin/cpio checking for file... /usr/bin/file checking for fastjar... fastjar checking for ldd... ldd checking for gawk... /usr/bin/gawk checking for hg... /usr/bin/hg checking for an OpenJDK source directory... /home/mwerner/Downloads/icedtea6-1.10.1/openjdk checking for IcedTea Mercurial revision ID... none checking for JDK Mercurial revision ID... none checking for HotSpot Mercurial revision ID... none checking for lsb_release... /usr/bin/lsb_release checking whether to compile ecj natively... no checking which HotSpot build to use... original checking for linux32... /usr/bin/linux32 checking version of GCC... 4.5.2 (major version 4, minor version 5) checking for getconf... /usr/bin/getconf checking the number of online processors... 1 checking how many parallel build jobs to execute... 2 checking if cp supports --reflink... yes checking if we can hard link rather than copy from /home/mwerner/Downloads/icedtea6-1.10.1... yes checking if a PaX-enabled kernel is running... no checking for system library directory... ./configure: line 7269: syntax error near unexpected token `NSS,' ./configure: line 7269: `PKG_CHECK_MODULES(NSS, nss, NSS_FOUND=yes, NSS_FOUND=no)' -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ahughes at redhat.com Mon May 9 06:20:53 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 9 May 2011 14:20:53 +0100 Subject: Patch: improve huge page support In-Reply-To: <4DC2915A.2070304@redhat.com> References: <4DC1678E.30402@redhat.com> <20110504155316.GF26415@rivendell.middle-earth.co.uk> <4DC2915A.2070304@redhat.com> Message-ID: <20110509132052.GA22437@rivendell.middle-earth.co.uk> On 13:00 Thu 05 May , Andrew Haley wrote: > On 05/04/2011 04:53 PM, Dr Andrew John Hughes wrote: > > On 15:49 Wed 04 May , Andrew Haley wrote: > >> My big patch to improve huge page support in now in HotSpot upstream. > >> This is a backport. > >> > >> The question is: to what branches should we apply this? It makes the > >> use of huge pages much, much easier. You no longer need root access > >> for anything except setting the size of the huge page pool, and the > >> huge pages aren't locked in memory, so it's a big improvement for > >> usability. If the new huge page support doesn't work in the kernel, > >> it falls back to the old SysV-style huge page allocator. > >> > >> Thoughts? > >> > > > > I notice this doesn't actually enable the patch in the Makefile.am. Have > > you built this on any version of IcedTea yet? > > Yes, but it's missing from the email, that's all. > So which version? > > I would prefer that this was two separate patches, corresponding to each > > upstream changeset. It makes it easier to just delete the patch file > > when it gets backported upstream in OpenJDK6 (and, prior to that, makes > > it easier to see what we need to request for backport). > > The patches aren't separate, and shouldn't be applied separately. There > are no circumstances in which it's appropriate to apply just one, IMO. > They are separate changesets so should be separate patches. It's very hard to tell what's in the current patch as it doesn't correspond directly to an OpenJDK7 changeset. If one was to appear in OpenJDK6 and not the other, it would be difficult to work out which parts were from which changeset. > > As to branches, things could get tricky, as each of the currently supported > > branches has two HotSpot variants as follows: > > > > 1.8: hs14 & hs16 > > 1.9: hs17 (default) & hs19 > > 1.10: hs19 (default) & hs20 > > 1.11 (HEAD): hs19 & hs20 (default) > > > > So that's potentially five versions of HotSpot to patch (hs14, hs16, hs17, hs19, hs20) > > but it may be that this code has changed little and the same patch can be applied to > > several versions. > > I suspect so, but I had to do a fair bit of work on the backport, > as this file has some churn. > Well, merging the two changesets makes this harder as it's now difficult to tell which bits of the patch came from which changeset, and which bits came from neither but are a result of backporting. > > 1.8 is due to become obsolete when we ship 1.11 (according to our 3-release policy [1]), > > but that won't be until July and there will be a security update before that on the 7th > > of June [2]. > > > > So I'll leave the call on 1.8 to you, but I'd expect we at least want this in 1.9, > > 1.10 and HEAD. > > > > 1. http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-March/013215.html > > 2. http://www.oracle.com/technetwork/topics/security/alerts-086861.html > > OK, I see. > > Andrew. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From aph at redhat.com Mon May 9 06:27:04 2011 From: aph at redhat.com (Andrew Haley) Date: Mon, 09 May 2011 14:27:04 +0100 Subject: Patch: improve huge page support In-Reply-To: <20110509132052.GA22437@rivendell.middle-earth.co.uk> References: <4DC1678E.30402@redhat.com> <20110504155316.GF26415@rivendell.middle-earth.co.uk> <4DC2915A.2070304@redhat.com> <20110509132052.GA22437@rivendell.middle-earth.co.uk> Message-ID: <4DC7EBA8.9030300@redhat.com> On 05/09/2011 02:20 PM, Dr Andrew John Hughes wrote: > On 13:00 Thu 05 May , Andrew Haley wrote: >> On 05/04/2011 04:53 PM, Dr Andrew John Hughes wrote: >>> On 15:49 Wed 04 May , Andrew Haley wrote: >>>> My big patch to improve huge page support in now in HotSpot upstream. >>>> This is a backport. >>>> >>>> The question is: to what branches should we apply this? It makes the >>>> use of huge pages much, much easier. You no longer need root access >>>> for anything except setting the size of the huge page pool, and the >>>> huge pages aren't locked in memory, so it's a big improvement for >>>> usability. If the new huge page support doesn't work in the kernel, >>>> it falls back to the old SysV-style huge page allocator. >>>> >>>> Thoughts? >>>> >>> >>> I notice this doesn't actually enable the patch in the Makefile.am. Have >>> you built this on any version of IcedTea yet? >> >> Yes, but it's missing from the email, that's all. > > So which version? Trunk; I always begin with trunk. >>> I would prefer that this was two separate patches, corresponding to each >>> upstream changeset. It makes it easier to just delete the patch file >>> when it gets backported upstream in OpenJDK6 (and, prior to that, makes >>> it easier to see what we need to request for backport). >> >> The patches aren't separate, and shouldn't be applied separately. There >> are no circumstances in which it's appropriate to apply just one, IMO. > > They are separate changesets so should be separate patches. It's very hard > to tell what's in the current patch as it doesn't correspond directly to > an OpenJDK7 changeset. If one was to appear in OpenJDK6 and not the other, > it would be difficult to work out which parts were from which changeset. 'Mkay, it's for changeset tracking, then. Fair enough. >>> As to branches, things could get tricky, as each of the currently supported >>> branches has two HotSpot variants as follows: >>> >>> 1.8: hs14 & hs16 >>> 1.9: hs17 (default) & hs19 >>> 1.10: hs19 (default) & hs20 >>> 1.11 (HEAD): hs19 & hs20 (default) >>> >>> So that's potentially five versions of HotSpot to patch (hs14, hs16, hs17, hs19, hs20) >>> but it may be that this code has changed little and the same patch can be applied to >>> several versions. >> >> I suspect so, but I had to do a fair bit of work on the backport, >> as this file has some churn. > > Well, merging the two changesets makes this harder as it's now difficult to tell which > bits of the patch came from which changeset, and which bits came from neither but are > a result of backporting. Sure, but that's going to be difficult no matter what. There isn't any patch that will apply that corresponds exactly to the upstream changesets. Andrew. From omajid at redhat.com Mon May 9 07:34:10 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 09 May 2011 10:34:10 -0400 Subject: Reviewer needed - patch which fixes class SunToolkit for IcedTea6-1.10 In-Reply-To: <20110331144325.GT6143@rivendell.middle-earth.co.uk> References: <4D945A85.7000208@redhat.com> <20110331144325.GT6143@rivendell.middle-earth.co.uk> Message-ID: <4DC7FB62.2030200@redhat.com> On 03/31/2011 10:43 AM, Dr Andrew John Hughes wrote: > On 12:42 Thu 31 Mar , Pavel Tisnovsky wrote: >> Hi all, >> >> I'd like to backport SunToolkit patch to IcedTea6-1.10 (it's already >> pushed to IcedTea6 HEAD). Can anybody please review it? >> >> 2011-03-31 Pavel Tisnovsky >> >> * Makefile.am: Add new patch. >> * NEWS: Updated (added info about new fix). >> * patches/mark_sun_toolkit_privileged_code.patch: >> Patch which fixes the AccessControlException while >> working with Color class in a PropertyEditor. >> >> Pavel T. > > Backport looks fine, assuming it builds. Please commit. > > Was there any response from Oracle as to the bug ID? I didn't see anything. > I am going to guess it's 6599601 [1]. The bug lists that it was fixed in b21 (another source [2]), and the diff between openjdk7 b20 and b21 seems to agree [3]. May I move this patch to patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch? Cheers, Omair [1] http://bugs.sun.com/view_bug.do?bug_id=6599601 [2] http://download.java.net/jdk7/changes/jdk7-b21.html [3] http://icedtea.classpath.org/hg/openjdk/diff/e2018f79de77/j2se/src/share/classes/sun/awt/SunToolkit.java From kelly.ohair at oracle.com Mon May 9 08:48:11 2011 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Mon, 9 May 2011 08:48:11 -0700 Subject: Reviewer needed - patch which fixes class SunToolkit for IcedTea6-1.10 In-Reply-To: <4D949E61.5010101@redhat.com> References: <4D945A85.7000208@redhat.com> <20110331144325.GT6143@rivendell.middle-earth.co.uk> <4D949E61.5010101@redhat.com> Message-ID: <358C50B5-96DB-42C2-8CAA-95BFD6FA1E6B@oracle.com> On Mar 31, 2011, at 8:31 AM, Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > >> Was there any response from Oracle as to the bug ID? I didn't see anything. >> > > Not, so far there was no answer from Oracle. I replied. Yes this is the right bugid. -kto From ahughes at redhat.com Mon May 9 08:58:48 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 9 May 2011 16:58:48 +0100 Subject: Reviewer needed - patch which fixes class SunToolkit for IcedTea6-1.10 In-Reply-To: <4DC7FB62.2030200@redhat.com> References: <4D945A85.7000208@redhat.com> <20110331144325.GT6143@rivendell.middle-earth.co.uk> <4DC7FB62.2030200@redhat.com> Message-ID: <20110509155847.GD22437@rivendell.middle-earth.co.uk> On 10:34 Mon 09 May , Omair Majid wrote: > On 03/31/2011 10:43 AM, Dr Andrew John Hughes wrote: > > On 12:42 Thu 31 Mar , Pavel Tisnovsky wrote: > >> Hi all, > >> > >> I'd like to backport SunToolkit patch to IcedTea6-1.10 (it's already > >> pushed to IcedTea6 HEAD). Can anybody please review it? > >> > >> 2011-03-31 Pavel Tisnovsky > >> > >> * Makefile.am: Add new patch. > >> * NEWS: Updated (added info about new fix). > >> * patches/mark_sun_toolkit_privileged_code.patch: > >> Patch which fixes the AccessControlException while > >> working with Color class in a PropertyEditor. > >> > >> Pavel T. > > > > Backport looks fine, assuming it builds. Please commit. > > > > Was there any response from Oracle as to the bug ID? I didn't see anything. > > > > I am going to guess it's 6599601 [1]. The bug lists that it was fixed in > b21 (another source [2]), and the diff between openjdk7 b20 and b21 > seems to agree [3]. May I move this patch to > patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch? > Yes, and you now have permission from Kelly to push it to OpenJDK6. > Cheers, > Omair > > [1] http://bugs.sun.com/view_bug.do?bug_id=6599601 > [2] http://download.java.net/jdk7/changes/jdk7-b21.html > [3] > http://icedtea.classpath.org/hg/openjdk/diff/e2018f79de77/j2se/src/share/classes/sun/awt/SunToolkit.java -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From jvanek at redhat.com Mon May 9 09:16:35 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 09 May 2011 18:16:35 +0200 Subject: [icedtea-web] xml output for junit, transformation sheets for daily report In-Reply-To: <4DC49084.9090900@redhat.com> References: <4DBA8360.5020403@redhat.com> <4DBB2613.5070000@redhat.com> <4DBC0E18.1060803@redhat.com> <4DC13892.6090500@redhat.com> <4DC49084.9090900@redhat.com> Message-ID: <4DC81363.2070409@redhat.com> On 05/07/2011 02:21 AM, Omair Majid wrote: snip > >> As Omair suggested, i have added class which exports xml-output >> following junit-xml output. As I have not found official dtd or schmea, >> I was careful which elements/attributes to output as resources on the >> web were not united. Current resul is quit sufficient - the only thing I >> miss are by-class statistics and date. I would like to break "junit >> dtd" (as there is none) and add those elements from my previous xml >> output. This step will not break possible usage of tools working with >> ant-xml output. >> > > It's really up to you. I thought junit-like xml might be better since we > could reuse tools for junit. But since you are already writing html > reports and everything, I dont think it matters too much. Breaking > junit's dtd (even if you know exactly what it is) is fine too. > >> In this patch are both xml exporters so reviewer can judge weather to >> keep both, merge them all keep just one (probably junit-like). >> >> I think Pavel do not care which one will appears at the and:) >> > > I will leave it to others (especially you and ptisnovs) to judge that. I > am fine with keeping both (if you want to maintain it, that is), though > I would like the default output to be just one format (with a switch for > the other format). junit-like xml output continue, and is enriched for date and statistics. other output is discarded. > >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/index.html Wed May 04 13:16:27 2011 +0200 >> @@ -0,0 +1,35 @@ >> + >> + >> + >> + >> + >> + >> +> onload="xslt('styles/report.xsl','tests.build/netx/unit/tests-output.xml','wholePage1'); >> >> + >> xslt('styles/jreport.xsl','tests.build/netx/unit/junit-like-tests-output.xml','wholePage2'); >> >> + >> xslt('styles/report.xsl','tests.build/netx/dist/tests-output.xml','wholePage3'); >> >> + >> xslt('styles/jreport.xsl','tests.build/netx/dist/junit-like-tests-output.xml','wholePage4');"> >> >> +
> > Is there a way to avoid hardcoding these paths? This html file is placed > in the source directory, I think it breaks with out-of-tree builds. > Perhaps this file should be stored in $(abs_top_srcdir)/tests/ and after > the tests are run, an updated version is placed in $(abs_top_builddir)/ > ($(abs_top_builddir)/tests.build)). i have "hardcoded" this paths into makefile instead of into html file. No there is index.html.in and all styles files are under tests directory (copyed into test.build/styles) and test.html is generated into tests.build. The "generation" is seding similar to javaws luncher. Is it enough? I have tryied to include absolute paths into index.html by inside make, but I don't think it is good idea, because the they will not be loaded when index.html is accessed from network by browser (and it probably will be on Pavel's torment). So I kept relative paths to be sed-ed. > >> diff -r a9729e1bb762 styles/index.js >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/styles/index.js Wed May 04 13:16:27 2011 +0200 snip >> + >> + >> +function negateId(which){ >> + var e = document.getElementById(which); >> + if (e.style.display=="block") { >> + e.style.display="none" >> + }else{ >> + e.style.display="block" >> + } >> + } >> + >> + >> + function setClass(which,what) { > > Perhaps setDisplay might be a better name? > done >> + var e = document.getElementsByClassName(which); >> + for ( var i = 0; i< e.length; i++ ){ >> + e[i].style.display=what >> + } >> + } >> + >> + >> + >> + >> + function xslt(sheet,data,dest) { >> + var sheetName=sheet; >> + var xmlName=data; >> + var htmlDest=dest; >> + // code for IE >> + if (window.ActiveXObject) { >> + var XML = new ActiveXObject("MSXML2.FreeThreadedDomDocument"); >> + XML.async = "false"; >> + XML.load(xmlName); >> + var XSL = new ActiveXObject("MSXML2.FreeThreadedDomDocument"); >> + XSL.async = "false"; >> + XSL.load(sheetName); >> + var XSLTCompiled = new ActiveXObject("MSXML2.XSLTemplate"); >> + //Add the stylesheet information >> + XSLTCompiled.stylesheet = XSL.documentElement; >> + //Create the XSLT processor >> + var msShit = XSLTCompiled.createProcessor(); >> + msShit.input = XML > > This is the funniest thing I saw today :) Still, I dont think this is > appropriate. Please rename this variable. Personally, I am just fine > with leaving out the entire "if IE" block. > Sorry O:) Variable renamed, ms-block kept. One newer knows.... >> diff -r a9729e1bb762 tests/junit-runner/JunitLikeXmlOutputListener.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/junit-runner/JunitLikeXmlOutputListener.java Wed May 04 >> 13:16:27 2011 +0200 > > >> diff -r a9729e1bb762 tests/junit-runner/XmlOutputListener.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/junit-runner/XmlOutputListener.java Wed May 04 13:16:27 >> 2011 +0200 > > > Two comments on the files above: please add a little more documentation, > and please use System.nanoTime() which is more resistant to change in > clock times. > > Everything else looks good enough to me (though I am quite unfamiliar > with most of the things here). > > Cheers, > Omair ready to commit? Regards J. -------------- next part -------------- A non-text attachment was scrubbed... Name: patch-xmloutput.patch Type: text/x-patch Size: 24336 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110509/5d96d2dd/patch-xmloutput.patch From jvanek at redhat.com Mon May 9 09:32:47 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 09 May 2011 18:32:47 +0200 Subject: Fwd: Re: [icedtea-web] xml output for junit, transformation sheets for daily report Message-ID: <4DC8172F.7020009@redhat.com> Clean was missing in previous post: @@ -485,6 +502,8 @@ rm -f $(JUNIT_RUNNER_JAR) clean-netx-unit-tests: + rm -rf $(TESTS_STYLES_DIR) + rm -f $(TESTS_DIR)/index.html rm -f netx-unit-tests-source-files.txt rm -rf $(NETX_UNIT_TEST_DIR) rm -f stamps/netx-unit-tests-compile.stamp and changelog: 2011-05-09 Jiri Vanek * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports results of junit in xml which "follows junit-output schema". Extended for date, duration and some statististics for future purpose * tests/junit-runner/CommandLine.java: added usage of JunitLikeXmlOutputListener added skipping of inner classes and one jnlp file from sources package. *index.html: file which provides runtime transformation of tests-output.xml and report.xml * tests/styles/index.js: runtime transformation script and fast navigation functions * tests/styles/report.css: styles for transformed result * tests/styles/jreport.xsl: template for human-readable xml->html transformation. -------------- next part -------------- A non-text attachment was scrubbed... Name: patch-xmloutput.patch Type: text/x-patch Size: 24588 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110509/dd0481ff/patch-xmloutput.patch From omajid at redhat.com Mon May 9 11:15:24 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 09 May 2011 14:15:24 -0400 Subject: Fwd: Re: [icedtea-web] xml output for junit, transformation sheets for daily report In-Reply-To: <4DC8172F.7020009@redhat.com> References: <4DC8172F.7020009@redhat.com> Message-ID: <4DC82F3C.70607@redhat.com> Hi Jiri, Overall, I think the patch looks good. A few concerns: > > 2011-05-09 Jiri Vanek > > * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports > results of junit in xml which "follows junit-output schema". Extended > for date, duration and some statististics for future purpose > * tests/junit-runner/CommandLine.java: added usage of > JunitLikeXmlOutputListener added skipping of inner classes and one > jnlp file from sources package. > *index.html: file which provides runtime transformation > of tests-output.xml and report.xml this file should be named tests/sytles/index.html.in > * tests/styles/index.js: runtime transformation script and fast > navigation functions > * tests/styles/report.css: styles for transformed result > * tests/styles/jreport.xsl: template for human-readable xml->html > transformation. Could you possibly rename the styles dir? Perhaps 'report' might be more appropriate. I also noticed that the patch contains lots of blank lines. Some of the really short (1-line) methods contain many blank lines (2 or more). Please delete them if you can. Other than that, this looks fine to me. I would love to get a second opinion, though. Cheers, Omair From ahughes at redhat.com Mon May 9 12:24:47 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 9 May 2011 20:24:47 +0100 Subject: Fwd: Re: [icedtea-web] xml output for junit, transformation sheets for daily report In-Reply-To: <4DC8172F.7020009@redhat.com> References: <4DC8172F.7020009@redhat.com> Message-ID: <20110509192447.GF22437@rivendell.middle-earth.co.uk> On 18:32 Mon 09 May , Jiri Vanek wrote: > Clean was missing in previous post: > @@ -485,6 +502,8 @@ > rm -f $(JUNIT_RUNNER_JAR) > > clean-netx-unit-tests: > + rm -rf $(TESTS_STYLES_DIR) > + rm -f $(TESTS_DIR)/index.html > rm -f netx-unit-tests-source-files.txt > rm -rf $(NETX_UNIT_TEST_DIR) > rm -f stamps/netx-unit-tests-compile.stamp > And this is for??? Please post patches with some explanation of what they are intended for. > and changelog: > > > 2011-05-09 Jiri Vanek > > * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports > results of junit in xml which "follows junit-output schema". Extended > for date, duration and some statististics for future purpose > * tests/junit-runner/CommandLine.java: added usage of > JunitLikeXmlOutputListener added skipping of inner classes and one > jnlp file from sources package. The inner class handling should be a separate patch, as it has nothing to do with this, other than being a prerequisite. > *index.html: file which provides runtime transformation > of tests-output.xml and report.xml > * tests/styles/index.js: runtime transformation script and fast > navigation functions I think the transformation should be preformed by make as part of producing index.html, rather than having browser-specific hacks. > * tests/styles/report.css: styles for transformed result > * tests/styles/jreport.xsl: template for human-readable xml->html > transformation. > > Also you seem to include @author tags in the Java code. I didn't realise we had a standard for doing this. Do we? Either way, 'jvanek' is not very identifiable. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Mon May 9 12:25:52 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 9 May 2011 20:25:52 +0100 Subject: Fwd: Re: [icedtea-web] xml output for junit, transformation sheets for daily report In-Reply-To: <4DC82F3C.70607@redhat.com> References: <4DC8172F.7020009@redhat.com> <4DC82F3C.70607@redhat.com> Message-ID: <20110509192552.GG22437@rivendell.middle-earth.co.uk> On 14:15 Mon 09 May , Omair Majid wrote: > Hi Jiri, > > Overall, I think the patch looks good. A few concerns: > > > > > 2011-05-09 Jiri Vanek > > > > * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports > > results of junit in xml which "follows junit-output schema". Extended > > for date, duration and some statististics for future purpose > > * tests/junit-runner/CommandLine.java: added usage of > > JunitLikeXmlOutputListener added skipping of inner classes and one > > jnlp file from sources package. > > *index.html: file which provides runtime transformation > > of tests-output.xml and report.xml > > this file should be named tests/sytles/index.html.in > > > * tests/styles/index.js: runtime transformation script and fast > > navigation functions > > * tests/styles/report.css: styles for transformed result > > * tests/styles/jreport.xsl: template for human-readable xml->html > > transformation. > > Could you possibly rename the styles dir? Perhaps 'report' might be more > appropriate. > > I also noticed that the patch contains lots of blank lines. Some of the > really short (1-line) methods contain many blank lines (2 or more). > Please delete them if you can. > > Other than that, this looks fine to me. I would love to get a second > opinion, though. > > Cheers, > Omair The code also needs documenting, though that could be done in a follow-up patch. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at redhat.com Mon May 9 12:33:18 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 09 May 2011 15:33:18 -0400 Subject: Fwd: Re: [icedtea-web] xml output for junit, transformation sheets for daily report In-Reply-To: <20110509192447.GF22437@rivendell.middle-earth.co.uk> References: <4DC8172F.7020009@redhat.com> <20110509192447.GF22437@rivendell.middle-earth.co.uk> Message-ID: <4DC8417E.6030403@redhat.com> On 05/09/2011 03:24 PM, Dr Andrew John Hughes wrote: > On 18:32 Mon 09 May , Jiri Vanek wrote: >> Clean was missing in previous post: >> @@ -485,6 +502,8 @@ >> rm -f $(JUNIT_RUNNER_JAR) >> >> clean-netx-unit-tests: >> + rm -rf $(TESTS_STYLES_DIR) >> + rm -f $(TESTS_DIR)/index.html >> rm -f netx-unit-tests-source-files.txt >> rm -rf $(NETX_UNIT_TEST_DIR) >> rm -f stamps/netx-unit-tests-compile.stamp >> > > And this is for??? > > Please post patches with some explanation of what they are intended for. > He did in the original email: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-April/013904.html. Unfortunately, this email broke the thread :( Cheers, Omair From bugzilla-daemon at icedtea.classpath.org Mon May 9 12:47:37 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 May 2011 19:47:37 +0000 Subject: [Bug 710] configure: syntax error near unexpected token `NSS,' In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=710 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|blocker |normal --- Comment #1 from Andrew John Hughes 2011-05-09 19:47:37 --- Where did you download IcedTea6 from? This looks like an error on your part in generating configure, which isn't even necessary from a tarball. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From jvanek at icedtea.classpath.org Mon May 9 13:02:39 2011 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Mon, 09 May 2011 20:02:39 +0000 Subject: /hg/icedtea-web: Innerclasses and jnlp files are now skipped dur... Message-ID: changeset f93285fdccdf in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f93285fdccdf author: Jiri Vanek date: Mon May 09 21:58:48 2011 +0200 Innerclasses and jnlp files are now skipped during testing without warning or eror diffstat: ChangeLog | 4 ++++ tests/junit-runner/CommandLine.java | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diffs (23 lines): diff -r c4a58969d117 -r f93285fdccdf ChangeLog --- a/ChangeLog Tue May 03 09:14:16 2011 -0400 +++ b/ChangeLog Mon May 09 21:58:48 2011 +0200 @@ -1,3 +1,7 @@ +2011-05-09 Jiri Vanek + * tests/junit-runner/CommandLine.java:r added skipping of inner + classes and one jnlp file from sources package. + 2011-05-03 Denis Lila * netx/net/sourceforge/jnlp/NetxPanel.java: diff -r c4a58969d117 -r f93285fdccdf tests/junit-runner/CommandLine.java --- a/tests/junit-runner/CommandLine.java Tue May 03 09:14:16 2011 -0400 +++ b/tests/junit-runner/CommandLine.java Mon May 09 21:58:48 2011 +0200 @@ -34,6 +34,8 @@ List missingClasses = new ArrayList(); for (String each : args) { try { + if (each.contains("$")) continue; + if (each.toLowerCase().endsWith(".jnlp")) continue; classes.add(Class.forName(each)); } catch (ClassNotFoundException e) { system.out().println("ERROR: Could not find class: " + each); From asu at redhat.com Mon May 9 15:55:04 2011 From: asu at redhat.com (Andrew Su) Date: Mon, 9 May 2011 18:55:04 -0400 (EDT) Subject: [RFC][Icedtea6]: Update jpegclasses.patch In-Reply-To: <356087934.28285.1304515989830.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <31493024.126087.1304981704693.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > From: "Andrew Su" > To: "Dr Andrew John Hughes" > Cc: "IcedTea" > Sent: Wednesday, May 4, 2011 9:33:09 AM > Subject: Re: [RFC][Icedtea6]: Update jpegclasses.patch > ----- Original Message ----- > > From: "Dr Andrew John Hughes" > > To: "Andrew Su" > > Cc: "IcedTea" > > Sent: Monday, May 2, 2011 6:18:24 PM > > Subject: Re: [RFC][Icedtea6]: Update jpegclasses.patch > > On 14:52 Mon 02 May , Andrew Su wrote: > > > Hello, > > --snip-- > > > I haven't looked at the code itself, but I think this would be much > > more maintainable if it used the overlays > > mechanism instead, with possibly a minimal patch to enable building > > of > > the code. I assume the com.sun.image.codec.jpeg > > code is not present in the OpenJDK6 tarball? > > That's right, neither com.sun.image.codec.jpeg and sun.awt.image.codec > is in the openJDK6 tarball. > > I agree that having it in overlays would make it easier to maintain. > I've moved it there. > > This patch now removes the jpegclasses.patch and adds the files to > overlays/jpeg. Hi, Here's an updated version with a more complete JPEGParam code. It is still missing subsampling... The encoder and decoder currently doesn't use all the parameters in JPEGParam. It builds successfully and can be tested with the attached sample. Ok to push to icedtea6 HEAD? Cheers, Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: SampleMain.java Type: text/x-java Size: 1420 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110509/7904b2d0/SampleMain.java -------------- next part -------------- A non-text attachment was scrubbed... Name: jpeg.patch Type: text/x-patch Size: 119388 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110509/7904b2d0/jpeg.patch From ahughes at redhat.com Mon May 9 16:41:02 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 May 2011 00:41:02 +0100 Subject: [RFC][Icedtea6]: Update jpegclasses.patch In-Reply-To: <31493024.126087.1304981704693.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <356087934.28285.1304515989830.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <31493024.126087.1304981704693.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <20110509234102.GH22437@rivendell.middle-earth.co.uk> On 18:55 Mon 09 May , Andrew Su wrote: > > > ----- Original Message ----- > > From: "Andrew Su" > > To: "Dr Andrew John Hughes" > > Cc: "IcedTea" > > Sent: Wednesday, May 4, 2011 9:33:09 AM > > Subject: Re: [RFC][Icedtea6]: Update jpegclasses.patch > > ----- Original Message ----- > > > From: "Dr Andrew John Hughes" > > > To: "Andrew Su" > > > Cc: "IcedTea" > > > Sent: Monday, May 2, 2011 6:18:24 PM > > > Subject: Re: [RFC][Icedtea6]: Update jpegclasses.patch > > > On 14:52 Mon 02 May , Andrew Su wrote: > > > > Hello, > > > > --snip-- > > > > > I haven't looked at the code itself, but I think this would be much > > > more maintainable if it used the overlays > > > mechanism instead, with possibly a minimal patch to enable building > > > of > > > the code. I assume the com.sun.image.codec.jpeg > > > code is not present in the OpenJDK6 tarball? > > > > That's right, neither com.sun.image.codec.jpeg and sun.awt.image.codec > > is in the openJDK6 tarball. > > > > I agree that having it in overlays would make it easier to maintain. > > I've moved it there. > > > > This patch now removes the jpegclasses.patch and adds the files to > > overlays/jpeg. > > Hi, > > Here's an updated version with a more complete JPEGParam code. It is still missing subsampling... > The encoder and decoder currently doesn't use all the parameters in JPEGParam. > > It builds successfully and can be tested with the attached sample. > > Ok to push to icedtea6 HEAD? > > Cheers, > Andrew Yes, go ahead. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Mon May 9 22:30:43 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 10 May 2011 05:30:43 +0000 Subject: [Bug 710] configure: syntax error near unexpected token `NSS,' In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=710 --- Comment #2 from Mike Werner 2011-05-10 05:30:42 --- Hi, > Where did you download IcedTea6 from? http://icedtea.classpath.org/download/source/icedtea6-1.10.1.tar.gz > This looks like an error on your part in generating configure, which isn't even > necessary from a tarball. First I want to build it for i386 but when this was sucessfull and my application runs fine I'd like to build it for an ARM target. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From valerie.peng at oracle.com Tue May 3 16:05:55 2011 From: valerie.peng at oracle.com (Valerie (Yu-Ching) Peng) Date: Tue, 03 May 2011 16:05:55 -0700 Subject: code without sources distributed in 7b130 In-Reply-To: <20110503213413.GB26415@rivendell.middle-earth.co.uk> References: <4DC01620.1040500@ubuntu.com> <20110503213413.GB26415@rivendell.middle-earth.co.uk> Message-ID: <4DC08A53.9000806@oracle.com> The binaries under test/sun/security/pkcs11/nss/lib is used for running PKCS11 regression tests. They have been there since the start. As for the hardcoded path in test/sun/security/pkcs11/Provider/csp.cfg, it's only for testing the configuration parsing code, i.e. it doesn't error out when encountering "~". Valerie On 05/03/11 14:34, Dr Andrew John Hughes wrote: >> >> in jdk: >> test/sun/security/pkcs11/nss/lib/ various precompiled shared libraries. Is it >> necessary to distribute these with the jdk sources? Checked that these files are >> available on Debian and Ubuntu distributions >> >> libsoftokn3.so: in /usr/lib, package libnss3-1d/libnss3 >> libnss3.so: same >> libnssckbi.so: in /usr/lib/nss >> >> libnspr4.so: in /usr/lib, package libnspr4-0d/libnspr4 >> libplds4.so: same >> libplc4.so: same >> >> thanks, Matthias >> > > I agree these binaries shouldn't be in the repositories. Seems things are slipping again. > Thanks for spotting. Either hg is lying or these have been there since the start. > > $ hg log -R jdk jdk/test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so > > Worst case, we can hg rm these from the IcedTea forest. I've now made this accessible to > all IcedTea committers on http://icedtea.classpath.org/hg/icedtea7-forest > > Could someone also explain > 6581254: pkcs11 provider fails to parse configuration file contains windows short path > which introduces a file with hardcoded Windows paths > test/sun/security/pkcs11/Provider/csp.cfg ? > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110503/ecce357e/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue May 10 02:44:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 10 May 2011 09:44:18 +0000 Subject: [Bug 673] eclipse crushing because of jdk In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=673 Jesus changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jolmos at buguroo.com --- Comment #5 from Jesus 2011-05-10 09:44:18 --- yesterday I upgraded my arch-linux, and then I have the same SIGSEGV on libxul. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From jvanek at icedtea.classpath.org Tue May 10 03:02:28 2011 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 10 May 2011 10:02:28 +0000 Subject: /hg/icedtea-web: added posibility for junit to export reports to... Message-ID: changeset 114a981d3552 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=114a981d3552 author: Jiri Vanek date: Tue May 10 11:58:19 2011 +0200 added posibility for junit to export reports to xml, addes set of styles for easy navigation inside tests-output file (transformed to html) diffstat: ChangeLog | 19 + Makefile.am | 38 ++- tests/junit-runner/CommandLine.java | 3 + tests/junit-runner/JunitLikeXmlOutputListener.java | 225 +++++++++++++++++++++ tests/report-styles/index.html.in | 25 ++ tests/report-styles/index.js | 67 ++++++ tests/report-styles/jreport.xsl | 215 ++++++++++++++++++++ tests/report-styles/report.css | 21 + 8 files changed, 606 insertions(+), 7 deletions(-) diffs (truncated from 705 to 500 lines): diff -r f93285fdccdf -r 114a981d3552 ChangeLog --- a/ChangeLog Mon May 09 21:58:48 2011 +0200 +++ b/ChangeLog Tue May 10 11:58:19 2011 +0200 @@ -1,3 +1,22 @@ +2011-05-10 Jiri Vanek + + * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports + results of junit in xml which "follows junit-output schema". Extended + for date, duration and some statististics for future purpose + *tests/report-sytles/index.html.in : file which provides runtime + transformation of tests-output.xml and report.xml + * tests/report-styles/index.js: runtime transformation script and fast + navigation functions + * tests/report-styles/report.css: styles for transformed result + * tests/report-styles/jreport.xsl: template for human-readable + xml->html transformation. + * Makefile.am (javaws, itweb_settings): New variables for report-styles + directory; (edit_tests_index) - sed makro for replacing variables + inside index.html.in; (index.html) - goal for generating index.html + file from index.html.in and copying styles fiels; (run-netx-unit-tests) + cloned stdout/err (clean-netx-unit-tests) cleaning styles dir and + index.html + 2011-05-09 Jiri Vanek * tests/junit-runner/CommandLine.java:r added skipping of inner classes and one jnlp file from sources package. diff -r f93285fdccdf -r 114a981d3552 Makefile.am --- a/Makefile.am Mon May 09 21:58:48 2011 +0200 +++ b/Makefile.am Tue May 10 11:58:19 2011 +0200 @@ -6,14 +6,18 @@ NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources +REPORT_STYLES_DIRNAME=report-styles + TESTS_SRCDIR=$(abs_top_srcdir)/tests +NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit +TESTS_STYLES_SRCDIR=$(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME) +JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner + TESTS_DIR=$(abs_top_builddir)/tests.build +NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit +TESTS_STYLES_DIR=$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) +JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner -NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit -NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit - -JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner -JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar @@ -122,6 +126,14 @@ -e 's|[@]JAVA[@]|$(JAVA)|g' \ -e 's|[@]JRE[@]|$(JRE)|g' +edit_tests_index = sed \ + -e 's|[@]data_path_unit[@]|netx/unit/tests-output.xml|g' \ + -e 's|[@]data_path_dist[@]|netx/dist/tests-output.xml|g' \ + -e 's|[@]css_styles[@]|$(REPORT_STYLES_DIRNAME)/report.css|g' \ + -e 's|[@]xslt_script[@]|$(REPORT_STYLES_DIRNAME)/index.js|g' \ + -e 's|[@]sheet_path_unit[@]|$(REPORT_STYLES_DIRNAME)/jreport.xsl|g' \ + -e 's|[@]sheet_path_dist[@]|$(REPORT_STYLES_DIRNAME)/jreport.xsl|g' + # Top-Level Targets # ================= @@ -450,6 +462,13 @@ netx-unit-tests-source-files.txt: find $(NETX_UNIT_TEST_SRCDIR) -name '*.java' | sort > $@ +$(TESTS_DIR)/index.html: stamps/netx-unit-tests-compile.stamp + mkdir $(TESTS_STYLES_DIR)/ + cp $(TESTS_STYLES_SRCDIR)/*.css $(TESTS_STYLES_DIR)/ + cp $(TESTS_STYLES_SRCDIR)/*.xsl $(TESTS_STYLES_DIR)/ + cp $(TESTS_STYLES_SRCDIR)/*.js $(TESTS_STYLES_DIR)/ + $(edit_tests_index) < $(TESTS_STYLES_SRCDIR)/index.html.in > $@ + stamps/netx-unit-tests-compile.stamp: stamps/netx.stamp \ netx-unit-tests-source-files.txt mkdir -p $(NETX_UNIT_TEST_DIR) && \ @@ -460,7 +479,7 @@ mkdir -p stamps && \ touch $@ -run-netx-unit-tests: stamps/netx-unit-tests-compile.stamp \ +run-netx-unit-tests: stamps/netx-unit-tests-compile.stamp $(TESTS_DIR)/index.html \ $(JUNIT_RUNNER_JAR) cp {$(NETX_UNIT_TEST_SRCDIR),$(NETX_UNIT_TEST_DIR)}/net/sourceforge/jnlp/basic.jnlp cd $(NETX_UNIT_TEST_DIR) ; \ @@ -472,7 +491,10 @@ done ; \ echo $$class_names ; \ CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \ - $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names + $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ + > stdout.log 2> stderr.log ; \ + cat stdout.log ; \ + cat stderr.log >&2 clean-netx-tests: clean-netx-unit-tests clean-junit-runner if [ -e $(TESTS_DIR)/netx ]; then \ @@ -485,6 +507,8 @@ rm -f $(JUNIT_RUNNER_JAR) clean-netx-unit-tests: + rm -rf $(TESTS_STYLES_DIR) + rm -f $(TESTS_DIR)/index.html rm -f netx-unit-tests-source-files.txt rm -rf $(NETX_UNIT_TEST_DIR) rm -f stamps/netx-unit-tests-compile.stamp diff -r f93285fdccdf -r 114a981d3552 tests/junit-runner/CommandLine.java --- a/tests/junit-runner/CommandLine.java Mon May 09 21:58:48 2011 +0200 +++ b/tests/junit-runner/CommandLine.java Tue May 10 11:58:19 2011 +0200 @@ -7,6 +7,7 @@ * http://www.eclipse.org/legal/cpl-v10.html */ +import java.io.File; import java.util.ArrayList; import java.util.List; @@ -41,6 +42,8 @@ system.out().println("ERROR: Could not find class: " + each); } } + RunListener jXmlOutput = new JunitLikeXmlOutputListener(system, new File("tests-output.xml")); + addListener(jXmlOutput); RunListener listener = new LessVerboseTextListener(system); addListener(listener); Result result = run(classes.toArray(new Class[0])); diff -r f93285fdccdf -r 114a981d3552 tests/junit-runner/JunitLikeXmlOutputListener.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/junit-runner/JunitLikeXmlOutputListener.java Tue May 10 11:58:19 2011 +0200 @@ -0,0 +1,225 @@ +/* + * Copyright 2011 Red Hat, Inc. + * + * This file is made available under the terms of the Common Public License + * v1.0 which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + */ + +import java.io.BufferedWriter; +import java.io.File; + +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + + +import org.junit.internal.JUnitSystem; +import org.junit.runner.Description; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.junit.runner.notification.RunListener; +/** + * This class listens for events in junit testsuite and wrote output to xml. + * Xml tryes to follow ant-tests schema, and is enriched for by-class statistics + * stdout and err elements are added, but must be filled from elsewhere (eg tee + * in make) as junit suite and listener run from our executer have no access to + * them. + * + */ +public class JunitLikeXmlOutputListener extends RunListener { + + private BufferedWriter writer; + private Failure testFailed = null; + private static final String ROOT = "testsuite"; + private static final String DATE_ELEMENT = "date"; + private static final String TEST_ELEMENT = "testcase"; + private static final String TEST_NAME_ATTRIBUTE = "name"; + private static final String TEST_TIME_ATTRIBUTE = "time"; + private static final String TEST_ERROR_ELEMENT = "error"; + private static final String TEST_CLASS_ATTRIBUTE = "classname"; + private static final String ERROR_MESSAGE_ATTRIBUTE = "message"; + private static final String ERROR_TYPE_ATTRIBUTE = "type"; + private static final String SOUT_ELEMENT = "system-out"; + private static final String SERR_ELEMENT = "system-err"; + private static final String CDATA_START = ""; + private static final String TEST_CLASS_ELEMENT = "class"; + private static final String STATS_ELEMENT = "stats"; + private static final String CLASSES_ELEMENT = "classes"; + private static final String SUMMARY_ELEMENT = "summary"; + private static final String SUMMARY_TOTAL_ELEMENT = "total"; + private static final String SUMMARY_PASSED_ELEMENT = "passed"; + private static final String SUMMARY_FAILED_ELEMENT = "failed"; + private static final String SUMMARY_IGNORED_ELEMENT = "ignored"; + private long testStart; + + private class ClassCounter { + + int total; + int failed; + int passed; + long time = 0; + } + Map classStats = new HashMap(); + + public JunitLikeXmlOutputListener(JUnitSystem system, File f) { + try { + writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f), "UTF-8")); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + @Override + public void testRunStarted(Description description) throws Exception { + openElement(ROOT); + writeElement(DATE_ELEMENT, new Date().toString()); + } + + private void openElement(String name) throws IOException { + openElement(name, null); + } + + private void openElement(String name, Map atts) throws IOException { + StringBuilder attString = new StringBuilder(); + if (atts != null) { + attString.append(" "); + Set> entries = atts.entrySet(); + for (Entry entry : entries) { + attString.append(entry.getKey()).append("=\"").append(attributize(entry.getValue())).append("\""); + attString.append(" "); + } + } + writer.write("<" + name + attString.toString() + ">"); + writer.newLine(); + } + + private static String attributize(String s) { + return s.replace("&", "&").replace("<", "<"); + } + + private void closeElement(String name) throws IOException { + writer.newLine(); + writer.write(""); + writer.newLine(); + } + + private void writeContent(String content) throws IOException { + writer.write(CDATA_START + content + CDATA_END); + } + + private void writeElement(String name, String content) throws IOException { + writeElement(name, content, null); + } + + private void writeElement(String name, String content, Map atts) throws IOException { + openElement(name, atts); + writeContent(content); + closeElement(name); + } + + @Override + public void testStarted(Description description) throws Exception { + testFailed = null; + testStart = System.nanoTime()/1000l/1000l; + } + + @Override + public void testFailure(Failure failure) throws IOException { + testFailed = failure; + } + + @Override + public void testFinished(org.junit.runner.Description description) throws Exception { + long testTime = System.nanoTime()/1000l/1000l - testStart; + double testTimeSeconds = ((double) testTime) / 1000d; + + Map testcaseAtts = new HashMap(3); + NumberFormat formatter = new DecimalFormat("#0.0000"); + String stringedTime = formatter.format(testTimeSeconds); + stringedTime.replace(",", "."); + testcaseAtts.put(TEST_TIME_ATTRIBUTE, stringedTime); + testcaseAtts.put(TEST_CLASS_ATTRIBUTE, description.getClassName()); + testcaseAtts.put(TEST_NAME_ATTRIBUTE, description.getMethodName()); + + openElement(TEST_ELEMENT, testcaseAtts); + if (testFailed != null) { + Map errorAtts = new HashMap(3); + + errorAtts.put(ERROR_MESSAGE_ATTRIBUTE, testFailed.getMessage()); + int i = testFailed.getTrace().indexOf(":"); + if (i >= 0) { + errorAtts.put(ERROR_TYPE_ATTRIBUTE, testFailed.getTrace().substring(0, i)); + } else { + errorAtts.put(ERROR_TYPE_ATTRIBUTE, "?"); + } + + writeElement(TEST_ERROR_ELEMENT, testFailed.getTrace(), errorAtts); + } + + closeElement(TEST_ELEMENT); + writer.flush(); + + ClassCounter cc = classStats.get(description.getClassName()); + if (cc == null) { + cc = new ClassCounter(); + classStats.put(description.getClassName(), cc); + } + cc.total++; + cc.time += testTime; + if (testFailed == null) { + cc.passed++; + } else { + + cc.failed++; + } + } + + @Override + public void testRunFinished(Result result) throws Exception { + + writeElement(SOUT_ELEMENT, "@sout@"); + writeElement(SERR_ELEMENT, "@serr@"); + openElement(STATS_ELEMENT); + openElement(SUMMARY_ELEMENT); + int passed = result.getRunCount() - result.getFailureCount() - result.getIgnoreCount(); + int failed = result.getFailureCount(); + int ignored = result.getIgnoreCount(); + writeElement(SUMMARY_TOTAL_ELEMENT, String.valueOf(result.getRunCount())); + writeElement(SUMMARY_FAILED_ELEMENT, String.valueOf(failed)); + writeElement(SUMMARY_IGNORED_ELEMENT, String.valueOf(ignored)); + writeElement(SUMMARY_PASSED_ELEMENT, String.valueOf(passed)); + closeElement(SUMMARY_ELEMENT); + openElement(CLASSES_ELEMENT); + Set> e = classStats.entrySet(); + for (Entry entry : e) { + + Map testcaseAtts = new HashMap(3); + testcaseAtts.put(TEST_NAME_ATTRIBUTE, entry.getKey()); + testcaseAtts.put(TEST_TIME_ATTRIBUTE, String.valueOf(entry.getValue().time)); + + openElement(TEST_CLASS_ELEMENT, testcaseAtts); + writeElement(SUMMARY_PASSED_ELEMENT, String.valueOf(entry.getValue().passed)); + writeElement(SUMMARY_FAILED_ELEMENT, String.valueOf(entry.getValue().failed)); + writeElement(SUMMARY_IGNORED_ELEMENT, String.valueOf(entry.getValue().total - entry.getValue().failed - entry.getValue().passed)); + writeElement(SUMMARY_TOTAL_ELEMENT, String.valueOf(entry.getValue().total)); + + closeElement(TEST_CLASS_ELEMENT); + } + closeElement(CLASSES_ELEMENT); + closeElement(STATS_ELEMENT); + + closeElement(ROOT); + writer.flush(); + writer.close(); + + } +} diff -r f93285fdccdf -r 114a981d3552 tests/report-styles/index.html.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/report-styles/index.html.in Tue May 10 11:58:19 2011 +0200 @@ -0,0 +1,25 @@ + + + + + + + + +
+
+Unit-tests: [dist tests] +
+
+
+ +
+Dist-tests: [unit tests] +
+
+
+ + diff -r f93285fdccdf -r 114a981d3552 tests/report-styles/index.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/report-styles/index.js Tue May 10 11:58:19 2011 +0200 @@ -0,0 +1,67 @@ + +if(typeof String.prototype.trim !== 'function') { String.prototype.trim = function() { return this.replace(/^\s+|\s+$/g, ''); } } + + +function negateIdDisplay(which){ + var e = document.getElementById(which); + if (e.style.display=="block") { + e.style.display="none" + }else{ + e.style.display="block" + } + } + + + function setClassDisplay(which,what) { + var e = document.getElementsByClassName(which); + for ( var i = 0; i < e.length; i++ ){ + e[i].style.display=what + } + } + + + function loadXMLDoc(dname) { + if (window.XMLHttpRequest) { + xhttp=new XMLHttpRequest(); + }else{ + xhttp=new ActiveXObject("Microsoft.XMLHTTP"); + } + xhttp.open("GET",dname,false); + xhttp.send(""); + return xhttp.responseXML; + } + + + function xslt(sheet,data,dest) { + var sheetName=sheet; + var xmlName=data; + var htmlDest=dest; + // code for IE + if (window.ActiveXObject) { + var XML = new ActiveXObject("MSXML2.FreeThreadedDomDocument"); + XML.async = "false"; + XML.load(xmlName); + var XSL = new ActiveXObject("MSXML2.FreeThreadedDomDocument"); + XSL.async = "false"; + XSL.load(sheetName); + var XSLTCompiled = new ActiveXObject("MSXML2.XSLTemplate"); + //Add the stylesheet information + XSLTCompiled.stylesheet = XSL.documentElement; + //Create the XSLT processor + var msSheet = XSLTCompiled.createProcessor(); + msSheet.input = XML + //Perform the transform + msSheet.transform(); + document.getElementById(htmlDest).innerHTML=msSheet.output; + } + // code for Mozilla, Firefox, Opera, etc. + else if (document.implementation && document.implementation.createDocument){ + xsl=loadXMLDoc(sheetName); + xml=loadXMLDoc(xmlName); + xsltProcessor=new XSLTProcessor(); + xsltProcessor.importStylesheet(xsl); + resultDocument = xsltProcessor.transformToFragment(xml,document); + document.getElementById(htmlDest).appendChild(resultDocument); + } + setClassDisplay("trace","none"); //by default allare visible to protect disabled javascript + } diff -r f93285fdccdf -r 114a981d3552 tests/report-styles/jreport.xsl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/report-styles/jreport.xsl Tue May 10 11:58:19 2011 +0200 @@ -0,0 +1,215 @@ + + (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=531) Icedtea build output for Shark -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ahughes at redhat.com Wed May 11 14:11:09 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 11 May 2011 22:11:09 +0100 Subject: Remove redundant 6664512 fix from IT7 In-Reply-To: <748254189.1838298.1305146582951.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <188954481.1838263.1305146468659.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <748254189.1838298.1305146582951.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <20110511211109.GS5351@rivendell.middle-earth.co.uk> On 16:43 Wed 11 May , Denis Lila wrote: > Hi. > > In icedtea7, S6664512 has two fixes. The attached > patch removes one of them (the one forward ported from > openjdk6) and leaves the one taken from the openjdk7 forests. > > I ran the reproducer for 6664512 and all was well. > > Ok to push (to icedtea7)? > > Regards, > Denis. Assuming you mean the forest, yeah go right ahead. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Wed May 11 14:21:49 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 11 May 2011 22:21:49 +0100 Subject: Fwd: Re: [icedtea-web] xml output for junit, transformation sheets for daily report In-Reply-To: <4DCAA611.5000909@redhat.com> References: <4DC8172F.7020009@redhat.com> <20110509192447.GF22437@rivendell.middle-earth.co.uk> <4DCA866C.1070204@redhat.com> <20110511135224.GF5351@rivendell.middle-earth.co.uk> <4DCAA611.5000909@redhat.com> Message-ID: <20110511212149.GT5351@rivendell.middle-earth.co.uk> On 17:06 Wed 11 May , Jiri Vanek wrote: > On 05/11/2011 03:52 PM, Dr Andrew John Hughes wrote: > > On 14:51 Wed 11 May , Jiri Vanek wrote: > >> ..snip.. > >>> > >>>> *index.html: file which provides runtime transformation > >>>> of tests-output.xml and report.xml > >>>> * tests/styles/index.js: runtime transformation script and fast > >>>> navigation functions > >>> > >>> I think the transformation should be preformed by make as part of producing index.html, > >>> rather than having browser-specific hacks. > >>> > >> > >> Not exactly. My "task" ..or.. my "desire".. was to produce full, > >> reusable report from testsuite. And this is XML (one for unit tests, one > >> for reproducers-tests). It will be used for anything we will want to > >> mine from results. (For now I'm aware about hystory, view of single run > >> and graphs and statistics). The sheet is designed to view the report in > >> human readable way for the single run. . It will be used to generate > >> htmls on torment. But the generation itself should not be in > >> icedtea-web (makefile). > > > > Yes, it should, if the XML is being produced by make. It's unintuitive for > > the index.html.in to be transformed to something that isn't the final HTML, > > but requires a further transformation. > > > > Still I must disagree. Add dependences to xalan-xercess is is quite big > step. And especially those two caused troubles in recent icedtea6 build > under f15. I do not want to provide result html after build. I would > like to provide results (xml) and some basic opinion to view them quicly > and comfortably. Oh, I certainly wasn't thinking of Xalan/Xerces when there is either xsltproc or in-tree JDK support. Xalan/Xerces is used in IcedTea6 purely for bootstrap support and I intend to replace it with xsltproc. > For daily report will be used xslt x xml on torment, so only resulted > html will be shown. Xml itself will be used also for statistics. > > Included runtime transformation should serve to develloper just as > "preview" of data after control build. > >> On the other way the sheet prove itself useful when hunting bugs. So I > >> decide to include the html skeleton which provide fast access to tests` > >> results using xslt transformation... > >> Btw - its not an hack:) The mozzila (and company) behaviour is following > >> w3c specification for this thing. Although... yes IE part is hack :-/. > >> So I'm willing to remove it (As i do not like M$ manners to :) ... ) but > >> no one ever knows... > >> > > > > No, I believe the standard is to include: > > > > > > > > in the XML. > > This will bound the xml to one concrete sheet. This means that when you > want several points of view to data (several xslt upon one XML) then you > need to have same number of XMLs. Also you will lost possibility to show > both reports simultaneously. > Ok. > As mentioned at the top, index.html is overview after make check and > make distcheck - especially for the one who made the build. > I still think something like xsltproc to generate the final HTML would be preferable. Doing things in web pages tends to be horrible to support across multiple browsers. > > > > Displaying the results should not require Javascript. > > > True. Still the javascript is included in final html (although it is not > required - all traces are visible then) for hide/show full stack traces. > >> > >> ..snip.. > >> > >> > > huh.. I hoped I described my point of view clearly (As I do not belive > my english :D ) > I think so. Unfortunately, I can't read your mind to verify this ;-) > >> Regards J. > > > > It Is very sad you did not mentioned your dislike to runtime > transformation after initial email (04/29/2011) (directly: > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-April/013904.html > and > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/013983.html) > and draft in java-team even ore before. Now it cause unnecessary troubles:( > I didn't see this post. My mailer shows the thread as started May 9th. Maybe it got buried during the time I was away with all the UK bank holidays. I do remember the internal post and said at the time I wouldn't reply internally. > > Regards J. > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Wed May 11 14:23:43 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 11 May 2011 22:23:43 +0100 Subject: Patch: improve huge page support In-Reply-To: <4DCAB5B0.2070400@redhat.com> References: <4DC1678E.30402@redhat.com> <20110504155316.GF26415@rivendell.middle-earth.co.uk> <4DC2915A.2070304@redhat.com> <20110509132052.GA22437@rivendell.middle-earth.co.uk> <4DCAA680.8050406@redhat.com> <20110511160423.GO5351@rivendell.middle-earth.co.uk> <4DCAB5B0.2070400@redhat.com> Message-ID: <20110511212343.GU5351@rivendell.middle-earth.co.uk> On 17:13 Wed 11 May , Andrew Haley wrote: > On 05/11/2011 05:04 PM, Dr Andrew John Hughes wrote: > > On 16:08 Wed 11 May , Andrew Haley wrote: > >> > > > > snip... > > > >> I won't bother with 1.8. I'll push to 1.9 and 1.10. > >> > > > > Ok, post the patches and I'll approve them for those branches. > > Righto. I'll do that once you have renamed the patch files. Let me > know. > I still can't build IcedTea6. Did you push the build fix for this, in one form or another? > Thanks, > Andrew. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:46:32 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:46:32 +0000 Subject: [Bug 698] Zero fails to build on bytecodeInterpreter.cpp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=698 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #4 from Andrew John Hughes 2011-05-11 23:46:32 --- Fixed. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:46:32 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:46:32 +0000 Subject: [Bug 695] [TRACKER] IcedTea7 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 Bug 695 depends on bug 698, which changed state. Bug 698 Summary: Zero fails to build on bytecodeInterpreter.cpp http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=698 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:49:02 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:49:02 +0000 Subject: [Bug 712] New: [TRACKER] IcedTea7 2.0 release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 Summary: [TRACKER] IcedTea7 2.0 release Product: IcedTea Version: 7-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea7 AssignedTo: gnu_andrew at member.fsf.org ReportedBy: gnu_andrew at member.fsf.org CC: unassigned at icedtea.classpath.org Metabug for the first full release of IcedTea7. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:50:26 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:50:26 +0000 Subject: [Bug 713] New: Port JamVM support to IcedTea7 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=713 Summary: Port JamVM support to IcedTea7 Product: IcedTea Version: 7-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea7 AssignedTo: gnu_andrew at member.fsf.org ReportedBy: gnu_andrew at member.fsf.org CC: unassigned at icedtea.classpath.org Blocks: 695 Forwardport the JamVM changesets to IcedTea7 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:50:26 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:50:26 +0000 Subject: [Bug 695] [TRACKER] IcedTea7 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |713 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:55:10 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:55:10 +0000 Subject: [Bug 695] [TRACKER] IcedTea7 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |714 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:55:10 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:55:10 +0000 Subject: [Bug 714] New: Forwardport replace-hotspot target from IcedTea6 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=714 Summary: Forwardport replace-hotspot target from IcedTea6 Product: IcedTea Version: 7-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea7 AssignedTo: gnu_andrew at member.fsf.org ReportedBy: gnu_andrew at member.fsf.org CC: unassigned at icedtea.classpath.org Blocks: 695 IcedTea6 has a separate target for replacing HotSpot which should be ported to 7. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:56:41 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:56:41 +0000 Subject: [Bug 715] New: Port updated macros from IcedTea6 to 7 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=715 Summary: Port updated macros from IcedTea6 to 7 Product: IcedTea Version: 7-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea7 AssignedTo: gnu_andrew at member.fsf.org ReportedBy: gnu_andrew at member.fsf.org CC: unassigned at icedtea.classpath.org Blocks: 695 Newer versions of some macros exist in acinclude.m4 in IcedTea6. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:56:41 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:56:41 +0000 Subject: [Bug 695] [TRACKER] IcedTea7 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |715 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:57:35 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:57:35 +0000 Subject: [Bug 716] New: IcedTea7 should bootstrap with IcedTea6 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=716 Summary: IcedTea7 should bootstrap with IcedTea6 Product: IcedTea Version: 7-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea7 AssignedTo: gnu_andrew at member.fsf.org ReportedBy: gnu_andrew at member.fsf.org CC: unassigned at icedtea.classpath.org Blocks: 695 Needs appropriate configure tests / some patches disabling, etc. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:57:35 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:57:35 +0000 Subject: [Bug 695] [TRACKER] IcedTea7 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |716 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:59:30 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:59:30 +0000 Subject: [Bug 712] [TRACKER] IcedTea7 2.0 release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |717 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 16:59:30 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 11 May 2011 23:59:30 +0000 Subject: [Bug 717] New: All non-bootstrap patches in IcedTea7 should be in the forest or dropped Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=717 Summary: All non-bootstrap patches in IcedTea7 should be in the forest or dropped Product: IcedTea Version: 7-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea7 AssignedTo: gnu_andrew at member.fsf.org ReportedBy: gnu_andrew at member.fsf.org CC: unassigned at icedtea.classpath.org, omajid at redhat.com Blocks: 712 There is still stuff in patches in IcedTea7, other than necessary for bootstrapping. As we have our own forest for IcedTea7, our patches should be in there, not IcedTea. This will indirectly make IcedTea7 work with other OpenJDK7 trees. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 17:02:03 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 00:02:03 +0000 Subject: [Bug 17] org.omg.CORBA tests fail due to ORB class not implemented In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=17 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |ptisnovs at redhat.com, | |gnu_andrew at member.fsf.org --- Comment #7 from Andrew John Hughes 2011-05-12 00:02:03 --- Pavel, one for you? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 17:03:13 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 00:03:13 +0000 Subject: [Bug 32] Double.toString(string) expands value In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=32 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org --- Comment #4 from Andrew John Hughes 2011-05-12 00:03:13 --- Pavel, can this be closed? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 17:07:48 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 00:07:48 +0000 Subject: [Bug 709] Crash in native code, problematic frame: libfreetype.so.6 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=709 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|critical |normal --- Comment #1 from Andrew John Hughes 2011-05-12 00:07:48 --- Do you have a reproducer for this? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 17:08:30 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 00:08:30 +0000 Subject: [Bug 709] Crash in native code, problematic frame: libfreetype.so.6 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=709 --- Comment #2 from Andrew John Hughes 2011-05-12 00:08:29 --- Please attach the hserr file for this. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 11 17:15:40 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 00:15:40 +0000 Subject: [Bug 719] New: make distcheck should work in IcedTea6 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=719 Summary: make distcheck should work in IcedTea6 Product: IcedTea Version: 6-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: gnu_andrew at member.fsf.org Blocks: 705 Currently doesn't as far as I'm aware, and never has. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ahughes at redhat.com Wed May 11 17:24:24 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 01:24:24 +0100 Subject: Release Update Message-ID: <20110512002424.GX5351@rivendell.middle-earth.co.uk> There will be a final IcedTea7 pre-release next Wednesday, issues permitting. This will be 1.14. A tracker is in Bugzilla. http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 The next major release after that will be IcedTea6 1.11. I expect this to happen in mid-June following the next batch of security updates. The tracker is: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=705 Finally, once OpenJDK7 is officially released, we will roll out IcedTea7 2.0. The tracker is: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 I'll be updating the wiki shortly with commit and release guidelines (long overdue!) -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at icedtea.classpath.org Wed May 11 17:28:30 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 12 May 2011 00:28:30 +0000 Subject: /hg/icedtea6: Only use non-jdk xml parsers for bootstrap Message-ID: changeset d8750486e54c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d8750486e54c author: Omair Majid date: Wed May 11 20:27:41 2011 -0400 Only use non-jdk xml parsers for bootstrap This patch moves patches/headers-hotspot.patch to patches/ecj /endorsed-dir-for-jvmti.patch and only applies it on a bootstrap build. The xerces/xalan parsers should only be required for bootstrap builds. OpenJDK's built-in xml parsers are good enough to handle the rest of the build. 2011-05-11 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Move headers-hotspot.patch to ... (ICEDTEA_ECJ_PATCHES): New patch. (ICEDTEA_ENV): Moves endorsed dir varaibles to ... (ICEDTEA_ENV_ECJ): Here. * patches/headers-hotspot.patch: Move to ... * patches/ecj/endorsed-dir-for-jvmti.patch: New file. diffstat: ChangeLog | 10 ++++++++++ Makefile.am | 6 +++--- patches/ecj/endorsed-dir-for-jvmti.patch | 12 ++++++++++++ patches/headers-hotspot.patch | 12 ------------ 4 files changed, 25 insertions(+), 15 deletions(-) diffs (88 lines): diff -r 439a9cd78f8c -r d8750486e54c ChangeLog --- a/ChangeLog Wed May 11 13:11:03 2011 -0400 +++ b/ChangeLog Wed May 11 20:27:41 2011 -0400 @@ -1,3 +1,13 @@ +2011-05-11 Omair Majid + + * Makefile.am + (ICEDTEA_PATCHES): Move headers-hotspot.patch to ... + (ICEDTEA_ECJ_PATCHES): New patch. + (ICEDTEA_ENV): Moves endorsed dir varaibles to ... + (ICEDTEA_ENV_ECJ): Here. + * patches/headers-hotspot.patch: Move to ... + * patches/ecj/endorsed-dir-for-jvmti.patch: New file. + 2011-05-11 Omair Majid Backport S7042040: Remove disk space sanity check diff -r 439a9cd78f8c -r d8750486e54c Makefile.am --- a/Makefile.am Wed May 11 13:11:03 2011 -0400 +++ b/Makefile.am Wed May 11 20:27:41 2011 -0400 @@ -221,7 +221,6 @@ patches/tools.patch \ patches/use-system-tzdata.patch \ patches/headers.patch \ - patches/headers-hotspot.patch \ patches/gcc-suffix.patch \ patches/hotspot/$(HSBUILD)/gcc-suffix.patch \ patches/memory-limits.patch \ @@ -415,6 +414,7 @@ ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \ patches/ecj/hotspot.patch \ + patches/ecj/endorsed-dir-for-jvmti.patch \ patches/ecj/spp.patch \ patches/ecj/jopt.patch \ patches/ecj/jaxp-dependency.patch \ @@ -475,8 +475,6 @@ ALT_BOOTDIR="$(BOOT_DIR)" \ BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \ ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR)" \ - ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \ - ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \ CLASSPATH="" \ LD_LIBRARY_PATH="" \ ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \ @@ -558,6 +556,8 @@ BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \ BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(RUNTIME)" \ CLASSPATH="" \ + ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \ + ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \ LD_LIBRARY_PATH="" \ GENSRCDIR="$(abs_top_builddir)/generated" \ JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ diff -r 439a9cd78f8c -r d8750486e54c patches/ecj/endorsed-dir-for-jvmti.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/endorsed-dir-for-jvmti.patch Wed May 11 20:27:41 2011 -0400 @@ -0,0 +1,13 @@ +diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jvmti.make openjdk/hotspot/make/linux/makefiles/jvmti.make +--- openjdk-ecj.orig/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:51:14.000000000 +0100 ++++ openjdk-ecj/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:54:13.000000000 +0100 +@@ -59,7 +59,7 @@ + + JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%) + +-XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen ++XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) $(ENDORSED) -classpath $(JvmtiOutDir) jvmtiGen + + .PHONY: all jvmtidocs clean cleanall + + diff -r 439a9cd78f8c -r d8750486e54c patches/headers-hotspot.patch --- a/patches/headers-hotspot.patch Wed May 11 13:11:03 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jvmti.make openjdk/hotspot/make/linux/makefiles/jvmti.make ---- openjdk.orig/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:51:14.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:54:13.000000000 +0100 -@@ -59,7 +59,7 @@ - - JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%) - --XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen -+XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) $(ENDORSED) -classpath $(JvmtiOutDir) jvmtiGen - - .PHONY: all jvmtidocs clean cleanall - - From omajid at redhat.com Wed May 11 18:43:36 2011 From: omajid at redhat.com (Omair Majid) Date: Wed, 11 May 2011 21:43:36 -0400 Subject: RFC: move patches/libpng.patch to patches/openjdk Message-ID: <4DCB3B48.50808@redhat.com> Hi, The attached patch moves patches/libpng.patch to clearly indicate that it is a backport of an openjdk patch. Okay to commit? Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-move-libpng-to-openjdk.patch Type: text/x-patch Size: 2246 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110511/43d3cab7/icedtea6-move-libpng-to-openjdk.patch From ahughes at redhat.com Wed May 11 18:48:24 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 02:48:24 +0100 Subject: RFC: move patches/libpng.patch to patches/openjdk In-Reply-To: <4DCB3B48.50808@redhat.com> References: <4DCB3B48.50808@redhat.com> Message-ID: <20110512014824.GY5351@rivendell.middle-earth.co.uk> On 21:43 Wed 11 May , Omair Majid wrote: > Hi, > > The attached patch moves patches/libpng.patch to clearly indicate that > it is a backport of an openjdk patch. > > Okay to commit? > > Cheers, > Omair Fine, though in reality the OpenJDK patch comes from this patch i.e. this one was here first ;-) Look who committed it... -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Wed May 11 18:50:49 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 02:50:49 +0100 Subject: Release and Commit Policies Message-ID: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> http://icedtea.classpath.org/wiki/ReleasePolicy http://icedtea.classpath.org/wiki/CommitPolicy These are largely explicit documentation of our current processes, but comments are welcomed. As specified on the wiki, don't make changes to these documents without first discussing it either or on the Discussion page. I also updated the Main page: http://icedtea.classpath.org/wiki/Main_Page to cleanup the contributing section and link to these documents. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at redhat.com Wed May 11 18:52:37 2011 From: omajid at redhat.com (Omair Majid) Date: Wed, 11 May 2011 21:52:37 -0400 Subject: RFC: move patches/libpng.patch to patches/openjdk In-Reply-To: <20110512014824.GY5351@rivendell.middle-earth.co.uk> References: <4DCB3B48.50808@redhat.com> <20110512014824.GY5351@rivendell.middle-earth.co.uk> Message-ID: <4DCB3D65.2020908@redhat.com> On 05/11/2011 09:48 PM, Dr Andrew John Hughes wrote: > On 21:43 Wed 11 May , Omair Majid wrote: >> Hi, >> >> The attached patch moves patches/libpng.patch to clearly indicate that >> it is a backport of an openjdk patch. >> >> Okay to commit? >> >> Cheers, >> Omair > > Fine, though in reality the OpenJDK patch comes from this patch i.e. > this one was here first ;-) Look who committed it... > Yeah, I saw the userid :) Still, I think moving it makes it clear that this fix is upstream (and hence is in IcedTea7), reducing future maintenance work. I think I am going to do the same to a few other patches. Thanks, Omair From bugzilla-daemon at icedtea.classpath.org Thu May 12 01:22:51 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 08:22:51 +0000 Subject: [Bug 17] org.omg.CORBA tests fail due to ORB class not implemented In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=17 Pavel Tisnovsky changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #8 from Pavel Tisnovsky 2011-05-12 08:22:51 --- Yeah, I'll look at it. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 12 01:54:04 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 08:54:04 +0000 Subject: [Bug 709] Crash in native code, problematic frame: libfreetype.so.6 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=709 --- Comment #3 from Reinout van Schouwen 2011-05-12 08:54:04 --- (In reply to comment #2) > Please attach the hserr file for this. > There's a hserr file in the RH bug. I got the error while starting Taverna 2.2 (taverna.org.uk) but it's not reproducable on demand. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 12 02:11:34 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 09:11:34 +0000 Subject: [Bug 711] Failed to build IcedTea6.1.10 with Shark enabled In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=711 Gary Benson changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #531|text/plain |application/zip mime type| | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 12 02:14:38 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 09:14:38 +0000 Subject: [Bug 711] Failed to build IcedTea6.1.10 with Shark enabled In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=711 --- Comment #2 from Gary Benson 2011-05-12 09:14:37 --- This looks like your build environment is mixing 32- and 64-bit libraries. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From jvanek at redhat.com Thu May 12 03:01:14 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 12 May 2011 12:01:14 +0200 Subject: Release and Commit Policies In-Reply-To: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> Message-ID: <4DCBAFEA.7020306@redhat.com> On 05/12/2011 03:50 AM, Dr Andrew John Hughes wrote: >> http://icedtea.classpath.org/wiki/ReleasePolicy >> http://icedtea.classpath.org/wiki/CommitPolicy >> >> These are largely explicit documentation of our current processes, >> but comments are welcomed. >> >> As specified on the wiki, don't make changes to these documents >> without first discussing it either or on the Discussion page. >> >> I also updated the Main page: >> >> http://icedtea.classpath.org/wiki/Main_Page >> >> to cleanup the contributing section and link to these documents. >"The review process should continue until all parties are happy with >the patch." This is very dangerous - one single person can block patch then (maybe uninterested person?) . Even when it is reviewer himself, then there is no judge when two _opinions_ (just! opinions) are standing against each other. > " Unless otherwise stated by the reviewer" This in contradiction with previous sentence. When reviewer said It looks ok then possible it can not be stopped by someone else (afterwards? Or overlap someone else "against" hints?) ? > "it should be assumed that the final version of the patch should be > posted and an acknowledgement acquired before the patch is committed." Does it really only _should_ ?? Regards J. From jvanek at redhat.com Thu May 12 04:20:56 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 12 May 2011 13:20:56 +0200 Subject: Fwd: Re: [icedtea-web] xml output for junit, transformation sheets for daily report In-Reply-To: <20110511212149.GT5351@rivendell.middle-earth.co.uk> References: <4DC8172F.7020009@redhat.com> <20110509192447.GF22437@rivendell.middle-earth.co.uk> <4DCA866C.1070204@redhat.com> <20110511135224.GF5351@rivendell.middle-earth.co.uk> <4DCAA611.5000909@redhat.com> <20110511212149.GT5351@rivendell.middle-earth.co.uk> Message-ID: <4DCBC298.50300@redhat.com> On 05/11/2011 11:21 PM, Dr Andrew John Hughes wrote: > On 17:06 Wed 11 May , Jiri Vanek wrote: >> On 05/11/2011 03:52 PM, Dr Andrew John Hughes wrote: >>> On 14:51 Wed 11 May , Jiri Vanek wrote: >>>> ..snip.. >>>>> >>>>>> *index.html: file which provides runtime transformation >>>>>> of tests-output.xml and report.xml >>>>>> * tests/styles/index.js: runtime transformation script and fast >>>>>> navigation functions >>>>> >>>>> I think the transformation should be preformed by make as part of producing index.html, >>>>> rather than having browser-specific hacks. >>>>> >>>> >>>> Not exactly. My "task" ..or.. my "desire".. was to produce full, >>>> reusable report from testsuite. And this is XML (one for unit tests, one >>>> for reproducers-tests). It will be used for anything we will want to >>>> mine from results. (For now I'm aware about hystory, view of single run >>>> and graphs and statistics). The sheet is designed to view the report in >>>> human readable way for the single run. . It will be used to generate >>>> htmls on torment. But the generation itself should not be in >>>> icedtea-web (makefile). >>> >>> Yes, it should, if the XML is being produced by make. It's unintuitive for >>> the index.html.in to be transformed to something that isn't the final HTML, >>> but requires a further transformation. >>> >> >> Still I must disagree. Add dependences to xalan-xercess is is quite big >> step. And especially those two caused troubles in recent icedtea6 build >> under f15. I do not want to provide result html after build. I would >> like to provide results (xml) and some basic opinion to view them quicly >> and comfortably. > > Oh, I certainly wasn't thinking of Xalan/Xerces when there is either xsltproc > or in-tree JDK support. Xalan/Xerces is used in IcedTea6 purely for > bootstrap support and I intend to replace it with xsltproc. My intention is really not to provide final html. It is to provide data, and some simple possibility to view them. Javascript have evolved into quite sufficient language, quite perfect for this usage. I see no reason why use xsltproc instead of it. I'm pretty sure that this solution is working in all common gui-based linux browser. In case somebody still prefer commandline browser then the xml is more suitable for him. > >> For daily report will be used xslt x xml on torment, so only resulted >> html will be shown. Xml itself will be used also for statistics. >> >> Included runtime transformation should serve to develloper just as >> "preview" of data after control build. >>>> On the other way the sheet prove itself useful when hunting bugs. So I >>>> decide to include the html skeleton which provide fast access to tests` >>>> results using xslt transformation... >>>> Btw - its not an hack:) The mozzila (and company) behaviour is following >>>> w3c specification for this thing. Although... yes IE part is hack :-/. >>>> So I'm willing to remove it (As i do not like M$ manners to :) ... ) but >>>> no one ever knows... >>>> >>> >>> No, I believe the standard is to include: >>> >>> >>> >>> in the XML. >> >> This will bound the xml to one concrete sheet. This means that when you >> want several points of view to data (several xslt upon one XML) then you >> need to have same number of XMLs. Also you will lost possibility to show >> both reports simultaneously. >> > > Ok. > >> As mentioned at the top, index.html is overview after make check and >> make distcheck - especially for the one who made the build. >> > > I still think something like xsltproc to generate the final HTML > would be preferable. Doing things in web pages tends to be horrible > to support across multiple browsers. Except M$IE javascript is moreover united IMHO. > >>> >>> Displaying the results should not require Javascript. >>> >> True. Still the javascript is included in final html (although it is not >> required - all traces are visible then) for hide/show full stack traces. >>>> >>>> ..snip.. >>>> >>>> >> >> huh.. I hoped I described my point of view clearly (As I do not belive >> my english :D ) >> > > I think so. Unfortunately, I can't read your mind to verify this ;-) > >>>> Regards J. >>> >> >> It Is very sad you did not mentioned your dislike to runtime >> transformation after initial email (04/29/2011) (directly: >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-April/013904.html >> and >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/013983.html) >> and draft in java-team even ore before. Now it cause unnecessary troubles:( >> > > I didn't see this post. My mailer shows the thread as started May 9th. > Maybe it got buried during the time I was away with all the UK bank holidays. That is why I have threads turned off and rely more to my (full of holes) memory :) > > I do remember the internal post and said at the time I wouldn't reply internally. > >> >> Regards J. >> >> > From aph at redhat.com Thu May 12 04:30:23 2011 From: aph at redhat.com (Andrew Haley) Date: Thu, 12 May 2011 12:30:23 +0100 Subject: Patch: improve huge page support In-Reply-To: <20110511212343.GU5351@rivendell.middle-earth.co.uk> References: <4DC1678E.30402@redhat.com> <20110504155316.GF26415@rivendell.middle-earth.co.uk> <4DC2915A.2070304@redhat.com> <20110509132052.GA22437@rivendell.middle-earth.co.uk> <4DCAA680.8050406@redhat.com> <20110511160423.GO5351@rivendell.middle-earth.co.uk> <4DCAB5B0.2070400@redhat.com> <20110511212343.GU5351@rivendell.middle-earth.co.uk> Message-ID: <4DCBC4CF.10509@redhat.com> On 05/11/2011 10:23 PM, Dr Andrew John Hughes wrote: > On 17:13 Wed 11 May , Andrew Haley wrote: >> On 05/11/2011 05:04 PM, Dr Andrew John Hughes wrote: >>> On 16:08 Wed 11 May , Andrew Haley wrote: >>>> >>> >>> snip... >>> >>>> I won't bother with 1.8. I'll push to 1.9 and 1.10. >>>> >>> >>> Ok, post the patches and I'll approve them for those branches. >> >> Righto. I'll do that once you have renamed the patch files. Let me >> know. >> > > I still can't build IcedTea6. Did you push the build fix for this, in one form or another? I'm surprised by this: AFAIK this is a Debian-only gcc bug. I thought I had pushed the build fix, but evidently not. I think this is an opportunity to move a couple of patch files the openjdk/ directory for ease of maintenance, as you suggested. You also said that you'd prefer the Debian fix to be in a separate file, with its upstream bug number. I've done that. The upstream Debian fix does not contain just that one fix, but also updates copyright notices in some files that may not be present in all HotSpot releases, so I had to trim it to just the bug fix Debian users need. So, it doesn't correspond exactly to the upstream patch, but that can't be helped. OK to commit? Andrew. 2011-05-12 Andrew Haley Rename icedtea-hugepage-7034464.patch -> openjdk/7034464-hugepage.patch icedtea-hugepage-7037939.patch -> openjdk/7037939-hugepage.patch * patches/openjdk/7043564-hugepage.patch: Import from upstream. * Makefile.am: move patches, add new patch. diff -r d8750486e54c Makefile.am --- a/Makefile.am Wed May 11 20:27:41 2011 -0400 +++ b/Makefile.am Thu May 12 11:47:29 2011 +0100 @@ -335,10 +335,11 @@ patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ patches/shark-llvm-2.9.patch \ - patches/icedtea-hugepage-7034464.patch \ - patches/icedtea-hugepage-7037939.patch \ patches/openjdk/6986968-crash_on_xim_restart.patch \ - patches/openjdk/7036754-stroker-nan.patch + patches/openjdk/7036754-stroker-nan.patch \ + patches/openjdk/7034464-hugepage.patch \ + patches/openjdk/7037939-hugepage.patch \ + patches/openjdk/7043564-hugepage.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r d8750486e54c patches/icedtea-hugepage-7034464.patch --- a/patches/icedtea-hugepage-7034464.patch Wed May 11 20:27:41 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,458 +0,0 @@ -# HG changeset patch -# User iveresov -# Date 1303344724 25200 -# Node ID 139667d9836ae218ab06a74d5813a5a700a076c9 -# Parent 49a67202bc671d23d719c9e14752d80295a9e8f6 -7034464: Support transparent large pages on Linux -Summary: Support transparent huge pages on Linux available since 2.6.38 -Reviewed-by: iveresov, ysr -Contributed-by: aph at redhat.com -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp ---- openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp 2011-03-16 02:30:16.000000000 +0000 -+++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2011-05-04 11:57:15.083470027 +0100 -@@ -29,13 +29,19 @@ - // Defines Linux specific flags. They are not available on other platforms. - // - #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \ -- product(bool, UseOprofile, false, \ -- "enable support for Oprofile profiler") \ -- \ -- product(bool, UseLinuxPosixThreadCPUClocks, true, \ -- "enable fast Linux Posix clocks where available") --// NB: The default value of UseLinuxPosixThreadCPUClocks may be --// overridden in Arguments::parse_each_vm_init_arg. -+ product(bool, UseOprofile, false, \ -+ "enable support for Oprofile profiler") \ -+ \ -+ product(bool, UseLinuxPosixThreadCPUClocks, true, \ -+ "enable fast Linux Posix clocks where available") \ -+/* NB: The default value of UseLinuxPosixThreadCPUClocks may be \ -+ overridden in Arguments::parse_each_vm_init_arg. */ \ -+ \ -+ product(bool, UseHugeTLBFS, false, \ -+ "Use MAP_HUGETLB for large pages") \ -+ \ -+ product(bool, UseSHM, false, \ -+ "Use SYSV shared memory for large pages") - - // - // Defines Linux-specific default values. The flags are available on all -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-03 14:32:54.285722656 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-09 14:31:51.358502774 +0100 -@@ -2495,16 +2495,40 @@ - return res != (uintptr_t) MAP_FAILED; - } - -+// Define MAP_HUGETLB here so we can build HotSpot on old systems. -+#ifndef MAP_HUGETLB -+#define MAP_HUGETLB 0x40000 -+#endif -+ -+// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. -+#ifndef MADV_HUGEPAGE -+#define MADV_HUGEPAGE 14 -+#endif -+ - bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, - bool exec) { -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { -+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; -+ uintptr_t res = -+ (uintptr_t) ::mmap(addr, size, prot, -+ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, -+ -1, 0); -+ return res != (uintptr_t) MAP_FAILED; -+ } -+ - return commit_memory(addr, size, exec); - } - --void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } -+void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { -+ // We don't check the return value: madvise(MADV_HUGEPAGE) may not -+ // be supported or the memory may already be backed by huge pages. -+ ::madvise(addr, bytes, MADV_HUGEPAGE); -+ } -+} - - void os::free_memory(char *addr, size_t bytes) { -- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, -- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); -+ ::madvise(addr, bytes, MADV_DONTNEED); - } - - void os::numa_make_global(char *addr, size_t bytes) { -@@ -2870,7 +2894,16 @@ - static size_t _large_page_size = 0; - - bool os::large_page_init() { -- if (!UseLargePages) return false; -+ if (!UseLargePages) { -+ UseHugeTLBFS = false; -+ UseSHM = false; -+ return false; -+ } -+ -+ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { -+ // Our user has not expressed a preference, so we'll try both. -+ UseHugeTLBFS = UseSHM = true; -+ } - - if (LargePageSizeInBytes) { - _large_page_size = LargePageSizeInBytes; -@@ -2915,6 +2948,9 @@ - } - } - -+ // print a warning if any large page related flag is specified on command line -+ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); -+ - const size_t default_page_size = (size_t)Linux::page_size(); - if (_large_page_size > default_page_size) { - _page_sizes[0] = _large_page_size; -@@ -2922,6 +2958,14 @@ - _page_sizes[2] = 0; - } - -+ UseHugeTLBFS = UseHugeTLBFS && -+ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); -+ -+ if (UseHugeTLBFS) -+ UseSHM = false; -+ -+ UseLargePages = UseHugeTLBFS || UseSHM; -+ - // Large page support is available on 2.6 or newer kernel, some vendors - // (e.g. Redhat) have backported it to their 2.4 based distributions. - // We optimistically assume the support is available. If later it turns out -@@ -2936,7 +2980,7 @@ - char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { - // "exec" is passed in but not used. Creating the shared image for - // the code cache doesn't have an SHM_X executable permission to check. -- assert(UseLargePages, "only for large pages"); -+ assert(UseLargePages && UseSHM, "only for SHM large pages"); - - key_t key = IPC_PRIVATE; - char *addr; -@@ -3003,19 +3047,19 @@ - return _large_page_size; - } - --// Linux does not support anonymous mmap with large page memory. The only way --// to reserve large page memory without file backing is through SysV shared --// memory API. The entire memory region is committed and pinned upfront. --// Hopefully this will change in the future... -+// HugeTLBFS allows application to commit large page memory on demand; -+// with SysV SHM the entire memory region must be allocated as shared -+// memory. - bool os::can_commit_large_page_memory() { -- return false; -+ return UseHugeTLBFS; - } - - bool os::can_execute_large_page_memory() { -- return false; -+ return UseHugeTLBFS; - } - - // Reserve memory at an arbitrary address, only if that area is -+// Reserve memory at an arbitrary address, only if that area is - // available (and not reserved for something else). - - char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { -@@ -5009,6 +5053,43 @@ - // JSR166 - // ------------------------------------------------------- - -+bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { -+ bool result = false; -+ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, -+ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, -+ -1, 0); -+ -+ if (p != (void *) -1) { -+ // We don't know if this really is a huge page or not. -+ FILE *fp = fopen("/proc/self/maps", "r"); -+ if (fp) { -+ while (!feof(fp)) { -+ char chars[257]; -+ long x = 0; -+ if (fgets(chars, sizeof(chars), fp)) { -+ if (sscanf(chars, "%lx-%*lx", &x) == 1 -+ && x == (long)p) { -+ if (strstr (chars, "hugepage")) { -+ result = true; -+ break; -+ } -+ } -+ } -+ } -+ fclose(fp); -+ } -+ munmap (p, page_size); -+ if (result) -+ return true; -+ } -+ -+ if (warn) { -+ warning("HugeTLBFS is not supported by the operating system."); -+ } -+ -+ return result; -+} -+ - /* - * The solaris and linux implementations of park/unpark are fairly - * conservative for now, but can be improved. They currently use a -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig ---- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 14:32:53.972649764 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-04 11:57:15.085470494 +0100 -@@ -117,6 +117,10 @@ - # include - # include - -+#if __x86_64__ -+#include -+#endif -+ - #define MAX_PATH (2 * K) - - // for timer info max values which include all bits -@@ -2491,16 +2495,40 @@ - return res != (uintptr_t) MAP_FAILED; - } - -+// Define MAP_HUGETLB here so we can build HotSpot on old systems. -+#ifndef MAP_HUGETLB -+#define MAP_HUGETLB 0x40000 -+#endif -+ -+// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. -+#ifndef MADV_HUGEPAGE -+#define MADV_HUGEPAGE 14 -+#endif -+ - bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, - bool exec) { -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { -+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; -+ uintptr_t res = -+ (uintptr_t) ::mmap(addr, size, prot, -+ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, -+ -1, 0); -+ return res != (uintptr_t) MAP_FAILED; -+ } -+ - return commit_memory(addr, size, exec); - } - --void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } -+void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { -+ // We don't check the return value: madvise(MADV_HUGEPAGE) may not -+ // be supported or the memory may already be backed by huge pages. -+ ::madvise(addr, bytes, MADV_HUGEPAGE); -+ } -+} - - void os::free_memory(char *addr, size_t bytes) { -- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, -- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); -+ ::madvise(addr, bytes, MADV_DONTNEED); - } - - void os::numa_make_global(char *addr, size_t bytes) { -@@ -2544,6 +2572,21 @@ - return end; - } - -+static int sched_getcpu_syscall(void) { -+ unsigned int cpu; -+ int retval = -1; -+ -+#if __x86_64__ -+ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); -+ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); -+ retval = vgetcpu(&cpu, NULL, NULL); -+#elif __i386__ -+ retval = syscall(SYS_getcpu, &cpu, NULL, NULL); -+#endif -+ -+ return (retval == -1) ? retval : cpu; -+} -+ - extern "C" void numa_warn(int number, char *where, ...) { } - extern "C" void numa_error(char *where) { } - -@@ -2565,6 +2608,10 @@ - set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, - dlsym(RTLD_DEFAULT, "sched_getcpu"))); - -+ // If it's not, try a direct syscall. -+ if (sched_getcpu() == -1) -+ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall)); -+ - if (sched_getcpu() != -1) { // Does it work? - void *handle = dlopen("libnuma.so.1", RTLD_LAZY); - if (handle != NULL) { -@@ -2847,7 +2894,16 @@ - static size_t _large_page_size = 0; - - bool os::large_page_init() { -- if (!UseLargePages) return false; -+ if (!UseLargePages) { -+ UseHugeTLBFS = false; -+ UseSHM = false; -+ return false; -+ } -+ -+ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { -+ // Our user has not expressed a preference, so we'll try both. -+ UseHugeTLBFS = UseSHM = true; -+ } - - if (LargePageSizeInBytes) { - _large_page_size = LargePageSizeInBytes; -@@ -2892,6 +2948,9 @@ - } - } - -+ // print a warning if any large page related flag is specified on command line -+ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); -+ - const size_t default_page_size = (size_t)Linux::page_size(); - if (_large_page_size > default_page_size) { - _page_sizes[0] = _large_page_size; -@@ -2899,6 +2958,14 @@ - _page_sizes[2] = 0; - } - -+ UseHugeTLBFS = UseHugeTLBFS && -+ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); -+ -+ if (UseHugeTLBFS) -+ UseSHM = false; -+ -+ UseLargePages = UseHugeTLBFS || UseSHM; -+ - // Large page support is available on 2.6 or newer kernel, some vendors - // (e.g. Redhat) have backported it to their 2.4 based distributions. - // We optimistically assume the support is available. If later it turns out -@@ -2913,7 +2980,7 @@ - char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { - // "exec" is passed in but not used. Creating the shared image for - // the code cache doesn't have an SHM_X executable permission to check. -- assert(UseLargePages, "only for large pages"); -+ assert(UseLargePages && UseSHM, "only for SHM large pages"); - - key_t key = IPC_PRIVATE; - char *addr; -@@ -2980,19 +3047,19 @@ - return _large_page_size; - } - --// Linux does not support anonymous mmap with large page memory. The only way --// to reserve large page memory without file backing is through SysV shared --// memory API. The entire memory region is committed and pinned upfront. --// Hopefully this will change in the future... -+// HugeTLBFS allows application to commit large page memory on demand; -+// with SysV SHM the entire memory region must be allocated as shared -+// memory. - bool os::can_commit_large_page_memory() { -- return false; -+ return UseHugeTLBFS; - } - - bool os::can_execute_large_page_memory() { -- return false; -+ return UseHugeTLBFS; - } - - // Reserve memory at an arbitrary address, only if that area is -+// Reserve memory at an arbitrary address, only if that area is - // available (and not reserved for something else). - - char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { -@@ -4081,6 +4148,23 @@ - UseNUMA = false; - } - } -+ // With SHM large pages we cannot uncommit a page, so there's not way -+ // we can make the adaptive lgrp chunk resizing work. If the user specified -+ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and -+ // disable adaptive resizing. -+ if (UseNUMA && UseLargePages && UseSHM) { -+ if (!FLAG_IS_DEFAULT(UseNUMA)) { -+ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { -+ UseLargePages = false; -+ } else { -+ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); -+ UseAdaptiveSizePolicy = false; -+ UseAdaptiveNUMAChunkSizing = false; -+ } -+ } else { -+ UseNUMA = false; -+ } -+ } - if (!UseNUMA && ForceNUMA) { - UseNUMA = true; - } -@@ -4986,6 +5070,43 @@ - // JSR166 - // ------------------------------------------------------- - -+bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { -+ bool result = false; -+ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, -+ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, -+ -1, 0); -+ -+ if (p != (void *) -1) { -+ // We don't know if this really is a huge page or not. -+ FILE *fp = fopen("/proc/self/maps", "r"); -+ if (fp) { -+ while (!feof(fp)) { -+ char chars[257]; -+ long x = 0; -+ if (fgets(chars, sizeof(chars), fp)) { -+ if (sscanf(chars, "%lx-%*lx", &x) == 1 -+ && x == (long)p) { -+ if (strstr (chars, "hugepage")) { -+ result = true; -+ break; -+ } -+ } -+<+ } -+ } -+ fclose(fp); -+ } -+ munmap (p, page_size); -+ if (result) -+ return true; -+ } -+ -+ if (warn) { -+ warning("HugeTLBFS is not supported by the operating system."); -+ } -+ -+ return result; -+} -+ - /* - * The solaris and linux implementations of park/unpark are fairly - * conservative for now, but can be improved. They currently use a -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp ---- openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp 2011-03-16 02:30:16.000000000 +0000 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp 2011-05-04 11:57:15.088471194 +0100 -@@ -86,6 +86,9 @@ - - static void rebuild_cpu_to_node_map(); - static GrowableArray* cpu_to_node() { return _cpu_to_node; } -+ -+ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); -+ - public: - static void init_thread_fpu_state(); - static int get_fpu_control_word(); diff -r d8750486e54c patches/icedtea-hugepage-7037939.patch --- a/patches/icedtea-hugepage-7037939.patch Wed May 11 20:27:41 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ - -# HG changeset patch -# User iveresov -# Date 1303843594 25200 -# Node ID c303b3532d4ada074facc42292219952c2a4204e -# Parent d6cdc6c77582408f6450bdda3ffc831d44298714 -7037939: NUMA: Disable adaptive resizing if SHM large pages are used -Summary: Make the NUMA allocator behave properly with SHM and ISM large pages. -Reviewed-by: ysr - ---- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp Sat Apr 23 04:20:09 2011 -0700 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Apr 26 11:46:34 2011 -0700 -@@ -4170,6 +4170,23 @@ jint os::init_2(void) - UseNUMA = false; - } - } -+ // With SHM large pages we cannot uncommit a page, so there's not way -+ // we can make the adaptive lgrp chunk resizing work. If the user specified -+ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and -+ // disable adaptive resizing. -+ if (UseNUMA && UseLargePages && UseSHM) { -+ if (!FLAG_IS_DEFAULT(UseNUMA)) { -+ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { -+ UseLargePages = false; -+ } else { -+ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); -+ UseAdaptiveSizePolicy = false; -+ UseAdaptiveNUMAChunkSizing = false; -+ } -+ } else { -+ UseNUMA = false; -+ } -+ } - if (!UseNUMA && ForceNUMA) { - UseNUMA = true; - } ---- openjdk.patched/hotspot/src/os/solaris/vm/os_solaris.cpp Sat Apr 23 04:20:09 2011 -0700 -+++ openjdk/hotspot/src/os/solaris/vm/os_solaris.cpp Tue Apr 26 11:46:34 2011 -0700 -@@ -2826,7 +2826,9 @@ void os::realign_memory(char *addr, size - void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { - assert((intptr_t)addr % alignment_hint == 0, "Address should be aligned."); - assert((intptr_t)(addr + bytes) % alignment_hint == 0, "End should be aligned."); -- Solaris::set_mpss_range(addr, bytes, alignment_hint); -+ if (UseLargePages && UseMPSS) { -+ Solaris::set_mpss_range(addr, bytes, alignment_hint); -+ } - } - - // Tell the OS to make the range local to the first-touching LWP -@@ -5041,6 +5043,20 @@ jint os::init_2(void) { - FREE_C_HEAP_ARRAY(int, lgrp_ids); - if (lgrp_num < 2) { - // There's only one locality group, disable NUMA. -+ UseNUMA = false; -+ } -+ } -+ // ISM is not compatible with the NUMA allocator - it always allocates -+ // pages round-robin across the lgroups. -+ if (UseNUMA && UseLargePages && UseISM) { -+ if (!FLAG_IS_DEFAULT(UseNUMA)) { -+ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseISM)) { -+ UseLargePages = false; -+ } else { -+ warning("UseNUMA is not compatible with ISM large pages, disabling NUMA allocator"); -+ UseNUMA = false; -+ } -+ } else { - UseNUMA = false; - } - } - diff -r d8750486e54c patches/openjdk/7034464-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7034464-hugepage.patch Thu May 12 11:47:29 2011 +0100 @@ -0,0 +1,458 @@ +# HG changeset patch +# User iveresov +# Date 1303344724 25200 +# Node ID 139667d9836ae218ab06a74d5813a5a700a076c9 +# Parent 49a67202bc671d23d719c9e14752d80295a9e8f6 +7034464: Support transparent large pages on Linux +Summary: Support transparent huge pages on Linux available since 2.6.38 +Reviewed-by: iveresov, ysr +Contributed-by: aph at redhat.com +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp +--- openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp 2011-03-16 02:30:16.000000000 +0000 ++++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2011-05-04 11:57:15.083470027 +0100 +@@ -29,13 +29,19 @@ + // Defines Linux specific flags. They are not available on other platforms. + // + #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \ +- product(bool, UseOprofile, false, \ +- "enable support for Oprofile profiler") \ +- \ +- product(bool, UseLinuxPosixThreadCPUClocks, true, \ +- "enable fast Linux Posix clocks where available") +-// NB: The default value of UseLinuxPosixThreadCPUClocks may be +-// overridden in Arguments::parse_each_vm_init_arg. ++ product(bool, UseOprofile, false, \ ++ "enable support for Oprofile profiler") \ ++ \ ++ product(bool, UseLinuxPosixThreadCPUClocks, true, \ ++ "enable fast Linux Posix clocks where available") \ ++/* NB: The default value of UseLinuxPosixThreadCPUClocks may be \ ++ overridden in Arguments::parse_each_vm_init_arg. */ \ ++ \ ++ product(bool, UseHugeTLBFS, false, \ ++ "Use MAP_HUGETLB for large pages") \ ++ \ ++ product(bool, UseSHM, false, \ ++ "Use SYSV shared memory for large pages") + + // + // Defines Linux-specific default values. The flags are available on all +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-03 14:32:54.285722656 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-09 14:31:51.358502774 +0100 +@@ -2495,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2870,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2915,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2922,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2936,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -3003,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -5009,6 +5053,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; ++} ++ + /* + * The solaris and linux implementations of park/unpark are fairly + * conservative for now, but can be improved. They currently use a +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 14:32:53.972649764 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-04 11:57:15.085470494 +0100 +@@ -117,6 +117,10 @@ + # include + # include + ++#if __x86_64__ ++#include ++#endif ++ + #define MAX_PATH (2 * K) + + // for timer info max values which include all bits +@@ -2491,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2544,6 +2572,21 @@ + return end; + } + ++static int sched_getcpu_syscall(void) { ++ unsigned int cpu; ++ int retval = -1; ++ ++#if __x86_64__ ++ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); ++ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); ++ retval = vgetcpu(&cpu, NULL, NULL); ++#elif __i386__ ++ retval = syscall(SYS_getcpu, &cpu, NULL, NULL); ++#endif ++ ++ return (retval == -1) ? retval : cpu; ++} ++ + extern "C" void numa_warn(int number, char *where, ...) { } + extern "C" void numa_error(char *where) { } + +@@ -2565,6 +2608,10 @@ + set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, + dlsym(RTLD_DEFAULT, "sched_getcpu"))); + ++ // If it's not, try a direct syscall. ++ if (sched_getcpu() == -1) ++ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall)); ++ + if (sched_getcpu() != -1) { // Does it work? + void *handle = dlopen("libnuma.so.1", RTLD_LAZY); + if (handle != NULL) { +@@ -2847,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2892,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2899,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2913,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -2980,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -4081,6 +4148,23 @@ + UseNUMA = false; + } + } ++ // With SHM large pages we cannot uncommit a page, so there's not way ++ // we can make the adaptive lgrp chunk resizing work. If the user specified ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and ++ // disable adaptive resizing. ++ if (UseNUMA && UseLargePages && UseSHM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); ++ UseAdaptiveSizePolicy = false; ++ UseAdaptiveNUMAChunkSizing = false; ++ } ++ } else { ++ UseNUMA = false; ++ } ++ } + if (!UseNUMA && ForceNUMA) { + UseNUMA = true; + } +@@ -4986,6 +5070,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++<+ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; ++} ++ + /* + * The solaris and linux implementations of park/unpark are fairly + * conservative for now, but can be improved. They currently use a +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp 2011-03-16 02:30:16.000000000 +0000 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp 2011-05-04 11:57:15.088471194 +0100 +@@ -86,6 +86,9 @@ + + static void rebuild_cpu_to_node_map(); + static GrowableArray* cpu_to_node() { return _cpu_to_node; } ++ ++ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); ++ + public: + static void init_thread_fpu_state(); + static int get_fpu_control_word(); diff -r d8750486e54c patches/openjdk/7037939-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7037939-hugepage.patch Thu May 12 11:47:29 2011 +0100 @@ -0,0 +1,71 @@ + +# HG changeset patch +# User iveresov +# Date 1303843594 25200 +# Node ID c303b3532d4ada074facc42292219952c2a4204e +# Parent d6cdc6c77582408f6450bdda3ffc831d44298714 +7037939: NUMA: Disable adaptive resizing if SHM large pages are used +Summary: Make the NUMA allocator behave properly with SHM and ISM large pages. +Reviewed-by: ysr + +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp Sat Apr 23 04:20:09 2011 -0700 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Apr 26 11:46:34 2011 -0700 +@@ -4170,6 +4170,23 @@ jint os::init_2(void) + UseNUMA = false; + } + } ++ // With SHM large pages we cannot uncommit a page, so there's not way ++ // we can make the adaptive lgrp chunk resizing work. If the user specified ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and ++ // disable adaptive resizing. ++ if (UseNUMA && UseLargePages && UseSHM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); ++ UseAdaptiveSizePolicy = false; ++ UseAdaptiveNUMAChunkSizing = false; ++ } ++ } else { ++ UseNUMA = false; ++ } ++ } + if (!UseNUMA && ForceNUMA) { + UseNUMA = true; + } +--- openjdk.patched/hotspot/src/os/solaris/vm/os_solaris.cpp Sat Apr 23 04:20:09 2011 -0700 ++++ openjdk/hotspot/src/os/solaris/vm/os_solaris.cpp Tue Apr 26 11:46:34 2011 -0700 +@@ -2826,7 +2826,9 @@ void os::realign_memory(char *addr, size + void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { + assert((intptr_t)addr % alignment_hint == 0, "Address should be aligned."); + assert((intptr_t)(addr + bytes) % alignment_hint == 0, "End should be aligned."); +- Solaris::set_mpss_range(addr, bytes, alignment_hint); ++ if (UseLargePages && UseMPSS) { ++ Solaris::set_mpss_range(addr, bytes, alignment_hint); ++ } + } + + // Tell the OS to make the range local to the first-touching LWP +@@ -5041,6 +5043,20 @@ jint os::init_2(void) { + FREE_C_HEAP_ARRAY(int, lgrp_ids); + if (lgrp_num < 2) { + // There's only one locality group, disable NUMA. ++ UseNUMA = false; ++ } ++ } ++ // ISM is not compatible with the NUMA allocator - it always allocates ++ // pages round-robin across the lgroups. ++ if (UseNUMA && UseLargePages && UseISM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseISM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not compatible with ISM large pages, disabling NUMA allocator"); ++ UseNUMA = false; ++ } ++ } else { + UseNUMA = false; + } + } + diff -r d8750486e54c patches/openjdk/7043564-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7043564-hugepage.patch Thu May 12 11:47:29 2011 +0100 @@ -0,0 +1,21 @@ + +# HG changeset patch +# User iveresov +# Date 1305055570 25200 +# Node ID 97b64f73103bddbcd9d987fd13854957d2a80600 +# Parent fc2b798ab316df025526f208aeeef19609ad51b3 +7043564: compile warning and copyright fixes +Summary: Fixed the warning, also fixed copyrights in a bunch of files. +Reviewed-by: johnc, kvn + +--- openjdk.prev/hotspot/src/os/linux/vm/os_linux.cpp Tue May 10 00:33:21 2011 -0700 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue May 10 12:26:10 2011 -0700 +@@ -2850,7 +2850,7 @@ bool os::Linux::hugetlbfs_sanity_check(b + char chars[257]; + long x = 0; + if (fgets(chars, sizeof(chars), fp)) { +- if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ if (sscanf(chars, "%lx-%*x", &x) == 1 + && x == (long)p) { + if (strstr (chars, "hugepage")) { + result = true; From bugzilla-daemon at icedtea.classpath.org Thu May 12 04:36:55 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 11:36:55 +0000 Subject: [Bug 32] Double.toString(string) expands value In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=32 --- Comment #5 from Pavel Tisnovsky 2011-05-12 11:36:54 --- No, because this bug is not fixed yet, we just have reproducers added to regression tests. From the messages I saw in Oracle bug database it seems that nobody is really interested to fix this issue - its even not fixed in OpenJDK7 (and the original bug is 10 years old ;-). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ptisnovs at redhat.com Thu May 12 04:46:40 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 12 May 2011 13:46:40 +0200 Subject: Release and Commit Policies In-Reply-To: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> Message-ID: <4DCBC8A0.5030101@redhat.com> Dr Andrew John Hughes wrote: > http://icedtea.classpath.org/wiki/ReleasePolicy > http://icedtea.classpath.org/wiki/CommitPolicy > > These are largely explicit documentation of our current processes, > but comments are welcomed. > > As specified on the wiki, don't make changes to these documents > without first discussing it either or on the Discussion page. > > I also updated the Main page: > > http://icedtea.classpath.org/wiki/Main_Page > > to cleanup the contributing section and link to these documents. Hi Andrew, in the sentence: "The ChangeLog should take the following format and be as detailed as possible, concerning the changes made, as this serves as a record for future maintenance." it IMHO should be noted that filename and all next lines except the first one (date+name) have to be indented by control character, not spaces - it's not clear from Wiki page because there's used spaces. Cheers, Pavel From aph at redhat.com Thu May 12 04:59:20 2011 From: aph at redhat.com (Andrew Haley) Date: Thu, 12 May 2011 12:59:20 +0100 Subject: Release and Commit Policies In-Reply-To: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> Message-ID: <4DCBCB98.4080203@redhat.com> On 05/12/2011 02:50 AM, Dr Andrew John Hughes wrote: > http://icedtea.classpath.org/wiki/ReleasePolicy > http://icedtea.classpath.org/wiki/CommitPolicy > > These are largely explicit documentation of our current processes, > but comments are welcomed. > > As specified on the wiki, don't make changes to these documents > without first discussing it either or on the Discussion page. No, this isn't right. We can't have one developer on his own writing documents like these. Please rename them to "Proposed xx policy" and then we can have a discussion, as a community, about what a reasonable set of policies might be. Andrew. From ahughes at redhat.com Thu May 12 05:10:53 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 13:10:53 +0100 Subject: Release and Commit Policies In-Reply-To: <4DCBC8A0.5030101@redhat.com> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBC8A0.5030101@redhat.com> Message-ID: <20110512121053.GB5351@rivendell.middle-earth.co.uk> On 13:46 Thu 12 May , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > http://icedtea.classpath.org/wiki/ReleasePolicy > > http://icedtea.classpath.org/wiki/CommitPolicy > > > > These are largely explicit documentation of our current processes, > > but comments are welcomed. > > > > As specified on the wiki, don't make changes to these documents > > without first discussing it either or on the Discussion page. > > > > I also updated the Main page: > > > > http://icedtea.classpath.org/wiki/Main_Page > > > > to cleanup the contributing section and link to these documents. > > Hi Andrew, > > in the sentence: > > "The ChangeLog should take the following format and be as detailed as > possible, concerning the changes made, as this serves as a record for > future maintenance." > > it IMHO should be noted that filename and all next lines except the > first one (date+name) have to be indented by control character, > not spaces - it's not clear from Wiki page because there's used spaces. > That's a good point, thanks. Do you want to add this to the page? Do you have access to the wiki? > Cheers, > Pavel -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ptisnovs at redhat.com Thu May 12 05:16:35 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 12 May 2011 14:16:35 +0200 Subject: Release and Commit Policies In-Reply-To: <20110512121053.GB5351@rivendell.middle-earth.co.uk> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBC8A0.5030101@redhat.com> <20110512121053.GB5351@rivendell.middle-earth.co.uk> Message-ID: <4DCBCFA3.2060806@redhat.com> Dr Andrew John Hughes wrote: > On 13:46 Thu 12 May , Pavel Tisnovsky wrote: >> Dr Andrew John Hughes wrote: >>> http://icedtea.classpath.org/wiki/ReleasePolicy >>> http://icedtea.classpath.org/wiki/CommitPolicy >>> >>> These are largely explicit documentation of our current processes, >>> but comments are welcomed. >>> >>> As specified on the wiki, don't make changes to these documents >>> without first discussing it either or on the Discussion page. >>> >>> I also updated the Main page: >>> >>> http://icedtea.classpath.org/wiki/Main_Page >>> >>> to cleanup the contributing section and link to these documents. >> Hi Andrew, >> >> in the sentence: >> >> "The ChangeLog should take the following format and be as detailed as >> possible, concerning the changes made, as this serves as a record for >> future maintenance." >> >> it IMHO should be noted that filename and all next lines except the >> first one (date+name) have to be indented by control character, >> not spaces - it's not clear from Wiki page because there's used spaces. >> > > That's a good point, thanks. Do you want to add this to the page? > Do you have access to the wiki? Yes, I have access to the wiki (I already edited some pages containing info about JCK, JTreg, building IT on RHEL etc.). I'll add this info. > >> Cheers, >> Pavel > From jvanek at redhat.com Thu May 12 05:15:10 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 12 May 2011 14:15:10 +0200 Subject: FYI [icedtea-web] xml output for junit, for daily report - no styles In-Reply-To: <4DCBC298.50300@redhat.com> References: <4DC8172F.7020009@redhat.com> <20110509192447.GF22437@rivendell.middle-earth.co.uk> <4DCA866C.1070204@redhat.com> <20110511135224.GF5351@rivendell.middle-earth.co.uk> <4DCAA611.5000909@redhat.com> <20110511212149.GT5351@rivendell.middle-earth.co.uk> <4DCBC298.50300@redhat.com> Message-ID: <4DCBCF4E.6080608@redhat.com> 2011-05-12 Jiri Vanek * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports results of junit in xml which "follows junit-output schema". Extended for date, duration and some statististics for future purpose * Makefile.am (run-netx-unit-tests): backuping stdout/stderr of tests Regards J. -------------- next part -------------- A non-text attachment was scrubbed... Name: xml-test-report.patch Type: text/x-patch Size: 10964 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110512/b02c87f2/xml-test-report.patch From ahughes at redhat.com Thu May 12 05:37:57 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 13:37:57 +0100 Subject: Release and Commit Policies In-Reply-To: <4DCBAFEA.7020306@redhat.com> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBAFEA.7020306@redhat.com> Message-ID: <20110512123756.GC5351@rivendell.middle-earth.co.uk> On 12:01 Thu 12 May , Jiri Vanek wrote: > On 05/12/2011 03:50 AM, Dr Andrew John Hughes wrote: > >> http://icedtea.classpath.org/wiki/ReleasePolicy > >> http://icedtea.classpath.org/wiki/CommitPolicy > >> > >> These are largely explicit documentation of our current processes, > >> but comments are welcomed. > >> > >> As specified on the wiki, don't make changes to these documents > >> without first discussing it either or on the Discussion page. > >> > >> I also updated the Main page: > >> > >> http://icedtea.classpath.org/wiki/Main_Page > >> > >> to cleanup the contributing section and link to these documents. > > >"The review process should continue until all parties are happy with > >the patch." > > This is very dangerous - one single person can block patch then (maybe > uninterested person?) . Even when it is reviewer himself, then there is > no judge when two _opinions_ (just! opinions) are standing against each > other. > My point here was inspired by current events i.e. don't go and commit a patch which there is still ongoing discussion. The issue you raise is a difficult one that really rolls out on a case-by-case basis. I don't think the situation you described is what any of us want, but also I don't think we want patches being committed to which there is clear disagreement. I guess such cases have to be resolved by involving more than two people and getting a majority consensus. Does that sound suitable? > > " Unless otherwise stated by the reviewer" > > This in contradiction with previous sentence. When reviewer said It > looks ok then possible it can not be stopped by someone else > (afterwards? Or overlap someone else "against" hints?) ? > That's possible. This section probably needs to be expanded to: "The review process should continue until the majority of reviewers are happy with the patch. Where there is divided opinion, the input of other developers should be sought in order to allow the discussion to reach an appropriate conclusion. The review process may involve several revisions of the patch being posted, in order to rectify any perceived shortcomings. Unless otherwise stated by the reviewer, it should be assumed that the new version of the patch should be posted and an acknowledgement acquired before the patch is committed." Does that help? > > > "it should be assumed that the final version of the patch should be > > posted and an acknowledgement acquired before the patch is committed." > > Does it really only _should_ ?? > > > Regards J. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 12 05:42:25 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 13:42:25 +0100 Subject: Release and Commit Policies In-Reply-To: <4DCBCB98.4080203@redhat.com> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBCB98.4080203@redhat.com> Message-ID: <20110512124225.GD5351@rivendell.middle-earth.co.uk> On 12:59 Thu 12 May , Andrew Haley wrote: > On 05/12/2011 02:50 AM, Dr Andrew John Hughes wrote: > > http://icedtea.classpath.org/wiki/ReleasePolicy > > http://icedtea.classpath.org/wiki/CommitPolicy > > > > These are largely explicit documentation of our current processes, > > but comments are welcomed. > > > > As specified on the wiki, don't make changes to these documents > > without first discussing it either or on the Discussion page. > > No, this isn't right. We can't have one developer on his own writing > documents like these. Please rename them to "Proposed xx policy" and > then we can have a discussion, as a community, about what a reasonable > set of policies might be. > Frankly, I find this offensive. I spend time and effort in trying to document our *existing* policies (something no-one else has bothered to do) and all I receive in return is criticism. Of course this isn't perfect. But we need something to start with, and this thread has already resulted in improvements. > Andrew. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From jvanek at redhat.com Thu May 12 05:39:15 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 12 May 2011 14:39:15 +0200 Subject: Release and Commit Policies In-Reply-To: <20110512123756.GC5351@rivendell.middle-earth.co.uk> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBAFEA.7020306@redhat.com> <20110512123756.GC5351@rivendell.middle-earth.co.uk> Message-ID: <4DCBD4F3.60407@redhat.com> Just short answer -- I need to left earlier, will return to this at the evening: On 05/12/2011 02:37 PM, Dr Andrew John Hughes wrote: > On 12:01 Thu 12 May , Jiri Vanek wrote: ...snip ... >> >> This is very dangerous - one single person can block patch then (maybe >> uninterested person?) . Even when it is reviewer himself, then there is >> no judge when two _opinions_ (just! opinions) are standing against each >> other. >> > > My point here was inspired by current events i.e. don't go and commit a patch > which there is still ongoing discussion. > > The issue you raise is a difficult one that really rolls out on a > case-by-case basis. I don't think the situation you described is what > any of us want, but also I don't think we want patches being committed > to which there is clear disagreement. > > I guess such cases have to be resolved by involving more than two people and > getting a majority consensus. Does that sound suitable? > It is exactly what I have in my mind. But there is no way, or .. is shard... to "force" somebody to be this... "judge" or third person or how to call her/him. Regards J. From ahughes at redhat.com Thu May 12 05:43:32 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 13:43:32 +0100 Subject: RFC: move patches/libpng.patch to patches/openjdk In-Reply-To: <4DCB3D65.2020908@redhat.com> References: <4DCB3B48.50808@redhat.com> <20110512014824.GY5351@rivendell.middle-earth.co.uk> <4DCB3D65.2020908@redhat.com> Message-ID: <20110512124332.GE5351@rivendell.middle-earth.co.uk> On 21:52 Wed 11 May , Omair Majid wrote: > On 05/11/2011 09:48 PM, Dr Andrew John Hughes wrote: > > On 21:43 Wed 11 May , Omair Majid wrote: > >> Hi, > >> > >> The attached patch moves patches/libpng.patch to clearly indicate that > >> it is a backport of an openjdk patch. > >> > >> Okay to commit? > >> > >> Cheers, > >> Omair > > > > Fine, though in reality the OpenJDK patch comes from this patch i.e. > > this one was here first ;-) Look who committed it... > > > > Yeah, I saw the userid :) Still, I think moving it makes it clear that > this fix is upstream (and hence is in IcedTea7), reducing future > maintenance work. > > I think I am going to do the same to a few other patches. > I don't disagree (I did ok it), just let's not rewrite history, hey? :-D > Thanks, > Omair -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Thu May 12 05:44:25 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 12:44:25 +0000 Subject: [Bug 32] Double.toString(string) expands value In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=32 --- Comment #6 from Andrew John Hughes 2011-05-12 12:44:25 --- Ok, do you have a fix in mind? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From jvanek at redhat.com Thu May 12 06:02:05 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 12 May 2011 15:02:05 +0200 Subject: RFC [icedtea-web] transformation sheet, styles for preview and daily report In-Reply-To: <4DCBC298.50300@redhat.com> References: <4DC8172F.7020009@redhat.com> <20110509192447.GF22437@rivendell.middle-earth.co.uk> <4DCA866C.1070204@redhat.com> <20110511135224.GF5351@rivendell.middle-earth.co.uk> <4DCAA611.5000909@redhat.com> <20110511212149.GT5351@rivendell.middle-earth.co.uk> <4DCBC298.50300@redhat.com> Message-ID: <4DCBDA4D.10402@redhat.com> 2011-05-10 Jiri Vanek *tests/report-sytles/index.html.in : file which provides runtime transformation of tests-output.xml and jreport.xsl * tests/report-styles/index.js: runtime transformation script and fast navigation functions * tests/report-styles/report.css: styles for transformed result * tests/report-styles/jreport.xsl: template for human-readable xml->html transformation. * Makefile.am: New variables for report-styles directory; (edit_tests_index) - sed makro for replacing variables inside index.html.in; (index.html) - goal for generating index.html file from index.html.in and copying styles fiels; (run-netx-unit-tests) cloned stdout/err (clean-netx-unit-tests) cleaning styles dir and index.html There is discussion weather to include preview-transformation or not. http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/014152.html If not. Then there is question whether include css+xsl in repository or just kept it locally on torment (for now I believe (-I know :) it is useful for both). Without preview it will be (probably) useful only locally on torment for genertaing html of single output. Regards J. -------------- next part -------------- A non-text attachment was scrubbed... Name: sheets_patch.patch Type: text/x-patch Size: 14642 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110512/ed181676/sheets_patch.patch From ptisnovs at redhat.com Thu May 12 06:34:54 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 12 May 2011 15:34:54 +0200 Subject: Reviewer needed: second fix for regression hotspot test hotspot/test/runtime/6929067/Test6929067 for IcedTea6 Message-ID: <4DCBE1FE.9080309@redhat.com> Hi all, I'd like to push second version of fix for regression hotspot test hotspot/test/runtime/6929067/Test6929067 for IcedTea6. This fix ensures that this test will work on these combinations: -32 bit JVM on an 32 bit platform -32 bit JVM on an 64 bit platform (pretty unusual but according to Oracle guys it is possible) -64 bit JVM on an 64 bit platform hg diff for IcedTea6 is stored in an attachment. Please note that older patch for this test is already included in IcedTea6, so no changes has to be made in Makefile*. Here is ChangeLog entry: 2011-05-12 Pavel Tisnovsky * patches/jtreg-6929067-fix.patch: fix this test so it works on any combination of JVM and platform (32 bit and 64 bit) Can anybody please review this change? Thank you in advance, Pavel T. PS: because this test fails on IcedTea7 too, I'd like to push similar changes to this JDK too. May I prepare similar patch for it? -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110512/95116fff/hg_diff.ksh From ptisnovs at redhat.com Thu May 12 06:41:31 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 12 May 2011 15:41:31 +0200 Subject: Release and Commit Policies In-Reply-To: <20110512124225.GD5351@rivendell.middle-earth.co.uk> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBCB98.4080203@redhat.com> <20110512124225.GD5351@rivendell.middle-earth.co.uk> Message-ID: <4DCBE38B.9030200@redhat.com> Dr Andrew John Hughes wrote: > On 12:59 Thu 12 May , Andrew Haley wrote: >> On 05/12/2011 02:50 AM, Dr Andrew John Hughes wrote: >>> http://icedtea.classpath.org/wiki/ReleasePolicy >>> http://icedtea.classpath.org/wiki/CommitPolicy >>> >>> These are largely explicit documentation of our current processes, >>> but comments are welcomed. >>> >>> As specified on the wiki, don't make changes to these documents >>> without first discussing it either or on the Discussion page. >> No, this isn't right. We can't have one developer on his own writing >> documents like these. Please rename them to "Proposed xx policy" and >> then we can have a discussion, as a community, about what a reasonable >> set of policies might be. >> > > Frankly, I find this offensive. I spend time and effort in trying to > document our *existing* policies (something no-one else has bothered to do) > and all I receive in return is criticism. Hi Andrew and Andrew :-), I hope my comment about tabs vs. spaces is not understood as mere criticism (if it sounds like this it's probably caused by my bad English, sorry). Personally I like that we have such proposals of commit policy - it should help newcomers at least. Cheers, Pavel > > Of course this isn't perfect. But we need something to start with, and > this thread has already resulted in improvements. > >> Andrew. > From aph at redhat.com Thu May 12 06:02:23 2011 From: aph at redhat.com (Andrew Haley) Date: Thu, 12 May 2011 14:02:23 +0100 Subject: Release and Commit Policies In-Reply-To: <20110512124225.GD5351@rivendell.middle-earth.co.uk> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBCB98.4080203@redhat.com> <20110512124225.GD5351@rivendell.middle-earth.co.uk> Message-ID: <4DCBDA5F.2040709@redhat.com> On 05/12/2011 01:42 PM, Dr Andrew John Hughes wrote: > On 12:59 Thu 12 May , Andrew Haley wrote: >> On 05/12/2011 02:50 AM, Dr Andrew John Hughes wrote: >>> http://icedtea.classpath.org/wiki/ReleasePolicy >>> http://icedtea.classpath.org/wiki/CommitPolicy >>> >>> These are largely explicit documentation of our current processes, >>> but comments are welcomed. >>> >>> As specified on the wiki, don't make changes to these documents >>> without first discussing it either or on the Discussion page. >> >> No, this isn't right. We can't have one developer on his own writing >> documents like these. Please rename them to "Proposed xx policy" and >> then we can have a discussion, as a community, about what a reasonable >> set of policies might be. > > Frankly, I find this offensive. I spend time and effort in trying to > document our *existing* policies (something no-one else has bothered to do) > and all I receive in return is criticism. There may well be considerable merits to your proposal, but it is simply a proposal, and you should mark it as such. Documents such as this are crucial to the success of a project, must be developed with a process of consensus building before posting to the Wiki as group policy. Andrew. From bugzilla-daemon at icedtea.classpath.org Thu May 12 08:03:30 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 15:03:30 +0000 Subject: [Bug 584] ARM Zero c++ interpreter freecol crash using -Xincgc In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=584 PauloWW changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |pauloweb16 at yahoo.com.br --- Comment #6 from PauloWW 2011-05-12 15:03:29 --- Hello, I'm too having problems with Tomcat6 in Debian (arm in a processor). It starts fine, runs a few moments, and then aborts. The JVM creates an error log: # # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (os_linux_zero.cpp:236), pid=841, tid=1332900976 # Error: caught unhandled signal 11 # # JRE version: 6.0_18-b18 # Java VM: OpenJDK Zero VM (14.0-b16 mixed mode linux-arm ) # Derivative: IcedTea6 1.8.3 # Distribution: Debian GNU/Linux unstable (sid), package 6b18-1.8.3-2 # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # I appreciate if someone can help me! Thanks, Paul. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 12 08:05:19 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 15:05:19 +0000 Subject: [Bug 584] ARM Zero c++ interpreter freecol crash using -Xincgc In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=584 --- Comment #7 from PauloWW 2011-05-12 15:05:19 --- Created an attachment (id=532) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=532) JVM Error Log -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From omajid at icedtea.classpath.org Thu May 12 08:22:45 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 12 May 2011 15:22:45 +0000 Subject: /hg/icedtea6: Move patches/libpng.patch to patches/openjdk/69591... Message-ID: changeset 0dad4d8420ac in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0dad4d8420ac author: Omair Majid date: Thu May 12 11:22:12 2011 -0400 Move patches/libpng.patch to patches/openjdk/6959123-libpng_14.patch This patch has been acceppted upstream. Move patch to openjdk dir and add commit information to clarify that it is upstream. 2011-05-12 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace patches/libpng.patch with patches/openjdk/6959123-libpng_14.patch. * patches/libpng.patch: Remove. * patches/openjdk/6959123-libpng_14.patch: New file. diffstat: ChangeLog | 7 +++++++ Makefile.am | 2 +- patches/libpng.patch | 11 ----------- patches/openjdk/6959123-libpng_14.patch | 20 ++++++++++++++++++++ 4 files changed, 28 insertions(+), 12 deletions(-) diffs (67 lines): diff -r d8750486e54c -r 0dad4d8420ac ChangeLog --- a/ChangeLog Wed May 11 20:27:41 2011 -0400 +++ b/ChangeLog Thu May 12 11:22:12 2011 -0400 @@ -1,3 +1,10 @@ +2011-05-12 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Replace patches/libpng.patch with + patches/openjdk/6959123-libpng_14.patch. + * patches/libpng.patch: Remove. + * patches/openjdk/6959123-libpng_14.patch: New file. + 2011-05-11 Omair Majid * Makefile.am diff -r d8750486e54c -r 0dad4d8420ac Makefile.am --- a/Makefile.am Wed May 11 20:27:41 2011 -0400 +++ b/Makefile.am Thu May 12 11:22:12 2011 -0400 @@ -265,7 +265,7 @@ patches/sh4-support.patch \ patches/policy-evaluation.patch \ patches/update-bootclasspath.patch \ - patches/libpng.patch \ + patches/openjdk/6959123-libpng_14.patch \ patches/applet_hole.patch \ patches/jtreg-httpTest.patch \ patches/arm.patch \ diff -r d8750486e54c -r 0dad4d8420ac patches/libpng.patch --- a/patches/libpng.patch Wed May 11 20:27:41 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -r 93c580ce5e88 jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c ---- openjdk.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c Fri Jan 15 08:41:51 2010 -0800 -+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c Wed Jan 27 16:52:44 2010 +0000 -@@ -182,7 +182,7 @@ - int success = 0; - - stream->read(stream, sig, SIG_BYTES); -- if (!png_check_sig(sig, SIG_BYTES)) { -+ if (png_sig_cmp(sig, 0, SIG_BYTES)) { - goto done; - } - success = SplashDecodePng(splash, my_png_read_stream, stream); diff -r d8750486e54c -r 0dad4d8420ac patches/openjdk/6959123-libpng_14.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6959123-libpng_14.patch Thu May 12 11:22:12 2011 -0400 @@ -0,0 +1,21 @@ +# HG changeset patch +# User andrew +# Date 1276015967 -3600 +# Node ID 4d55419ce99e749da5037fa4d8247117f1a5cc2e +# Parent be6f14f83ea7cfbb4b9d167d853b1fda420bb2cf +6959123: Remove use of obsolete png_check_sig function in splashscreen_png.c +Summary: Avoid use of deprecated libpng macro (removed in some 1.4.x releases) +Reviewed-by: prr + +diff --git a/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/src/share/native/sun/awt/splashscreen/splashscreen_png.c +--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c ++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c +@@ -182,7 +182,7 @@ + int success = 0; + + stream->read(stream, sig, SIG_BYTES); +- if (!png_check_sig(sig, SIG_BYTES)) { ++ if (png_sig_cmp(sig, 0, SIG_BYTES)) { + goto done; + } + success = SplashDecodePng(splash, my_png_read_stream, stream); From omajid at redhat.com Thu May 12 08:25:49 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 12 May 2011 11:25:49 -0400 Subject: RFC: move patches/libpng.patch to patches/openjdk In-Reply-To: <20110512124332.GE5351@rivendell.middle-earth.co.uk> References: <4DCB3B48.50808@redhat.com> <20110512014824.GY5351@rivendell.middle-earth.co.uk> <4DCB3D65.2020908@redhat.com> <20110512124332.GE5351@rivendell.middle-earth.co.uk> Message-ID: <4DCBFBFD.90405@redhat.com> On 05/12/2011 08:43 AM, Dr Andrew John Hughes wrote: > On 21:52 Wed 11 May , Omair Majid wrote: >> On 05/11/2011 09:48 PM, Dr Andrew John Hughes wrote: >>> On 21:43 Wed 11 May , Omair Majid wrote: >>>> Hi, >>>> >>>> The attached patch moves patches/libpng.patch to clearly indicate that >>>> it is a backport of an openjdk patch. >>>> >>>> Okay to commit? >>> >>> Fine, though in reality the OpenJDK patch comes from this patch i.e. >>> this one was here first ;-) Look who committed it... >>> >> >> Yeah, I saw the userid :) Still, I think moving it makes it clear that >> this fix is upstream (and hence is in IcedTea7), reducing future >> maintenance work. >> >> I think I am going to do the same to a few other patches. >> > > I don't disagree (I did ok it), just let's not rewrite history, hey? :-D My apologies. I should have phrased myself more carefully. Cheers, Omair From ptisnovs at redhat.com Thu May 12 08:46:25 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 12 May 2011 17:46:25 +0200 Subject: Reviewer needed - fix for regression test test/sun/net/www/protocol/file/DirPermissionDenied in IcedTea7 Message-ID: <4DCC00D1.8030906@redhat.com> Hi all, I'd like to add new simple patch to IcedTea7 which fixes regression test test/sun/net/www/protocol/file/DirPermissionDenied. Currently this test creates unreadable directory (chmod a-r, more precisely chmod 333) and this directory (which is not empty btw.) is not erased when the test finishes (command rm -rf does not work in this case). So I added command which restores +w flag for given user (chmod u+r) and then the directory and its contents could be properly deleted. Tested on: recent IcedTea7 on RHEL 5 x86_64 Here is ChangeLog entry: 2011-05-12 Pavel Tisnovsky * Makefile.am: Added new patch. * patches/jtreg-DirPermissionDenied-fix.patch: Patch for regression test DirPermissionDenied - this test should clean all files and directories created during its run. Can anybody please review this patch? Thank you in advance, Pavel T. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110512/42d612c1/hg_diff.ksh From omajid at redhat.com Thu May 12 09:02:52 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 12 May 2011 12:02:52 -0400 Subject: Reviewer needed - fix for regression test test/sun/net/www/protocol/file/DirPermissionDenied in IcedTea7 In-Reply-To: <4DCC00D1.8030906@redhat.com> References: <4DCC00D1.8030906@redhat.com> Message-ID: <4DCC04AC.5070004@redhat.com> On 05/12/2011 11:46 AM, Pavel Tisnovsky wrote: > Hi all, > > I'd like to add new simple patch to IcedTea7 which fixes regression test > test/sun/net/www/protocol/file/DirPermissionDenied. Currently this test > creates unreadable directory (chmod a-r, more precisely chmod 333) and > this directory (which is not empty btw.) is not erased when the test > finishes (command rm -rf does not work in this case). > > So I added command which restores +w flag for given user (chmod u+r) and > then the directory and its contents could be properly deleted. > I am assuming you meant "restores +r flag". > Tested on: recent IcedTea7 on RHEL 5 x86_64 > Any chance you could try and convince upstream OpenJDK to accept this? > > Here is ChangeLog entry: > > 2011-05-12 Pavel Tisnovsky > > * Makefile.am: Added new patch. > * patches/jtreg-DirPermissionDenied-fix.patch: > Patch for regression test DirPermissionDenied - > this test should clean all files and directories > created during its run. > > Can anybody please review this patch? > > Thank you in advance, > Pavel T. > > > hg_diff > > > diff -r 5ffa85bf891c Makefile.am > --- a/Makefile.am Thu May 05 01:17:33 2011 +0100 > +++ b/Makefile.am Thu May 12 16:38:17 2011 +0200 > @@ -357,7 +357,8 @@ > patches/boot/hotspot-jdk-dependency.patch \ > patches/boot/ecj-multicatch.patch \ > patches/boot/ecj-trywithresources.patch \ > - patches/boot/ecj-autoboxing.patch > + patches/boot/ecj-autoboxing.patch \ > + patches/jtreg-DirPermissionDenied-fix.patch > This should not be added to the boot patch list (ICEDTEA_BOOT_PATCHES). Please add it to ICEDTEA_PATCHES instead. Whether a patch is applied to the bootstrap jdk is determined by the path in the patch file - so this patch will affect the non-bootstrapped JDK. But the patch will only be applied on boostrap builds. > if CP39408_JAVAH > ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch > diff -r 5ffa85bf891c patches/jtreg-DirPermissionDenied-fix.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/jtreg-DirPermissionDenied-fix.patch Thu May 12 16:38:17 2011 +0200 > @@ -0,0 +1,9 @@ > +--- openjdk.orig/jdk/test/sun/net/www/protocol/file/DirPermissionDenied.sh 2011-05-12 16:04:01.000000000 +0200 > ++++ openjdk/jdk/test/sun/net/www/protocol/file/DirPermissionDenied.sh 2011-05-12 15:57:32.000000000 +0200 > +@@ -37,5 +37,6 @@ > + > + $TESTJAVA/bin/java -classpath $TESTCLASSES DirPermissionDenied ${TESTDIR} > + result=$? > ++chmod u+r ${TESTDIR} > + rm -rf ${TESTDIR} > + exit $result From dlila at redhat.com Thu May 12 09:03:29 2011 From: dlila at redhat.com (Denis Lila) Date: Thu, 12 May 2011 12:03:29 -0400 (EDT) Subject: [RFC][icedtea6-{head,1.10}] request to backport In-Reply-To: <2133232575.14028.1305215700631.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <549995788.14211.1305216209166.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Hi. I would like to backport the fix of S7043054. This is a fix for a regression caused by backporting the parallelogram pipes. 1.10 and head are affected, and the patch should go into both. ChangeLog: +2011-05-12 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/pgram-pipe-regression.patch: Fix regression a + where the wrong user space bounds would be passed to user supplied + paint object. + Ok to push? Regards, Denis. -------------- next part -------------- A non-text attachment was scrubbed... Name: pgramBackport.patch Type: text/x-patch Size: 27382 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110512/5c285869/pgramBackport.patch From ptisnovs at redhat.com Thu May 12 09:08:34 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 12 May 2011 18:08:34 +0200 Subject: Reviewer needed - fix for regression test test/sun/net/www/protocol/file/DirPermissionDenied in IcedTea7 In-Reply-To: <4DCC04AC.5070004@redhat.com> References: <4DCC00D1.8030906@redhat.com> <4DCC04AC.5070004@redhat.com> Message-ID: <4DCC0602.9010305@redhat.com> Omair Majid wrote: > On 05/12/2011 11:46 AM, Pavel Tisnovsky wrote: Hi Omair, >> > > I am assuming you meant "restores +r flag". yes you are right, sorry > >> Tested on: recent IcedTea7 on RHEL 5 x86_64 >> > > Any chance you could try and convince upstream OpenJDK to accept this? Sure, I'm going to create webrev, but I don't expect that this change will be included in OpenJDK7 at this moment, because O7 was "closed" from the Oracle side (AFAIK). > > This should not be added to the boot patch list (ICEDTEA_BOOT_PATCHES). > Please add it to ICEDTEA_PATCHES instead. Whether a patch is applied to > the bootstrap jdk is determined by the path in the patch file - so this > patch will affect the non-bootstrapped JDK. But the patch will only be > applied on boostrap builds. > I'll send another version of change, thank you for pointing this out. Cheers, Pavel From ptisnovs at redhat.com Thu May 12 09:11:49 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 12 May 2011 18:11:49 +0200 Subject: Reviewer needed: second fix for regression hotspot test In-Reply-To: <4DCC0460.9040700@LGonQn.Org> References: <4DCC0460.9040700@LGonQn.Org> Message-ID: <4DCC06C5.5070700@redhat.com> Chris Phillips wrote: > On 12/05/11 11:44 AM, distro-pkg-dev-request at openjdk.java.net wrote: >> ---------------------------------------------------------------------- Hi Chris, > This also works on RH linux with appropriate finagling of yum and libries: > 210 % ./i586/jdk1.7.0/bin/java -version > java version "1.7.0-ea" > Java(TM) SE Runtime Environment (build 1.7.0-ea-b137) > Java HotSpot(TM) Server VM (build 21.0-b07, mixed mode) > 211 % arch > x86_64 yeah, I tried this test against 32-bit proprietary Oracle JDK 6/7 on RHEL 5 x86_64. I just forgot to mention this. > > > Looking at the patch ( not sure if it qualifies as a review ;) > > > > This : > > + i585) > + ARCH=i386 > > > probably wants to be > > + i586) > _ > + ARCH=i386 > sure ;-) my fault. > Otherwise looks OK to me . Thank you Chris, I'll send new version of patch to another review. > > Cheers! > Chris > From bugzilla-daemon at icedtea.classpath.org Thu May 12 09:16:28 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 16:16:28 +0000 Subject: [Bug 720] New: Error: caught unhandled signal 11, tomcat6, arm, debian linux, Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=720 Summary: Error: caught unhandled signal 11, tomcat6, arm, debian linux, Product: IcedTea Version: 6-1.8.3 Platform: arm OS/Version: Linux Status: NEW Severity: critical Priority: P1 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: pauloweb16 at yahoo.com.br CC: pauloweb16 at yahoo.com.br Created an attachment (id=533) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=533) hs_err_pid841.log I'm having problems with Tomcat6 in Debian (arm processor). It starts fine, runs a few moments, and then aborts. The JVM creates an error log: # # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (os_linux_zero.cpp:236), pid=841, tid=1332900976 # Error: caught unhandled signal 11 # # JRE version: 6.0_18-b18 # Java VM: OpenJDK Zero VM (14.0-b16 mixed mode linux-arm ) # Derivative: IcedTea6 1.8.3 # Distribution: Debian GNU/Linux unstable (sid), package 6b18-1.8.3-2 # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # Complete error log attached. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ahughes at redhat.com Thu May 12 09:30:23 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 17:30:23 +0100 Subject: Reviewer needed: second fix for regression hotspot test hotspot/test/runtime/6929067/Test6929067 for IcedTea6 In-Reply-To: <4DCBE1FE.9080309@redhat.com> References: <4DCBE1FE.9080309@redhat.com> Message-ID: <20110512163023.GA31710@rivendell.middle-earth.co.uk> On 15:34 Thu 12 May , Pavel Tisnovsky wrote: > Hi all, > > I'd like to push second version of fix for regression hotspot test > hotspot/test/runtime/6929067/Test6929067 for IcedTea6. This fix ensures > that this test will work on these combinations: > > -32 bit JVM on an 32 bit platform > -32 bit JVM on an 64 bit platform (pretty unusual but according to > Oracle guys it is possible) > -64 bit JVM on an 64 bit platform > I still don't understand the second option. I don't believe there are any build options to get such a setup. > hg diff for IcedTea6 is stored in an attachment. Please note that older > patch for this test is already included in IcedTea6, so no changes has > to be made in Makefile*. > > Here is ChangeLog entry: > > 2011-05-12 Pavel Tisnovsky > > * patches/jtreg-6929067-fix.patch: fix this test > so it works on any combination of JVM and platform > (32 bit and 64 bit) > > > Can anybody please review this change? > Looks fine to me. Did you manage to get it upstream or are they still playing games? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 12 09:34:23 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 17:34:23 +0100 Subject: Reviewer needed - fix for regression test test/sun/net/www/protocol/file/DirPermissionDenied in IcedTea7 In-Reply-To: <4DCC00D1.8030906@redhat.com> References: <4DCC00D1.8030906@redhat.com> Message-ID: <20110512163423.GB31710@rivendell.middle-earth.co.uk> On 17:46 Thu 12 May , Pavel Tisnovsky wrote: > Hi all, > > I'd like to add new simple patch to IcedTea7 which fixes regression test > test/sun/net/www/protocol/file/DirPermissionDenied. Currently this test > creates unreadable directory (chmod a-r, more precisely chmod 333) and > this directory (which is not empty btw.) is not erased when the test > finishes (command rm -rf does not work in this case). > > So I added command which restores +w flag for given user (chmod u+r) and > then the directory and its contents could be properly deleted. > > Tested on: recent IcedTea7 on RHEL 5 x86_64 > > > Here is ChangeLog entry: > > 2011-05-12 Pavel Tisnovsky > > * Makefile.am: Added new patch. > * patches/jtreg-DirPermissionDenied-fix.patch: > Patch for regression test DirPermissionDenied - > this test should clean all files and directories > created during its run. > > Can anybody please review this patch? > > Thank you in advance, > Pavel T. As mentioned in http://icedtea.classpath.org/wiki/CommitPolicy IcedTea7 patches are applied to the IcedTea forest, not to IcedTea7 itself. For 2.0, all patches will be removed from IcedTea7. See: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 Also, this patch is wrong anyway as it adds the patch as a bootstrapping patch. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 12 09:41:10 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 17:41:10 +0100 Subject: [RFC][icedtea6-{head,1.10}] request to backport In-Reply-To: <549995788.14211.1305216209166.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <2133232575.14028.1305215700631.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <549995788.14211.1305216209166.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <20110512164110.GC31710@rivendell.middle-earth.co.uk> On 12:03 Thu 12 May , Denis Lila wrote: > Hi. > > I would like to backport the fix of S7043054. This is a > fix for a regression caused by backporting the parallelogram > pipes. 1.10 and head are affected, and the patch should go > into both. > > ChangeLog: > +2011-05-12 Denis Lila > + > + * Makefile.am: Apply patch. > + * NEWS: Update with backport. > + * patches/openjdk/pgram-pipe-regression.patch: Fix regression a > + where the wrong user space bounds would be passed to user supplied > + paint object. > + > > > Ok to push? > This looks fine for HEAD. There doesn't seem to be a patch attached for 1.10. I presume 1.8 & 1.9 are not affected? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 12 09:47:08 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 17:47:08 +0100 Subject: Patch: improve huge page support In-Reply-To: <4DCBC4CF.10509@redhat.com> References: <4DC1678E.30402@redhat.com> <20110504155316.GF26415@rivendell.middle-earth.co.uk> <4DC2915A.2070304@redhat.com> <20110509132052.GA22437@rivendell.middle-earth.co.uk> <4DCAA680.8050406@redhat.com> <20110511160423.GO5351@rivendell.middle-earth.co.uk> <4DCAB5B0.2070400@redhat.com> <20110511212343.GU5351@rivendell.middle-earth.co.uk> <4DCBC4CF.10509@redhat.com> Message-ID: <20110512164708.GD31710@rivendell.middle-earth.co.uk> On 12:30 Thu 12 May , Andrew Haley wrote: > On 05/11/2011 10:23 PM, Dr Andrew John Hughes wrote: > > On 17:13 Wed 11 May , Andrew Haley wrote: > >> On 05/11/2011 05:04 PM, Dr Andrew John Hughes wrote: > >>> On 16:08 Wed 11 May , Andrew Haley wrote: > >>>> > >>> > >>> snip... > >>> > >>>> I won't bother with 1.8. I'll push to 1.9 and 1.10. > >>>> > >>> > >>> Ok, post the patches and I'll approve them for those branches. > >> > >> Righto. I'll do that once you have renamed the patch files. Let me > >> know. > >> > > > > I still can't build IcedTea6. Did you push the build fix for this, in one form or another? > > I'm surprised by this: AFAIK this is a Debian-only gcc bug. > Make it a Debian and Gentoo issue. This is the problem with having -Werror on. > I thought I had pushed the build fix, but evidently not. I think this > is an opportunity to move a couple of patch files the openjdk/ > directory for ease of maintenance, as you suggested. You also said > that you'd prefer the Debian fix to be in a separate file, with its > upstream bug number. I've done that. > Thanks. I've been testing the same thing, but can't build :-( g++ -DLINUX -D_GNU_SOURCE -DAMD64 -DPRODUCT -I. -I../generated/adfiles -I../generated/jvmtifiles -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/asm -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/ci -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/classfile -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/code -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/compiler -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/g1 -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parallelScavenge -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parNew -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/shared -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_interface -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/interpreter -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/libadt -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/memory -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/oops -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/opto -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/prims -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/runtime -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/services -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/shark -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/utilities -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/cpu/x86/vm -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/os/linux/vm -I/mnt/builder/icedtea6/openjdk-ecj/hotspot/src/os_cpu/linux_x86/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"19.0-b09\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"andrew\"" -DHOTSPOT_LIB_ARCH=\"amd64\" -DJRE_RELEASE_VERSION="\"1.6.0_22-b22\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea6 1.11pre+r439a9cd78f8c+\"" -DDISTRIBUTION_ID="\"Built on Gentoo Base System release 2.0.2 (Wed May 11 20:20:47 BST 2011)\"" -g -O2 -DCOMPILER2 -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -m64 -pipe -g -DCOMPILER2 -fpic -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -m64 -pipe -g -O3 -fno-strict-aliasing -DVM_LITTLE_ENDIAN -D_LP64=1 -fno-omit-frame-pointer -Werror -Wpointer-arith -Wsign-compare -DDTRACE_ENABLED -c -o parse2.o /mnt/builder/icedtea6/openjdk-ecj/hotspot/src/share/vm/opto/parse2.cpp /mnt/builder/icedtea6/openjdk-ecj/hotspot/src/os/linux/vm/os_linux.cpp: In static member function 'static bool os::Linux::hugetlbfs_sanity_check(bool, size_t)': /mnt/builder/icedtea6/openjdk-ecj/hotspot/src/os/linux/vm/os_linux.cpp:4879:43: error: use of assignment suppression and length modifier together in gnu_scanf format [-Werror=format] cc1plus: all warnings being treated as errors > The upstream Debian fix does not contain just that one fix, but also > updates copyright notices in some files that may not be present in all > HotSpot releases, so I had to trim it to just the bug fix Debian users > need. So, it doesn't correspond exactly to the upstream patch, but that > can't be helped. > I agree and was planning to do the same thing. Do you know if they discussed this on the mailing list? I really dislike bundling unrelated fixes in this manner. > OK to commit? > Looks ok for HEAD to me, assuming it still builds. Post patches for 1.9 and 1.10 and I'll approve them. There's likely to be some churn between HotSpot versions so I wouldn't be surprised if the patch had to be rejigged. Probably worth checking it even still works on old versions, as I don't know if this has dependencies on other changes. > Andrew. > > > > 2011-05-12 Andrew Haley > > Rename icedtea-hugepage-7034464.patch -> openjdk/7034464-hugepage.patch > icedtea-hugepage-7037939.patch -> openjdk/7037939-hugepage.patch > * patches/openjdk/7043564-hugepage.patch: Import from upstream. > * Makefile.am: move patches, add new patch. > > diff -r d8750486e54c Makefile.am > --- a/Makefile.am Wed May 11 20:27:41 2011 -0400 > +++ b/Makefile.am Thu May 12 11:47:29 2011 +0100 > @@ -335,10 +335,11 @@ > patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ > patches/openjdk/7031385-gcc-register-allocation-fix.patch \ > patches/shark-llvm-2.9.patch \ > - patches/icedtea-hugepage-7034464.patch \ > - patches/icedtea-hugepage-7037939.patch \ > patches/openjdk/6986968-crash_on_xim_restart.patch \ > - patches/openjdk/7036754-stroker-nan.patch > + patches/openjdk/7036754-stroker-nan.patch \ > + patches/openjdk/7034464-hugepage.patch \ > + patches/openjdk/7037939-hugepage.patch \ > + patches/openjdk/7043564-hugepage.patch > > if WITH_ALT_HSBUILD > ICEDTEA_PATCHES += \ > diff -r d8750486e54c patches/icedtea-hugepage-7034464.patch > --- a/patches/icedtea-hugepage-7034464.patch Wed May 11 20:27:41 2011 -0400 > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > @@ -1,458 +0,0 @@ > -# HG changeset patch > -# User iveresov > -# Date 1303344724 25200 > -# Node ID 139667d9836ae218ab06a74d5813a5a700a076c9 > -# Parent 49a67202bc671d23d719c9e14752d80295a9e8f6 > -7034464: Support transparent large pages on Linux > -Summary: Support transparent huge pages on Linux available since 2.6.38 > -Reviewed-by: iveresov, ysr > -Contributed-by: aph at redhat.com > -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp > ---- openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp 2011-03-16 02:30:16.000000000 +0000 > -+++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2011-05-04 11:57:15.083470027 +0100 > -@@ -29,13 +29,19 @@ > - // Defines Linux specific flags. They are not available on other platforms. > - // > - #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \ > -- product(bool, UseOprofile, false, \ > -- "enable support for Oprofile profiler") \ > -- \ > -- product(bool, UseLinuxPosixThreadCPUClocks, true, \ > -- "enable fast Linux Posix clocks where available") > --// NB: The default value of UseLinuxPosixThreadCPUClocks may be > --// overridden in Arguments::parse_each_vm_init_arg. > -+ product(bool, UseOprofile, false, \ > -+ "enable support for Oprofile profiler") \ > -+ \ > -+ product(bool, UseLinuxPosixThreadCPUClocks, true, \ > -+ "enable fast Linux Posix clocks where available") \ > -+/* NB: The default value of UseLinuxPosixThreadCPUClocks may be \ > -+ overridden in Arguments::parse_each_vm_init_arg. */ \ > -+ \ > -+ product(bool, UseHugeTLBFS, false, \ > -+ "Use MAP_HUGETLB for large pages") \ > -+ \ > -+ product(bool, UseSHM, false, \ > -+ "Use SYSV shared memory for large pages") > - > - // > - // Defines Linux-specific default values. The flags are available on all > -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp > ---- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-03 14:32:54.285722656 +0100 > -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-09 14:31:51.358502774 +0100 > -@@ -2495,16 +2495,40 @@ > - return res != (uintptr_t) MAP_FAILED; > - } > - > -+// Define MAP_HUGETLB here so we can build HotSpot on old systems. > -+#ifndef MAP_HUGETLB > -+#define MAP_HUGETLB 0x40000 > -+#endif > -+ > -+// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. > -+#ifndef MADV_HUGEPAGE > -+#define MADV_HUGEPAGE 14 > -+#endif > -+ > - bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, > - bool exec) { > -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { > -+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; > -+ uintptr_t res = > -+ (uintptr_t) ::mmap(addr, size, prot, > -+ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, > -+ -1, 0); > -+ return res != (uintptr_t) MAP_FAILED; > -+ } > -+ > - return commit_memory(addr, size, exec); > - } > - > --void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } > -+void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { > -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { > -+ // We don't check the return value: madvise(MADV_HUGEPAGE) may not > -+ // be supported or the memory may already be backed by huge pages. > -+ ::madvise(addr, bytes, MADV_HUGEPAGE); > -+ } > -+} > - > - void os::free_memory(char *addr, size_t bytes) { > -- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, > -- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); > -+ ::madvise(addr, bytes, MADV_DONTNEED); > - } > - > - void os::numa_make_global(char *addr, size_t bytes) { > -@@ -2870,7 +2894,16 @@ > - static size_t _large_page_size = 0; > - > - bool os::large_page_init() { > -- if (!UseLargePages) return false; > -+ if (!UseLargePages) { > -+ UseHugeTLBFS = false; > -+ UseSHM = false; > -+ return false; > -+ } > -+ > -+ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { > -+ // Our user has not expressed a preference, so we'll try both. > -+ UseHugeTLBFS = UseSHM = true; > -+ } > - > - if (LargePageSizeInBytes) { > - _large_page_size = LargePageSizeInBytes; > -@@ -2915,6 +2948,9 @@ > - } > - } > - > -+ // print a warning if any large page related flag is specified on command line > -+ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); > -+ > - const size_t default_page_size = (size_t)Linux::page_size(); > - if (_large_page_size > default_page_size) { > - _page_sizes[0] = _large_page_size; > -@@ -2922,6 +2958,14 @@ > - _page_sizes[2] = 0; > - } > - > -+ UseHugeTLBFS = UseHugeTLBFS && > -+ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); > -+ > -+ if (UseHugeTLBFS) > -+ UseSHM = false; > -+ > -+ UseLargePages = UseHugeTLBFS || UseSHM; > -+ > - // Large page support is available on 2.6 or newer kernel, some vendors > - // (e.g. Redhat) have backported it to their 2.4 based distributions. > - // We optimistically assume the support is available. If later it turns out > -@@ -2936,7 +2980,7 @@ > - char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { > - // "exec" is passed in but not used. Creating the shared image for > - // the code cache doesn't have an SHM_X executable permission to check. > -- assert(UseLargePages, "only for large pages"); > -+ assert(UseLargePages && UseSHM, "only for SHM large pages"); > - > - key_t key = IPC_PRIVATE; > - char *addr; > -@@ -3003,19 +3047,19 @@ > - return _large_page_size; > - } > - > --// Linux does not support anonymous mmap with large page memory. The only way > --// to reserve large page memory without file backing is through SysV shared > --// memory API. The entire memory region is committed and pinned upfront. > --// Hopefully this will change in the future... > -+// HugeTLBFS allows application to commit large page memory on demand; > -+// with SysV SHM the entire memory region must be allocated as shared > -+// memory. > - bool os::can_commit_large_page_memory() { > -- return false; > -+ return UseHugeTLBFS; > - } > - > - bool os::can_execute_large_page_memory() { > -- return false; > -+ return UseHugeTLBFS; > - } > - > - // Reserve memory at an arbitrary address, only if that area is > -+// Reserve memory at an arbitrary address, only if that area is > - // available (and not reserved for something else). > - > - char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { > -@@ -5009,6 +5053,43 @@ > - // JSR166 > - // ------------------------------------------------------- > - > -+bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { > -+ bool result = false; > -+ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, > -+ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, > -+ -1, 0); > -+ > -+ if (p != (void *) -1) { > -+ // We don't know if this really is a huge page or not. > -+ FILE *fp = fopen("/proc/self/maps", "r"); > -+ if (fp) { > -+ while (!feof(fp)) { > -+ char chars[257]; > -+ long x = 0; > -+ if (fgets(chars, sizeof(chars), fp)) { > -+ if (sscanf(chars, "%lx-%*lx", &x) == 1 > -+ && x == (long)p) { > -+ if (strstr (chars, "hugepage")) { > -+ result = true; > -+ break; > -+ } > -+ } > -+ } > -+ } > -+ fclose(fp); > -+ } > -+ munmap (p, page_size); > -+ if (result) > -+ return true; > -+ } > -+ > -+ if (warn) { > -+ warning("HugeTLBFS is not supported by the operating system."); > -+ } > -+ > -+ return result; > -+} > -+ > - /* > - * The solaris and linux implementations of park/unpark are fairly > - * conservative for now, but can be improved. They currently use a > -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig > ---- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 14:32:53.972649764 +0100 > -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-04 11:57:15.085470494 +0100 > -@@ -117,6 +117,10 @@ > - # include > - # include > - > -+#if __x86_64__ > -+#include > -+#endif > -+ > - #define MAX_PATH (2 * K) > - > - // for timer info max values which include all bits > -@@ -2491,16 +2495,40 @@ > - return res != (uintptr_t) MAP_FAILED; > - } > - > -+// Define MAP_HUGETLB here so we can build HotSpot on old systems. > -+#ifndef MAP_HUGETLB > -+#define MAP_HUGETLB 0x40000 > -+#endif > -+ > -+// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. > -+#ifndef MADV_HUGEPAGE > -+#define MADV_HUGEPAGE 14 > -+#endif > -+ > - bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, > - bool exec) { > -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { > -+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; > -+ uintptr_t res = > -+ (uintptr_t) ::mmap(addr, size, prot, > -+ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, > -+ -1, 0); > -+ return res != (uintptr_t) MAP_FAILED; > -+ } > -+ > - return commit_memory(addr, size, exec); > - } > - > --void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } > -+void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { > -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { > -+ // We don't check the return value: madvise(MADV_HUGEPAGE) may not > -+ // be supported or the memory may already be backed by huge pages. > -+ ::madvise(addr, bytes, MADV_HUGEPAGE); > -+ } > -+} > - > - void os::free_memory(char *addr, size_t bytes) { > -- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, > -- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); > -+ ::madvise(addr, bytes, MADV_DONTNEED); > - } > - > - void os::numa_make_global(char *addr, size_t bytes) { > -@@ -2544,6 +2572,21 @@ > - return end; > - } > - > -+static int sched_getcpu_syscall(void) { > -+ unsigned int cpu; > -+ int retval = -1; > -+ > -+#if __x86_64__ > -+ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); > -+ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); > -+ retval = vgetcpu(&cpu, NULL, NULL); > -+#elif __i386__ > -+ retval = syscall(SYS_getcpu, &cpu, NULL, NULL); > -+#endif > -+ > -+ return (retval == -1) ? retval : cpu; > -+} > -+ > - extern "C" void numa_warn(int number, char *where, ...) { } > - extern "C" void numa_error(char *where) { } > - > -@@ -2565,6 +2608,10 @@ > - set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, > - dlsym(RTLD_DEFAULT, "sched_getcpu"))); > - > -+ // If it's not, try a direct syscall. > -+ if (sched_getcpu() == -1) > -+ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall)); > -+ > - if (sched_getcpu() != -1) { // Does it work? > - void *handle = dlopen("libnuma.so.1", RTLD_LAZY); > - if (handle != NULL) { > -@@ -2847,7 +2894,16 @@ > - static size_t _large_page_size = 0; > - > - bool os::large_page_init() { > -- if (!UseLargePages) return false; > -+ if (!UseLargePages) { > -+ UseHugeTLBFS = false; > -+ UseSHM = false; > -+ return false; > -+ } > -+ > -+ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { > -+ // Our user has not expressed a preference, so we'll try both. > -+ UseHugeTLBFS = UseSHM = true; > -+ } > - > - if (LargePageSizeInBytes) { > - _large_page_size = LargePageSizeInBytes; > -@@ -2892,6 +2948,9 @@ > - } > - } > - > -+ // print a warning if any large page related flag is specified on command line > -+ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); > -+ > - const size_t default_page_size = (size_t)Linux::page_size(); > - if (_large_page_size > default_page_size) { > - _page_sizes[0] = _large_page_size; > -@@ -2899,6 +2958,14 @@ > - _page_sizes[2] = 0; > - } > - > -+ UseHugeTLBFS = UseHugeTLBFS && > -+ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); > -+ > -+ if (UseHugeTLBFS) > -+ UseSHM = false; > -+ > -+ UseLargePages = UseHugeTLBFS || UseSHM; > -+ > - // Large page support is available on 2.6 or newer kernel, some vendors > - // (e.g. Redhat) have backported it to their 2.4 based distributions. > - // We optimistically assume the support is available. If later it turns out > -@@ -2913,7 +2980,7 @@ > - char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { > - // "exec" is passed in but not used. Creating the shared image for > - // the code cache doesn't have an SHM_X executable permission to check. > -- assert(UseLargePages, "only for large pages"); > -+ assert(UseLargePages && UseSHM, "only for SHM large pages"); > - > - key_t key = IPC_PRIVATE; > - char *addr; > -@@ -2980,19 +3047,19 @@ > - return _large_page_size; > - } > - > --// Linux does not support anonymous mmap with large page memory. The only way > --// to reserve large page memory without file backing is through SysV shared > --// memory API. The entire memory region is committed and pinned upfront. > --// Hopefully this will change in the future... > -+// HugeTLBFS allows application to commit large page memory on demand; > -+// with SysV SHM the entire memory region must be allocated as shared > -+// memory. > - bool os::can_commit_large_page_memory() { > -- return false; > -+ return UseHugeTLBFS; > - } > - > - bool os::can_execute_large_page_memory() { > -- return false; > -+ return UseHugeTLBFS; > - } > - > - // Reserve memory at an arbitrary address, only if that area is > -+// Reserve memory at an arbitrary address, only if that area is > - // available (and not reserved for something else). > - > - char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { > -@@ -4081,6 +4148,23 @@ > - UseNUMA = false; > - } > - } > -+ // With SHM large pages we cannot uncommit a page, so there's not way > -+ // we can make the adaptive lgrp chunk resizing work. If the user specified > -+ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and > -+ // disable adaptive resizing. > -+ if (UseNUMA && UseLargePages && UseSHM) { > -+ if (!FLAG_IS_DEFAULT(UseNUMA)) { > -+ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { > -+ UseLargePages = false; > -+ } else { > -+ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); > -+ UseAdaptiveSizePolicy = false; > -+ UseAdaptiveNUMAChunkSizing = false; > -+ } > -+ } else { > -+ UseNUMA = false; > -+ } > -+ } > - if (!UseNUMA && ForceNUMA) { > - UseNUMA = true; > - } > -@@ -4986,6 +5070,43 @@ > - // JSR166 > - // ------------------------------------------------------- > - > -+bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { > -+ bool result = false; > -+ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, > -+ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, > -+ -1, 0); > -+ > -+ if (p != (void *) -1) { > -+ // We don't know if this really is a huge page or not. > -+ FILE *fp = fopen("/proc/self/maps", "r"); > -+ if (fp) { > -+ while (!feof(fp)) { > -+ char chars[257]; > -+ long x = 0; > -+ if (fgets(chars, sizeof(chars), fp)) { > -+ if (sscanf(chars, "%lx-%*lx", &x) == 1 > -+ && x == (long)p) { > -+ if (strstr (chars, "hugepage")) { > -+ result = true; > -+ break; > -+ } > -+ } > -+<+ } > -+ } > -+ fclose(fp); > -+ } > -+ munmap (p, page_size); > -+ if (result) > -+ return true; > -+ } > -+ > -+ if (warn) { > -+ warning("HugeTLBFS is not supported by the operating system."); > -+ } > -+ > -+ return result; > -+} > -+ > - /* > - * The solaris and linux implementations of park/unpark are fairly > - * conservative for now, but can be improved. They currently use a > -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp > ---- openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp 2011-03-16 02:30:16.000000000 +0000 > -+++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp 2011-05-04 11:57:15.088471194 +0100 > -@@ -86,6 +86,9 @@ > - > - static void rebuild_cpu_to_node_map(); > - static GrowableArray* cpu_to_node() { return _cpu_to_node; } > -+ > -+ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); > -+ > - public: > - static void init_thread_fpu_state(); > - static int get_fpu_control_word(); > diff -r d8750486e54c patches/icedtea-hugepage-7037939.patch > --- a/patches/icedtea-hugepage-7037939.patch Wed May 11 20:27:41 2011 -0400 > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > @@ -1,71 +0,0 @@ > - > -# HG changeset patch > -# User iveresov > -# Date 1303843594 25200 > -# Node ID c303b3532d4ada074facc42292219952c2a4204e > -# Parent d6cdc6c77582408f6450bdda3ffc831d44298714 > -7037939: NUMA: Disable adaptive resizing if SHM large pages are used > -Summary: Make the NUMA allocator behave properly with SHM and ISM large pages. > -Reviewed-by: ysr > - > ---- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp Sat Apr 23 04:20:09 2011 -0700 > -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Apr 26 11:46:34 2011 -0700 > -@@ -4170,6 +4170,23 @@ jint os::init_2(void) > - UseNUMA = false; > - } > - } > -+ // With SHM large pages we cannot uncommit a page, so there's not way > -+ // we can make the adaptive lgrp chunk resizing work. If the user specified > -+ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and > -+ // disable adaptive resizing. > -+ if (UseNUMA && UseLargePages && UseSHM) { > -+ if (!FLAG_IS_DEFAULT(UseNUMA)) { > -+ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { > -+ UseLargePages = false; > -+ } else { > -+ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); > -+ UseAdaptiveSizePolicy = false; > -+ UseAdaptiveNUMAChunkSizing = false; > -+ } > -+ } else { > -+ UseNUMA = false; > -+ } > -+ } > - if (!UseNUMA && ForceNUMA) { > - UseNUMA = true; > - } > ---- openjdk.patched/hotspot/src/os/solaris/vm/os_solaris.cpp Sat Apr 23 04:20:09 2011 -0700 > -+++ openjdk/hotspot/src/os/solaris/vm/os_solaris.cpp Tue Apr 26 11:46:34 2011 -0700 > -@@ -2826,7 +2826,9 @@ void os::realign_memory(char *addr, size > - void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { > - assert((intptr_t)addr % alignment_hint == 0, "Address should be aligned."); > - assert((intptr_t)(addr + bytes) % alignment_hint == 0, "End should be aligned."); > -- Solaris::set_mpss_range(addr, bytes, alignment_hint); > -+ if (UseLargePages && UseMPSS) { > -+ Solaris::set_mpss_range(addr, bytes, alignment_hint); > -+ } > - } > - > - // Tell the OS to make the range local to the first-touching LWP > -@@ -5041,6 +5043,20 @@ jint os::init_2(void) { > - FREE_C_HEAP_ARRAY(int, lgrp_ids); > - if (lgrp_num < 2) { > - // There's only one locality group, disable NUMA. > -+ UseNUMA = false; > -+ } > -+ } > -+ // ISM is not compatible with the NUMA allocator - it always allocates > -+ // pages round-robin across the lgroups. > -+ if (UseNUMA && UseLargePages && UseISM) { > -+ if (!FLAG_IS_DEFAULT(UseNUMA)) { > -+ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseISM)) { > -+ UseLargePages = false; > -+ } else { > -+ warning("UseNUMA is not compatible with ISM large pages, disabling NUMA allocator"); > -+ UseNUMA = false; > -+ } > -+ } else { > - UseNUMA = false; > - } > - } > - > diff -r d8750486e54c patches/openjdk/7034464-hugepage.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/openjdk/7034464-hugepage.patch Thu May 12 11:47:29 2011 +0100 > @@ -0,0 +1,458 @@ > +# HG changeset patch > +# User iveresov > +# Date 1303344724 25200 > +# Node ID 139667d9836ae218ab06a74d5813a5a700a076c9 > +# Parent 49a67202bc671d23d719c9e14752d80295a9e8f6 > +7034464: Support transparent large pages on Linux > +Summary: Support transparent huge pages on Linux available since 2.6.38 > +Reviewed-by: iveresov, ysr > +Contributed-by: aph at redhat.com > +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp > +--- openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp 2011-03-16 02:30:16.000000000 +0000 > ++++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2011-05-04 11:57:15.083470027 +0100 > +@@ -29,13 +29,19 @@ > + // Defines Linux specific flags. They are not available on other platforms. > + // > + #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \ > +- product(bool, UseOprofile, false, \ > +- "enable support for Oprofile profiler") \ > +- \ > +- product(bool, UseLinuxPosixThreadCPUClocks, true, \ > +- "enable fast Linux Posix clocks where available") > +-// NB: The default value of UseLinuxPosixThreadCPUClocks may be > +-// overridden in Arguments::parse_each_vm_init_arg. > ++ product(bool, UseOprofile, false, \ > ++ "enable support for Oprofile profiler") \ > ++ \ > ++ product(bool, UseLinuxPosixThreadCPUClocks, true, \ > ++ "enable fast Linux Posix clocks where available") \ > ++/* NB: The default value of UseLinuxPosixThreadCPUClocks may be \ > ++ overridden in Arguments::parse_each_vm_init_arg. */ \ > ++ \ > ++ product(bool, UseHugeTLBFS, false, \ > ++ "Use MAP_HUGETLB for large pages") \ > ++ \ > ++ product(bool, UseSHM, false, \ > ++ "Use SYSV shared memory for large pages") > + > + // > + // Defines Linux-specific default values. The flags are available on all > +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp > +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-03 14:32:54.285722656 +0100 > ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-09 14:31:51.358502774 +0100 > +@@ -2495,16 +2495,40 @@ > + return res != (uintptr_t) MAP_FAILED; > + } > + > ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. > ++#ifndef MAP_HUGETLB > ++#define MAP_HUGETLB 0x40000 > ++#endif > ++ > ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. > ++#ifndef MADV_HUGEPAGE > ++#define MADV_HUGEPAGE 14 > ++#endif > ++ > + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, > + bool exec) { > ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { > ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; > ++ uintptr_t res = > ++ (uintptr_t) ::mmap(addr, size, prot, > ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, > ++ -1, 0); > ++ return res != (uintptr_t) MAP_FAILED; > ++ } > ++ > + return commit_memory(addr, size, exec); > + } > + > +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } > ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { > ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { > ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not > ++ // be supported or the memory may already be backed by huge pages. > ++ ::madvise(addr, bytes, MADV_HUGEPAGE); > ++ } > ++} > + > + void os::free_memory(char *addr, size_t bytes) { > +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, > +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); > ++ ::madvise(addr, bytes, MADV_DONTNEED); > + } > + > + void os::numa_make_global(char *addr, size_t bytes) { > +@@ -2870,7 +2894,16 @@ > + static size_t _large_page_size = 0; > + > + bool os::large_page_init() { > +- if (!UseLargePages) return false; > ++ if (!UseLargePages) { > ++ UseHugeTLBFS = false; > ++ UseSHM = false; > ++ return false; > ++ } > ++ > ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { > ++ // Our user has not expressed a preference, so we'll try both. > ++ UseHugeTLBFS = UseSHM = true; > ++ } > + > + if (LargePageSizeInBytes) { > + _large_page_size = LargePageSizeInBytes; > +@@ -2915,6 +2948,9 @@ > + } > + } > + > ++ // print a warning if any large page related flag is specified on command line > ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); > ++ > + const size_t default_page_size = (size_t)Linux::page_size(); > + if (_large_page_size > default_page_size) { > + _page_sizes[0] = _large_page_size; > +@@ -2922,6 +2958,14 @@ > + _page_sizes[2] = 0; > + } > + > ++ UseHugeTLBFS = UseHugeTLBFS && > ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); > ++ > ++ if (UseHugeTLBFS) > ++ UseSHM = false; > ++ > ++ UseLargePages = UseHugeTLBFS || UseSHM; > ++ > + // Large page support is available on 2.6 or newer kernel, some vendors > + // (e.g. Redhat) have backported it to their 2.4 based distributions. > + // We optimistically assume the support is available. If later it turns out > +@@ -2936,7 +2980,7 @@ > + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { > + // "exec" is passed in but not used. Creating the shared image for > + // the code cache doesn't have an SHM_X executable permission to check. > +- assert(UseLargePages, "only for large pages"); > ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); > + > + key_t key = IPC_PRIVATE; > + char *addr; > +@@ -3003,19 +3047,19 @@ > + return _large_page_size; > + } > + > +-// Linux does not support anonymous mmap with large page memory. The only way > +-// to reserve large page memory without file backing is through SysV shared > +-// memory API. The entire memory region is committed and pinned upfront. > +-// Hopefully this will change in the future... > ++// HugeTLBFS allows application to commit large page memory on demand; > ++// with SysV SHM the entire memory region must be allocated as shared > ++// memory. > + bool os::can_commit_large_page_memory() { > +- return false; > ++ return UseHugeTLBFS; > + } > + > + bool os::can_execute_large_page_memory() { > +- return false; > ++ return UseHugeTLBFS; > + } > + > + // Reserve memory at an arbitrary address, only if that area is > ++// Reserve memory at an arbitrary address, only if that area is > + // available (and not reserved for something else). > + > + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { > +@@ -5009,6 +5053,43 @@ > + // JSR166 > + // ------------------------------------------------------- > + > ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { > ++ bool result = false; > ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, > ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, > ++ -1, 0); > ++ > ++ if (p != (void *) -1) { > ++ // We don't know if this really is a huge page or not. > ++ FILE *fp = fopen("/proc/self/maps", "r"); > ++ if (fp) { > ++ while (!feof(fp)) { > ++ char chars[257]; > ++ long x = 0; > ++ if (fgets(chars, sizeof(chars), fp)) { > ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 > ++ && x == (long)p) { > ++ if (strstr (chars, "hugepage")) { > ++ result = true; > ++ break; > ++ } > ++ } > ++ } > ++ } > ++ fclose(fp); > ++ } > ++ munmap (p, page_size); > ++ if (result) > ++ return true; > ++ } > ++ > ++ if (warn) { > ++ warning("HugeTLBFS is not supported by the operating system."); > ++ } > ++ > ++ return result; > ++} > ++ > + /* > + * The solaris and linux implementations of park/unpark are fairly > + * conservative for now, but can be improved. They currently use a > +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig > +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 14:32:53.972649764 +0100 > ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-04 11:57:15.085470494 +0100 > +@@ -117,6 +117,10 @@ > + # include > + # include > + > ++#if __x86_64__ > ++#include > ++#endif > ++ > + #define MAX_PATH (2 * K) > + > + // for timer info max values which include all bits > +@@ -2491,16 +2495,40 @@ > + return res != (uintptr_t) MAP_FAILED; > + } > + > ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. > ++#ifndef MAP_HUGETLB > ++#define MAP_HUGETLB 0x40000 > ++#endif > ++ > ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. > ++#ifndef MADV_HUGEPAGE > ++#define MADV_HUGEPAGE 14 > ++#endif > ++ > + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, > + bool exec) { > ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { > ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; > ++ uintptr_t res = > ++ (uintptr_t) ::mmap(addr, size, prot, > ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, > ++ -1, 0); > ++ return res != (uintptr_t) MAP_FAILED; > ++ } > ++ > + return commit_memory(addr, size, exec); > + } > + > +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } > ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { > ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { > ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not > ++ // be supported or the memory may already be backed by huge pages. > ++ ::madvise(addr, bytes, MADV_HUGEPAGE); > ++ } > ++} > + > + void os::free_memory(char *addr, size_t bytes) { > +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, > +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); > ++ ::madvise(addr, bytes, MADV_DONTNEED); > + } > + > + void os::numa_make_global(char *addr, size_t bytes) { > +@@ -2544,6 +2572,21 @@ > + return end; > + } > + > ++static int sched_getcpu_syscall(void) { > ++ unsigned int cpu; > ++ int retval = -1; > ++ > ++#if __x86_64__ > ++ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); > ++ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); > ++ retval = vgetcpu(&cpu, NULL, NULL); > ++#elif __i386__ > ++ retval = syscall(SYS_getcpu, &cpu, NULL, NULL); > ++#endif > ++ > ++ return (retval == -1) ? retval : cpu; > ++} > ++ > + extern "C" void numa_warn(int number, char *where, ...) { } > + extern "C" void numa_error(char *where) { } > + > +@@ -2565,6 +2608,10 @@ > + set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, > + dlsym(RTLD_DEFAULT, "sched_getcpu"))); > + > ++ // If it's not, try a direct syscall. > ++ if (sched_getcpu() == -1) > ++ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall)); > ++ > + if (sched_getcpu() != -1) { // Does it work? > + void *handle = dlopen("libnuma.so.1", RTLD_LAZY); > + if (handle != NULL) { > +@@ -2847,7 +2894,16 @@ > + static size_t _large_page_size = 0; > + > + bool os::large_page_init() { > +- if (!UseLargePages) return false; > ++ if (!UseLargePages) { > ++ UseHugeTLBFS = false; > ++ UseSHM = false; > ++ return false; > ++ } > ++ > ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { > ++ // Our user has not expressed a preference, so we'll try both. > ++ UseHugeTLBFS = UseSHM = true; > ++ } > + > + if (LargePageSizeInBytes) { > + _large_page_size = LargePageSizeInBytes; > +@@ -2892,6 +2948,9 @@ > + } > + } > + > ++ // print a warning if any large page related flag is specified on command line > ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); > ++ > + const size_t default_page_size = (size_t)Linux::page_size(); > + if (_large_page_size > default_page_size) { > + _page_sizes[0] = _large_page_size; > +@@ -2899,6 +2958,14 @@ > + _page_sizes[2] = 0; > + } > + > ++ UseHugeTLBFS = UseHugeTLBFS && > ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); > ++ > ++ if (UseHugeTLBFS) > ++ UseSHM = false; > ++ > ++ UseLargePages = UseHugeTLBFS || UseSHM; > ++ > + // Large page support is available on 2.6 or newer kernel, some vendors > + // (e.g. Redhat) have backported it to their 2.4 based distributions. > + // We optimistically assume the support is available. If later it turns out > +@@ -2913,7 +2980,7 @@ > + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { > + // "exec" is passed in but not used. Creating the shared image for > + // the code cache doesn't have an SHM_X executable permission to check. > +- assert(UseLargePages, "only for large pages"); > ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); > + > + key_t key = IPC_PRIVATE; > + char *addr; > +@@ -2980,19 +3047,19 @@ > + return _large_page_size; > + } > + > +-// Linux does not support anonymous mmap with large page memory. The only way > +-// to reserve large page memory without file backing is through SysV shared > +-// memory API. The entire memory region is committed and pinned upfront. > +-// Hopefully this will change in the future... > ++// HugeTLBFS allows application to commit large page memory on demand; > ++// with SysV SHM the entire memory region must be allocated as shared > ++// memory. > + bool os::can_commit_large_page_memory() { > +- return false; > ++ return UseHugeTLBFS; > + } > + > + bool os::can_execute_large_page_memory() { > +- return false; > ++ return UseHugeTLBFS; > + } > + > + // Reserve memory at an arbitrary address, only if that area is > ++// Reserve memory at an arbitrary address, only if that area is > + // available (and not reserved for something else). > + > + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { > +@@ -4081,6 +4148,23 @@ > + UseNUMA = false; > + } > + } > ++ // With SHM large pages we cannot uncommit a page, so there's not way > ++ // we can make the adaptive lgrp chunk resizing work. If the user specified > ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and > ++ // disable adaptive resizing. > ++ if (UseNUMA && UseLargePages && UseSHM) { > ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { > ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { > ++ UseLargePages = false; > ++ } else { > ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); > ++ UseAdaptiveSizePolicy = false; > ++ UseAdaptiveNUMAChunkSizing = false; > ++ } > ++ } else { > ++ UseNUMA = false; > ++ } > ++ } > + if (!UseNUMA && ForceNUMA) { > + UseNUMA = true; > + } > +@@ -4986,6 +5070,43 @@ > + // JSR166 > + // ------------------------------------------------------- > + > ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { > ++ bool result = false; > ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, > ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, > ++ -1, 0); > ++ > ++ if (p != (void *) -1) { > ++ // We don't know if this really is a huge page or not. > ++ FILE *fp = fopen("/proc/self/maps", "r"); > ++ if (fp) { > ++ while (!feof(fp)) { > ++ char chars[257]; > ++ long x = 0; > ++ if (fgets(chars, sizeof(chars), fp)) { > ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 > ++ && x == (long)p) { > ++ if (strstr (chars, "hugepage")) { > ++ result = true; > ++ break; > ++ } > ++ } > ++<+ } > ++ } > ++ fclose(fp); > ++ } > ++ munmap (p, page_size); > ++ if (result) > ++ return true; > ++ } > ++ > ++ if (warn) { > ++ warning("HugeTLBFS is not supported by the operating system."); > ++ } > ++ > ++ return result; > ++} > ++ > + /* > + * The solaris and linux implementations of park/unpark are fairly > + * conservative for now, but can be improved. They currently use a > +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp > +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp 2011-03-16 02:30:16.000000000 +0000 > ++++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp 2011-05-04 11:57:15.088471194 +0100 > +@@ -86,6 +86,9 @@ > + > + static void rebuild_cpu_to_node_map(); > + static GrowableArray* cpu_to_node() { return _cpu_to_node; } > ++ > ++ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); > ++ > + public: > + static void init_thread_fpu_state(); > + static int get_fpu_control_word(); > diff -r d8750486e54c patches/openjdk/7037939-hugepage.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/openjdk/7037939-hugepage.patch Thu May 12 11:47:29 2011 +0100 > @@ -0,0 +1,71 @@ > + > +# HG changeset patch > +# User iveresov > +# Date 1303843594 25200 > +# Node ID c303b3532d4ada074facc42292219952c2a4204e > +# Parent d6cdc6c77582408f6450bdda3ffc831d44298714 > +7037939: NUMA: Disable adaptive resizing if SHM large pages are used > +Summary: Make the NUMA allocator behave properly with SHM and ISM large pages. > +Reviewed-by: ysr > + > +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp Sat Apr 23 04:20:09 2011 -0700 > ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Apr 26 11:46:34 2011 -0700 > +@@ -4170,6 +4170,23 @@ jint os::init_2(void) > + UseNUMA = false; > + } > + } > ++ // With SHM large pages we cannot uncommit a page, so there's not way > ++ // we can make the adaptive lgrp chunk resizing work. If the user specified > ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and > ++ // disable adaptive resizing. > ++ if (UseNUMA && UseLargePages && UseSHM) { > ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { > ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { > ++ UseLargePages = false; > ++ } else { > ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); > ++ UseAdaptiveSizePolicy = false; > ++ UseAdaptiveNUMAChunkSizing = false; > ++ } > ++ } else { > ++ UseNUMA = false; > ++ } > ++ } > + if (!UseNUMA && ForceNUMA) { > + UseNUMA = true; > + } > +--- openjdk.patched/hotspot/src/os/solaris/vm/os_solaris.cpp Sat Apr 23 04:20:09 2011 -0700 > ++++ openjdk/hotspot/src/os/solaris/vm/os_solaris.cpp Tue Apr 26 11:46:34 2011 -0700 > +@@ -2826,7 +2826,9 @@ void os::realign_memory(char *addr, size > + void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { > + assert((intptr_t)addr % alignment_hint == 0, "Address should be aligned."); > + assert((intptr_t)(addr + bytes) % alignment_hint == 0, "End should be aligned."); > +- Solaris::set_mpss_range(addr, bytes, alignment_hint); > ++ if (UseLargePages && UseMPSS) { > ++ Solaris::set_mpss_range(addr, bytes, alignment_hint); > ++ } > + } > + > + // Tell the OS to make the range local to the first-touching LWP > +@@ -5041,6 +5043,20 @@ jint os::init_2(void) { > + FREE_C_HEAP_ARRAY(int, lgrp_ids); > + if (lgrp_num < 2) { > + // There's only one locality group, disable NUMA. > ++ UseNUMA = false; > ++ } > ++ } > ++ // ISM is not compatible with the NUMA allocator - it always allocates > ++ // pages round-robin across the lgroups. > ++ if (UseNUMA && UseLargePages && UseISM) { > ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { > ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseISM)) { > ++ UseLargePages = false; > ++ } else { > ++ warning("UseNUMA is not compatible with ISM large pages, disabling NUMA allocator"); > ++ UseNUMA = false; > ++ } > ++ } else { > + UseNUMA = false; > + } > + } > + > diff -r d8750486e54c patches/openjdk/7043564-hugepage.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/openjdk/7043564-hugepage.patch Thu May 12 11:47:29 2011 +0100 > @@ -0,0 +1,21 @@ > + > +# HG changeset patch > +# User iveresov > +# Date 1305055570 25200 > +# Node ID 97b64f73103bddbcd9d987fd13854957d2a80600 > +# Parent fc2b798ab316df025526f208aeeef19609ad51b3 > +7043564: compile warning and copyright fixes > +Summary: Fixed the warning, also fixed copyrights in a bunch of files. > +Reviewed-by: johnc, kvn > + > +--- openjdk.prev/hotspot/src/os/linux/vm/os_linux.cpp Tue May 10 00:33:21 2011 -0700 > ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue May 10 12:26:10 2011 -0700 > +@@ -2850,7 +2850,7 @@ bool os::Linux::hugetlbfs_sanity_check(b > + char chars[257]; > + long x = 0; > + if (fgets(chars, sizeof(chars), fp)) { > +- if (sscanf(chars, "%lx-%*lx", &x) == 1 > ++ if (sscanf(chars, "%lx-%*x", &x) == 1 > + && x == (long)p) { > + if (strstr (chars, "hugepage")) { > + result = true; -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at redhat.com Thu May 12 09:52:03 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 12 May 2011 12:52:03 -0400 Subject: RFC: replace rmi_amd64.patch with upstream's fix in icedtea6 Message-ID: <4DCC1033.5090509@redhat.com> Hi, Upstream has applied an improved version of patches/rmi_amd64.patch. I would like to add that patch to icedtea6 and remove rmi_amd64. Patch is attached. Not sure if I should add a NEWS entry or not. I have left it out for now. ChangeLog 2011-05-12 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Remove rmi_amd64.patch. Add 7043921-java_rmi_cgi.patch * patches/openjdk/7043921-java_rmi_cgi.patch: New file. * patches/rmi_amd64.patch: Remove. Any comments or concerns? Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-java-rmi-cgi.patch Type: text/x-patch Size: 2236 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110512/d0194a12/icedtea6-java-rmi-cgi.patch From dlila at redhat.com Thu May 12 09:54:48 2011 From: dlila at redhat.com (Denis Lila) Date: Thu, 12 May 2011 12:54:48 -0400 (EDT) Subject: [RFC][icedtea6-{head,1.10}] request to backport In-Reply-To: <20110512164110.GC31710@rivendell.middle-earth.co.uk> Message-ID: <1815132394.15176.1305219288505.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> > This looks fine for HEAD. There doesn't seem to be a patch attached > for 1.10. I didn't include it because the patch for 1.10 would be almost exactly the same. The only differences would be the Makefile.am and NEWS hunks. The actual patch in patches/openjdk would be the same. Anyway, I attached it in this e-mail. > I presume 1.8 & 1.9 are not affected? That's right. Regards, Denis. ----- Original Message ----- > On 12:03 Thu 12 May , Denis Lila wrote: > > Hi. > > > > I would like to backport the fix of S7043054. This is a > > fix for a regression caused by backporting the parallelogram > > pipes. 1.10 and head are affected, and the patch should go > > into both. > > > > ChangeLog: > > +2011-05-12 Denis Lila > > + > > + * Makefile.am: Apply patch. > > + * NEWS: Update with backport. > > + * patches/openjdk/pgram-pipe-regression.patch: Fix regression a > > + where the wrong user space bounds would be passed to user supplied > > + paint object. > > + > > > > > > Ok to push? > > > > > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and IcedTea > http://www.gnu.org/software/classpath > http://icedtea.classpath.org > PGP Key: F5862A37 (https://keys.indymedia.org/) > Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 -------------- next part -------------- A non-text attachment was scrubbed... Name: pgramRegression110.patch Type: text/x-patch Size: 26744 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110512/eba00757/pgramRegression110.patch From ahughes at redhat.com Thu May 12 09:57:04 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 17:57:04 +0100 Subject: Fwd: Re: [icedtea-web] xml output for junit, transformation sheets for daily report In-Reply-To: <4DCBC298.50300@redhat.com> References: <4DC8172F.7020009@redhat.com> <20110509192447.GF22437@rivendell.middle-earth.co.uk> <4DCA866C.1070204@redhat.com> <20110511135224.GF5351@rivendell.middle-earth.co.uk> <4DCAA611.5000909@redhat.com> <20110511212149.GT5351@rivendell.middle-earth.co.uk> <4DCBC298.50300@redhat.com> Message-ID: <20110512165704.GE31710@rivendell.middle-earth.co.uk> On 13:20 Thu 12 May , Jiri Vanek wrote: snip... > > My intention is really not to provide final html. It is to provide data, > and some simple possibility to view them. Javascript have evolved into > quite sufficient language, quite perfect for this usage. I see no reason > why use xsltproc instead of it. I'm pretty sure that this solution is > working in all common gui-based linux browser. In case somebody still > prefer commandline browser then the xml is more suitable for him. > What contradicts this is the fact you had to have two cases in the Javascript to handle different browsers. I presume, now you removed the ActiveX solution, it doesn't work on Internet Explorer any more. I don't like making assumptions about end users. Not only may it not work on some browsers, people do perfectly legitimately disable Javascript or restrict it to certain sites. Processing the XML post-test using xsltproc has the advantage that there is only a requirement on the machine producing the test results, rather than every client viewing it. > >> As mentioned at the top, index.html is overview after make check and > >> make distcheck - especially for the one who made the build. > >> > > > > I still think something like xsltproc to generate the final HTML > > would be preferable. Doing things in web pages tends to be horrible > > to support across multiple browsers. > > Except M$IE javascript is moreover united IMHO. > > Which browsers did you test? As I said, even if it works on a browser, it doesn't mean it's enabled. On a side note, can we please not have all this "M$" nonsense? It seems a little childish. snip... > > > > I didn't see this post. My mailer shows the thread as started May 9th. > > Maybe it got buried during the time I was away with all the UK bank holidays. > > That is why I have threads turned off and rely more to my (full of > holes) memory :) > > Having threads on works well for most mail, as it allows me to recap the context of a discussion. You seem to have broken the thread with one of your mails, which is what caused the problem. > >> > >> Regards J. > >> > >> > > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 12 10:05:13 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 18:05:13 +0100 Subject: Release and Commit Policies In-Reply-To: <4DCBD4F3.60407@redhat.com> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBAFEA.7020306@redhat.com> <20110512123756.GC5351@rivendell.middle-earth.co.uk> <4DCBD4F3.60407@redhat.com> Message-ID: <20110512170513.GG31710@rivendell.middle-earth.co.uk> On 14:39 Thu 12 May , Jiri Vanek wrote: > Just short answer -- I need to left earlier, will return to this at the > evening: > On 05/12/2011 02:37 PM, Dr Andrew John Hughes wrote: > > On 12:01 Thu 12 May , Jiri Vanek wrote: > ...snip ... > >> > >> This is very dangerous - one single person can block patch then (maybe > >> uninterested person?) . Even when it is reviewer himself, then there is > >> no judge when two _opinions_ (just! opinions) are standing against each > >> other. > >> > > > > My point here was inspired by current events i.e. don't go and commit a patch > > which there is still ongoing discussion. > > > > The issue you raise is a difficult one that really rolls out on a > > case-by-case basis. I don't think the situation you described is what > > any of us want, but also I don't think we want patches being committed > > to which there is clear disagreement. > > > > I guess such cases have to be resolved by involving more than two people and > > getting a majority consensus. Does that sound suitable? > > > > It is exactly what I have in my mind. But there is no way, or .. is > shard... to "force" somebody to be this... "judge" or third person or > how to call her/him. > I know, but policies can only guide and not account for every occurrence. Were you ok with the change I posted? You haven't replied about it here. > Regards J. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 12 10:12:22 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 18:12:22 +0100 Subject: Release and Commit Policies In-Reply-To: <4DCBE38B.9030200@redhat.com> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBCB98.4080203@redhat.com> <20110512124225.GD5351@rivendell.middle-earth.co.uk> <4DCBE38B.9030200@redhat.com> Message-ID: <20110512171222.GH31710@rivendell.middle-earth.co.uk> On 15:41 Thu 12 May , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > Hi Andrew and Andrew :-), > > I hope my comment about tabs vs. spaces is not understood as mere > criticism (if it sounds like this it's probably caused by my bad > English, sorry). > No, not at all. That was a very helpful and useful addition by a regular contributor. > Personally I like that we have such proposals of commit policy - it > should help newcomers at least. > That was exactly the point. These are all issues that come up regularly in patch reviews and on IRC. We now have one document we can refer to and maintain over time. > Cheers, > Pavel > > > > > Of course this isn't perfect. But we need something to start with, and > > this thread has already resulted in improvements. > > > >> Andrew. > > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 12 10:19:54 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 18:19:54 +0100 Subject: RFC: replace rmi_amd64.patch with upstream's fix in icedtea6 In-Reply-To: <4DCC1033.5090509@redhat.com> References: <4DCC1033.5090509@redhat.com> Message-ID: <20110512171953.GJ31710@rivendell.middle-earth.co.uk> On 12:52 Thu 12 May , Omair Majid wrote: > Hi, > > Upstream has applied an improved version of patches/rmi_amd64.patch. I > would like to add that patch to icedtea6 and remove rmi_amd64. Patch is > attached. > > Not sure if I should add a NEWS entry or not. I have left it out for now. > > ChangeLog > 2011-05-12 Omair Majid > > * Makefile.am (ICEDTEA_PATCHES): Remove rmi_amd64.patch. Add > 7043921-java_rmi_cgi.patch > * patches/openjdk/7043921-java_rmi_cgi.patch: New file. > * patches/rmi_amd64.patch: Remove. > > Any comments or concerns? > > Cheers, > Omair Looks fine to me. Thanks for tracking this one down. I agree it doesn't need a NEWS entry as nothing has actually changed. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 12 10:23:27 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 May 2011 18:23:27 +0100 Subject: [RFC][icedtea6-{head,1.10}] request to backport In-Reply-To: <1815132394.15176.1305219288505.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <20110512164110.GC31710@rivendell.middle-earth.co.uk> <1815132394.15176.1305219288505.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <20110512172327.GK31710@rivendell.middle-earth.co.uk> On 12:54 Thu 12 May , Denis Lila wrote: > > This looks fine for HEAD. There doesn't seem to be a patch attached > > for 1.10. > > I didn't include it because the patch for 1.10 would be almost > exactly the same. The only differences would be the Makefile.am > and NEWS hunks. The actual patch in patches/openjdk would be > the same. Anyway, I attached it in this e-mail. > It was the NEWS hunk I wanted to check out as I know we've had some slip ups before. This looks fine though. Approved for 1.10. > > I presume 1.8 & 1.9 are not affected? > > That's right. > > Regards, > Denis. > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at icedtea.classpath.org Thu May 12 10:28:24 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 12 May 2011 17:28:24 +0000 Subject: /hg/icedtea6: Replace rmi_amd64.patch with upstream's improved fix Message-ID: changeset 57518374feba in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=57518374feba author: Omair Majid date: Thu May 12 13:28:05 2011 -0400 Replace rmi_amd64.patch with upstream's improved fix Upstream applied an improved version of the fix which also addressed duplicate binaries on solaris-64. Replace our custom patch with upstream's fix. 2011-05-12 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Remove rmi_amd64.patch. Add 7043921-java_rmi_cgi.patch * patches/openjdk/7043921-java_rmi_cgi.patch: New file. * patches/rmi_amd64.patch: Remove. diffstat: ChangeLog | 7 +++++ Makefile.am | 2 +- patches/openjdk/7043921-java_rmi_cgi.patch | 39 ++++++++++++++++++++++++++++++ patches/rmi_amd64.patch | 14 ---------- 4 files changed, 47 insertions(+), 15 deletions(-) diffs (89 lines): diff -r 0dad4d8420ac -r 57518374feba ChangeLog --- a/ChangeLog Thu May 12 11:22:12 2011 -0400 +++ b/ChangeLog Thu May 12 13:28:05 2011 -0400 @@ -1,3 +1,10 @@ +2011-05-12 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Remove rmi_amd64.patch. Add + 7043921-java_rmi_cgi.patch + * patches/openjdk/7043921-java_rmi_cgi.patch: New file. + * patches/rmi_amd64.patch: Remove. + 2011-05-12 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace patches/libpng.patch with diff -r 0dad4d8420ac -r 57518374feba Makefile.am --- a/Makefile.am Thu May 12 11:22:12 2011 -0400 +++ b/Makefile.am Thu May 12 13:28:05 2011 -0400 @@ -217,7 +217,7 @@ patches/version.patch \ patches/version-hotspot.patch \ patches/hotspot/$(HSBUILD)/text-relocations.patch \ - patches/rmi_amd64.patch \ + patches/openjdk/7043921-java_rmi_cgi.patch \ patches/tools.patch \ patches/use-system-tzdata.patch \ patches/headers.patch \ diff -r 0dad4d8420ac -r 57518374feba patches/openjdk/7043921-java_rmi_cgi.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7043921-java_rmi_cgi.patch Thu May 12 13:28:05 2011 -0400 @@ -0,0 +1,40 @@ +# HG changeset patch +# User ohair +# Date 1305210277 25200 +# Node ID 13fa9a0c628f58326cc376b7623a03b9d796136e +# Parent caed82420c5d01f5aaee5b15e8e37befc8db3d49 +7043921: generate java-rmi.cgi on 64 bit platform +Reviewed-by: omajid, katleman + +diff -r caed82420c5d -r 13fa9a0c628f make/sun/rmi/rmi/Makefile +--- openjdk/jdk/make/sun/rmi/rmi/Makefile Wed May 11 14:12:50 2011 -0700 ++++ openjdk/jdk/make/sun/rmi/rmi/Makefile Thu May 12 07:24:37 2011 -0700 +@@ -85,16 +85,21 @@ + sun.rmi.registry.RegistryImpl \ + sun.rmi.transport.DGCImpl + +-ifeq ($(PLATFORM), windows) +-build: stubs +-else # PLATFORM +-ifneq ($(ARCH_DATA_MODEL), 32) +-build: stubs +-else # ARCH_DATA_MODEL +-build: stubs bin ++# ++# The java-rmi.cgi script in bin/ only gets delivered in certain situations ++# ++BUILD_TARGETS = stubs ++ifeq ($(PLATFORM), linux) ++ BUILD_TARGETS += bin + endif ++ifeq ($(PLATFORM), solaris) ++ ifeq ($(ARCH_DATA_MODEL), 32) ++ BUILD_TARGETS += bin ++ endif + endif + ++build: $(BUILD_TARGETS) ++ + clean clobber:: bin.clean + + diff -r 0dad4d8420ac -r 57518374feba patches/rmi_amd64.patch --- a/patches/rmi_amd64.patch Thu May 12 11:22:12 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ ---- ../openjdk/jdk/make/sun/rmi/rmi/Makefile 2007-08-16 03:17:52.000000000 -0400 -+++ openjdk/jdk/make/sun/rmi/rmi/Makefile 2007-08-30 12:36:07.000000000 -0400 -@@ -88,12 +88,8 @@ - ifeq ($(PLATFORM), windows) - build: stubs - else # PLATFORM --ifneq ($(ARCH_DATA_MODEL), 32) --build: stubs --else # ARCH_DATA_MODEL - build: stubs bin - endif --endif - - clean clobber:: bin.clean - From omajid at redhat.com Thu May 12 10:32:29 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 12 May 2011 13:32:29 -0400 Subject: RFC: replace rmi_amd64.patch with upstream's fix in icedtea6 In-Reply-To: <20110512171953.GJ31710@rivendell.middle-earth.co.uk> References: <4DCC1033.5090509@redhat.com> <20110512171953.GJ31710@rivendell.middle-earth.co.uk> Message-ID: <4DCC19AD.2070303@redhat.com> On 05/12/2011 01:19 PM, Dr Andrew John Hughes wrote: > On 12:52 Thu 12 May , Omair Majid wrote: >> Hi, >> >> Upstream has applied an improved version of patches/rmi_amd64.patch. I >> would like to add that patch to icedtea6 and remove rmi_amd64. Patch is >> attached. >> >> Not sure if I should add a NEWS entry or not. I have left it out for now. >> >> ChangeLog >> 2011-05-12 Omair Majid >> >> * Makefile.am (ICEDTEA_PATCHES): Remove rmi_amd64.patch. Add >> 7043921-java_rmi_cgi.patch >> * patches/openjdk/7043921-java_rmi_cgi.patch: New file. >> * patches/rmi_amd64.patch: Remove. >> >> Any comments or concerns? >> >> Cheers, >> Omair > > Looks fine to me. Thanks for tracking this one down. > Thank _you_ for reviewing the patch. > I agree it doesn't need a NEWS entry as nothing has actually changed. > Actually the behaviour on solaris-64 has. solaris-64 had duplicate copies of java-rmi.cgi (in bin/ and sparv9/bin/) (I have not verified this myself). Which is why the original check for 32 bit arch was added. This fix makes sure that on linux java-rmi.cgi is always placed in bin/ and on solaris-64 it is not. Anyway, I have pushed the fix. Cheers, Omair From dlila at icedtea.classpath.org Thu May 12 10:33:33 2011 From: dlila at icedtea.classpath.org (dlila at icedtea.classpath.org) Date: Thu, 12 May 2011 17:33:33 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset 55217d6f7533 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=55217d6f7533 author: Denis Lila date: Thu May 12 13:27:51 2011 -0400 Fix regression. changeset d41db027b4ea in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d41db027b4ea author: Denis Lila date: Thu May 12 13:33:06 2011 -0400 merge diffstat: ChangeLog | 15 + Makefile.am | 5 +- NEWS | 1 + patches/openjdk/7043921-java_rmi_cgi.patch | 39 ++ patches/openjdk/pgram-pipe-regression.patch | 543 ++++++++++++++++++++++++++++ patches/rmi_amd64.patch | 14 - 6 files changed, 601 insertions(+), 16 deletions(-) diffs (truncated from 674 to 500 lines): diff -r 0dad4d8420ac -r d41db027b4ea ChangeLog --- a/ChangeLog Thu May 12 11:22:12 2011 -0400 +++ b/ChangeLog Thu May 12 13:33:06 2011 -0400 @@ -1,3 +1,18 @@ +2011-05-12 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/pgram-pipe-regression.patch: Fix regression a + where the wrong user space bounds would be passed to user supplied + paint object. + +2011-05-12 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Remove rmi_amd64.patch. Add + 7043921-java_rmi_cgi.patch + * patches/openjdk/7043921-java_rmi_cgi.patch: New file. + * patches/rmi_amd64.patch: Remove. + 2011-05-12 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace patches/libpng.patch with diff -r 0dad4d8420ac -r d41db027b4ea Makefile.am --- a/Makefile.am Thu May 12 11:22:12 2011 -0400 +++ b/Makefile.am Thu May 12 13:33:06 2011 -0400 @@ -217,7 +217,7 @@ patches/version.patch \ patches/version-hotspot.patch \ patches/hotspot/$(HSBUILD)/text-relocations.patch \ - patches/rmi_amd64.patch \ + patches/openjdk/7043921-java_rmi_cgi.patch \ patches/tools.patch \ patches/use-system-tzdata.patch \ patches/headers.patch \ @@ -338,7 +338,8 @@ patches/icedtea-hugepage-7034464.patch \ patches/icedtea-hugepage-7037939.patch \ patches/openjdk/6986968-crash_on_xim_restart.patch \ - patches/openjdk/7036754-stroker-nan.patch + patches/openjdk/7036754-stroker-nan.patch \ + patches/openjdk/pgram-pipe-regression.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 0dad4d8420ac -r d41db027b4ea NEWS --- a/NEWS Thu May 12 11:22:12 2011 -0400 +++ b/NEWS Thu May 12 13:33:06 2011 -0400 @@ -27,6 +27,7 @@ - S7018387: Xrender pipeline may leak GC's - S7036754: Stroked quads sometimes contain NaN - S7042040: Remove disk space sanity check + - S7043054: REGRESSION - wrong userBounds in Paint.createContext() * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - G356743: Support libpng 1.5. diff -r 0dad4d8420ac -r d41db027b4ea patches/openjdk/7043921-java_rmi_cgi.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7043921-java_rmi_cgi.patch Thu May 12 13:33:06 2011 -0400 @@ -0,0 +1,40 @@ +# HG changeset patch +# User ohair +# Date 1305210277 25200 +# Node ID 13fa9a0c628f58326cc376b7623a03b9d796136e +# Parent caed82420c5d01f5aaee5b15e8e37befc8db3d49 +7043921: generate java-rmi.cgi on 64 bit platform +Reviewed-by: omajid, katleman + +diff -r caed82420c5d -r 13fa9a0c628f make/sun/rmi/rmi/Makefile +--- openjdk/jdk/make/sun/rmi/rmi/Makefile Wed May 11 14:12:50 2011 -0700 ++++ openjdk/jdk/make/sun/rmi/rmi/Makefile Thu May 12 07:24:37 2011 -0700 +@@ -85,16 +85,21 @@ + sun.rmi.registry.RegistryImpl \ + sun.rmi.transport.DGCImpl + +-ifeq ($(PLATFORM), windows) +-build: stubs +-else # PLATFORM +-ifneq ($(ARCH_DATA_MODEL), 32) +-build: stubs +-else # ARCH_DATA_MODEL +-build: stubs bin ++# ++# The java-rmi.cgi script in bin/ only gets delivered in certain situations ++# ++BUILD_TARGETS = stubs ++ifeq ($(PLATFORM), linux) ++ BUILD_TARGETS += bin + endif ++ifeq ($(PLATFORM), solaris) ++ ifeq ($(ARCH_DATA_MODEL), 32) ++ BUILD_TARGETS += bin ++ endif + endif + ++build: $(BUILD_TARGETS) ++ + clean clobber:: bin.clean + + diff -r 0dad4d8420ac -r d41db027b4ea patches/openjdk/pgram-pipe-regression.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/pgram-pipe-regression.patch Thu May 12 13:33:06 2011 -0400 @@ -0,0 +1,552 @@ +# HG changeset patch +# User flar +# Date 1305155521 25200 +# Node ID f290441b0cb7f5059caab84936b363b1f45e9e2f +# Parent 85f53467c30ce903c3ea51cfea7759d9c7e39edc +7043054: REGRESSION: JDK 7 b126 : Wrong userBounds in Paint.createContext() +Reviewed-by: prr + +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/opengl/OGLRenderer.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java Wed May 11 16:12:01 2011 -0700 +@@ -102,15 +102,20 @@ + final ParallelogramPipe realpipe = oglr.getAAParallelogramPipe(); + return new ParallelogramPipe() { + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) + { + GraphicsPrimitive.tracePrimitive("OGLFillAAParallelogram"); + realpipe.fillParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, + x, y, dx1, dy1, dx2, dy2); + } + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +@@ -118,6 +123,7 @@ + { + GraphicsPrimitive.tracePrimitive("OGLDrawAAParallelogram"); + realpipe.drawParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, + x, y, dx1, dy1, dx2, dy2, + lw1, lw2); + } +@@ -166,21 +172,29 @@ + oglr.fillSpans(sg2d, si, transx, transy); + } + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) + { + GraphicsPrimitive.tracePrimitive("OGLFillParallelogram"); +- oglr.fillParallelogram(sg2d, x, y, dx1, dy1, dx2, dy2); ++ oglr.fillParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, ++ x, y, dx1, dy1, dx2, dy2); + } + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, + double lw1, double lw2) + { + GraphicsPrimitive.tracePrimitive("OGLDrawParallelogram"); +- oglr.drawParallelogram(sg2d, x, y, dx1, dy1, dx2, dy2, lw1, lw2); ++ oglr.drawParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, ++ x, y, dx1, dy1, dx2, dy2, lw1, lw2); + } + public void copyArea(SunGraphics2D sg2d, + int x, int y, int w, int h, int dx, int dy) +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/AAShapePipe.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java Wed May 11 16:12:01 2011 -0700 +@@ -68,21 +68,23 @@ + renderPath(sg, s, null); + } + +- private static Rectangle2D computeBBox(double x, double y, +- double dx1, double dy1, +- double dx2, double dy2) ++ private static Rectangle2D computeBBox(double ux1, double uy1, ++ double ux2, double uy2) + { +- double lox, loy, hix, hiy; +- lox = hix = x; +- loy = hiy = y; +- if (dx1 < 0) { lox += dx1; } else { hix += dx1; } +- if (dy1 < 0) { loy += dy1; } else { hiy += dy1; } +- if (dx2 < 0) { lox += dx2; } else { hix += dx2; } +- if (dy2 < 0) { loy += dy2; } else { hiy += dy2; } +- return new Rectangle2D.Double(lox, loy, hix-lox, hiy-loy); ++ if ((ux2 -= ux1) < 0) { ++ ux1 += ux2; ++ ux2 = -ux2; ++ } ++ if ((uy2 -= uy1) < 0) { ++ uy1 += uy2; ++ uy2 = -uy2; ++ } ++ return new Rectangle2D.Double(ux1, uy1, ux2, uy2); + } + + public void fillParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) +@@ -97,10 +99,12 @@ + return; + } + +- renderTiles(sg, computeBBox(x, y, dx1, dy1, dx2, dy2), aatg, abox); ++ renderTiles(sg, computeBBox(ux1, uy1, ux2, uy2), aatg, abox); + } + + public void drawParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +@@ -118,7 +122,7 @@ + + // Note that bbox is of the original shape, not the wide path. + // This is appropriate for handing to Paint methods... +- renderTiles(sg, computeBBox(x, y, dx1, dy1, dx2, dy2), aatg, abox); ++ renderTiles(sg, computeBBox(ux1, uy1, ux2, uy2), aatg, abox); + } + + private static byte[] theTile; +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/AlphaColorPipe.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/AlphaColorPipe.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/AlphaColorPipe.java Wed May 11 16:12:01 2011 -0700 +@@ -66,6 +66,8 @@ + } + + public void fillParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) +@@ -75,6 +77,8 @@ + } + + public void drawParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java Wed May 11 16:12:01 2011 -0700 +@@ -408,6 +408,8 @@ + } + + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) +@@ -429,6 +431,8 @@ + } + + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +@@ -454,6 +458,8 @@ + + private class AAParallelogramPipe implements ParallelogramPipe { + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) +@@ -475,6 +481,8 @@ + } + + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/LoopPipe.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java Wed May 11 16:12:01 2011 -0700 +@@ -352,6 +352,8 @@ + } + + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) +@@ -362,6 +364,8 @@ + } + + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/ParallelogramPipe.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java Wed May 11 16:12:01 2011 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2008, 2011 Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -40,9 +40,17 @@ + * => (x+dx2, y+dy2) + * => origin + * ++ * The four u[xy][12] parameters are the unsorted extreme coordinates ++ * of the primitive in user space. They may have been generated by a ++ * line or a rectangle so they could have u[xy]2 < u[xy]1 in some cases. ++ * They should be sorted before calculating the bounds of the original ++ * primitive (such as for calculating the user space bounds for the ++ * Paint.createContext() method). + */ + public interface ParallelogramPipe { + public void fillParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2); +@@ -59,6 +67,8 @@ + * difference between the outer and inner parallelograms. + */ + public void drawParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java Wed May 11 16:12:01 2011 -0700 +@@ -175,8 +175,8 @@ + } + + public boolean drawGeneralLine(SunGraphics2D sg2d, +- double x1, double y1, +- double x2, double y2) ++ double ux1, double uy1, ++ double ux2, double uy2) + { + if (sg2d.strokeState == SunGraphics2D.STROKE_CUSTOM || + sg2d.strokeState == SunGraphics2D.STROKE_THINDASHED) +@@ -194,13 +194,14 @@ + double lw = bs.getLineWidth(); + // Save the original dx, dy in case we need it to transform + // the linewidth as a perpendicular vector below +- double dx = x2 - x1; +- double dy = y2 - y1; ++ double dx = ux2 - ux1; ++ double dy = uy2 - uy1; ++ double x1, y1, x2, y2; + switch (sg2d.transformState) { + case SunGraphics2D.TRANSFORM_GENERIC: + case SunGraphics2D.TRANSFORM_TRANSLATESCALE: + { +- double coords[] = {x1, y1, x2, y2}; ++ double coords[] = {ux1, uy1, ux2, uy2}; + sg2d.transform.transform(coords, 0, coords, 0, 2); + x1 = coords[0]; + y1 = coords[1]; +@@ -213,13 +214,17 @@ + { + double tx = sg2d.transform.getTranslateX(); + double ty = sg2d.transform.getTranslateY(); +- x1 += tx; +- y1 += ty; +- x2 += tx; +- y2 += ty; ++ x1 = ux1 + tx; ++ y1 = uy1 + ty; ++ x2 = ux2 + tx; ++ y2 = uy2 + ty; + } + break; + case SunGraphics2D.TRANSFORM_ISIDENT: ++ x1 = ux1; ++ y1 = uy1; ++ x2 = ux2; ++ y2 = uy2; + break; + default: + throw new InternalError("unknown TRANSFORM state..."); +@@ -279,7 +284,8 @@ + dx += udx; + dy += udy; + } +- outrenderer.fillParallelogram(sg2d, px, py, -udy, udx, dx, dy); ++ outrenderer.fillParallelogram(sg2d, ux1, uy1, ux2, uy2, ++ px, py, -udy, udx, dx, dy); + return true; + } + +@@ -313,7 +319,8 @@ + px = newx; + py = newy; + } +- outrenderer.fillParallelogram(sg2d, px, py, dx1, dy1, dx2, dy2); ++ outrenderer.fillParallelogram(sg2d, rx, ry, rx+rw, ry+rh, ++ px, py, dx1, dy1, dx2, dy2); + } + + public void drawRectangle(SunGraphics2D sg2d, +@@ -360,10 +367,12 @@ + // entire hole in the middle of the parallelogram + // so we can just fill the outer parallelogram. + fillOuterParallelogram(sg2d, ++ rx, ry, rx+rw, ry+rh, + px, py, dx1, dy1, dx2, dy2, + len1, len2, lw1, lw2); + } else { + outrenderer.drawParallelogram(sg2d, ++ rx, ry, rx+rw, ry+rh, + px, py, dx1, dy1, dx2, dy2, + lw1 / len1, lw2 / len2); + } +@@ -377,6 +386,8 @@ + * and issues a single fillParallelogram request to fill it. + */ + public void fillOuterParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double px, double py, + double dx1, double dy1, + double dx2, double dy2, +@@ -412,6 +423,7 @@ + dx2 += udx2; + dy2 += udy2; + +- outrenderer.fillParallelogram(sg2d, px, py, dx1, dy1, dx2, dy2); ++ outrenderer.fillParallelogram(sg2d, ux1, uy1, ux2, uy2, ++ px, py, dx1, dy1, dx2, dy2); + } + } +diff -r 85f53467c30c -r f290441b0cb7 src/windows/classes/sun/java2d/d3d/D3DRenderer.java +--- openjdk.orig/jdk/src/windows/classes/sun/java2d/d3d/D3DRenderer.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/windows/classes/sun/java2d/d3d/D3DRenderer.java Wed May 11 16:12:01 2011 -0700 +@@ -102,15 +102,20 @@ + final ParallelogramPipe realpipe = d3dr.getAAParallelogramPipe(); + return new ParallelogramPipe() { + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) + { + GraphicsPrimitive.tracePrimitive("D3DFillAAParallelogram"); + realpipe.fillParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, + x, y, dx1, dy1, dx2, dy2); + } + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +@@ -118,6 +123,7 @@ + { + GraphicsPrimitive.tracePrimitive("D3DDrawAAParallelogram"); + realpipe.drawParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, + x, y, dx1, dy1, dx2, dy2, + lw1, lw2); + } +@@ -167,21 +173,29 @@ + d3dr.fillSpans(sg2d, si, transx, transy); + } + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) From dlila at redhat.com Thu May 12 10:35:26 2011 From: dlila at redhat.com (Denis Lila) Date: Thu, 12 May 2011 13:35:26 -0400 (EDT) Subject: [RFC][icedtea6-{head,1.10}] request to backport In-Reply-To: <20110512172327.GK31710@rivendell.middle-earth.co.uk> Message-ID: <1664436566.15998.1305221726277.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> > It was the NEWS hunk I wanted to check out as I know we've had some > slip ups before. Ah, right - sorry about those. > This looks fine though. Approved for 1.10. I pushed them. Thanks for the review, Denis. ----- Original Message ----- > On 12:54 Thu 12 May , Denis Lila wrote: > > > This looks fine for HEAD. There doesn't seem to be a patch > > > attached > > > for 1.10. > > > > I didn't include it because the patch for 1.10 would be almost > > exactly the same. The only differences would be the Makefile.am > > and NEWS hunks. The actual patch in patches/openjdk would be > > the same. Anyway, I attached it in this e-mail. > > > > > > > I presume 1.8 & 1.9 are not affected? > > > > That's right. > > > > Regards, > > Denis. > > > > > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and IcedTea > http://www.gnu.org/software/classpath > http://icedtea.classpath.org > PGP Key: F5862A37 (https://keys.indymedia.org/) > Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From dlila at icedtea.classpath.org Thu May 12 10:37:18 2011 From: dlila at icedtea.classpath.org (dlila at icedtea.classpath.org) Date: Thu, 12 May 2011 17:37:18 +0000 Subject: /hg/release/icedtea6-1.10: Fix regression. Message-ID: changeset 3cf29ba320c1 in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=3cf29ba320c1 author: Denis Lila date: Thu May 12 13:36:41 2011 -0400 Fix regression. diffstat: ChangeLog | 8 + Makefile.am | 3 +- NEWS | 2 + patches/openjdk/pgram-pipe-regression.patch | 543 ++++++++++++++++++++++++++++ 4 files changed, 555 insertions(+), 1 deletions(-) diffs (truncated from 596 to 500 lines): diff -r b142e8e007e6 -r 3cf29ba320c1 ChangeLog --- a/ChangeLog Tue Apr 12 15:50:57 2011 +0200 +++ b/ChangeLog Thu May 12 13:36:41 2011 -0400 @@ -1,3 +1,11 @@ +2011-05-12 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/pgram-pipe-regression.patch: Fix regression a + where the wrong user space bounds would be passed to user supplied + paint object. + 2011-04-12 Xerxes R??nby PR689: Shark fails to find LLVM 2.9 System headers during build diff -r b142e8e007e6 -r 3cf29ba320c1 Makefile.am --- a/Makefile.am Tue Apr 12 15:50:57 2011 +0200 +++ b/Makefile.am Thu May 12 13:36:41 2011 -0400 @@ -330,7 +330,8 @@ patches/mark_sun_toolkit_privileged_code.patch \ patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ - patches/shark-llvm-2.9.patch + patches/shark-llvm-2.9.patch \ + patches/openjdk/pgram-pipe-regression.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r b142e8e007e6 -r 3cf29ba320c1 NEWS --- a/NEWS Tue Apr 12 15:50:57 2011 +0200 +++ b/NEWS Thu May 12 13:36:41 2011 -0400 @@ -13,6 +13,8 @@ * Shark - PR689: Shark fails to find LLVM 2.9 System headers during build. +* Backports + - S7043054: REGRESSION - wrong userBounds in Paint.createContext() New in release 1.10.1 (2011-04-04): diff -r b142e8e007e6 -r 3cf29ba320c1 patches/openjdk/pgram-pipe-regression.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/pgram-pipe-regression.patch Thu May 12 13:36:41 2011 -0400 @@ -0,0 +1,552 @@ +# HG changeset patch +# User flar +# Date 1305155521 25200 +# Node ID f290441b0cb7f5059caab84936b363b1f45e9e2f +# Parent 85f53467c30ce903c3ea51cfea7759d9c7e39edc +7043054: REGRESSION: JDK 7 b126 : Wrong userBounds in Paint.createContext() +Reviewed-by: prr + +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/opengl/OGLRenderer.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java Wed May 11 16:12:01 2011 -0700 +@@ -102,15 +102,20 @@ + final ParallelogramPipe realpipe = oglr.getAAParallelogramPipe(); + return new ParallelogramPipe() { + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) + { + GraphicsPrimitive.tracePrimitive("OGLFillAAParallelogram"); + realpipe.fillParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, + x, y, dx1, dy1, dx2, dy2); + } + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +@@ -118,6 +123,7 @@ + { + GraphicsPrimitive.tracePrimitive("OGLDrawAAParallelogram"); + realpipe.drawParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, + x, y, dx1, dy1, dx2, dy2, + lw1, lw2); + } +@@ -166,21 +172,29 @@ + oglr.fillSpans(sg2d, si, transx, transy); + } + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) + { + GraphicsPrimitive.tracePrimitive("OGLFillParallelogram"); +- oglr.fillParallelogram(sg2d, x, y, dx1, dy1, dx2, dy2); ++ oglr.fillParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, ++ x, y, dx1, dy1, dx2, dy2); + } + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, + double lw1, double lw2) + { + GraphicsPrimitive.tracePrimitive("OGLDrawParallelogram"); +- oglr.drawParallelogram(sg2d, x, y, dx1, dy1, dx2, dy2, lw1, lw2); ++ oglr.drawParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, ++ x, y, dx1, dy1, dx2, dy2, lw1, lw2); + } + public void copyArea(SunGraphics2D sg2d, + int x, int y, int w, int h, int dx, int dy) +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/AAShapePipe.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/AAShapePipe.java Wed May 11 16:12:01 2011 -0700 +@@ -68,21 +68,23 @@ + renderPath(sg, s, null); + } + +- private static Rectangle2D computeBBox(double x, double y, +- double dx1, double dy1, +- double dx2, double dy2) ++ private static Rectangle2D computeBBox(double ux1, double uy1, ++ double ux2, double uy2) + { +- double lox, loy, hix, hiy; +- lox = hix = x; +- loy = hiy = y; +- if (dx1 < 0) { lox += dx1; } else { hix += dx1; } +- if (dy1 < 0) { loy += dy1; } else { hiy += dy1; } +- if (dx2 < 0) { lox += dx2; } else { hix += dx2; } +- if (dy2 < 0) { loy += dy2; } else { hiy += dy2; } +- return new Rectangle2D.Double(lox, loy, hix-lox, hiy-loy); ++ if ((ux2 -= ux1) < 0) { ++ ux1 += ux2; ++ ux2 = -ux2; ++ } ++ if ((uy2 -= uy1) < 0) { ++ uy1 += uy2; ++ uy2 = -uy2; ++ } ++ return new Rectangle2D.Double(ux1, uy1, ux2, uy2); + } + + public void fillParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) +@@ -97,10 +99,12 @@ + return; + } + +- renderTiles(sg, computeBBox(x, y, dx1, dy1, dx2, dy2), aatg, abox); ++ renderTiles(sg, computeBBox(ux1, uy1, ux2, uy2), aatg, abox); + } + + public void drawParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +@@ -118,7 +122,7 @@ + + // Note that bbox is of the original shape, not the wide path. + // This is appropriate for handing to Paint methods... +- renderTiles(sg, computeBBox(x, y, dx1, dy1, dx2, dy2), aatg, abox); ++ renderTiles(sg, computeBBox(ux1, uy1, ux2, uy2), aatg, abox); + } + + private static byte[] theTile; +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/AlphaColorPipe.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/AlphaColorPipe.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/AlphaColorPipe.java Wed May 11 16:12:01 2011 -0700 +@@ -66,6 +66,8 @@ + } + + public void fillParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) +@@ -75,6 +77,8 @@ + } + + public void drawParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java Wed May 11 16:12:01 2011 -0700 +@@ -408,6 +408,8 @@ + } + + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) +@@ -429,6 +431,8 @@ + } + + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +@@ -454,6 +458,8 @@ + + private class AAParallelogramPipe implements ParallelogramPipe { + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) +@@ -475,6 +481,8 @@ + } + + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/LoopPipe.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/LoopPipe.java Wed May 11 16:12:01 2011 -0700 +@@ -352,6 +352,8 @@ + } + + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) +@@ -362,6 +364,8 @@ + } + + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/ParallelogramPipe.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java Wed May 11 16:12:01 2011 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2008, 2011 Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -40,9 +40,17 @@ + * => (x+dx2, y+dy2) + * => origin + * ++ * The four u[xy][12] parameters are the unsorted extreme coordinates ++ * of the primitive in user space. They may have been generated by a ++ * line or a rectangle so they could have u[xy]2 < u[xy]1 in some cases. ++ * They should be sorted before calculating the bounds of the original ++ * primitive (such as for calculating the user space bounds for the ++ * Paint.createContext() method). + */ + public interface ParallelogramPipe { + public void fillParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2); +@@ -59,6 +67,8 @@ + * difference between the outer and inner parallelograms. + */ + public void drawParallelogram(SunGraphics2D sg, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +diff -r 85f53467c30c -r f290441b0cb7 src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java +--- openjdk.orig/jdk/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java Wed May 11 16:12:01 2011 -0700 +@@ -175,8 +175,8 @@ + } + + public boolean drawGeneralLine(SunGraphics2D sg2d, +- double x1, double y1, +- double x2, double y2) ++ double ux1, double uy1, ++ double ux2, double uy2) + { + if (sg2d.strokeState == SunGraphics2D.STROKE_CUSTOM || + sg2d.strokeState == SunGraphics2D.STROKE_THINDASHED) +@@ -194,13 +194,14 @@ + double lw = bs.getLineWidth(); + // Save the original dx, dy in case we need it to transform + // the linewidth as a perpendicular vector below +- double dx = x2 - x1; +- double dy = y2 - y1; ++ double dx = ux2 - ux1; ++ double dy = uy2 - uy1; ++ double x1, y1, x2, y2; + switch (sg2d.transformState) { + case SunGraphics2D.TRANSFORM_GENERIC: + case SunGraphics2D.TRANSFORM_TRANSLATESCALE: + { +- double coords[] = {x1, y1, x2, y2}; ++ double coords[] = {ux1, uy1, ux2, uy2}; + sg2d.transform.transform(coords, 0, coords, 0, 2); + x1 = coords[0]; + y1 = coords[1]; +@@ -213,13 +214,17 @@ + { + double tx = sg2d.transform.getTranslateX(); + double ty = sg2d.transform.getTranslateY(); +- x1 += tx; +- y1 += ty; +- x2 += tx; +- y2 += ty; ++ x1 = ux1 + tx; ++ y1 = uy1 + ty; ++ x2 = ux2 + tx; ++ y2 = uy2 + ty; + } + break; + case SunGraphics2D.TRANSFORM_ISIDENT: ++ x1 = ux1; ++ y1 = uy1; ++ x2 = ux2; ++ y2 = uy2; + break; + default: + throw new InternalError("unknown TRANSFORM state..."); +@@ -279,7 +284,8 @@ + dx += udx; + dy += udy; + } +- outrenderer.fillParallelogram(sg2d, px, py, -udy, udx, dx, dy); ++ outrenderer.fillParallelogram(sg2d, ux1, uy1, ux2, uy2, ++ px, py, -udy, udx, dx, dy); + return true; + } + +@@ -313,7 +319,8 @@ + px = newx; + py = newy; + } +- outrenderer.fillParallelogram(sg2d, px, py, dx1, dy1, dx2, dy2); ++ outrenderer.fillParallelogram(sg2d, rx, ry, rx+rw, ry+rh, ++ px, py, dx1, dy1, dx2, dy2); + } + + public void drawRectangle(SunGraphics2D sg2d, +@@ -360,10 +367,12 @@ + // entire hole in the middle of the parallelogram + // so we can just fill the outer parallelogram. + fillOuterParallelogram(sg2d, ++ rx, ry, rx+rw, ry+rh, + px, py, dx1, dy1, dx2, dy2, + len1, len2, lw1, lw2); + } else { + outrenderer.drawParallelogram(sg2d, ++ rx, ry, rx+rw, ry+rh, + px, py, dx1, dy1, dx2, dy2, + lw1 / len1, lw2 / len2); + } +@@ -377,6 +386,8 @@ + * and issues a single fillParallelogram request to fill it. + */ + public void fillOuterParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double px, double py, + double dx1, double dy1, + double dx2, double dy2, +@@ -412,6 +423,7 @@ + dx2 += udx2; + dy2 += udy2; + +- outrenderer.fillParallelogram(sg2d, px, py, dx1, dy1, dx2, dy2); ++ outrenderer.fillParallelogram(sg2d, ux1, uy1, ux2, uy2, ++ px, py, dx1, dy1, dx2, dy2); + } + } +diff -r 85f53467c30c -r f290441b0cb7 src/windows/classes/sun/java2d/d3d/D3DRenderer.java +--- openjdk.orig/jdk/src/windows/classes/sun/java2d/d3d/D3DRenderer.java Tue May 10 15:59:01 2011 -0700 ++++ openjdk/jdk/src/windows/classes/sun/java2d/d3d/D3DRenderer.java Wed May 11 16:12:01 2011 -0700 +@@ -102,15 +102,20 @@ + final ParallelogramPipe realpipe = d3dr.getAAParallelogramPipe(); + return new ParallelogramPipe() { + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) + { + GraphicsPrimitive.tracePrimitive("D3DFillAAParallelogram"); + realpipe.fillParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, + x, y, dx1, dy1, dx2, dy2); + } + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, +@@ -118,6 +123,7 @@ + { + GraphicsPrimitive.tracePrimitive("D3DDrawAAParallelogram"); + realpipe.drawParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, + x, y, dx1, dy1, dx2, dy2, + lw1, lw2); + } +@@ -167,21 +173,29 @@ + d3dr.fillSpans(sg2d, si, transx, transy); + } + public void fillParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2) + { + GraphicsPrimitive.tracePrimitive("D3DFillParallelogram"); +- d3dr.fillParallelogram(sg2d, x, y, dx1, dy1, dx2, dy2); ++ d3dr.fillParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, ++ x, y, dx1, dy1, dx2, dy2); + } + public void drawParallelogram(SunGraphics2D sg2d, ++ double ux1, double uy1, ++ double ux2, double uy2, + double x, double y, + double dx1, double dy1, + double dx2, double dy2, + double lw1, double lw2) + { + GraphicsPrimitive.tracePrimitive("D3DDrawParallelogram"); +- d3dr.drawParallelogram(sg2d, x, y, dx1, dy1, dx2, dy2, lw1, lw2); ++ d3dr.drawParallelogram(sg2d, ++ ux1, uy1, ux2, uy2, ++ x, y, dx1, dy1, dx2, dy2, lw1, lw2); + } + public void copyArea(SunGraphics2D sg2d, + int x, int y, int w, int h, int dx, int dy) +diff -r 85f53467c30c -r f290441b0cb7 test/java/awt/Paint/PgramUserBoundsTest.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/awt/Paint/PgramUserBoundsTest.java Wed May 11 16:12:01 2011 -0700 +@@ -0,0 +1,126 @@ ++/* ++ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code 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 ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++/** ++ * @test ++ * @bug 7043054 ++ * @summary Verifies that Paint objects receive the appropriate user space ++ * bounds in their createContext() method ++ * @run main PgramUserBoundsTest ++ */ ++ ++import java.awt.Color; From kelly.ohair at oracle.com Thu May 12 10:37:33 2011 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Thu, 12 May 2011 10:37:33 -0700 Subject: Reviewer needed - fix for regression test test/sun/net/www/protocol/file/DirPermissionDenied in IcedTea7 In-Reply-To: <4DCC0602.9010305@redhat.com> References: <4DCC00D1.8030906@redhat.com> <4DCC04AC.5070004@redhat.com> <4DCC0602.9010305@redhat.com> Message-ID: <26B5792E-F1EF-4879-8F1E-5C008A576C5A@oracle.com> On May 12, 2011, at 9:08 AM, Pavel Tisnovsky wrote: >> >> Any chance you could try and convince upstream OpenJDK to accept this? > > Sure, I'm going to create webrev, but I don't expect that this change > will be included in OpenJDK7 at this moment, because O7 was "closed" > from the Oracle side (AFAIK). Test changes may still be allowed in. I'm not exactly sure of the procedure at this stage, some of us have been insisting that it's only goodness to fix testcases, almost at any time. So you might try. But to be quite honest, once a release gets into this kind of lockdown phase, I try and avoid all the red-tape and avoid making any changes, just move on to the next release, which in this case is difficult without jdk8 repos... which reminds me... I need to get back to that... -kto -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110512/e8c8813a/attachment.html From jvanek at redhat.com Thu May 12 11:05:59 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 12 May 2011 20:05:59 +0200 Subject: Release and Commit Policies In-Reply-To: <20110512124225.GD5351@rivendell.middle-earth.co.uk> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBCB98.4080203@redhat.com> <20110512124225.GD5351@rivendell.middle-earth.co.uk> Message-ID: <4DCC2187.8080404@redhat.com> On 05/12/2011 02:42 PM, Dr Andrew John Hughes wrote: > On 12:59 Thu 12 May , Andrew Haley wrote: >> On 05/12/2011 02:50 AM, Dr Andrew John Hughes wrote: >>> http://icedtea.classpath.org/wiki/ReleasePolicy >>> http://icedtea.classpath.org/wiki/CommitPolicy >>> >>> These are largely explicit documentation of our current processes, >>> but comments are welcomed. >>> >>> As specified on the wiki, don't make changes to these documents >>> without first discussing it either or on the Discussion page. >> >> No, this isn't right. We can't have one developer on his own writing >> documents like these. Please rename them to "Proposed xx policy" and >> then we can have a discussion, as a community, about what a reasonable >> set of policies might be. >> > > Frankly, I find this offensive. I spend time and effort in trying to > document our *existing* policies (something no-one else has bothered to do) Someone can wonder where those existing ones come from;) > and all I receive in return is criticism. > > Of course this isn't perfect. But we need something to start with, and > this thread has already resulted in improvements. > >> Andrew. > Regards J. From asu at redhat.com Thu May 12 13:04:45 2011 From: asu at redhat.com (Andrew Su) Date: Thu, 12 May 2011 16:04:45 -0400 (EDT) Subject: [icedtea6]: Adding to AUTHORS In-Reply-To: <20110511150852.GJ5351@rivendell.middle-earth.co.uk> Message-ID: <1422108303.17301.1305230685471.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > From: "Dr Andrew John Hughes" > To: "Andrew Su" > Cc: "IcedTea" > Sent: Wednesday, May 11, 2011 11:08:52 AM > Subject: Re: [icedtea6]: Adding to AUTHORS > On 10:57 Wed 11 May , Andrew Su wrote: > > Hi, > > > > Here are some additions I want to add to the AUTHORS file. > > > > I've added: > > Denis Lila > > Marathon (Will change to full name when we get it) > > Andrew Su > > > > to the list so far. > > Please let me know if there are any other names that should be > > included. > > > > Cheers, > > Andrew > > Can't think of any. Change looks good to me. Marathon has provided me with his full name (Paul Maurer), here's the patch to update, is this okay? (will add changelog before commit) Cheers, Anrew -------------- next part -------------- A non-text attachment was scrubbed... Name: update_authors.patch Type: text/x-patch Size: 448 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110512/a368ee93/update_authors.patch From omajid at redhat.com Thu May 12 13:20:09 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 12 May 2011 16:20:09 -0400 Subject: RFC: drop patches/tools.patch from icedtea6 In-Reply-To: <4DC47811.6090405@redhat.com> References: <4DC47811.6090405@redhat.com> Message-ID: <4DCC40F9.30700@redhat.com> On 05/06/2011 06:37 PM, Omair Majid wrote: > Hi, > > The attached patch drops patches/tools.patch from icedtea6. > > tools.patch consists of 2 parts: the first part modifies > jdk/make/tools/sharing/classlist.$(PLATFORM) and the other modifies > jdk/make/java/awt/Makefile. > > As described in jdk/make/tools/sharing/README.txt, classlist.$(PLATFORM) > is the class list used in class data sharing (-Xshare). The patch > removes DebugHelper and DebugHelperStub classes, but leaves many other > classes which are not present in IcedTea6 (for example > java/util/Hashtable$EmptyEnumerator). In fact, a large changeset went > into OpenJDK7 to update this classlist [1]. As such, this part of > tools.patch is not necessary (otherwise we would see more build errors) > nor sufficient (since it leaves many other removed classes alone). > > The second part of the patch adds a phony target sources which is not > used anywhere. > > I have done a bootstrap build without a patches/tools.patch and I have > not seen any problems. > > Any thoughts on dropping the patch? Matthias, I see that this patch was > dropped once (icedtea6 changeset 2855ab5fe0e7) but you reverted it. Do > you know if the problems were caused by this patch, or was it one of the > other patches that was dropped? > > [1] http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/da5e33af0e61 Ping. Anyone have any thoughts? Cheers, Omair From omajid at redhat.com Thu May 12 13:42:46 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 12 May 2011 16:42:46 -0400 Subject: RFC: move patches/javafiles.patch to patches/ecj/ Message-ID: <4DCC4646.5090403@redhat.com> Hi, I have been looking at the patches/javafiles.patch file. It seems like it adds extra classes to the file list so those classes can be added to rt.jar. Surprisingly, I can build plain OpenJDK6 using IcedTea6 and it contains the necessary classes. Sounds to me like this patch should be a bootstrap patch. The attached patch moves it. I did icedtea6 builds both with and without bootstrap and non of the classes mentioned in patches/javafiles.patch were missing. Any thoughts? ChangeLog: 2011-05-12 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Move javafiles.patch to ... (ICEDTEA_ECJ_PATCHES): Add new patch. * patches/javafiles.patch: Move to ... * patches/ecj/javafiles.patch: New file. Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-move-javafiles-to-ecj-01.patch Type: text/x-patch Size: 17618 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110512/b525bb7d/icedtea6-move-javafiles-to-ecj-01.patch From dbhole at redhat.com Thu May 12 13:47:49 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Thu, 12 May 2011 16:47:49 -0400 Subject: [icedtea-web] RFC: Patch to allow recursive calls from NPN_GetURL Message-ID: <20110512204748.GA12268@redhat.com> Hi, This patch addresses the issue brought up here: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-April/013706.html Current plugin code does not expect NPN_getURL to make recursive calls back to Java. Firefox 4 does just that, causing the browser to hang. Attached patch wires url load calls to be handled through the standard Java -> JS call code, which can handle recursive calls. The scope of this patch is contained, and I think it should go into 1.1 as well. Thoughts? ChangeLog: 2011-05-12 Deepak Bhole * plugin/icedteanp/IcedTeaNPPlugin.cc (consume_message): Defer handling to url load request to the queue processor. * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (PluginRequestProcessor::newMessageOnBus): Handle new LoadURL command. (PluginRequestProcessor::loadURL): New method. Loads the specified url in the given target. (queue_processor): Process the LoadURL command. (_loadURL): New async callback function to handle LoadURL commands. * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Add _loadURL and loadURL method declerations. * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (showDocument): Send the url load command in the standard "instance X reference Y " format. Cheers, Deepak -------------- next part -------------- diff -r 0e6b12424423 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed May 11 14:56:32 2011 +0100 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu May 12 16:42:16 2011 -0400 @@ -1169,26 +1169,7 @@ data = (ITNPPluginData*) instance->pdata; } - if (g_str_has_prefix (parts[2], "url")) - { - // Open the URL in a new browser window. - gchar* decoded_url = (gchar*) calloc(strlen(parts[3]) + 1, sizeof(gchar)); - IcedTeaPluginUtilities::decodeURL(parts[3], &decoded_url); - - PLUGIN_DEBUG ("plugin_in_pipe_callback: opening URL %s\n", decoded_url); - PLUGIN_DEBUG ("plugin_in_pipe_callback: URL target %s\n", parts[4]); - - NPError np_error = - (*browser_functions.geturlnotify) (data->owner, decoded_url, parts[4], NULL); - - - if (np_error != NPERR_NO_ERROR) - PLUGIN_ERROR ("Failed to load URL."); - - g_free(decoded_url); - decoded_url = NULL; - } - else if (g_str_has_prefix (parts[2], "status")) + if (g_str_has_prefix (parts[2], "status")) { // clear the "instance X status" parts diff -r 0e6b12424423 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Wed May 11 14:56:32 2011 +0100 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu May 12 16:42:16 2011 -0400 @@ -130,11 +130,12 @@ !command->find("GetSlot") || !command->find("SetSlot") || !command->find("Eval") || - !command->find("Finalize")) + !command->find("Finalize") || + !command->find("LoadURL")) { // Update queue synchronously - pthread_mutex_lock(&message_queue_mutex); + pthread_mutex_lock(&message_queue_mutex); message_queue->push_back(message_parts); pthread_mutex_unlock(&message_queue_mutex); @@ -714,6 +715,38 @@ plugin_to_java_bus->post(response.c_str()); } +/** + * Fetches the URL and loads it into the given target + * + * @param message_parts The request message. + */ +void +PluginRequestProcessor::loadURL(std::vector* message_parts) +{ + + int id = atoi(message_parts->at(1)->c_str()); + + AsyncCallThreadData thread_data = AsyncCallThreadData(); + thread_data.result_ready = false; + thread_data.parameters = std::vector(); + thread_data.result = std::string(); + + NPP instance; + get_instance_from_id(id, instance); + + // If instance is invalid, do not proceed further + if (!instance) + return; + + thread_data.parameters.push_back(instance); + thread_data.parameters.push_back(message_parts->at(5)); // push url + thread_data.parameters.push_back(message_parts->at(6)); // push target + + thread_data.result_ready = false; + browser_functions.pluginthreadasynccall(instance, &_loadURL, &thread_data); + while (!thread_data.result_ready) usleep(2000); // wait till ready +} + static void queue_cleanup(void* data) { @@ -794,6 +827,12 @@ pthread_mutex_lock(&syn_write_mutex); processor->finalize(message_parts); pthread_mutex_unlock(&syn_write_mutex); + } else if (command == "LoadURL") // For instance X url + { + // write methods are synchronized + pthread_mutex_lock(&syn_write_mutex); + processor->loadURL(message_parts); + pthread_mutex_unlock(&syn_write_mutex); } else { // Nothing matched @@ -1014,3 +1053,34 @@ PLUGIN_DEBUG("_getString returning\n"); } +void +_loadURL(void* data) { + + PLUGIN_DEBUG("_loadURL called\n"); + + NPP instance; + std::string* url; + std::string* target; + + std::vector parameters = ((AsyncCallThreadData*) data)->parameters; + + instance = (NPP) parameters.at(0); + url = (std::string*) parameters.at(1); + target = (std::string*) parameters.at(2); + + PLUGIN_DEBUG("Launching %s in %s\n", url->c_str(), target->c_str()); + + // Each decode can expand to 4 chars at the most + gchar* decoded_url = (gchar*) calloc(strlen(url->c_str())*4 + 1, sizeof(gchar)); + IcedTeaPluginUtilities::decodeURL(url->c_str(), &decoded_url); + + ((AsyncCallThreadData*) data)->call_successful = + (*browser_functions.geturl) (instance, decoded_url, target->c_str()); + + ((AsyncCallThreadData*) data)->result_ready = true; + + g_free(decoded_url); + decoded_url = NULL; + + PLUGIN_DEBUG("_loadURL returning %d\n", ((AsyncCallThreadData*) data)->call_successful); +} diff -r 0e6b12424423 plugin/icedteanp/IcedTeaPluginRequestProcessor.h --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Wed May 11 14:56:32 2011 +0100 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Thu May 12 16:42:16 2011 -0400 @@ -83,6 +83,7 @@ void _call(void* data); void _eval(void* data); void _getString(void* data); +void _loadURL(void* data); void* queue_processor(void* data); @@ -138,6 +139,9 @@ /* Decrements reference count for given object */ void finalize(std::vector* message_parts); + + /* Loads a URL into the specified target */ + void loadURL(std::vector* message_parts); }; #endif // __ICEDTEAPLUGINREQUESTPROCESSOR_H__ diff -r 0e6b12424423 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Wed May 11 14:56:32 2011 +0100 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Thu May 12 16:42:16 2011 -0400 @@ -928,8 +928,8 @@ */ public void showDocument(URL url, String target) { try { - // FIXME: change to postCallRequest - write("url " + UrlUtil.encode(url.toString(), "UTF-8") + " " + target); + Long reference = getRequestIdentifier(); + write("reference " + reference + " LoadURL " + UrlUtil.encode(url.toString(), "UTF-8") + " " + target); } catch (IOException exception) { // Deliberately ignore IOException. showDocument may be // called from threads other than the main thread after From bugzilla-daemon at icedtea.classpath.org Thu May 12 14:52:20 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 21:52:20 +0000 Subject: [Bug 721] New: IcedTeaPlugin.so cannot run g_main_context_iteration on a different thread unless a different GMainContext *context is used [Crashes Mozilla Nightly] Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=721 Summary: IcedTeaPlugin.so cannot run g_main_context_iteration on a different thread unless a different GMainContext *context is used [Crashes Mozilla Nightly] Product: IcedTea-Web Version: unspecified Platform: all URL: https://bugzilla.mozilla.org/show_bug.cgi?id=642117#c23 OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: alex_mayorga at yahoo.com CC: unassigned at icedtea.classpath.org #58 0x00007fd788c65525 in ?? () from /usr/lib/firefox-trunk-6.0a1/libxul.so #59 0x00007fd782a96578 in ?? () from /usr/lib/libgtk-x11-2.0.so.0 #60 0x00007fd7836a781c in g_closure_invoke (closure=0x7fd7600f8790, return_value=0x7fd760dfe2b0, n_param_values=2, param_values=0x7fd75f43f3a0, invocation_hint=0x7fd760dfe270) at /build/buildd/glib2.0-2.28.6/./gobject/gclosure.c:767 #61 0x00007fd7836b9019 in signal_emit_unlocked_R (node=, detail=0, instance=0x7fd76868db80, emission_return=0x7fd760dfe420, instance_and_params=0x7fd75f43f3a0) at /build/buildd/glib2.0-2.28.6/./gobject/gsignal.c:3252 #62 0x00007fd7836c1fa9 in g_signal_emit_valist ( instance=, signal_id=, detail=, var_args=) at /build/buildd/glib2.0-2.28.6/./gobject/gsignal.c:2993 #63 0x00007fd7836c241f in g_signal_emit (instance=, signal_id=, detail=) at /build/buildd/glib2.0-2.28.6/./gobject/gsignal.c:3040 #64 0x00007fd782bb24d1 in ?? () from /usr/lib/libgtk-x11-2.0.so.0 #65 0x00007fd782a94cff in gtk_main_do_event () from /usr/lib/libgtk-x11-2.0.so.0 #66 0x00007fd7821a27dc in ?? () from /usr/lib/libgdk-x11-2.0.so.0 #67 0x00007fd78219d73b in ?? () from /usr/lib/libgdk-x11-2.0.so.0 #68 0x00007fd78219f929 in gdk_window_process_all_updates () from /usr/lib/libgdk-x11-2.0.so.0 #69 0x00007fd78219f999 in ?? () from /usr/lib/libgdk-x11-2.0.so.0 #70 0x00007fd78217cc46 in ?? () from /usr/lib/libgdk-x11-2.0.so.0 #71 0x00007fd782fe3bcd in g_main_dispatch (context=0x7fd77e528440) at /build/buildd/glib2.0-2.28.6/./glib/gmain.c:2440 #72 g_main_context_dispatch (context=0x7fd77e528440) at /build/buildd/glib2.0-2.28.6/./glib/gmain.c:3013 #73 0x00007fd782fe43a8 in g_main_context_iterate (context=0x7fd77e528440, block=, dispatch=1, self=) at /build/buildd/glib2.0-2.28.6/./glib/gmain.c:3091 #74 0x00007fd782fe4639 in g_main_context_iteration (context=0x7fd77e528440, may_block=0) at /build/buildd/glib2.0-2.28.6/./glib/gmain.c:3154 #75 0x00007fd75e3e3f57 in JavaRequestProcessor::postAndWaitForResponse(std::basic_string, std::allocator >) () from /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/IcedTeaPlugin.so #76 0x00007fd75e3e66dd in JavaRequestProcessor::getString(std::basic_string, std::allocator >) () from /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/IcedTeaPlugin.so #77 0x00007fd75e3efda4 in PluginRequestProcessor::sendMember(std::vector, std::allocator >*, std::allocator, std::allocator >*> >*) () from /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/IcedTeaPlugin.so #78 0x00007fd75e3f0f3f in queue_processor(void*) () from /usr/lib/jvm/java-6-openjdk/jre/lib/amd64/IcedTeaPlugin.so #79 0x00007fd78a043d8c in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0 #80 0x00007fd78628604d in clone () from /lib/x86_64-linux-gnu/libc.so.6 #81 0x0000000000000000 in ?? () -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 12 14:57:13 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 21:57:13 +0000 Subject: [Bug 721] IcedTeaPlugin.so cannot run g_main_context_iteration on a different thread unless a different GMainContext *context is used [Crashes Mozilla Nightly] In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=721 --- Comment #1 from alex_mayorga 2011-05-12 21:57:12 --- alex-mayorga at VPCCW1FFXL:~$ java -version java version "1.6.0_22" OpenJDK Runtime Environment (IcedTea6 1.10.1) (6b22-1.10.1-0ubuntu1) OpenJDK 64-Bit Server VM (build 20.0-b11, mixed mode) alex-mayorga at VPCCW1FFXL:~$ uname -a Linux VPCCW1FFXL 2.6.38-8-generic #42-Ubuntu SMP Mon Apr 11 03:31:24 UTC 2011 x86_64 x86_64 x86_64 GNU/Linux -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 12 14:58:53 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 12 May 2011 21:58:53 +0000 Subject: [Bug 711] Failed to build IcedTea6.1.10 with Shark enabled In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=711 --- Comment #3 from Yoanis 2011-05-12 21:58:53 --- Created an attachment (id=534) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=534) Output obtained after running make VERBOSE=1 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 12 17:00:04 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 13 May 2011 00:00:04 +0000 Subject: [Bug 716] IcedTea7 should bootstrap with IcedTea6 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=716 --- Comment #1 from Andrew John Hughes 2011-05-13 00:00:04 --- BUILD FAILED /mnt/builder/icedtea-icedtea-bootstrap/openjdk-boot/langtools/make/build.xml:659: java.lang.NoSuchMethodError: com.sun.tools.javac.api.JavacTool.getStandardFileManager(Ljavax/tools/DiagnosticListener;Ljava/util/Locale;Ljava/nio/charset/Charset;)Lcom/sun/tools/javac/file/JavacFileManager; at GenStubs.run(Unknown Source) at GenStubs$Ant.execute(Unknown Source) at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:291) at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:106) at org.apache.tools.ant.Task.perform(Task.java:348) at org.apache.tools.ant.Target.execute(Target.java:390) at org.apache.tools.ant.Target.performTasks(Target.java:411) at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1397) at org.apache.tools.ant.Project.executeTarget(Project.java:1366) at org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41) at org.apache.tools.ant.Project.executeTargets(Project.java:1249) at org.apache.tools.ant.Main.runBuild(Main.java:801) at org.apache.tools.ant.Main.startAnt(Main.java:218) at org.apache.tools.ant.launch.Launcher.run(Launcher.java:280) at org.apache.tools.ant.launch.Launcher.main(Launcher.java:109) I believe this is due to genstubs not being called with the correct bootclasspath. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Thu May 12 17:32:40 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 13 May 2011 01:32:40 +0100 Subject: RFC: move patches/javafiles.patch to patches/ecj/ In-Reply-To: <4DCC4646.5090403@redhat.com> References: <4DCC4646.5090403@redhat.com> Message-ID: <20110513003240.GL31710@rivendell.middle-earth.co.uk> On 16:42 Thu 12 May , Omair Majid wrote: > Hi, > > I have been looking at the patches/javafiles.patch file. It seems like > it adds extra classes to the file list so those classes can be added to > rt.jar. Surprisingly, I can build plain OpenJDK6 using IcedTea6 and it > contains the necessary classes. > > Sounds to me like this patch should be a bootstrap patch. The attached > patch moves it. I did icedtea6 builds both with and without bootstrap > and non of the classes mentioned in patches/javafiles.patch were missing. > > Any thoughts? > > ChangeLog: > 2011-05-12 Omair Majid > > * Makefile.am > (ICEDTEA_PATCHES): Move javafiles.patch to ... > (ICEDTEA_ECJ_PATCHES): Add new patch. > * patches/javafiles.patch: Move to ... > * patches/ecj/javafiles.patch: New file. > > Cheers, > Omair Have you tried just removing it altogether? Can we still bootstrap? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Thu May 12 20:08:34 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 13 May 2011 03:08:34 +0000 Subject: [Bug 721] IcedTeaPlugin.so cannot run g_main_context_iteration on a different thread unless a different GMainContext *context is used [Crashes Mozilla Nightly] In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=721 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org --- Comment #2 from Andrew John Hughes 2011-05-13 03:08:33 --- 1.10.1 doesn't have a plugin included. Please take a look at about:plugins and check what version of the plugin is being used. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Thu May 12 20:10:55 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 13 May 2011 04:10:55 +0100 Subject: RFC: drop patches/tools.patch from icedtea6 In-Reply-To: <4DCC40F9.30700@redhat.com> References: <4DC47811.6090405@redhat.com> <4DCC40F9.30700@redhat.com> Message-ID: <20110513031055.GM31710@rivendell.middle-earth.co.uk> On 16:20 Thu 12 May , Omair Majid wrote: > On 05/06/2011 06:37 PM, Omair Majid wrote: > > Hi, > > > > The attached patch drops patches/tools.patch from icedtea6. > > > > tools.patch consists of 2 parts: the first part modifies > > jdk/make/tools/sharing/classlist.$(PLATFORM) and the other modifies > > jdk/make/java/awt/Makefile. > > > > As described in jdk/make/tools/sharing/README.txt, classlist.$(PLATFORM) > > is the class list used in class data sharing (-Xshare). The patch > > removes DebugHelper and DebugHelperStub classes, but leaves many other > > classes which are not present in IcedTea6 (for example > > java/util/Hashtable$EmptyEnumerator). In fact, a large changeset went > > into OpenJDK7 to update this classlist [1]. As such, this part of > > tools.patch is not necessary (otherwise we would see more build errors) > > nor sufficient (since it leaves many other removed classes alone). > > > > The second part of the patch adds a phony target sources which is not > > used anywhere. > > > > I have done a bootstrap build without a patches/tools.patch and I have > > not seen any problems. > > > > Any thoughts on dropping the patch? Matthias, I see that this patch was > > dropped once (icedtea6 changeset 2855ab5fe0e7) but you reverted it. Do > > you know if the problems were caused by this patch, or was it one of the > > other patches that was dropped? > > > > [1] http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/da5e33af0e61 > > Ping. Anyone have any thoughts? > > Cheers, > Omair Drop it. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 12 20:11:54 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 13 May 2011 04:11:54 +0100 Subject: [icedtea6]: Adding to AUTHORS In-Reply-To: <1422108303.17301.1305230685471.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <20110511150852.GJ5351@rivendell.middle-earth.co.uk> <1422108303.17301.1305230685471.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <20110513031154.GN31710@rivendell.middle-earth.co.uk> On 16:04 Thu 12 May , Andrew Su wrote: > > > ----- Original Message ----- > > From: "Dr Andrew John Hughes" > > To: "Andrew Su" > > Cc: "IcedTea" > > Sent: Wednesday, May 11, 2011 11:08:52 AM > > Subject: Re: [icedtea6]: Adding to AUTHORS > > On 10:57 Wed 11 May , Andrew Su wrote: > > > Hi, > > > > > > Here are some additions I want to add to the AUTHORS file. > > > > > > I've added: > > > Denis Lila > > > Marathon (Will change to full name when we get it) > > > Andrew Su > > > > > > to the list so far. > > > Please let me know if there are any other names that should be > > > included. > > > > > > Cheers, > > > Andrew > > > > Can't think of any. Change looks good to me. > > Marathon has provided me with his full name (Paul Maurer), here's the patch to update, is this okay? (will add changelog before commit) > > Cheers, > Anrew Fine, you can commit that one as an obvious/trivial fix. > diff -r d41db027b4ea AUTHORS > --- a/AUTHORS Thu May 12 13:33:06 2011 -0400 > +++ b/AUTHORS Thu May 12 16:02:59 2011 -0400 > @@ -22,8 +22,8 @@ > Denis Lila > DJ Lucas > Omair Majid > -Marathon > Casey Marshall > +Paul Maurer > Dan Munckton > Raif Naffah > Parag Nemade -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 12 20:14:56 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 13 May 2011 04:14:56 +0100 Subject: Release and Commit Policies In-Reply-To: <4DCC2187.8080404@redhat.com> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBCB98.4080203@redhat.com> <20110512124225.GD5351@rivendell.middle-earth.co.uk> <4DCC2187.8080404@redhat.com> Message-ID: <20110513031456.GO31710@rivendell.middle-earth.co.uk> On 20:05 Thu 12 May , Jiri Vanek wrote: > On 05/12/2011 02:42 PM, Dr Andrew John Hughes wrote: > > On 12:59 Thu 12 May , Andrew Haley wrote: > >> On 05/12/2011 02:50 AM, Dr Andrew John Hughes wrote: > >>> http://icedtea.classpath.org/wiki/ReleasePolicy > >>> http://icedtea.classpath.org/wiki/CommitPolicy > >>> > >>> These are largely explicit documentation of our current processes, > >>> but comments are welcomed. > >>> > >>> As specified on the wiki, don't make changes to these documents > >>> without first discussing it either or on the Discussion page. > >> > >> No, this isn't right. We can't have one developer on his own writing > >> documents like these. Please rename them to "Proposed xx policy" and > >> then we can have a discussion, as a community, about what a reasonable > >> set of policies might be. > >> > > > > Frankly, I find this offensive. I spend time and effort in trying to > > document our *existing* policies (something no-one else has bothered to do) > > Someone can wonder where those existing ones come from;) > They've evolved over time (this project will shortly celebrate its 4th birthday), as we've seen what works and what doesn't. IMHO, we currently have a good balance. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ptisnovs at redhat.com Fri May 13 00:08:07 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 13 May 2011 09:08:07 +0200 Subject: Reviewer needed - fix for regression test test/sun/net/www/protocol/file/DirPermissionDenied in IcedTea7 In-Reply-To: <26B5792E-F1EF-4879-8F1E-5C008A576C5A@oracle.com> References: <4DCC00D1.8030906@redhat.com> <4DCC04AC.5070004@redhat.com> <4DCC0602.9010305@redhat.com> <26B5792E-F1EF-4879-8F1E-5C008A576C5A@oracle.com> Message-ID: <4DCCD8D7.50001@redhat.com> Kelly O'Hair wrote: > > On May 12, 2011, at 9:08 AM, Pavel Tisnovsky wrote: > >>> >>> Any chance you could try and convince upstream OpenJDK to accept this? >> >> Sure, I'm going to create webrev, but I don't expect that this change >> will be included in OpenJDK7 at this moment, because O7 was "closed" >> from the Oracle side (AFAIK). > > Test changes may still be allowed in. I'm not exactly sure of the > procedure at this stage, some of > us have been insisting that it's only goodness to fix testcases, almost > at any time. > So you might try. > > But to be quite honest, once a release gets into this kind of lockdown > phase, I try and avoid all > the red-tape and avoid making any changes, just move on to the next > release, which in this case > is difficult without jdk8 repos... which reminds me... I need to get > back to that... Hi Kelly, I see. Thank you very much for this information. Cheers, Pavel > > -kto > From ptisnovs at redhat.com Fri May 13 00:32:36 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 13 May 2011 09:32:36 +0200 Subject: Reviewer needed: second fix for regression hotspot test hotspot/test/runtime/6929067/Test6929067 for IcedTea6 In-Reply-To: <20110512163023.GA31710@rivendell.middle-earth.co.uk> References: <4DCBE1FE.9080309@redhat.com> <20110512163023.GA31710@rivendell.middle-earth.co.uk> Message-ID: <4DCCDE94.30403@redhat.com> Dr Andrew John Hughes wrote: > On 15:34 Thu 12 May , Pavel Tisnovsky wrote: >> Hi all, >> >> I'd like to push second version of fix for regression hotspot test >> hotspot/test/runtime/6929067/Test6929067 for IcedTea6. This fix ensures >> that this test will work on these combinations: >> >> -32 bit JVM on an 32 bit platform >> -32 bit JVM on an 64 bit platform (pretty unusual but according to >> Oracle guys it is possible) >> -64 bit JVM on an 64 bit platform >> > > I still don't understand the second option. I don't believe there are > any build options to get such a setup. I did not manage to build 32-bit IcedTea on 64-bit JVM too, but if such simple change will make everybody happy and it does not break anything I personally think it's best to be synchronized with OpenJDK (where I was asked to change the test this way, as you probably know). > >> hg diff for IcedTea6 is stored in an attachment. Please note that older >> patch for this test is already included in IcedTea6, so no changes has >> to be made in Makefile*. >> >> Here is ChangeLog entry: >> >> 2011-05-12 Pavel Tisnovsky >> >> * patches/jtreg-6929067-fix.patch: fix this test >> so it works on any combination of JVM and platform >> (32 bit and 64 bit) >> >> >> Can anybody please review this change? >> > > Looks fine to me. Did you manage to get it upstream or are they still playing games? > I created webrev on Wed (http://cr.openjdk.java.net/~ptisnovs/jtreg-runtime-test-6929067-fix2/) and sent e-mail with review request, it took some time to respond. Pavel From aph at redhat.com Fri May 13 01:21:16 2011 From: aph at redhat.com (Andrew Haley) Date: Fri, 13 May 2011 09:21:16 +0100 Subject: Release and Commit Policies In-Reply-To: <20110512170513.GG31710@rivendell.middle-earth.co.uk> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBAFEA.7020306@redhat.com> <20110512123756.GC5351@rivendell.middle-earth.co.uk> <4DCBD4F3.60407@redhat.com> <20110512170513.GG31710@rivendell.middle-earth.co.uk> Message-ID: <4DCCE9FC.1070303@redhat.com> On 12/05/11 18:05, Dr Andrew John Hughes wrote: > On 14:39 Thu 12 May , Jiri Vanek wrote: >> Just short answer -- I need to left earlier, will return to this at the >> evening: >> On 05/12/2011 02:37 PM, Dr Andrew John Hughes wrote: >>> On 12:01 Thu 12 May , Jiri Vanek wrote: >> ...snip ... >>>> >>>> This is very dangerous - one single person can block patch then (maybe >>>> uninterested person?) . Even when it is reviewer himself, then there is >>>> no judge when two _opinions_ (just! opinions) are standing against each >>>> other. >>> >>> My point here was inspired by current events i.e. don't go and commit a patch >>> which there is still ongoing discussion. >>> >>> The issue you raise is a difficult one that really rolls out on a >>> case-by-case basis. I don't think the situation you described is what >>> any of us want, but also I don't think we want patches being committed >>> to which there is clear disagreement. >>> >>> I guess such cases have to be resolved by involving more than two people and >>> getting a majority consensus. Does that sound suitable? >> >> It is exactly what I have in my mind. But there is no way, or .. is >> shard... to "force" somebody to be this... "judge" or third person or >> how to call her/him. > > I know, but policies can only guide and not account for every occurrence. That's right. I think we need more emphasis on reaching a consensus: if the situation gets really bad then we're beyond the point where policies really help. The big risk here is revert wars, which are to be avoided like the plague. Andrew. From ptisnovs at redhat.com Fri May 13 02:20:48 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 13 May 2011 11:20:48 +0200 Subject: Reviewer needed: second fix for regression hotspot test hotspot/test/runtime/6929067/Test6929067 for IcedTea6 In-Reply-To: <20110512163023.GA31710@rivendell.middle-earth.co.uk> References: <4DCBE1FE.9080309@redhat.com> <20110512163023.GA31710@rivendell.middle-earth.co.uk> Message-ID: <4DCCF7F0.5000907@redhat.com> Dr Andrew John Hughes wrote: > On 15:34 Thu 12 May , Pavel Tisnovsky wrote: >> Hi all, >> >> > > Looks fine to me. Did you manage to get it upstream or are they still playing games? > Hi Andrew, Chris found a typo in the test script ("i585" was used instead of "i587" in a case control statement). Can you please review and approve new changes in the tests please? I've only changed the string mentioned above and date in the changelog entry: 2011-05-13 Pavel Tisnovsky * patches/jtreg-6929067-fix.patch: fix this test so it works on any combination of JVM and platform (32 bit and 64 bit) Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110513/e5fbe00c/hg_diff.ksh From ptisnovs at redhat.com Fri May 13 02:57:24 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 13 May 2011 11:57:24 +0200 Subject: Reviewer needed - fix for regression test test/sun/net/www/protocol/file/DirPermissionDenied in IcedTea7 In-Reply-To: <20110512163423.GB31710@rivendell.middle-earth.co.uk> References: <4DCC00D1.8030906@redhat.com> <20110512163423.GB31710@rivendell.middle-earth.co.uk> Message-ID: <4DCD0084.8050203@redhat.com> Dr Andrew John Hughes wrote: > On 17:46 Thu 12 May , Pavel Tisnovsky wrote: > > As mentioned in http://icedtea.classpath.org/wiki/CommitPolicy IcedTea7 > patches are applied to the IcedTea forest, not to IcedTea7 itself. For 2.0, all > patches will be removed from IcedTea7. See: > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 > > Also, this patch is wrong anyway as it adds the patch as a bootstrapping patch. Hi Andrew, if I understand correctly, I'm able to directly change files in jdk|hotspot|...etc...etc...| repo in IcedTea7-forest right? I've created hg diff against IcedTea7-forest which is stored in an attachment, but I'm not sure when to store Changelog entry - or are commit messages enough to keep track of changes? Cheers, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110513/24300eb9/hg_diff.ksh From aph at redhat.com Fri May 13 03:23:24 2011 From: aph at redhat.com (Andrew Haley) Date: Fri, 13 May 2011 11:23:24 +0100 Subject: Patch: improve huge page support In-Reply-To: <20110512164708.GD31710@rivendell.middle-earth.co.uk> References: <4DC1678E.30402@redhat.com> <20110504155316.GF26415@rivendell.middle-earth.co.uk> <4DC2915A.2070304@redhat.com> <20110509132052.GA22437@rivendell.middle-earth.co.uk> <4DCAA680.8050406@redhat.com> <20110511160423.GO5351@rivendell.middle-earth.co.uk> <4DCAB5B0.2070400@redhat.com> <20110511212343.GU5351@rivendell.middle-earth.co.uk> <4DCBC4CF.10509@redhat.com> <20110512164708.GD31710@rivendell.middle-earth.co.uk> Message-ID: <4DCD069C.8030408@redhat.com> On 05/12/2011 05:47 PM, Dr Andrew John Hughes wrote: > On 12:30 Thu 12 May , Andrew Haley wrote: >> On 05/11/2011 10:23 PM, Dr Andrew John Hughes wrote: >>> On 17:13 Wed 11 May , Andrew Haley wrote: >>>> On 05/11/2011 05:04 PM, Dr Andrew John Hughes wrote: >>>>> On 16:08 Wed 11 May , Andrew Haley wrote: >>>>>> >>>>> >>>>> snip... >>>>> >>>>>> I won't bother with 1.8. I'll push to 1.9 and 1.10. >>>>>> >>>>> >>>>> Ok, post the patches and I'll approve them for those branches. >>>> >>>> Righto. I'll do that once you have renamed the patch files. Let me >>>> know. >>>> >>> >>> I still can't build IcedTea6. Did you push the build fix for this, in one form or another? >> >> I'm surprised by this: AFAIK this is a Debian-only gcc bug. >> > > Make it a Debian and Gentoo issue. This is the problem with having -Werror on. OK, I'm doing a bit more digging to try to find out the real cause of this. We should be able to find some build flags that are compatible with all GNU/Linux distros so that this sort of thing doesn't happen again. > I agree and was planning to do the same thing. Do you know if they discussed > this on the mailing list? I really dislike bundling unrelated fixes in this > manner. I saw nothing. >> OK to commit? >> > > Looks ok for HEAD to me, assuming it still builds. OK. I don't understand the "assuming it still builds" issue, though. It always has built for me. Andrew. From aph at icedtea.classpath.org Fri May 13 04:17:31 2011 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Fri, 13 May 2011 11:17:31 +0000 Subject: /hg/icedtea6: Fix Debian gcc problem, move huge page patches. Message-ID: changeset 320b7ef798ed in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=320b7ef798ed author: aph date: Fri May 13 12:16:44 2011 +0100 Fix Debian gcc problem, move huge page patches. 2011-05-12 Andrew Haley Rename icedtea-hugepage-7034464.patch -> openjdk/7034464-hugepage.patch icedtea- hugepage-7037939.patch -> openjdk/7037939-hugepage.patch * patches/openjdk/7043564-hugepage.patch: Import from upstream. * Makefile.am: move patches, add new patch. diffstat: ChangeLog | 7 + Makefile.am | 7 +- patches/icedtea-hugepage-7034464.patch | 454 --------------------------------- patches/icedtea-hugepage-7037939.patch | 69 ----- patches/openjdk/7034464-hugepage.patch | 454 +++++++++++++++++++++++++++++++++ patches/openjdk/7037939-hugepage.patch | 69 +++++ patches/openjdk/7043564-hugepage.patch | 20 + 7 files changed, 554 insertions(+), 526 deletions(-) diffs (truncated from 1132 to 500 lines): diff -r d41db027b4ea -r 320b7ef798ed ChangeLog --- a/ChangeLog Thu May 12 13:33:06 2011 -0400 +++ b/ChangeLog Fri May 13 12:16:44 2011 +0100 @@ -1,3 +1,10 @@ +2011-05-12 Andrew Haley + + Rename icedtea-hugepage-7034464.patch -> openjdk/7034464-hugepage.patch + icedtea-hugepage-7037939.patch -> openjdk/7037939-hugepage.patch + * patches/openjdk/7043564-hugepage.patch: Import from upstream. + * Makefile.am: move patches, add new patch. + 2011-05-12 Denis Lila * Makefile.am: Apply patch. diff -r d41db027b4ea -r 320b7ef798ed Makefile.am --- a/Makefile.am Thu May 12 13:33:06 2011 -0400 +++ b/Makefile.am Fri May 13 12:16:44 2011 +0100 @@ -335,11 +335,12 @@ patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ patches/shark-llvm-2.9.patch \ - patches/icedtea-hugepage-7034464.patch \ - patches/icedtea-hugepage-7037939.patch \ patches/openjdk/6986968-crash_on_xim_restart.patch \ patches/openjdk/7036754-stroker-nan.patch \ - patches/openjdk/pgram-pipe-regression.patch + patches/openjdk/pgram-pipe-regression.patch \ + patches/openjdk/7034464-hugepage.patch \ + patches/openjdk/7037939-hugepage.patch \ + patches/openjdk/7043564-hugepage.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r d41db027b4ea -r 320b7ef798ed patches/icedtea-hugepage-7034464.patch --- a/patches/icedtea-hugepage-7034464.patch Thu May 12 13:33:06 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,458 +0,0 @@ -# HG changeset patch -# User iveresov -# Date 1303344724 25200 -# Node ID 139667d9836ae218ab06a74d5813a5a700a076c9 -# Parent 49a67202bc671d23d719c9e14752d80295a9e8f6 -7034464: Support transparent large pages on Linux -Summary: Support transparent huge pages on Linux available since 2.6.38 -Reviewed-by: iveresov, ysr -Contributed-by: aph at redhat.com -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp ---- openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp 2011-03-16 02:30:16.000000000 +0000 -+++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2011-05-04 11:57:15.083470027 +0100 -@@ -29,13 +29,19 @@ - // Defines Linux specific flags. They are not available on other platforms. - // - #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \ -- product(bool, UseOprofile, false, \ -- "enable support for Oprofile profiler") \ -- \ -- product(bool, UseLinuxPosixThreadCPUClocks, true, \ -- "enable fast Linux Posix clocks where available") --// NB: The default value of UseLinuxPosixThreadCPUClocks may be --// overridden in Arguments::parse_each_vm_init_arg. -+ product(bool, UseOprofile, false, \ -+ "enable support for Oprofile profiler") \ -+ \ -+ product(bool, UseLinuxPosixThreadCPUClocks, true, \ -+ "enable fast Linux Posix clocks where available") \ -+/* NB: The default value of UseLinuxPosixThreadCPUClocks may be \ -+ overridden in Arguments::parse_each_vm_init_arg. */ \ -+ \ -+ product(bool, UseHugeTLBFS, false, \ -+ "Use MAP_HUGETLB for large pages") \ -+ \ -+ product(bool, UseSHM, false, \ -+ "Use SYSV shared memory for large pages") - - // - // Defines Linux-specific default values. The flags are available on all -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-03 14:32:54.285722656 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-09 14:31:51.358502774 +0100 -@@ -2495,16 +2495,40 @@ - return res != (uintptr_t) MAP_FAILED; - } - -+// Define MAP_HUGETLB here so we can build HotSpot on old systems. -+#ifndef MAP_HUGETLB -+#define MAP_HUGETLB 0x40000 -+#endif -+ -+// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. -+#ifndef MADV_HUGEPAGE -+#define MADV_HUGEPAGE 14 -+#endif -+ - bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, - bool exec) { -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { -+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; -+ uintptr_t res = -+ (uintptr_t) ::mmap(addr, size, prot, -+ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, -+ -1, 0); -+ return res != (uintptr_t) MAP_FAILED; -+ } -+ - return commit_memory(addr, size, exec); - } - --void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } -+void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { -+ // We don't check the return value: madvise(MADV_HUGEPAGE) may not -+ // be supported or the memory may already be backed by huge pages. -+ ::madvise(addr, bytes, MADV_HUGEPAGE); -+ } -+} - - void os::free_memory(char *addr, size_t bytes) { -- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, -- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); -+ ::madvise(addr, bytes, MADV_DONTNEED); - } - - void os::numa_make_global(char *addr, size_t bytes) { -@@ -2870,7 +2894,16 @@ - static size_t _large_page_size = 0; - - bool os::large_page_init() { -- if (!UseLargePages) return false; -+ if (!UseLargePages) { -+ UseHugeTLBFS = false; -+ UseSHM = false; -+ return false; -+ } -+ -+ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { -+ // Our user has not expressed a preference, so we'll try both. -+ UseHugeTLBFS = UseSHM = true; -+ } - - if (LargePageSizeInBytes) { - _large_page_size = LargePageSizeInBytes; -@@ -2915,6 +2948,9 @@ - } - } - -+ // print a warning if any large page related flag is specified on command line -+ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); -+ - const size_t default_page_size = (size_t)Linux::page_size(); - if (_large_page_size > default_page_size) { - _page_sizes[0] = _large_page_size; -@@ -2922,6 +2958,14 @@ - _page_sizes[2] = 0; - } - -+ UseHugeTLBFS = UseHugeTLBFS && -+ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); -+ -+ if (UseHugeTLBFS) -+ UseSHM = false; -+ -+ UseLargePages = UseHugeTLBFS || UseSHM; -+ - // Large page support is available on 2.6 or newer kernel, some vendors - // (e.g. Redhat) have backported it to their 2.4 based distributions. - // We optimistically assume the support is available. If later it turns out -@@ -2936,7 +2980,7 @@ - char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { - // "exec" is passed in but not used. Creating the shared image for - // the code cache doesn't have an SHM_X executable permission to check. -- assert(UseLargePages, "only for large pages"); -+ assert(UseLargePages && UseSHM, "only for SHM large pages"); - - key_t key = IPC_PRIVATE; - char *addr; -@@ -3003,19 +3047,19 @@ - return _large_page_size; - } - --// Linux does not support anonymous mmap with large page memory. The only way --// to reserve large page memory without file backing is through SysV shared --// memory API. The entire memory region is committed and pinned upfront. --// Hopefully this will change in the future... -+// HugeTLBFS allows application to commit large page memory on demand; -+// with SysV SHM the entire memory region must be allocated as shared -+// memory. - bool os::can_commit_large_page_memory() { -- return false; -+ return UseHugeTLBFS; - } - - bool os::can_execute_large_page_memory() { -- return false; -+ return UseHugeTLBFS; - } - - // Reserve memory at an arbitrary address, only if that area is -+// Reserve memory at an arbitrary address, only if that area is - // available (and not reserved for something else). - - char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { -@@ -5009,6 +5053,43 @@ - // JSR166 - // ------------------------------------------------------- - -+bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { -+ bool result = false; -+ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, -+ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, -+ -1, 0); -+ -+ if (p != (void *) -1) { -+ // We don't know if this really is a huge page or not. -+ FILE *fp = fopen("/proc/self/maps", "r"); -+ if (fp) { -+ while (!feof(fp)) { -+ char chars[257]; -+ long x = 0; -+ if (fgets(chars, sizeof(chars), fp)) { -+ if (sscanf(chars, "%lx-%*lx", &x) == 1 -+ && x == (long)p) { -+ if (strstr (chars, "hugepage")) { -+ result = true; -+ break; -+ } -+ } -+ } -+ } -+ fclose(fp); -+ } -+ munmap (p, page_size); -+ if (result) -+ return true; -+ } -+ -+ if (warn) { -+ warning("HugeTLBFS is not supported by the operating system."); -+ } -+ -+ return result; -+} -+ - /* - * The solaris and linux implementations of park/unpark are fairly - * conservative for now, but can be improved. They currently use a -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig ---- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 14:32:53.972649764 +0100 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-04 11:57:15.085470494 +0100 -@@ -117,6 +117,10 @@ - # include - # include - -+#if __x86_64__ -+#include -+#endif -+ - #define MAX_PATH (2 * K) - - // for timer info max values which include all bits -@@ -2491,16 +2495,40 @@ - return res != (uintptr_t) MAP_FAILED; - } - -+// Define MAP_HUGETLB here so we can build HotSpot on old systems. -+#ifndef MAP_HUGETLB -+#define MAP_HUGETLB 0x40000 -+#endif -+ -+// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. -+#ifndef MADV_HUGEPAGE -+#define MADV_HUGEPAGE 14 -+#endif -+ - bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, - bool exec) { -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { -+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; -+ uintptr_t res = -+ (uintptr_t) ::mmap(addr, size, prot, -+ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, -+ -1, 0); -+ return res != (uintptr_t) MAP_FAILED; -+ } -+ - return commit_memory(addr, size, exec); - } - --void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } -+void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { -+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { -+ // We don't check the return value: madvise(MADV_HUGEPAGE) may not -+ // be supported or the memory may already be backed by huge pages. -+ ::madvise(addr, bytes, MADV_HUGEPAGE); -+ } -+} - - void os::free_memory(char *addr, size_t bytes) { -- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, -- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); -+ ::madvise(addr, bytes, MADV_DONTNEED); - } - - void os::numa_make_global(char *addr, size_t bytes) { -@@ -2544,6 +2572,21 @@ - return end; - } - -+static int sched_getcpu_syscall(void) { -+ unsigned int cpu; -+ int retval = -1; -+ -+#if __x86_64__ -+ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); -+ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); -+ retval = vgetcpu(&cpu, NULL, NULL); -+#elif __i386__ -+ retval = syscall(SYS_getcpu, &cpu, NULL, NULL); -+#endif -+ -+ return (retval == -1) ? retval : cpu; -+} -+ - extern "C" void numa_warn(int number, char *where, ...) { } - extern "C" void numa_error(char *where) { } - -@@ -2565,6 +2608,10 @@ - set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, - dlsym(RTLD_DEFAULT, "sched_getcpu"))); - -+ // If it's not, try a direct syscall. -+ if (sched_getcpu() == -1) -+ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall)); -+ - if (sched_getcpu() != -1) { // Does it work? - void *handle = dlopen("libnuma.so.1", RTLD_LAZY); - if (handle != NULL) { -@@ -2847,7 +2894,16 @@ - static size_t _large_page_size = 0; - - bool os::large_page_init() { -- if (!UseLargePages) return false; -+ if (!UseLargePages) { -+ UseHugeTLBFS = false; -+ UseSHM = false; -+ return false; -+ } -+ -+ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { -+ // Our user has not expressed a preference, so we'll try both. -+ UseHugeTLBFS = UseSHM = true; -+ } - - if (LargePageSizeInBytes) { - _large_page_size = LargePageSizeInBytes; -@@ -2892,6 +2948,9 @@ - } - } - -+ // print a warning if any large page related flag is specified on command line -+ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); -+ - const size_t default_page_size = (size_t)Linux::page_size(); - if (_large_page_size > default_page_size) { - _page_sizes[0] = _large_page_size; -@@ -2899,6 +2958,14 @@ - _page_sizes[2] = 0; - } - -+ UseHugeTLBFS = UseHugeTLBFS && -+ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); -+ -+ if (UseHugeTLBFS) -+ UseSHM = false; -+ -+ UseLargePages = UseHugeTLBFS || UseSHM; -+ - // Large page support is available on 2.6 or newer kernel, some vendors - // (e.g. Redhat) have backported it to their 2.4 based distributions. - // We optimistically assume the support is available. If later it turns out -@@ -2913,7 +2980,7 @@ - char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { - // "exec" is passed in but not used. Creating the shared image for - // the code cache doesn't have an SHM_X executable permission to check. -- assert(UseLargePages, "only for large pages"); -+ assert(UseLargePages && UseSHM, "only for SHM large pages"); - - key_t key = IPC_PRIVATE; - char *addr; -@@ -2980,19 +3047,19 @@ - return _large_page_size; - } - --// Linux does not support anonymous mmap with large page memory. The only way --// to reserve large page memory without file backing is through SysV shared --// memory API. The entire memory region is committed and pinned upfront. --// Hopefully this will change in the future... -+// HugeTLBFS allows application to commit large page memory on demand; -+// with SysV SHM the entire memory region must be allocated as shared -+// memory. - bool os::can_commit_large_page_memory() { -- return false; -+ return UseHugeTLBFS; - } - - bool os::can_execute_large_page_memory() { -- return false; -+ return UseHugeTLBFS; - } - - // Reserve memory at an arbitrary address, only if that area is -+// Reserve memory at an arbitrary address, only if that area is - // available (and not reserved for something else). - - char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { -@@ -4081,6 +4148,23 @@ - UseNUMA = false; - } - } -+ // With SHM large pages we cannot uncommit a page, so there's not way -+ // we can make the adaptive lgrp chunk resizing work. If the user specified -+ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and -+ // disable adaptive resizing. -+ if (UseNUMA && UseLargePages && UseSHM) { -+ if (!FLAG_IS_DEFAULT(UseNUMA)) { -+ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { -+ UseLargePages = false; -+ } else { -+ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); -+ UseAdaptiveSizePolicy = false; -+ UseAdaptiveNUMAChunkSizing = false; -+ } -+ } else { -+ UseNUMA = false; -+ } -+ } - if (!UseNUMA && ForceNUMA) { - UseNUMA = true; - } -@@ -4986,6 +5070,43 @@ - // JSR166 - // ------------------------------------------------------- - -+bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { -+ bool result = false; -+ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, -+ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, -+ -1, 0); -+ -+ if (p != (void *) -1) { -+ // We don't know if this really is a huge page or not. -+ FILE *fp = fopen("/proc/self/maps", "r"); -+ if (fp) { -+ while (!feof(fp)) { -+ char chars[257]; -+ long x = 0; -+ if (fgets(chars, sizeof(chars), fp)) { -+ if (sscanf(chars, "%lx-%*lx", &x) == 1 -+ && x == (long)p) { -+ if (strstr (chars, "hugepage")) { -+ result = true; -+ break; -+ } -+ } -+<+ } -+ } -+ fclose(fp); -+ } -+ munmap (p, page_size); -+ if (result) -+ return true; -+ } -+ -+ if (warn) { -+ warning("HugeTLBFS is not supported by the operating system."); -+ } -+ -+ return result; -+} -+ - /* - * The solaris and linux implementations of park/unpark are fairly - * conservative for now, but can be improved. They currently use a -diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp ---- openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp 2011-03-16 02:30:16.000000000 +0000 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp 2011-05-04 11:57:15.088471194 +0100 -@@ -86,6 +86,9 @@ - - static void rebuild_cpu_to_node_map(); - static GrowableArray* cpu_to_node() { return _cpu_to_node; } -+ -+ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); -+ - public: - static void init_thread_fpu_state(); - static int get_fpu_control_word(); diff -r d41db027b4ea -r 320b7ef798ed patches/icedtea-hugepage-7037939.patch --- a/patches/icedtea-hugepage-7037939.patch Thu May 12 13:33:06 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ - From jvanek at redhat.com Fri May 13 04:17:57 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 13 May 2011 13:17:57 +0200 Subject: Release and Commit Policies In-Reply-To: <20110512123756.GC5351@rivendell.middle-earth.co.uk> References: <20110512015049.GZ5351@rivendell.middle-earth.co.uk> <4DCBAFEA.7020306@redhat.com> <20110512123756.GC5351@rivendell.middle-earth.co.uk> Message-ID: <4DCD1365.8000809@redhat.com> >> >> This in contradiction with previous sentence. When reviewer said It >> looks ok then possible it can not be stopped by someone else >> (afterwards? Or overlap someone else "against" hints?) ? >> > > That's possible. This section probably needs to be expanded to: > > "The review process should continue until the majority of reviewers > are happy with the patch. Where there is divided opinion, the input > of other developers should be sought in order to allow the discussion > to reach an appropriate conclusion. The review process may involve > several revisions of the patch being posted, in order to rectify any > perceived shortcomings. Unless otherwise stated by the reviewer, it > should be assumed that the new version of the patch should be posted > and an acknowledgement acquired before the patch is committed." > > Does that help? > >> Its getting closer to study of law instead of information technologies :) But yes. Its better. But maybe still worthy of future discussion. Thanx for it. J. From bugzilla-daemon at icedtea.classpath.org Fri May 13 05:45:05 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 13 May 2011 12:45:05 +0000 Subject: [Bug 721] IcedTeaPlugin.so cannot run g_main_context_iteration on a different thread unless a different GMainContext *context is used [Crashes Mozilla Nightly] In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=721 --- Comment #3 from Deepak Bhole 2011-05-13 12:45:04 --- Thanks for reporting this. I became aware of the issue a few days ago when trying to figure out issues w/ chromium. I have started working on it, but unfortunately it is not going to be easy to fix, so it will have to be deferred to 1.1.1. This should remained assigned to icedtea-web. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From asu at icedtea.classpath.org Fri May 13 06:03:35 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Fri, 13 May 2011 13:03:35 +0000 Subject: /hg/icedtea6: Updated AUTHORS. Message-ID: changeset 73869cc50c8c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=73869cc50c8c author: Andrew Su date: Fri May 13 09:05:45 2011 -0400 Updated AUTHORS. diffstat: AUTHORS | 2 +- ChangeLog | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 320b7ef798ed -r 73869cc50c8c AUTHORS --- a/AUTHORS Fri May 13 12:16:44 2011 +0100 +++ b/AUTHORS Fri May 13 09:05:45 2011 -0400 @@ -22,8 +22,8 @@ Denis Lila DJ Lucas Omair Majid -Marathon Casey Marshall +Paul Maurer Dan Munckton Raif Naffah Parag Nemade diff -r 320b7ef798ed -r 73869cc50c8c ChangeLog --- a/ChangeLog Fri May 13 12:16:44 2011 +0100 +++ b/ChangeLog Fri May 13 09:05:45 2011 -0400 @@ -1,3 +1,7 @@ +2011-05-12 Andrew Su + + * AUTHORS: Updated name. + 2011-05-12 Andrew Haley Rename icedtea-hugepage-7034464.patch -> openjdk/7034464-hugepage.patch From aph at redhat.com Fri May 13 08:03:59 2011 From: aph at redhat.com (Andrew Haley) Date: Fri, 13 May 2011 16:03:59 +0100 Subject: Patch: improve huge page support In-Reply-To: <20110512164708.GD31710@rivendell.middle-earth.co.uk> References: <4DC1678E.30402@redhat.com> <20110504155316.GF26415@rivendell.middle-earth.co.uk> <4DC2915A.2070304@redhat.com> <20110509132052.GA22437@rivendell.middle-earth.co.uk> <4DCAA680.8050406@redhat.com> <20110511160423.GO5351@rivendell.middle-earth.co.uk> <4DCAB5B0.2070400@redhat.com> <20110511212343.GU5351@rivendell.middle-earth.co.uk> <4DCBC4CF.10509@redhat.com> <20110512164708.GD31710@rivendell.middle-earth.co.uk> Message-ID: <4DCD485F.5010609@redhat.com> On 05/12/2011 05:47 PM, Dr Andrew John Hughes wrote: > Looks ok for HEAD to me, assuming it still builds. > > Post patches for 1.9 and 1.10 and I'll approve them. There's likely to be some > churn between HotSpot versions so I wouldn't be surprised if the patch had > to be rejigged. Probably worth checking it even still works on old versions, > as I don't know if this has dependencies on other changes. I've checked with HS19 and 20. This is the patch for icedtea6-1.10, 1.9 to follow. This is the same as trunk, 1.9 had to be reworked. Andrew. comparing with ssh://icedtea.classpath.org/hg/release/icedtea6-1.10 searching for changes changeset: 2513:092163559bb7 tag: tip user: aph date: Fri May 13 14:59:27 2011 +0100 summary: Import hugepage patches from upstream. diff -r 3cf29ba320c1 -r 092163559bb7 ChangeLog --- a/ChangeLog Thu May 12 13:36:41 2011 -0400 +++ b/ChangeLog Fri May 13 14:59:27 2011 +0100 @@ -1,3 +1,10 @@ +2011-05-13 Andrew Haley + + * patches/openjdk/7034464-hugepage.patch, + * patches/openjdk/7037939-hugepage.patch, + * patches/openjdk/7043564-hugepage.patch: Import from upstream. + * Makefile.am: add patches. + 2011-05-12 Denis Lila * Makefile.am: Apply patch. diff -r 3cf29ba320c1 -r 092163559bb7 Makefile.am --- a/Makefile.am Thu May 12 13:36:41 2011 -0400 +++ b/Makefile.am Fri May 13 14:59:27 2011 +0100 @@ -331,7 +331,10 @@ patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ patches/shark-llvm-2.9.patch \ - patches/openjdk/pgram-pipe-regression.patch + patches/openjdk/pgram-pipe-regression.patch \ + patches/openjdk/7034464-hugepage.patch \ + patches/openjdk/7037939-hugepage.patch \ + patches/openjdk/7043564-hugepage.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 3cf29ba320c1 -r 092163559bb7 patches/openjdk/7034464-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7034464-hugepage.patch Fri May 13 14:59:27 2011 +0100 @@ -0,0 +1,458 @@ +# HG changeset patch +# User iveresov +# Date 1303344724 25200 +# Node ID 139667d9836ae218ab06a74d5813a5a700a076c9 +# Parent 49a67202bc671d23d719c9e14752d80295a9e8f6 +7034464: Support transparent large pages on Linux +Summary: Support transparent huge pages on Linux available since 2.6.38 +Reviewed-by: iveresov, ysr +Contributed-by: aph at redhat.com +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp +--- openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp 2011-03-16 02:30:16.000000000 +0000 ++++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2011-05-04 11:57:15.083470027 +0100 +@@ -29,13 +29,19 @@ + // Defines Linux specific flags. They are not available on other platforms. + // + #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \ +- product(bool, UseOprofile, false, \ +- "enable support for Oprofile profiler") \ +- \ +- product(bool, UseLinuxPosixThreadCPUClocks, true, \ +- "enable fast Linux Posix clocks where available") +-// NB: The default value of UseLinuxPosixThreadCPUClocks may be +-// overridden in Arguments::parse_each_vm_init_arg. ++ product(bool, UseOprofile, false, \ ++ "enable support for Oprofile profiler") \ ++ \ ++ product(bool, UseLinuxPosixThreadCPUClocks, true, \ ++ "enable fast Linux Posix clocks where available") \ ++/* NB: The default value of UseLinuxPosixThreadCPUClocks may be \ ++ overridden in Arguments::parse_each_vm_init_arg. */ \ ++ \ ++ product(bool, UseHugeTLBFS, false, \ ++ "Use MAP_HUGETLB for large pages") \ ++ \ ++ product(bool, UseSHM, false, \ ++ "Use SYSV shared memory for large pages") + + // + // Defines Linux-specific default values. The flags are available on all +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-03 14:32:54.285722656 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-09 14:31:51.358502774 +0100 +@@ -2495,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2870,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2915,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2922,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2936,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -3003,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -5009,6 +5053,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; ++} ++ + /* + * The solaris and linux implementations of park/unpark are fairly + * conservative for now, but can be improved. They currently use a +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 14:32:53.972649764 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-04 11:57:15.085470494 +0100 +@@ -117,6 +117,10 @@ + # include + # include + ++#if __x86_64__ ++#include ++#endif ++ + #define MAX_PATH (2 * K) + + // for timer info max values which include all bits +@@ -2491,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2544,6 +2572,21 @@ + return end; + } + ++static int sched_getcpu_syscall(void) { ++ unsigned int cpu; ++ int retval = -1; ++ ++#if __x86_64__ ++ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); ++ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); ++ retval = vgetcpu(&cpu, NULL, NULL); ++#elif __i386__ ++ retval = syscall(SYS_getcpu, &cpu, NULL, NULL); ++#endif ++ ++ return (retval == -1) ? retval : cpu; ++} ++ + extern "C" void numa_warn(int number, char *where, ...) { } + extern "C" void numa_error(char *where) { } + +@@ -2565,6 +2608,10 @@ + set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, + dlsym(RTLD_DEFAULT, "sched_getcpu"))); + ++ // If it's not, try a direct syscall. ++ if (sched_getcpu() == -1) ++ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall)); ++ + if (sched_getcpu() != -1) { // Does it work? + void *handle = dlopen("libnuma.so.1", RTLD_LAZY); + if (handle != NULL) { +@@ -2847,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2892,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2899,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2913,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -2980,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -4081,6 +4148,23 @@ + UseNUMA = false; + } + } ++ // With SHM large pages we cannot uncommit a page, so there's not way ++ // we can make the adaptive lgrp chunk resizing work. If the user specified ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and ++ // disable adaptive resizing. ++ if (UseNUMA && UseLargePages && UseSHM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); ++ UseAdaptiveSizePolicy = false; ++ UseAdaptiveNUMAChunkSizing = false; ++ } ++ } else { ++ UseNUMA = false; ++ } ++ } + if (!UseNUMA && ForceNUMA) { + UseNUMA = true; + } +@@ -4986,6 +5070,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++<+ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; ++} ++ + /* + * The solaris and linux implementations of park/unpark are fairly + * conservative for now, but can be improved. They currently use a +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp 2011-03-16 02:30:16.000000000 +0000 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp 2011-05-04 11:57:15.088471194 +0100 +@@ -86,6 +86,9 @@ + + static void rebuild_cpu_to_node_map(); + static GrowableArray* cpu_to_node() { return _cpu_to_node; } ++ ++ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); ++ + public: + static void init_thread_fpu_state(); + static int get_fpu_control_word(); diff -r 3cf29ba320c1 -r 092163559bb7 patches/openjdk/7037939-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7037939-hugepage.patch Fri May 13 14:59:27 2011 +0100 @@ -0,0 +1,71 @@ + +# HG changeset patch +# User iveresov +# Date 1303843594 25200 +# Node ID c303b3532d4ada074facc42292219952c2a4204e +# Parent d6cdc6c77582408f6450bdda3ffc831d44298714 +7037939: NUMA: Disable adaptive resizing if SHM large pages are used +Summary: Make the NUMA allocator behave properly with SHM and ISM large pages. +Reviewed-by: ysr + +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp Sat Apr 23 04:20:09 2011 -0700 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Apr 26 11:46:34 2011 -0700 +@@ -4170,6 +4170,23 @@ jint os::init_2(void) + UseNUMA = false; + } + } ++ // With SHM large pages we cannot uncommit a page, so there's not way ++ // we can make the adaptive lgrp chunk resizing work. If the user specified ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and ++ // disable adaptive resizing. ++ if (UseNUMA && UseLargePages && UseSHM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); ++ UseAdaptiveSizePolicy = false; ++ UseAdaptiveNUMAChunkSizing = false; ++ } ++ } else { ++ UseNUMA = false; ++ } ++ } + if (!UseNUMA && ForceNUMA) { + UseNUMA = true; + } +--- openjdk.patched/hotspot/src/os/solaris/vm/os_solaris.cpp Sat Apr 23 04:20:09 2011 -0700 ++++ openjdk/hotspot/src/os/solaris/vm/os_solaris.cpp Tue Apr 26 11:46:34 2011 -0700 +@@ -2826,7 +2826,9 @@ void os::realign_memory(char *addr, size + void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { + assert((intptr_t)addr % alignment_hint == 0, "Address should be aligned."); + assert((intptr_t)(addr + bytes) % alignment_hint == 0, "End should be aligned."); +- Solaris::set_mpss_range(addr, bytes, alignment_hint); ++ if (UseLargePages && UseMPSS) { ++ Solaris::set_mpss_range(addr, bytes, alignment_hint); ++ } + } + + // Tell the OS to make the range local to the first-touching LWP +@@ -5041,6 +5043,20 @@ jint os::init_2(void) { + FREE_C_HEAP_ARRAY(int, lgrp_ids); + if (lgrp_num < 2) { + // There's only one locality group, disable NUMA. ++ UseNUMA = false; ++ } ++ } ++ // ISM is not compatible with the NUMA allocator - it always allocates ++ // pages round-robin across the lgroups. ++ if (UseNUMA && UseLargePages && UseISM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseISM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not compatible with ISM large pages, disabling NUMA allocator"); ++ UseNUMA = false; ++ } ++ } else { + UseNUMA = false; + } + } + diff -r 3cf29ba320c1 -r 092163559bb7 patches/openjdk/7043564-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7043564-hugepage.patch Fri May 13 14:59:27 2011 +0100 @@ -0,0 +1,21 @@ + +# HG changeset patch +# User iveresov +# Date 1305055570 25200 +# Node ID 97b64f73103bddbcd9d987fd13854957d2a80600 +# Parent fc2b798ab316df025526f208aeeef19609ad51b3 +7043564: compile warning and copyright fixes +Summary: Fixed the warning, also fixed copyrights in a bunch of files. +Reviewed-by: johnc, kvn + +--- openjdk.prev/hotspot/src/os/linux/vm/os_linux.cpp Tue May 10 00:33:21 2011 -0700 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue May 10 12:26:10 2011 -0700 +@@ -2850,7 +2850,7 @@ bool os::Linux::hugetlbfs_sanity_check(b + char chars[257]; + long x = 0; + if (fgets(chars, sizeof(chars), fp)) { +- if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ if (sscanf(chars, "%lx-%*x", &x) == 1 + && x == (long)p) { + if (strstr (chars, "hugepage")) { + result = true; From bugzilla-daemon at icedtea.classpath.org Fri May 13 08:24:37 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 13 May 2011 15:24:37 +0000 Subject: [Bug 721] IcedTeaPlugin.so cannot run g_main_context_iteration on a different thread unless a different GMainContext *context is used [Crashes Mozilla Nightly] In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=721 --- Comment #4 from alex_mayorga 2011-05-13 15:24:37 --- (In reply to comment #3) > Thanks for reporting this. I became aware of the issue a few days ago when > trying to figure out issues w/ chromium. I have started working on it, but > unfortunately it is not going to be easy to fix, so it will have to be deferred > to 1.1.1. Thanks to you for working on this! These crashes have been haunting me for months now =) FWIW there are a couple more reports I filed on Ubuntu's bug tracker for the exact same or very similar crashes on both Chromium and Firefox: https://bugs.launchpad.net/bugs/727190 https://bugs.launchpad.net/bugs/727365 Hope these help you somehow. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at redhat.com Fri May 13 09:14:11 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 13 May 2011 12:14:11 -0400 Subject: RFC: move patches/javafiles.patch to patches/ecj/ In-Reply-To: <20110513003240.GL31710@rivendell.middle-earth.co.uk> References: <4DCC4646.5090403@redhat.com> <20110513003240.GL31710@rivendell.middle-earth.co.uk> Message-ID: <4DCD58D3.40304@redhat.com> On 05/12/2011 08:32 PM, Dr Andrew John Hughes wrote: > On 16:42 Thu 12 May , Omair Majid wrote: >> Hi, >> >> I have been looking at the patches/javafiles.patch file. It seems like >> it adds extra classes to the file list so those classes can be added to >> rt.jar. Surprisingly, I can build plain OpenJDK6 using IcedTea6 and it >> contains the necessary classes. >> >> Sounds to me like this patch should be a bootstrap patch. The attached >> patch moves it. I did icedtea6 builds both with and without bootstrap >> and non of the classes mentioned in patches/javafiles.patch were missing. >> >> Any thoughts? >> >> ChangeLog: >> 2011-05-12 Omair Majid >> >> * Makefile.am >> (ICEDTEA_PATCHES): Move javafiles.patch to ... >> (ICEDTEA_ECJ_PATCHES): Add new patch. >> * patches/javafiles.patch: Move to ... >> * patches/ecj/javafiles.patch: New file. >> >> Cheers, >> Omair > > Have you tried just removing it altogether? Can we still bootstrap? Removing it completely was the first thing I attempted. But it looks like this patch is required for bootstrap: rt.jar in the bootstrap jdk does not contain the classes listed in the patch. Even java -version fails. Cheers, Omair From aph at redhat.com Fri May 13 10:17:16 2011 From: aph at redhat.com (Andrew Haley) Date: Fri, 13 May 2011 18:17:16 +0100 Subject: Patch: improve huge page support In-Reply-To: <4DCD485F.5010609@redhat.com> References: <4DC1678E.30402@redhat.com> <20110504155316.GF26415@rivendell.middle-earth.co.uk> <4DC2915A.2070304@redhat.com> <20110509132052.GA22437@rivendell.middle-earth.co.uk> <4DCAA680.8050406@redhat.com> <20110511160423.GO5351@rivendell.middle-earth.co.uk> <4DCAB5B0.2070400@redhat.com> <20110511212343.GU5351@rivendell.middle-earth.co.uk> <4DCBC4CF.10509@redhat.com> <20110512164708.GD31710@rivendell.middle-earth.co.uk> <4DCD485F.5010609@redhat.com> Message-ID: <4DCD679C.2070206@redhat.com> On 05/13/2011 04:03 PM, Andrew Haley wrote: > On 05/12/2011 05:47 PM, Dr Andrew John Hughes wrote: >> Looks ok for HEAD to me, assuming it still builds. >> >> Post patches for 1.9 and 1.10 and I'll approve them. There's likely to be some >> churn between HotSpot versions so I wouldn't be surprised if the patch had >> to be rejigged. Probably worth checking it even still works on old versions, >> as I don't know if this has dependencies on other changes. > > I've checked with HS19 and 20. This is the patch for icedtea6-1.10, 1.9 > to follow. This is the same as trunk, 1.9 had to be reworked. 1.9 is problematic in that we need different patches for HotSpot. This is a slightly tweaked version form hs18, the hs19 patch is the same as 1.10. Andrew. 2011-05-13 Andrew Haley * patches/hotspot/*/7034464-hugepage.patch, * patches/openjdk/7037939-hugepage.patch, * patches/openjdk/7043564-hugepage.patch: Import from upstream. * Makefile.am: add patches. diff -r 2f549e3a4720 Makefile.am --- a/Makefile.am Fri Apr 15 15:51:17 2011 +0200 +++ b/Makefile.am Fri May 13 18:15:09 2011 +0100 @@ -342,7 +342,10 @@ patches/openjdk/6691503-malicious-applet-always-on-top.patch \ patches/jtreg-LastErrorString.patch \ patches/shark-llvm-2.9.patch \ - patches/mark_sun_toolkit_privileged_code.patch + patches/mark_sun_toolkit_privileged_code.patch \ + patches/hotspot/$(HSBUILD)/7034464-hugepage.patch \ + patches/openjdk/7037939-hugepage.patch \ + patches/openjdk/7043564-hugepage.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 2f549e3a4720 patches/hotspot/hs19/7034464-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/hotspot/hs19/7034464-hugepage.patch Fri May 13 18:15:09 2011 +0100 @@ -0,0 +1,458 @@ +# HG changeset patch +# User iveresov +# Date 1303344724 25200 +# Node ID 139667d9836ae218ab06a74d5813a5a700a076c9 +# Parent 49a67202bc671d23d719c9e14752d80295a9e8f6 +7034464: Support transparent large pages on Linux +Summary: Support transparent huge pages on Linux available since 2.6.38 +Reviewed-by: iveresov, ysr +Contributed-by: aph at redhat.com +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp +--- openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp 2011-03-16 02:30:16.000000000 +0000 ++++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2011-05-04 11:57:15.083470027 +0100 +@@ -29,13 +29,19 @@ + // Defines Linux specific flags. They are not available on other platforms. + // + #define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \ +- product(bool, UseOprofile, false, \ +- "enable support for Oprofile profiler") \ +- \ +- product(bool, UseLinuxPosixThreadCPUClocks, true, \ +- "enable fast Linux Posix clocks where available") +-// NB: The default value of UseLinuxPosixThreadCPUClocks may be +-// overridden in Arguments::parse_each_vm_init_arg. ++ product(bool, UseOprofile, false, \ ++ "enable support for Oprofile profiler") \ ++ \ ++ product(bool, UseLinuxPosixThreadCPUClocks, true, \ ++ "enable fast Linux Posix clocks where available") \ ++/* NB: The default value of UseLinuxPosixThreadCPUClocks may be \ ++ overridden in Arguments::parse_each_vm_init_arg. */ \ ++ \ ++ product(bool, UseHugeTLBFS, false, \ ++ "Use MAP_HUGETLB for large pages") \ ++ \ ++ product(bool, UseSHM, false, \ ++ "Use SYSV shared memory for large pages") + + // + // Defines Linux-specific default values. The flags are available on all +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-03 14:32:54.285722656 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-09 14:31:51.358502774 +0100 +@@ -2495,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2870,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2915,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2922,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2936,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -3003,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -5009,6 +5053,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; ++} ++ + /* + * The solaris and linux implementations of park/unpark are fairly + * conservative for now, but can be improved. They currently use a +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 14:32:53.972649764 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-04 11:57:15.085470494 +0100 +@@ -117,6 +117,10 @@ + # include + # include + ++#if __x86_64__ ++#include ++#endif ++ + #define MAX_PATH (2 * K) + + // for timer info max values which include all bits +@@ -2491,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2544,6 +2572,21 @@ + return end; + } + ++static int sched_getcpu_syscall(void) { ++ unsigned int cpu; ++ int retval = -1; ++ ++#if __x86_64__ ++ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); ++ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); ++ retval = vgetcpu(&cpu, NULL, NULL); ++#elif __i386__ ++ retval = syscall(SYS_getcpu, &cpu, NULL, NULL); ++#endif ++ ++ return (retval == -1) ? retval : cpu; ++} ++ + extern "C" void numa_warn(int number, char *where, ...) { } + extern "C" void numa_error(char *where) { } + +@@ -2565,6 +2608,10 @@ + set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, + dlsym(RTLD_DEFAULT, "sched_getcpu"))); + ++ // If it's not, try a direct syscall. ++ if (sched_getcpu() == -1) ++ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall)); ++ + if (sched_getcpu() != -1) { // Does it work? + void *handle = dlopen("libnuma.so.1", RTLD_LAZY); + if (handle != NULL) { +@@ -2847,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2892,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2899,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2913,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -2980,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -4081,6 +4148,23 @@ + UseNUMA = false; + } + } ++ // With SHM large pages we cannot uncommit a page, so there's not way ++ // we can make the adaptive lgrp chunk resizing work. If the user specified ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and ++ // disable adaptive resizing. ++ if (UseNUMA && UseLargePages && UseSHM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); ++ UseAdaptiveSizePolicy = false; ++ UseAdaptiveNUMAChunkSizing = false; ++ } ++ } else { ++ UseNUMA = false; ++ } ++ } + if (!UseNUMA && ForceNUMA) { + UseNUMA = true; + } +@@ -4986,6 +5070,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++<+ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; ++} ++ + /* + * The solaris and linux implementations of park/unpark are fairly + * conservative for now, but can be improved. They currently use a +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp 2011-03-16 02:30:16.000000000 +0000 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp 2011-05-04 11:57:15.088471194 +0100 +@@ -86,6 +86,9 @@ + + static void rebuild_cpu_to_node_map(); + static GrowableArray* cpu_to_node() { return _cpu_to_node; } ++ ++ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); ++ + public: + static void init_thread_fpu_state(); + static int get_fpu_control_word(); diff -r 2f549e3a4720 patches/hotspot/original/7034464-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/hotspot/original/7034464-hugepage.patch Fri May 13 18:15:09 2011 +0100 @@ -0,0 +1,444 @@ +# HG changeset patch +# User iveresov +# Date 1303344724 25200 +# Node ID 139667d9836ae218ab06a74d5813a5a700a076c9 +# Parent 49a67202bc671d23d719c9e14752d80295a9e8f6 +7034464: Support transparent large pages on Linux +Summary: Support transparent huge pages on Linux available since 2.6.38 +Reviewed-by: iveresov, ysr +Contributed-by: aph at redhat.com +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/globals_linux.hpp openjdk/hotspot/src/os/linux/vm/globals_linux.hpp +--- openjdk/hotspot/src/os/linux/vm/globals_linux.hpp~ 2010-06-21 22:12:15.000000000 +0100 ++++ openjdk/hotspot/src/os/linux/vm/globals_linux.hpp 2011-05-13 15:11:07.344978229 +0100 +@@ -31,6 +31,12 @@ + \ + product(bool, UseLinuxPosixThreadCPUClocks, false, \ + "enable fast Linux Posix clocks where available") \ ++ \ ++ product(bool, UseHugeTLBFS, false, \ ++ "Use MAP_HUGETLB for large pages") \ ++ \ ++ product(bool, UseSHM, false, \ ++ "Use SYSV shared memory for large pages") + + + // +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-03 14:32:54.285722656 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2011-05-09 14:31:51.358502774 +0100 +@@ -2495,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2870,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2915,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2922,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2936,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -3003,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -5009,6 +5053,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; ++} ++ + /* + * The solaris and linux implementations of park/unpark are fairly + * conservative for now, but can be improved. They currently use a +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-03 14:32:53.972649764 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig 2011-05-04 11:57:15.085470494 +0100 +@@ -117,6 +117,10 @@ + # include + # include + ++#if __x86_64__ ++#include ++#endif ++ + #define MAX_PATH (2 * K) + + // for timer info max values which include all bits +@@ -2491,16 +2495,40 @@ + return res != (uintptr_t) MAP_FAILED; + } + ++// Define MAP_HUGETLB here so we can build HotSpot on old systems. ++#ifndef MAP_HUGETLB ++#define MAP_HUGETLB 0x40000 ++#endif ++ ++// Define MADV_HUGEPAGE here so we can build HotSpot on old systems. ++#ifndef MADV_HUGEPAGE ++#define MADV_HUGEPAGE 14 ++#endif ++ + bool os::commit_memory(char* addr, size_t size, size_t alignment_hint, + bool exec) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; ++ uintptr_t res = ++ (uintptr_t) ::mmap(addr, size, prot, ++ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB, ++ -1, 0); ++ return res != (uintptr_t) MAP_FAILED; ++ } ++ + return commit_memory(addr, size, exec); + } + +-void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { } ++void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { ++ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) { ++ // We don't check the return value: madvise(MADV_HUGEPAGE) may not ++ // be supported or the memory may already be backed by huge pages. ++ ::madvise(addr, bytes, MADV_HUGEPAGE); ++ } ++} + + void os::free_memory(char *addr, size_t bytes) { +- ::mmap(addr, bytes, PROT_READ | PROT_WRITE, +- MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); ++ ::madvise(addr, bytes, MADV_DONTNEED); + } + + void os::numa_make_global(char *addr, size_t bytes) { +@@ -2544,6 +2572,21 @@ + return end; + } + ++static int sched_getcpu_syscall(void) { ++ unsigned int cpu; ++ int retval = -1; ++ ++#if __x86_64__ ++ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache); ++ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu); ++ retval = vgetcpu(&cpu, NULL, NULL); ++#elif __i386__ ++ retval = syscall(SYS_getcpu, &cpu, NULL, NULL); ++#endif ++ ++ return (retval == -1) ? retval : cpu; ++} ++ + extern "C" void numa_warn(int number, char *where, ...) { } + extern "C" void numa_error(char *where) { } + +@@ -2565,6 +2608,10 @@ + set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, + dlsym(RTLD_DEFAULT, "sched_getcpu"))); + ++ // If it's not, try a direct syscall. ++ if (sched_getcpu() == -1) ++ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall)); ++ + if (sched_getcpu() != -1) { // Does it work? + void *handle = dlopen("libnuma.so.1", RTLD_LAZY); + if (handle != NULL) { +@@ -2847,7 +2894,16 @@ + static size_t _large_page_size = 0; + + bool os::large_page_init() { +- if (!UseLargePages) return false; ++ if (!UseLargePages) { ++ UseHugeTLBFS = false; ++ UseSHM = false; ++ return false; ++ } ++ ++ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) { ++ // Our user has not expressed a preference, so we'll try both. ++ UseHugeTLBFS = UseSHM = true; ++ } + + if (LargePageSizeInBytes) { + _large_page_size = LargePageSizeInBytes; +@@ -2892,6 +2948,9 @@ + } + } + ++ // print a warning if any large page related flag is specified on command line ++ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ + const size_t default_page_size = (size_t)Linux::page_size(); + if (_large_page_size > default_page_size) { + _page_sizes[0] = _large_page_size; +@@ -2899,6 +2958,14 @@ + _page_sizes[2] = 0; + } + ++ UseHugeTLBFS = UseHugeTLBFS && ++ Linux::hugetlbfs_sanity_check(warn_on_failure, _large_page_size); ++ ++ if (UseHugeTLBFS) ++ UseSHM = false; ++ ++ UseLargePages = UseHugeTLBFS || UseSHM; ++ + // Large page support is available on 2.6 or newer kernel, some vendors + // (e.g. Redhat) have backported it to their 2.4 based distributions. + // We optimistically assume the support is available. If later it turns out +@@ -2913,7 +2980,7 @@ + char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) { + // "exec" is passed in but not used. Creating the shared image for + // the code cache doesn't have an SHM_X executable permission to check. +- assert(UseLargePages, "only for large pages"); ++ assert(UseLargePages && UseSHM, "only for SHM large pages"); + + key_t key = IPC_PRIVATE; + char *addr; +@@ -2980,19 +3047,19 @@ + return _large_page_size; + } + +-// Linux does not support anonymous mmap with large page memory. The only way +-// to reserve large page memory without file backing is through SysV shared +-// memory API. The entire memory region is committed and pinned upfront. +-// Hopefully this will change in the future... ++// HugeTLBFS allows application to commit large page memory on demand; ++// with SysV SHM the entire memory region must be allocated as shared ++// memory. + bool os::can_commit_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + bool os::can_execute_large_page_memory() { +- return false; ++ return UseHugeTLBFS; + } + + // Reserve memory at an arbitrary address, only if that area is ++// Reserve memory at an arbitrary address, only if that area is + // available (and not reserved for something else). + + char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) { +@@ -4081,6 +4148,23 @@ + UseNUMA = false; + } + } ++ // With SHM large pages we cannot uncommit a page, so there's not way ++ // we can make the adaptive lgrp chunk resizing work. If the user specified ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and ++ // disable adaptive resizing. ++ if (UseNUMA && UseLargePages && UseSHM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); ++ UseAdaptiveSizePolicy = false; ++ UseAdaptiveNUMAChunkSizing = false; ++ } ++ } else { ++ UseNUMA = false; ++ } ++ } + if (!UseNUMA && ForceNUMA) { + UseNUMA = true; + } +@@ -4986,6 +5070,43 @@ + // JSR166 + // ------------------------------------------------------- + ++bool os::Linux::hugetlbfs_sanity_check(bool warn, size_t page_size) { ++ bool result = false; ++ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE, ++ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB, ++ -1, 0); ++ ++ if (p != (void *) -1) { ++ // We don't know if this really is a huge page or not. ++ FILE *fp = fopen("/proc/self/maps", "r"); ++ if (fp) { ++ while (!feof(fp)) { ++ char chars[257]; ++ long x = 0; ++ if (fgets(chars, sizeof(chars), fp)) { ++ if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ && x == (long)p) { ++ if (strstr (chars, "hugepage")) { ++ result = true; ++ break; ++ } ++ } ++<+ } ++ } ++ fclose(fp); ++ } ++ munmap (p, page_size); ++ if (result) ++ return true; ++ } ++ ++ if (warn) { ++ warning("HugeTLBFS is not supported by the operating system."); ++ } ++ ++ return result; ++} ++ + /* + * The solaris and linux implementations of park/unpark are fairly + * conservative for now, but can be improved. They currently use a +diff -u -r openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp openjdk/hotspot/src/os/linux/vm/os_linux.hpp +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.hpp 2011-03-16 02:30:16.000000000 +0000 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp 2011-05-04 11:57:15.088471194 +0100 +@@ -86,6 +86,9 @@ + + static void rebuild_cpu_to_node_map(); + static GrowableArray* cpu_to_node() { return _cpu_to_node; } ++ ++ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); ++ + public: + static void init_thread_fpu_state(); + static int get_fpu_control_word(); diff -r 2f549e3a4720 patches/openjdk/7037939-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7037939-hugepage.patch Fri May 13 18:15:09 2011 +0100 @@ -0,0 +1,71 @@ + +# HG changeset patch +# User iveresov +# Date 1303843594 25200 +# Node ID c303b3532d4ada074facc42292219952c2a4204e +# Parent d6cdc6c77582408f6450bdda3ffc831d44298714 +7037939: NUMA: Disable adaptive resizing if SHM large pages are used +Summary: Make the NUMA allocator behave properly with SHM and ISM large pages. +Reviewed-by: ysr + +--- openjdk.patched/hotspot/src/os/linux/vm/os_linux.cpp Sat Apr 23 04:20:09 2011 -0700 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue Apr 26 11:46:34 2011 -0700 +@@ -4170,6 +4170,23 @@ jint os::init_2(void) + UseNUMA = false; + } + } ++ // With SHM large pages we cannot uncommit a page, so there's not way ++ // we can make the adaptive lgrp chunk resizing work. If the user specified ++ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and ++ // disable adaptive resizing. ++ if (UseNUMA && UseLargePages && UseSHM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing"); ++ UseAdaptiveSizePolicy = false; ++ UseAdaptiveNUMAChunkSizing = false; ++ } ++ } else { ++ UseNUMA = false; ++ } ++ } + if (!UseNUMA && ForceNUMA) { + UseNUMA = true; + } +--- openjdk.patched/hotspot/src/os/solaris/vm/os_solaris.cpp Sat Apr 23 04:20:09 2011 -0700 ++++ openjdk/hotspot/src/os/solaris/vm/os_solaris.cpp Tue Apr 26 11:46:34 2011 -0700 +@@ -2826,7 +2826,9 @@ void os::realign_memory(char *addr, size + void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) { + assert((intptr_t)addr % alignment_hint == 0, "Address should be aligned."); + assert((intptr_t)(addr + bytes) % alignment_hint == 0, "End should be aligned."); +- Solaris::set_mpss_range(addr, bytes, alignment_hint); ++ if (UseLargePages && UseMPSS) { ++ Solaris::set_mpss_range(addr, bytes, alignment_hint); ++ } + } + + // Tell the OS to make the range local to the first-touching LWP +@@ -5041,6 +5043,20 @@ jint os::init_2(void) { + FREE_C_HEAP_ARRAY(int, lgrp_ids); + if (lgrp_num < 2) { + // There's only one locality group, disable NUMA. ++ UseNUMA = false; ++ } ++ } ++ // ISM is not compatible with the NUMA allocator - it always allocates ++ // pages round-robin across the lgroups. ++ if (UseNUMA && UseLargePages && UseISM) { ++ if (!FLAG_IS_DEFAULT(UseNUMA)) { ++ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseISM)) { ++ UseLargePages = false; ++ } else { ++ warning("UseNUMA is not compatible with ISM large pages, disabling NUMA allocator"); ++ UseNUMA = false; ++ } ++ } else { + UseNUMA = false; + } + } + diff -r 2f549e3a4720 patches/openjdk/7043564-hugepage.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7043564-hugepage.patch Fri May 13 18:15:09 2011 +0100 @@ -0,0 +1,21 @@ + +# HG changeset patch +# User iveresov +# Date 1305055570 25200 +# Node ID 97b64f73103bddbcd9d987fd13854957d2a80600 +# Parent fc2b798ab316df025526f208aeeef19609ad51b3 +7043564: compile warning and copyright fixes +Summary: Fixed the warning, also fixed copyrights in a bunch of files. +Reviewed-by: johnc, kvn + +--- openjdk.prev/hotspot/src/os/linux/vm/os_linux.cpp Tue May 10 00:33:21 2011 -0700 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Tue May 10 12:26:10 2011 -0700 +@@ -2850,7 +2850,7 @@ bool os::Linux::hugetlbfs_sanity_check(b + char chars[257]; + long x = 0; + if (fgets(chars, sizeof(chars), fp)) { +- if (sscanf(chars, "%lx-%*lx", &x) == 1 ++ if (sscanf(chars, "%lx-%*x", &x) == 1 + && x == (long)p) { + if (strstr (chars, "hugepage")) { + result = true; From bugzilla-daemon at icedtea.classpath.org Sun May 15 08:30:46 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 15 May 2011 15:30:46 +0000 Subject: [Bug 721] IcedTeaPlugin.so cannot run g_main_context_iteration on a different thread unless a different GMainContext *context is used [Crashes Mozilla Nightly] In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=721 --- Comment #5 from alex_mayorga 2011-05-15 15:30:46 --- (In reply to comment #2) > 1.10.1 doesn't have a plugin included. > > Please take a look at about:plugins and check what version of the plugin is > being used. > about:plugins reports: IcedTea-Web Plugin (using IcedTea-Web 1.1pre (1.1~20110420-0ubuntu1)) alex-mayorga at VPCCW1FFXL:~$ aptitude show icedtea-plugin Package: icedtea-plugin New: yes State: installed Automatically installed: no Version: 1.1~20110420-0ubuntu1 Priority: extra Section: web Maintainer: Ubuntu Developers Uncompressed Size: 406 k Depends: openjdk-6-jre, icedtea-netx (= 1.1~20110420-0ubuntu1), firefox (>= 4.0~b7), libatk1.0-0 (>= 1.12.4), libc6 (>= 2.3.4), libcairo2 (>= 1.2.4), libfontconfig1 (>= 2.8.0), libfreetype6 (>= 2.2.1), libgcc1 (>= 1:4.1.1), libgdk-pixbuf2.0-0 (>= 2.22.0), libglib2.0-0 (>= 2.16.0), libgtk2.0-0 (>= 2.8.0), libpango1.0-0 (>= 1.14.0), libstdc++6 (>= 4.5) Conflicts: icedtea-gcjwebplugin (< 1.0-1ubuntu4), icedtea6-plugin (< 6b21.0~20101127~) Replaces: icedtea-gcjwebplugin, icedtea6-plugin (< 6b21.0~20101127~), openjdk-6-jre (< 6b20-1.10~pre2) Provides: icedtea6-plugin Description: web browser plugin based on OpenJDK and IcedTea to execute Java applets IcedTeaPlugin is a web browser plugin to execute Java applets, supporting LiveConnect/JavaScript. It is targeted for xulrunner-1.9 and compatible browsers that support the NPAPI. Homepage: http://icedtea.classpath.org/wiki/IcedTea-Web -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From avg at icyb.net.ua Sun May 15 12:17:49 2011 From: avg at icyb.net.ua (Andriy Gapon) Date: Sun, 15 May 2011 22:17:49 +0300 Subject: firefox 4: problem with NPN_GetURL target=_self In-Reply-To: <20110421153134.GC7494@redhat.com> References: <4DADADC8.7010404@icyb.net.ua> <4DADCF06.8080803@smedbergs.us> <4DADD105.30103@icyb.net.ua> <20110421153134.GC7494@redhat.com> Message-ID: <4DD026DD.8010205@icyb.net.ua> on 21/04/2011 18:31 Deepak Bhole said the following: > * Andriy Gapon [2011-04-19 14:16]: >> on 19/04/2011 21:05 Benjamin Smedberg said the following: >>> It sounds like this could possibly be related to the plugin process implementation >>> in Firefox 4 >> >> I am not if this is really so... >> IcedTea plugin itself spawns a JVM process to handle applet byte code. I am not >> sure if that has any relation to what Firefox does for/on/about plugins. >> > > Hi, > > I have modified the plugin to use NPN_GetURLNotify instead of > NPN_GetURL. The former is non-blocking, and thus allows the plugin to > continue to service requests. > > This should solve the problem in the interim. Andriy, can you please > give it a try? > > Instructions to get, build and use the latest icedtea-web are here: > http://icedtea.classpath.org/wiki/?title=IcedTea-Web#Getting_IcedTea-Web Sorry for disappearing for a while. Unfortunately it seems that the issue is still there for me with the latest icedtea-web code from hg and firefox4. -- Andriy Gapon From ptisnovs at redhat.com Mon May 16 05:23:58 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 16 May 2011 14:23:58 +0200 Subject: Reviewer needed - fix for JTreg tool in IcedTea7 Message-ID: <4DD1175E.2090600@redhat.com> Hi all, I'd like to push fix for JTreg tool into IcedTea7. This fix enables "process" flag for "compile" tag so some langtools tests does not end with "error" status, but are properly executed. Here you can see differences in langtools test results between unpatched IcedTea7 and patched one: --- /jck/icedtea/test/check-langtools.log 2011-05-16 14:03:10.000000000 +0200 +++ check-langtools.log 2011-05-16 13:12:35.000000000 +0200 @@ -1248,15 +1248,15 @@ Passed: tools/javac/processing/6413690/T6413690.java Passed: tools/javac/processing/6414633/T6414633.java Passed: tools/javac/processing/6430209/T6430209.java -Error: tools/javac/processing/6499119/ClassProcessor.java +FAILED: tools/javac/processing/6499119/ClassProcessor.java Passed: tools/javac/processing/6511613/clss41701.java Passed: tools/javac/processing/6512707/T6512707.java Passed: tools/javac/processing/6634138/T6634138.java Passed: tools/javac/processing/6994946/SemanticErrorTest.java Passed: tools/javac/processing/6994946/SyntaxErrorTest.java Passed: tools/javac/processing/completion/TestCompletions.java -Error: tools/javac/processing/environment/round/TestContext.java -Error: tools/javac/processing/environment/round/TestElementsAnnotatedWith.java +Passed: tools/javac/processing/environment/round/TestContext.java +Passed: tools/javac/processing/environment/round/TestElementsAnnotatedWith.java Passed: tools/javac/processing/environment/TestSourceVersion.java Passed: tools/javac/processing/errors/TestParseErrors/TestParseErrors.java Passed: tools/javac/processing/errors/TestErrorCount.java @@ -1267,10 +1267,10 @@ Passed: tools/javac/processing/filer/TestFilerConstraints.java Passed: tools/javac/processing/filer/TestGetResource.java Passed: tools/javac/processing/filer/TestGetResource2.java -Error: tools/javac/processing/filer/TestInvalidRelativeNames.java +Passed: tools/javac/processing/filer/TestInvalidRelativeNames.java Passed: tools/javac/processing/filer/TestLastRound.java Passed: tools/javac/processing/filer/TestPackageInfo.java -Error: tools/javac/processing/filer/TestValidRelativeNames.java +Passed: tools/javac/processing/filer/TestValidRelativeNames.java Passed: tools/javac/processing/messager/6362067/T6362067.java Passed: tools/javac/processing/messager/MessagerBasics.java Passed: tools/javac/processing/model/6194785/T6194785.java @@ -1871,6 +1871,6 @@ Passed: tools/javap/T6879371.java Passed: tools/javap/T6980017.java Passed: tools/javap/T7004698.java -Test results: passed: 1,864; failed: 3; error: 5 -Report written to /jck/icedtea/test/langtools/JTreport/html/report.html -Results written to /jck/icedtea/test/langtools/JTwork +Test results: passed: 1,868; failed: 4 +Report written to /jck/1/icedtea/test/langtools/JTreport/html/report.html +Results written to /jck/1/icedtea/test/langtools/JTwork hg diff generated against recent IcedTea7 version is stored in an attachment. Here is ChangeLog entry: 2011-05-16 Pavel Tisnovsky * test/jtreg/README: Updated. * test/jtreg/com/sun/javatest/regtest/Path.java: Added. * test/jtreg/com/sun/javatest/regtest/Action.java: * test/jtreg/com/sun/javatest/regtest/CompileAction.java: * test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java: Corrected JTreg harness - this tool now accepts "process" flag for "compile" tag. Can anybody please review this change? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110516/6497058e/hg_diff.ksh From ahughes at redhat.com Mon May 16 06:07:18 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 16 May 2011 14:07:18 +0100 Subject: RFC: move patches/javafiles.patch to patches/ecj/ In-Reply-To: <4DCD58D3.40304@redhat.com> References: <4DCC4646.5090403@redhat.com> <20110513003240.GL31710@rivendell.middle-earth.co.uk> <4DCD58D3.40304@redhat.com> Message-ID: <20110516130718.GP31710@rivendell.middle-earth.co.uk> On 12:14 Fri 13 May , Omair Majid wrote: > On 05/12/2011 08:32 PM, Dr Andrew John Hughes wrote: > > Have you tried just removing it altogether? Can we still bootstrap? > > Removing it completely was the first thing I attempted. But it looks > like this patch is required for bootstrap: rt.jar in the bootstrap jdk > does not contain the classes listed in the patch. Even java -version fails. > Ok, weird. Can you make the same change in IcedTea7 too, moving it to patches/boot? > Cheers, > Omair Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Mon May 16 06:52:08 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 16 May 2011 14:52:08 +0100 Subject: FYI [icedtea-web] xml output for junit, for daily report - no styles In-Reply-To: <4DCBCF4E.6080608@redhat.com> References: <4DC8172F.7020009@redhat.com> <20110509192447.GF22437@rivendell.middle-earth.co.uk> <4DCA866C.1070204@redhat.com> <20110511135224.GF5351@rivendell.middle-earth.co.uk> <4DCAA611.5000909@redhat.com> <20110511212149.GT5351@rivendell.middle-earth.co.uk> <4DCBC298.50300@redhat.com> <4DCBCF4E.6080608@redhat.com> Message-ID: <20110516135208.GQ31710@rivendell.middle-earth.co.uk> On 14:15 Thu 12 May , Jiri Vanek wrote: > 2011-05-12 Jiri Vanek > > * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports > results of junit in xml which "follows junit-output schema". Extended > for date, duration and some statististics for future purpose > * Makefile.am (run-netx-unit-tests): backuping stdout/stderr of tests > > > Regards J. Comments below. > diff -r 0e6b12424423 ChangeLog > --- a/ChangeLog Wed May 11 14:56:32 2011 +0100 > +++ b/ChangeLog Thu May 12 14:13:40 2011 +0200 > @@ -1,3 +1,10 @@ > +2011-05-12 Jiri Vanek > + > + * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports > + results of junit in xml which "follows junit-output schema". Extended > + for date, duration and some statististics for future purpose > + * Makefile.am (run-netx-unit-tests): backuping stdout/stderr of tests > + > 2011-05-10 Andrew Su > > * netx/net/sourceforge/jnlp/controlpanel/CachePane.java: > diff -r 0e6b12424423 Makefile.am > --- a/Makefile.am Wed May 11 14:56:32 2011 +0100 > +++ b/Makefile.am Thu May 12 14:13:40 2011 +0200 > @@ -472,7 +472,10 @@ > done ; \ > echo $$class_names ; \ > CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \ > - $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names > + $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ > + > stdout.log 2> stderr.log ; \ > + cat stdout.log ; \ > + cat stderr.log >&2 > Is there any reason you want these separate and don't just use 2>&1 | tee log ? > clean-netx-tests: clean-netx-unit-tests clean-junit-runner > if [ -e $(TESTS_DIR)/netx ]; then \ > diff -r 0e6b12424423 tests/junit-runner/CommandLine.java > --- a/tests/junit-runner/CommandLine.java Wed May 11 14:56:32 2011 +0100 > +++ b/tests/junit-runner/CommandLine.java Thu May 12 14:13:40 2011 +0200 > @@ -7,6 +7,7 @@ > * http://www.eclipse.org/legal/cpl-v10.html > */ > > +import java.io.File; > import java.util.ArrayList; > import java.util.List; > > @@ -41,6 +42,8 @@ > system.out().println("ERROR: Could not find class: " + each); > } > } > + RunListener jXmlOutput = new JunitLikeXmlOutputListener(system, new File("tests-output.xml")); > + addListener(jXmlOutput); > RunListener listener = new LessVerboseTextListener(system); > addListener(listener); > Result result = run(classes.toArray(new Class[0])); > diff -r 0e6b12424423 tests/junit-runner/JunitLikeXmlOutputListener.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/junit-runner/JunitLikeXmlOutputListener.java Thu May 12 14:13:40 2011 +0200 > @@ -0,0 +1,225 @@ > +/* > + * Copyright 2011 Red Hat, Inc. > + * > + * This file is made available under the terms of the Common Public License > + * v1.0 which accompanies this distribution, and is available at > + * http://www.eclipse.org/legal/cpl-v10.html > + */ > + > +import java.io.BufferedWriter; > +import java.io.File; > + > +import java.io.FileOutputStream; > +import java.io.IOException; > +import java.io.OutputStreamWriter; > +import java.text.DecimalFormat; > +import java.text.NumberFormat; > +import java.util.Date; > +import java.util.HashMap; > +import java.util.Map; > +import java.util.Map.Entry; > +import java.util.Set; > + > + > +import org.junit.internal.JUnitSystem; > +import org.junit.runner.Description; > +import org.junit.runner.Result; > +import org.junit.runner.notification.Failure; > +import org.junit.runner.notification.RunListener; > +/** > + * This class listens for events in junit testsuite and wrote output to xml. > + * Xml tryes to follow ant-tests schema, and is enriched for by-class statistics > + * stdout and err elements are added, but must be filled from elsewhere (eg tee > + * in make) as junit suite and listener run from our executer have no access to > + * them. > + * > + */ > +public class JunitLikeXmlOutputListener extends RunListener { > + > + private BufferedWriter writer; > + private Failure testFailed = null; > + private static final String ROOT = "testsuite"; > + private static final String DATE_ELEMENT = "date"; > + private static final String TEST_ELEMENT = "testcase"; > + private static final String TEST_NAME_ATTRIBUTE = "name"; > + private static final String TEST_TIME_ATTRIBUTE = "time"; > + private static final String TEST_ERROR_ELEMENT = "error"; > + private static final String TEST_CLASS_ATTRIBUTE = "classname"; > + private static final String ERROR_MESSAGE_ATTRIBUTE = "message"; > + private static final String ERROR_TYPE_ATTRIBUTE = "type"; > + private static final String SOUT_ELEMENT = "system-out"; > + private static final String SERR_ELEMENT = "system-err"; > + private static final String CDATA_START = " + private static final String CDATA_END = "]]>"; > + private static final String TEST_CLASS_ELEMENT = "class"; > + private static final String STATS_ELEMENT = "stats"; > + private static final String CLASSES_ELEMENT = "classes"; > + private static final String SUMMARY_ELEMENT = "summary"; > + private static final String SUMMARY_TOTAL_ELEMENT = "total"; > + private static final String SUMMARY_PASSED_ELEMENT = "passed"; > + private static final String SUMMARY_FAILED_ELEMENT = "failed"; > + private static final String SUMMARY_IGNORED_ELEMENT = "ignored"; > + private long testStart; > + > + private class ClassCounter { > + > + int total; > + int failed; > + int passed; > + long time = 0; > + } > + Map classStats = new HashMap(); > + > + public JunitLikeXmlOutputListener(JUnitSystem system, File f) { > + try { > + writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f), "UTF-8")); > + } catch (Exception ex) { > + throw new RuntimeException(ex); > + } > + } > + > + @Override > + public void testRunStarted(Description description) throws Exception { > + openElement(ROOT); > + writeElement(DATE_ELEMENT, new Date().toString()); > + } > + > + private void openElement(String name) throws IOException { > + openElement(name, null); > + } > + > + private void openElement(String name, Map atts) throws IOException { > + StringBuilder attString = new StringBuilder(); > + if (atts != null) { > + attString.append(" "); > + Set> entries = atts.entrySet(); > + for (Entry entry : entries) { > + attString.append(entry.getKey()).append("=\"").append(attributize(entry.getValue())).append("\""); > + attString.append(" "); > + } > + } > + writer.write("<" + name + attString.toString() + ">"); > + writer.newLine(); > + } > + > + private static String attributize(String s) { > + return s.replace("&", "&").replace("<", "<").replace("\"","""); > + } > + > + private void closeElement(String name) throws IOException { > + writer.newLine(); > + writer.write(""); > + writer.newLine(); > + } > + > + private void writeContent(String content) throws IOException { > + writer.write(CDATA_START + content + CDATA_END); > + } > + > + private void writeElement(String name, String content) throws IOException { > + writeElement(name, content, null); > + } > + > + private void writeElement(String name, String content, Map atts) throws IOException { > + openElement(name, atts); > + writeContent(content); > + closeElement(name); > + } > + > + @Override > + public void testStarted(Description description) throws Exception { > + testFailed = null; > + testStart = System.nanoTime()/1000l/1000l; > + } > + > + @Override > + public void testFailure(Failure failure) throws IOException { > + testFailed = failure; > + } > + > + @Override > + public void testFinished(org.junit.runner.Description description) throws Exception { > + long testTime = System.nanoTime()/1000l/1000l - testStart; > + double testTimeSeconds = ((double) testTime) / 1000d; > + > + Map testcaseAtts = new HashMap(3); > + NumberFormat formatter = new DecimalFormat("#0.0000"); > + String stringedTime = formatter.format(testTimeSeconds); > + stringedTime.replace(",", "."); > + testcaseAtts.put(TEST_TIME_ATTRIBUTE, stringedTime); > + testcaseAtts.put(TEST_CLASS_ATTRIBUTE, description.getClassName()); > + testcaseAtts.put(TEST_NAME_ATTRIBUTE, description.getMethodName()); > + > + openElement(TEST_ELEMENT, testcaseAtts); > + if (testFailed != null) { > + Map errorAtts = new HashMap(3); > + > + errorAtts.put(ERROR_MESSAGE_ATTRIBUTE, testFailed.getMessage()); > + int i = testFailed.getTrace().indexOf(":"); > + if (i >= 0) { > + errorAtts.put(ERROR_TYPE_ATTRIBUTE, testFailed.getTrace().substring(0, i)); > + } else { > + errorAtts.put(ERROR_TYPE_ATTRIBUTE, "?"); > + } > + > + writeElement(TEST_ERROR_ELEMENT, testFailed.getTrace(), errorAtts); > + } > + > + closeElement(TEST_ELEMENT); > + writer.flush(); > + > + ClassCounter cc = classStats.get(description.getClassName()); > + if (cc == null) { > + cc = new ClassCounter(); > + classStats.put(description.getClassName(), cc); > + } > + cc.total++; > + cc.time += testTime; > + if (testFailed == null) { > + cc.passed++; > + } else { > + > + cc.failed++; > + } > + } > + > + @Override > + public void testRunFinished(Result result) throws Exception { > + > + writeElement(SOUT_ELEMENT, "@sout@"); > + writeElement(SERR_ELEMENT, "@serr@"); > + openElement(STATS_ELEMENT); > + openElement(SUMMARY_ELEMENT); > + int passed = result.getRunCount() - result.getFailureCount() - result.getIgnoreCount(); > + int failed = result.getFailureCount(); > + int ignored = result.getIgnoreCount(); > + writeElement(SUMMARY_TOTAL_ELEMENT, String.valueOf(result.getRunCount())); > + writeElement(SUMMARY_FAILED_ELEMENT, String.valueOf(failed)); > + writeElement(SUMMARY_IGNORED_ELEMENT, String.valueOf(ignored)); > + writeElement(SUMMARY_PASSED_ELEMENT, String.valueOf(passed)); > + closeElement(SUMMARY_ELEMENT); > + openElement(CLASSES_ELEMENT); > + Set> e = classStats.entrySet(); > + for (Entry entry : e) { > + > + Map testcaseAtts = new HashMap(3); > + testcaseAtts.put(TEST_NAME_ATTRIBUTE, entry.getKey()); > + testcaseAtts.put(TEST_TIME_ATTRIBUTE, String.valueOf(entry.getValue().time)); > + > + openElement(TEST_CLASS_ELEMENT, testcaseAtts); > + writeElement(SUMMARY_PASSED_ELEMENT, String.valueOf(entry.getValue().passed)); > + writeElement(SUMMARY_FAILED_ELEMENT, String.valueOf(entry.getValue().failed)); > + writeElement(SUMMARY_IGNORED_ELEMENT, String.valueOf(entry.getValue().total - entry.getValue().failed - entry.getValue().passed)); > + writeElement(SUMMARY_TOTAL_ELEMENT, String.valueOf(entry.getValue().total)); > + > + closeElement(TEST_CLASS_ELEMENT); > + } > + closeElement(CLASSES_ELEMENT); > + closeElement(STATS_ELEMENT); > + > + closeElement(ROOT); > + writer.flush(); > + writer.close(); > + > + } > +} I assume this produces the correct output. What confuses me is why you didn't use the standard XML APIs rather than rolling your own? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Mon May 16 06:56:12 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 16 May 2011 14:56:12 +0100 Subject: Reviewer needed - fix for JTreg tool in IcedTea7 In-Reply-To: <4DD1175E.2090600@redhat.com> References: <4DD1175E.2090600@redhat.com> Message-ID: <20110516135612.GR31710@rivendell.middle-earth.co.uk> On 14:23 Mon 16 May , Pavel Tisnovsky wrote: > Hi all, > > I'd like to push fix for JTreg tool into IcedTea7. This fix enables > "process" flag for "compile" tag so some langtools tests does not end > with "error" status, but are properly executed. Here you can see > differences in langtools test results between unpatched IcedTea7 and > patched one: > > --- /jck/icedtea/test/check-langtools.log 2011-05-16 > 14:03:10.000000000 +0200 > +++ check-langtools.log 2011-05-16 13:12:35.000000000 +0200 > @@ -1248,15 +1248,15 @@ > Passed: tools/javac/processing/6413690/T6413690.java > Passed: tools/javac/processing/6414633/T6414633.java > Passed: tools/javac/processing/6430209/T6430209.java > -Error: tools/javac/processing/6499119/ClassProcessor.java > +FAILED: tools/javac/processing/6499119/ClassProcessor.java > Passed: tools/javac/processing/6511613/clss41701.java > Passed: tools/javac/processing/6512707/T6512707.java > Passed: tools/javac/processing/6634138/T6634138.java > Passed: tools/javac/processing/6994946/SemanticErrorTest.java > Passed: tools/javac/processing/6994946/SyntaxErrorTest.java > Passed: tools/javac/processing/completion/TestCompletions.java > -Error: tools/javac/processing/environment/round/TestContext.java > -Error: > tools/javac/processing/environment/round/TestElementsAnnotatedWith.java > +Passed: tools/javac/processing/environment/round/TestContext.java > +Passed: > tools/javac/processing/environment/round/TestElementsAnnotatedWith.java > Passed: tools/javac/processing/environment/TestSourceVersion.java > Passed: tools/javac/processing/errors/TestParseErrors/TestParseErrors.java > Passed: tools/javac/processing/errors/TestErrorCount.java > @@ -1267,10 +1267,10 @@ > Passed: tools/javac/processing/filer/TestFilerConstraints.java > Passed: tools/javac/processing/filer/TestGetResource.java > Passed: tools/javac/processing/filer/TestGetResource2.java > -Error: tools/javac/processing/filer/TestInvalidRelativeNames.java > +Passed: tools/javac/processing/filer/TestInvalidRelativeNames.java > Passed: tools/javac/processing/filer/TestLastRound.java > Passed: tools/javac/processing/filer/TestPackageInfo.java > -Error: tools/javac/processing/filer/TestValidRelativeNames.java > +Passed: tools/javac/processing/filer/TestValidRelativeNames.java > Passed: tools/javac/processing/messager/6362067/T6362067.java > Passed: tools/javac/processing/messager/MessagerBasics.java > Passed: tools/javac/processing/model/6194785/T6194785.java > @@ -1871,6 +1871,6 @@ > Passed: tools/javap/T6879371.java > Passed: tools/javap/T6980017.java > Passed: tools/javap/T7004698.java > -Test results: passed: 1,864; failed: 3; error: 5 > -Report written to /jck/icedtea/test/langtools/JTreport/html/report.html > -Results written to /jck/icedtea/test/langtools/JTwork > +Test results: passed: 1,868; failed: 4 > +Report written to /jck/1/icedtea/test/langtools/JTreport/html/report.html > +Results written to /jck/1/icedtea/test/langtools/JTwork > > > > hg diff generated against recent IcedTea7 version is stored in an > attachment. > > Here is ChangeLog entry: > > 2011-05-16 Pavel Tisnovsky > > * test/jtreg/README: > Updated. > * test/jtreg/com/sun/javatest/regtest/Path.java: > Added. > * test/jtreg/com/sun/javatest/regtest/Action.java: > * test/jtreg/com/sun/javatest/regtest/CompileAction.java: > * > test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java: > Corrected JTreg harness - this tool now accepts "process" flag for > "compile" tag. > > Can anybody please review this change? > Is this the same change that went into IcedTea6? If so, ok. I think we should consider separating out our jtreg support long term, so we don't have to keep both in sync, but I'm not sure how feasible this is. > Thank you in advance, > Pavel -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ptisnovs at redhat.com Mon May 16 07:06:48 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 16 May 2011 16:06:48 +0200 Subject: Reviewer needed - fix for JTreg tool in IcedTea7 In-Reply-To: <20110516135612.GR31710@rivendell.middle-earth.co.uk> References: <4DD1175E.2090600@redhat.com> <20110516135612.GR31710@rivendell.middle-earth.co.uk> Message-ID: <4DD12F78.5080107@redhat.com> Dr Andrew John Hughes wrote: > On 14:23 Mon 16 May , Pavel Tisnovsky wrote: >> Hi all, >> >> I'd like to push fix for JTreg tool into IcedTea7. This fix enables >> "process" flag for "compile" tag so some langtools tests does not end >> with "error" status, but are properly executed. Here you can see >> differences in langtools test results between unpatched IcedTea7 and >> patched one: >> >> --- /jck/icedtea/test/check-langtools.log 2011-05-16 >> 14:03:10.000000000 +0200 >> +++ check-langtools.log 2011-05-16 13:12:35.000000000 +0200 >> @@ -1248,15 +1248,15 @@ >> Passed: tools/javac/processing/6413690/T6413690.java >> Passed: tools/javac/processing/6414633/T6414633.java >> Passed: tools/javac/processing/6430209/T6430209.java >> -Error: tools/javac/processing/6499119/ClassProcessor.java >> +FAILED: tools/javac/processing/6499119/ClassProcessor.java >> Passed: tools/javac/processing/6511613/clss41701.java >> Passed: tools/javac/processing/6512707/T6512707.java >> Passed: tools/javac/processing/6634138/T6634138.java >> Passed: tools/javac/processing/6994946/SemanticErrorTest.java >> Passed: tools/javac/processing/6994946/SyntaxErrorTest.java >> Passed: tools/javac/processing/completion/TestCompletions.java >> -Error: tools/javac/processing/environment/round/TestContext.java >> -Error: >> tools/javac/processing/environment/round/TestElementsAnnotatedWith.java >> +Passed: tools/javac/processing/environment/round/TestContext.java >> +Passed: >> tools/javac/processing/environment/round/TestElementsAnnotatedWith.java >> Passed: tools/javac/processing/environment/TestSourceVersion.java >> Passed: tools/javac/processing/errors/TestParseErrors/TestParseErrors.java >> Passed: tools/javac/processing/errors/TestErrorCount.java >> @@ -1267,10 +1267,10 @@ >> Passed: tools/javac/processing/filer/TestFilerConstraints.java >> Passed: tools/javac/processing/filer/TestGetResource.java >> Passed: tools/javac/processing/filer/TestGetResource2.java >> -Error: tools/javac/processing/filer/TestInvalidRelativeNames.java >> +Passed: tools/javac/processing/filer/TestInvalidRelativeNames.java >> Passed: tools/javac/processing/filer/TestLastRound.java >> Passed: tools/javac/processing/filer/TestPackageInfo.java >> -Error: tools/javac/processing/filer/TestValidRelativeNames.java >> +Passed: tools/javac/processing/filer/TestValidRelativeNames.java >> Passed: tools/javac/processing/messager/6362067/T6362067.java >> Passed: tools/javac/processing/messager/MessagerBasics.java >> Passed: tools/javac/processing/model/6194785/T6194785.java >> @@ -1871,6 +1871,6 @@ >> Passed: tools/javap/T6879371.java >> Passed: tools/javap/T6980017.java >> Passed: tools/javap/T7004698.java >> -Test results: passed: 1,864; failed: 3; error: 5 >> -Report written to /jck/icedtea/test/langtools/JTreport/html/report.html >> -Results written to /jck/icedtea/test/langtools/JTwork >> +Test results: passed: 1,868; failed: 4 >> +Report written to /jck/1/icedtea/test/langtools/JTreport/html/report.html >> +Results written to /jck/1/icedtea/test/langtools/JTwork >> >> >> >> hg diff generated against recent IcedTea7 version is stored in an >> attachment. >> >> Here is ChangeLog entry: >> >> 2011-05-16 Pavel Tisnovsky >> >> * test/jtreg/README: >> Updated. >> * test/jtreg/com/sun/javatest/regtest/Path.java: >> Added. >> * test/jtreg/com/sun/javatest/regtest/Action.java: >> * test/jtreg/com/sun/javatest/regtest/CompileAction.java: >> * >> test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java: >> Corrected JTreg harness - this tool now accepts "process" flag for >> "compile" tag. >> >> Can anybody please review this change? >> > > Is this the same change that went into IcedTea6? If so, ok. yes, it's based on IcedTea6 version of JTreg (more precisely based on JTreg included in IcedTea6), but please note that ATM it's not full synchronization because I'm going to post second update of JTreg tool containing fix of permission management (I just don't have time to check if all new IcedTea7-only tests will work with this change). > > I think we should consider separating out our jtreg support long term, so we > don't have to keep both in sync, but I'm not sure how feasible this is. That should be great, update of JTreg tool to the latest one is on my TODO list ;-) > >> Thank you in advance, >> Pavel > From jvanek at redhat.com Mon May 16 07:06:40 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 16 May 2011 16:06:40 +0200 Subject: FYI [icedtea-web] xml output for junit, for daily report - no styles In-Reply-To: <20110516135208.GQ31710@rivendell.middle-earth.co.uk> References: <4DC8172F.7020009@redhat.com> <20110509192447.GF22437@rivendell.middle-earth.co.uk> <4DCA866C.1070204@redhat.com> <20110511135224.GF5351@rivendell.middle-earth.co.uk> <4DCAA611.5000909@redhat.com> <20110511212149.GT5351@rivendell.middle-earth.co.uk> <4DCBC298.50300@redhat.com> <4DCBCF4E.6080608@redhat.com> <20110516135208.GQ31710@rivendell.middle-earth.co.uk> Message-ID: <4DD12F70.7080400@redhat.com> On 05/16/2011 03:52 PM, Dr Andrew John Hughes wrote: > On 14:15 Thu 12 May , Jiri Vanek wrote: >> 2011-05-12 Jiri Vanek >> >> * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports >> results of junit in xml which "follows junit-output schema". Extended >> for date, duration and some statististics for future purpose >> * Makefile.am (run-netx-unit-tests): backuping stdout/stderr of tests >> >> >> Regards J. > > Comments below. > >> diff -r 0e6b12424423 ChangeLog >> --- a/ChangeLog Wed May 11 14:56:32 2011 +0100 >> +++ b/ChangeLog Thu May 12 14:13:40 2011 +0200 >> @@ -1,3 +1,10 @@ >> +2011-05-12 Jiri Vanek >> + >> + * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports >> + results of junit in xml which "follows junit-output schema". Extended >> + for date, duration and some statististics for future purpose >> + * Makefile.am (run-netx-unit-tests): backuping stdout/stderr of tests >> + >> 2011-05-10 Andrew Su >> >> * netx/net/sourceforge/jnlp/controlpanel/CachePane.java: >> diff -r 0e6b12424423 Makefile.am >> --- a/Makefile.am Wed May 11 14:56:32 2011 +0100 >> +++ b/Makefile.am Thu May 12 14:13:40 2011 +0200 >> @@ -472,7 +472,10 @@ >> done ; \ >> echo $$class_names ; \ >> CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \ >> - $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names >> + $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ >> + > stdout.log 2> stderr.log ; \ >> + cat stdout.log ; \ >> + cat stderr.log>&2 >> > > Is there any reason you want these separate and don't just use 2>&1 | tee log ? yap. I want to keep each stream where it belongs. I tried something like > >(tee stdout.log) 2> >(tee stderr.log >&2) m which work fine in shell, but I was unable to make it work in make :( > >> clean-netx-tests: clean-netx-unit-tests clean-junit-runner >> if [ -e $(TESTS_DIR)/netx ]; then \ >> diff -r 0e6b12424423 tests/junit-runner/CommandLine.java >> --- a/tests/junit-runner/CommandLine.java Wed May 11 14:56:32 2011 +0100 >> +++ b/tests/junit-runner/CommandLine.java Thu May 12 14:13:40 2011 +0200 >> @@ -7,6 +7,7 @@ >> * http://www.eclipse.org/legal/cpl-v10.html >> */ >> >> +import java.io.File; >> import java.util.ArrayList; >> import java.util.List; >> >> @@ -41,6 +42,8 @@ >> system.out().println("ERROR: Could not find class: " + each); >> } >> } >> + RunListener jXmlOutput = new JunitLikeXmlOutputListener(system, new File("tests-output.xml")); >> + addListener(jXmlOutput); >> RunListener listener = new LessVerboseTextListener(system); >> addListener(listener); >> Result result = run(classes.toArray(new Class[0])); >> diff -r 0e6b12424423 tests/junit-runner/JunitLikeXmlOutputListener.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/junit-runner/JunitLikeXmlOutputListener.java Thu May 12 14:13:40 2011 +0200 >> @@ -0,0 +1,225 @@ >> +/* >> + * Copyright 2011 Red Hat, Inc. >> + * >> + * This file is made available under the terms of the Common Public License >> + * v1.0 which accompanies this distribution, and is available at >> + * http://www.eclipse.org/legal/cpl-v10.html >> + */ >> + >> +import java.io.BufferedWriter; >> +import java.io.File; >> + >> +import java.io.FileOutputStream; >> +import java.io.IOException; >> +import java.io.OutputStreamWriter; >> +import java.text.DecimalFormat; >> +import java.text.NumberFormat; >> +import java.util.Date; >> +import java.util.HashMap; >> +import java.util.Map; >> +import java.util.Map.Entry; >> +import java.util.Set; >> + >> + >> +import org.junit.internal.JUnitSystem; >> +import org.junit.runner.Description; >> +import org.junit.runner.Result; >> +import org.junit.runner.notification.Failure; >> +import org.junit.runner.notification.RunListener; >> +/** >> + * This class listens for events in junit testsuite and wrote output to xml. >> + * Xml tryes to follow ant-tests schema, and is enriched for by-class statistics >> + * stdout and err elements are added, but must be filled from elsewhere (eg tee >> + * in make) as junit suite and listener run from our executer have no access to >> + * them. >> + * >> + */ >> +public class JunitLikeXmlOutputListener extends RunListener { >> + >> + private BufferedWriter writer; >> + private Failure testFailed = null; >> + private static final String ROOT = "testsuite"; >> + private static final String DATE_ELEMENT = "date"; >> + private static final String TEST_ELEMENT = "testcase"; >> + private static final String TEST_NAME_ATTRIBUTE = "name"; >> + private static final String TEST_TIME_ATTRIBUTE = "time"; >> + private static final String TEST_ERROR_ELEMENT = "error"; >> + private static final String TEST_CLASS_ATTRIBUTE = "classname"; >> + private static final String ERROR_MESSAGE_ATTRIBUTE = "message"; >> + private static final String ERROR_TYPE_ATTRIBUTE = "type"; >> + private static final String SOUT_ELEMENT = "system-out"; >> + private static final String SERR_ELEMENT = "system-err"; >> + private static final String CDATA_START = "> + private static final String CDATA_END = "]]>"; >> + private static final String TEST_CLASS_ELEMENT = "class"; >> + private static final String STATS_ELEMENT = "stats"; >> + private static final String CLASSES_ELEMENT = "classes"; >> + private static final String SUMMARY_ELEMENT = "summary"; >> + private static final String SUMMARY_TOTAL_ELEMENT = "total"; >> + private static final String SUMMARY_PASSED_ELEMENT = "passed"; >> + private static final String SUMMARY_FAILED_ELEMENT = "failed"; >> + private static final String SUMMARY_IGNORED_ELEMENT = "ignored"; >> + private long testStart; >> + >> + private class ClassCounter { >> + >> + int total; >> + int failed; >> + int passed; >> + long time = 0; >> + } >> + Map classStats = new HashMap(); >> + >> + public JunitLikeXmlOutputListener(JUnitSystem system, File f) { >> + try { >> + writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f), "UTF-8")); >> + } catch (Exception ex) { >> + throw new RuntimeException(ex); >> + } >> + } >> + >> + @Override >> + public void testRunStarted(Description description) throws Exception { >> + openElement(ROOT); >> + writeElement(DATE_ELEMENT, new Date().toString()); >> + } >> + >> + private void openElement(String name) throws IOException { >> + openElement(name, null); >> + } >> + >> + private void openElement(String name, Map atts) throws IOException { >> + StringBuilder attString = new StringBuilder(); >> + if (atts != null) { >> + attString.append(" "); >> + Set> entries = atts.entrySet(); >> + for (Entry entry : entries) { >> + attString.append(entry.getKey()).append("=\"").append(attributize(entry.getValue())).append("\""); >> + attString.append(" "); >> + } >> + } >> + writer.write("<" + name + attString.toString() +">"); >> + writer.newLine(); >> + } >> + >> + private static String attributize(String s) { >> + return s.replace("&","&").replace("<","<").replace("\"","""); >> + } >> + >> + private void closeElement(String name) throws IOException { >> + writer.newLine(); >> + writer.write(""); >> + writer.newLine(); >> + } >> + >> + private void writeContent(String content) throws IOException { >> + writer.write(CDATA_START + content + CDATA_END); >> + } >> + >> + private void writeElement(String name, String content) throws IOException { >> + writeElement(name, content, null); >> + } >> + >> + private void writeElement(String name, String content, Map atts) throws IOException { >> + openElement(name, atts); >> + writeContent(content); >> + closeElement(name); >> + } >> + >> + @Override >> + public void testStarted(Description description) throws Exception { >> + testFailed = null; >> + testStart = System.nanoTime()/1000l/1000l; >> + } >> + >> + @Override >> + public void testFailure(Failure failure) throws IOException { >> + testFailed = failure; >> + } >> + >> + @Override >> + public void testFinished(org.junit.runner.Description description) throws Exception { >> + long testTime = System.nanoTime()/1000l/1000l - testStart; >> + double testTimeSeconds = ((double) testTime) / 1000d; >> + >> + Map testcaseAtts = new HashMap(3); >> + NumberFormat formatter = new DecimalFormat("#0.0000"); >> + String stringedTime = formatter.format(testTimeSeconds); >> + stringedTime.replace(",", "."); >> + testcaseAtts.put(TEST_TIME_ATTRIBUTE, stringedTime); >> + testcaseAtts.put(TEST_CLASS_ATTRIBUTE, description.getClassName()); >> + testcaseAtts.put(TEST_NAME_ATTRIBUTE, description.getMethodName()); >> + >> + openElement(TEST_ELEMENT, testcaseAtts); >> + if (testFailed != null) { >> + Map errorAtts = new HashMap(3); >> + >> + errorAtts.put(ERROR_MESSAGE_ATTRIBUTE, testFailed.getMessage()); >> + int i = testFailed.getTrace().indexOf(":"); >> + if (i>= 0) { >> + errorAtts.put(ERROR_TYPE_ATTRIBUTE, testFailed.getTrace().substring(0, i)); >> + } else { >> + errorAtts.put(ERROR_TYPE_ATTRIBUTE, "?"); >> + } >> + >> + writeElement(TEST_ERROR_ELEMENT, testFailed.getTrace(), errorAtts); >> + } >> + >> + closeElement(TEST_ELEMENT); >> + writer.flush(); >> + >> + ClassCounter cc = classStats.get(description.getClassName()); >> + if (cc == null) { >> + cc = new ClassCounter(); >> + classStats.put(description.getClassName(), cc); >> + } >> + cc.total++; >> + cc.time += testTime; >> + if (testFailed == null) { >> + cc.passed++; >> + } else { >> + >> + cc.failed++; >> + } >> + } >> + >> + @Override >> + public void testRunFinished(Result result) throws Exception { >> + >> + writeElement(SOUT_ELEMENT, "@sout@"); >> + writeElement(SERR_ELEMENT, "@serr@"); >> + openElement(STATS_ELEMENT); >> + openElement(SUMMARY_ELEMENT); >> + int passed = result.getRunCount() - result.getFailureCount() - result.getIgnoreCount(); >> + int failed = result.getFailureCount(); >> + int ignored = result.getIgnoreCount(); >> + writeElement(SUMMARY_TOTAL_ELEMENT, String.valueOf(result.getRunCount())); >> + writeElement(SUMMARY_FAILED_ELEMENT, String.valueOf(failed)); >> + writeElement(SUMMARY_IGNORED_ELEMENT, String.valueOf(ignored)); >> + writeElement(SUMMARY_PASSED_ELEMENT, String.valueOf(passed)); >> + closeElement(SUMMARY_ELEMENT); >> + openElement(CLASSES_ELEMENT); >> + Set> e = classStats.entrySet(); >> + for (Entry entry : e) { >> + >> + Map testcaseAtts = new HashMap(3); >> + testcaseAtts.put(TEST_NAME_ATTRIBUTE, entry.getKey()); >> + testcaseAtts.put(TEST_TIME_ATTRIBUTE, String.valueOf(entry.getValue().time)); >> + >> + openElement(TEST_CLASS_ELEMENT, testcaseAtts); >> + writeElement(SUMMARY_PASSED_ELEMENT, String.valueOf(entry.getValue().passed)); >> + writeElement(SUMMARY_FAILED_ELEMENT, String.valueOf(entry.getValue().failed)); >> + writeElement(SUMMARY_IGNORED_ELEMENT, String.valueOf(entry.getValue().total - entry.getValue().failed - entry.getValue().passed)); >> + writeElement(SUMMARY_TOTAL_ELEMENT, String.valueOf(entry.getValue().total)); >> + >> + closeElement(TEST_CLASS_ELEMENT); >> + } >> + closeElement(CLASSES_ELEMENT); >> + closeElement(STATS_ELEMENT); >> + >> + closeElement(ROOT); >> + writer.flush(); >> + writer.close(); >> + >> + } >> +} > > I assume this produces the correct output. What confuses me is why you didn't use the standard XML APIs > rather than rolling your own? After some rather nasty experience with standart java xml api/tools, I fell in love to love Apache axiom for everyhing worthy. And for every simple output much more rather to keep the class stright and without terrible standart api. If you mind, I will rewrite it. But I would rather to keep it straight-forward. Regards J. From dlila at redhat.com Mon May 16 07:10:25 2011 From: dlila at redhat.com (Denis Lila) Date: Mon, 16 May 2011 10:10:25 -0400 (EDT) Subject: Mutter awt fix. In-Reply-To: <78356398.220799.1305554368827.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Hi. I would like to push this to icedtea7-forest. It fixes RH698295. The only part of it that hasn't been reviewed is the regression test so, Pavel could you please take a look at that? You already saw a previous version of it, but I made some changes. This will also need to be backported into icedtea6 head. Thank you, Denis. -------------- next part -------------- A non-text attachment was scrubbed... Name: mutter.patch Type: text/x-patch Size: 11091 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110516/9f0ba595/mutter.patch From ptisnovs at icedtea.classpath.org Mon May 16 07:14:29 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 16 May 2011 14:14:29 +0000 Subject: /hg/icedtea6: Fixed patch for regression test Message-ID: changeset 29d688c7693d in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=29d688c7693d author: ptisnovs date: Mon May 16 16:19:11 2011 +0200 Fixed patch for regression test test/runtime/6929067/Test6929067.sh diffstat: ChangeLog | 6 ++++++ patches/jtreg-6929067-fix.patch | 23 +++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diffs (64 lines): diff -r 73869cc50c8c -r 29d688c7693d ChangeLog --- a/ChangeLog Fri May 13 09:05:45 2011 -0400 +++ b/ChangeLog Mon May 16 16:19:11 2011 +0200 @@ -1,3 +1,9 @@ +2011-05-16 Pavel Tisnovsky + + * patches/jtreg-6929067-fix.patch: fix this regression + test so it works on any combination of JVM and platform + (32 bit and 64 bit) + 2011-05-12 Andrew Su * AUTHORS: Updated name. diff -r 73869cc50c8c -r 29d688c7693d patches/jtreg-6929067-fix.patch --- a/patches/jtreg-6929067-fix.patch Fri May 13 09:05:45 2011 -0400 +++ b/patches/jtreg-6929067-fix.patch Mon May 16 16:19:11 2011 +0200 @@ -1,28 +1,27 @@ --- openjdk-old/hotspot/test/runtime/6929067/Test6929067.sh 2010-10-08 22:29:24.000000000 +0200 +++ openjdk/hotspot/test/runtime/6929067/Test6929067.sh 2010-12-08 13:45:18.000000000 +0100 -@@ -7,6 +7,7 @@ - ## @run shell Test6929067.sh - ## - -+ - if [ "${TESTSRC}" = "" ] - then TESTSRC=. - fi -@@ -42,7 +43,24 @@ +@@ -42,7 +42,31 @@ ;; esac -LD_LIBRARY_PATH=.:${TESTJAVA}/jre/lib/i386/client:/usr/openwin/lib:/usr/dt/lib:/usr/lib:$LD_LIBRARY_PATH +COMP_FLAG="-m32" + ++# Test if JDK is 32 or 64 bits ++${TESTJAVA}/bin/java -d64 ++ ++if [[ $? == 0 ]] ++then ++ COMP_FLAG="-m64" ++fi ++ +# Get ARCH specifics +ARCH=`uname -m` +case "$ARCH" in + x86_64) + ARCH=amd64 -+ COMP_FLAG="-m64" + ;; -+ i585) ++ i586) + ARCH=i386 + ;; + i686) @@ -34,7 +33,7 @@ export LD_LIBRARY_PATH THIS_DIR=`pwd` -@@ -55,6 +73,13 @@ +@@ -55,6 +79,13 @@ ${TESTJAVA}${FS}bin${FS}javac T.java From ptisnovs at redhat.com Mon May 16 07:42:03 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 16 May 2011 16:42:03 +0200 Subject: Mutter awt fix. In-Reply-To: <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <4DD137BB.7070409@redhat.com> Denis Lila wrote: > Hi. > > I would like to push this to icedtea7-forest. It fixes > RH698295. The only part of it that hasn't been reviewed > is the regression test so, Pavel could you please take > a look at that? You already saw a previous version of it, > but I made some changes. > > This will also need to be backported into icedtea6 head. > > Thank you, > Denis. > Hi Denis, it looks ok for me, thanks you. AFAIK you still did not received the rights to push this change to OpenJDK right (because the repos is in frozen state)? Or do you have bug ID for this fix at least? Cheers, Pavel From ptisnovs at icedtea.classpath.org Mon May 16 07:47:47 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 16 May 2011 14:47:47 +0000 Subject: /hg/icedtea: Corrected JTreg harness - this tool now accepts "pr... Message-ID: changeset 0bea9271a681 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0bea9271a681 author: ptisnovs date: Mon May 16 16:52:29 2011 +0200 Corrected JTreg harness - this tool now accepts "process" flag for "compile" tag. diffstat: ChangeLog | 12 + test/jtreg/README | 4 +- test/jtreg/com/sun/javatest/regtest/Action.java | 20 + test/jtreg/com/sun/javatest/regtest/CompileAction.java | 200 +++++---- test/jtreg/com/sun/javatest/regtest/Path.java | 164 ++++++++ test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java | 2 + 6 files changed, 312 insertions(+), 90 deletions(-) diffs (truncated from 804 to 500 lines): diff -r 5ffa85bf891c -r 0bea9271a681 ChangeLog --- a/ChangeLog Thu May 05 01:17:33 2011 +0100 +++ b/ChangeLog Mon May 16 16:52:29 2011 +0200 @@ -1,3 +1,15 @@ +2011-05-16 Pavel Tisnovsky + + * test/jtreg/README: + Updated. + * test/jtreg/com/sun/javatest/regtest/Path.java: + Added. + * test/jtreg/com/sun/javatest/regtest/Action.java: + * test/jtreg/com/sun/javatest/regtest/CompileAction.java: + * test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java: + Corrected JTreg harness - this tool now accepts "process" flag for + "compile" tag. + 2011-05-04 Andrew John Hughes * remove-intree-libraries.sh: Renamed. diff -r 5ffa85bf891c -r 0bea9271a681 test/jtreg/README --- a/test/jtreg/README Thu May 05 01:17:33 2011 +0100 +++ b/test/jtreg/README Mon May 16 16:52:29 2011 +0200 @@ -20,7 +20,9 @@ This version is based on: - jtharness-oss-4_1_3a-dev -- jtreg-4_0-src-b02-15_oct_2008 +- jtreg-4_0-src-b02-15_oct_2008 with change backported from + jtreg-4.1-src-b02_21_may_2010.zip. This change adds support for + option named "process" which can be used along with tag "compile". IcedJTReg is distrubuted under the GPLv2.0, like jtreg and jtharness. See the documents in the legal directory included in this release. diff -r 5ffa85bf891c -r 0bea9271a681 test/jtreg/com/sun/javatest/regtest/Action.java --- a/test/jtreg/com/sun/javatest/regtest/Action.java Thu May 05 01:17:33 2011 +0100 +++ b/test/jtreg/com/sun/javatest/regtest/Action.java Mon May 16 16:52:29 2011 +0200 @@ -300,6 +300,8 @@ section.setStatus(status); } // endAction() + //----------workarounds------------------------------------------------------- + /** * This method pushes the full, constructed command for the action to the * log. The constructed command contains the the action and its arguments @@ -425,6 +427,13 @@ EXEC_ERROR_CLEANUP = "Error while cleaning up threads after test", CHECK_PASS = "Test description appears acceptable", + // used in: compile, main + SAMEVM_CANT_RESET_SECMGR= "Cannot reset security manager", + SAMEVM_CANT_RESET_PROPS = "Cannot reset system properties", + + // used in:compile, main + AGENTVM_CANT_GET_VM = "Cannot get VM for test", + UNEXPECT_SYS_EXIT = "Unexpected exit from test", CANT_FIND_SRC = "Can't file source file: ", @@ -454,6 +463,8 @@ BUILD_UP_TO_DATE = "All files up to date", BUILD_SUCC = "Build successful", BUILD_LIB_LIST = " in directory-list: ", + BUILD_FUTURE_SOURCE = "WARNING: file %s has a modification time in the future: %s", + BUILD_FUTURE_SOURCE_2 = "Unexpected results may occur", // clean CLEAN_SUCC = "Clean successful", @@ -478,6 +489,8 @@ COMPILE_PASS = "Compilation successful", COMPILE_FAIL_EXPECT = "Compilation failed as expected", COMPILE_FAIL = "Compilation failed", + COMPILE_CANT_RESET_SECMGR= "Cannot reset security manager", + COMPILE_CANT_RESET_PROPS = "Cannot reset system properties", // ignore IGNORE_UNEXPECT_OPTS = "Unexpected option(s) for `ignore'", @@ -486,6 +499,11 @@ IGNORE_TEST_SUPPRESSED = "@ignore suppressed by command line option", IGNORE_TEST_SUPPRESSED_C = "@ignore suppressed by command line option: ", + // junit + JUNIT_NO_DRIVER = "No JUnit 4 driver (install junit.jar next to jtreg.jar)", + JUNIT_NO_CLASSNAME = "No class provided for `junit'", + JUNIT_BAD_MAIN_ARG = "Bad argument provided for class in `junit'", + // main MAIN_NO_CLASSNAME = "No class provided for `main'", MAIN_MANUAL_NO_VAL = "Arguments to `manual' option not supported: ", @@ -500,6 +518,8 @@ MAIN_UNEXPECT_VMOPT = ": vm option(s) found, need to specify /othervm", MAIN_POLICY_WRITE_PROB= "Problems writing new policy file: ", MAIN_POLICY_SM_PROB = "Unable to create new policy file: ", + MAIN_CANT_RESET_SECMGR= "Cannot reset security manager", + MAIN_CANT_RESET_PROPS = "Cannot reset system properties", // runOtherJVM MAIN_CANT_WRITE_ARGS = "Can't write `main' argument file", diff -r 5ffa85bf891c -r 0bea9271a681 test/jtreg/com/sun/javatest/regtest/CompileAction.java --- a/test/jtreg/com/sun/javatest/regtest/CompileAction.java Thu May 05 01:17:33 2011 +0100 +++ b/test/jtreg/com/sun/javatest/regtest/CompileAction.java Mon May 16 16:52:29 2011 +0200 @@ -37,6 +37,12 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Enumeration; +import java.util.Hashtable; +import java.security.AccessController; +import java.security.PrivilegedAction; import com.sun.javatest.Status; import com.sun.javatest.TestResult; @@ -68,7 +74,7 @@ init(opts, args, reason, script); return run(); } // compile() - + /** * This method does initial processing of the options and arguments for the * action. Processing is determined by the requirements of run() and @@ -97,46 +103,48 @@ throws ParseException { this.script = script; this.reason = reason; - + if (args.length == 0) throw new ParseException(COMPILE_NO_CLASSNAME); - + for (int i = 0; i < opts.length; i++) { String optName = opts[i][0]; String optValue = opts[i][1]; - + if (optName.equals("fail")) { reverseStatus = parseFail(optValue); } else if (optName.equals("timeout")) { timeout = parseTimeout(optValue); } else if (optName.equals("ref")) { ref = parseRef(optValue); + } else if (optName.equals("process")) { + process = true; } else { throw new ParseException(COMPILE_BAD_OPT + optName); } } - + if (timeout < 0) timeout = script.getActionTimeout(0); - + // add absolute path name to all the .java files create appropriate // class directories try { for (int i = 0; i < args.length; i++) { String currArg = args[i]; - + if (currArg.endsWith(".java")) { // make sure the correct file separator has been used currArg = currArg.replace('/', File.separatorChar); - + File sourceFile = new File(currArg); if (!sourceFile.isAbsolute()) // User must have used @compile, so file must be // in the same directory as the defining file. - args[i] = script.absTestSrcDir() + FILESEP + currArg; + args[i] = new File(script.absTestSrcDir(), currArg).getPath(); // if (!sourceFile.exists()) // throw new ParseException(CANT_FIND_SRC); - + // set the destination directory only if we've actually // found something to compile if (script.hasEnv()) { @@ -144,65 +152,72 @@ if (!destDir.exists()) destDir.mkdirs(); } - + } - + if (currArg.equals("-classpath") || currArg.equals("-cp")) { classpathp = true; // assume the next element provides the classpath, add // test.classes and test.src and lib-list to it if (script.hasEnv()) { - args[i+1] = addPath(args[i+1], - script.absTestClsDir() + PATHSEP + - script.absTestSrcDir() + PATHSEP + - script.absClsLibListStr()); + Path p = new Path(args[i+1]) + .append(script.absTestClsDir()) + .append(script.absTestSrcDir()) + .append(script.absClsLibListStr()); + args[i+1] = p.toString(); } args[i+1] = singleQuoteString(args[i+1]); } - + if (currArg.equals("-d")) { throw new ParseException(COMPILE_OPT_DISALLOW); } - + // note that -sourcepath is only valid for JDK1.2 and beyond if (currArg.equals("-sourcepath")) { sourcepathp = true; // assume the next element provides the sourcepath, add test.src // and lib-list to it - args[i+1] = addPath(args[i+1], - script.absTestSrcDir() + PATHSEP + - script.absSrcLibListStr()); + Path p = new Path(args[i+1]) + .append(script.absTestSrcDir()) + .append(script.absSrcLibListStr()); + args[i+1] = p.toString(); args[i+1] = singleQuoteString(args[i+1]); } } + + // If we didn't set the destination directory, then we must not have + // found something ending with ".java" to compile. + if (script.hasEnv() && destDir == null) { + if (process) { + destDir = script.absTestClsDir(); + if (!destDir.exists()) + destDir.mkdirs(); + } else + throw new ParseException(COMPILE_NO_DOT_JAVA); + } } catch (RegressionScript.TestClassException e) { throw new ParseException(e.getMessage()); } - // If we didn't set the destination directory, then we must not have - // found something ending with ".java" to compile. - if (script.hasEnv() && destDir == null) { - throw new ParseException(COMPILE_NO_DOT_JAVA); - } - this.args = args; } // init() - + @Override public File[] getSourceFiles() { List l = new ArrayList(); - + for (int i = 0; i < args.length; i++) { String currArg = args[i]; - + if (currArg.endsWith(".java")) { l.add(new File(currArg)); } } - + return l.toArray(new File[l.size()]); } - + /** * The method that does the work of the action. The necessary work for the * given action is defined by the tag specification. @@ -227,9 +242,9 @@ */ public Status run() throws TestRunException { Status status; - + section = startAction("compile", args, reason); - + // Make sure that all of the .java files we want to compile exist. // We could let the compiler handle this, but if we put the extra check // here, we get more information in "check" mode. @@ -240,7 +255,7 @@ throw new TestRunException(CANT_FIND_SRC + currArg); } } - + if (script.isCheck()) { status = Status.passed(CHECK_PASS); } else { @@ -249,71 +264,73 @@ else status = runSameJVM(); } - + endAction(status, section); return status; } // run() - + //----------internal methods------------------------------------------------ - + private Status runOtherJVM() throws TestRunException { Status status; final boolean jdk11 = script.isJDK11(); final boolean useCLASSPATHEnv = jdk11; final boolean useClassPathOpt = !jdk11; final boolean useSourcePathOpt = !jdk11; - + // CONSTRUCT THE COMMAND LINE List javacOpts = new ArrayList(); - + // Why JavaTest? + Path cp = new Path(script.getJavaTestClassPath(), script.testClassPath()); if (useCLASSPATHEnv) { - javacOpts.add("CLASSPATH=" + script.getJavaTestClassPath() + PATHSEP + script.testClassPath()); + javacOpts.add("CLASSPATH=" + cp); } - + javacOpts.add(script.getJavacProg()); - + javacOpts.addAll(script.getTestToolVMOptions()); - + javacOpts.addAll(script.getTestCompilerOptions()); - + javacOpts.add("-d"); javacOpts.add(destDir.toString()); - + // JavaTest added, to match CLASSPATH, but not sure why JavaTest required at all if (!classpathp && useClassPathOpt) { javacOpts.add("-classpath"); - javacOpts.add(script.getJavaTestClassPath() + PATHSEP + script.testClassPath()); + javacOpts.add(cp.toString()); } - + if (!sourcepathp && useSourcePathOpt) { javacOpts.add("-sourcepath"); javacOpts.add(script.testSourcePath()); } - + + // Set test.src and test.classes for the benefit of annotation processors String[] envVars = script.getEnvVars(); String[] jcOpts = javacOpts.toArray(new String[javacOpts.size()]); String[] cmdArgs = StringArray.append(envVars, jcOpts); cmdArgs = StringArray.append(cmdArgs, args); - + if (showCmd) JTCmd("compile", cmdArgs, section); - + // PASS TO PROCESSCOMMAND StringWriter outSW = new StringWriter(); StringWriter errSW = new StringWriter(); try { ProcessCommand cmd = new ProcessCommand(); cmd.setExecDir(script.absTestScratchDir()); - + if (timeout > 0) script.setAlarm(timeout*1000); - + status = cmd.run(cmdArgs, new PrintWriter(errSW), new PrintWriter(outSW)); } finally { script.setAlarm(0); } - + // EVALUATE THE RESULTS boolean ok = status.isPassed(); int st = status.getType(); @@ -330,7 +347,7 @@ sr = COMPILE_FAIL; } status = new Status(st, sr); - + String outString = outSW.toString(); String errString = errSW.toString(); PrintWriter sysOut = section.createOutput("System.out"); @@ -338,11 +355,11 @@ try { sysOut.write(outString); sysErr.write(errString); - + // COMPARE OUTPUT TO GOLDENFILE IF REQUIRED // tag-spec says that "standard error is redirected to standard out // so that /ref can be used." Simulate this by concatenating streams. - + try { if ((ref != null) && (status.getType() == Status.PASSED)) { File refFile = new File(script.absTestSrcDir(), ref); @@ -361,7 +378,7 @@ if (sysOut != null) sysOut.close(); if (sysErr != null) sysErr.close(); } - + return status; } // runOtherJVM() @@ -370,86 +387,90 @@ // CONSTRUCT THE COMMAND LINE List javacOpts = new ArrayList(); - + javacOpts.addAll(script.getTestCompilerOptions()); - - javacOpts.add("-d"); - javacOpts.add(destDir.toString()); - + + if (destDir != null) { + javacOpts.add("-d"); + javacOpts.add(destDir.toString()); + } + if (!classpathp) { javacOpts.add("-classpath"); javacOpts.add(script.testClassPath()); } - + if (!sourcepathp) { // must be JDK1.4 or greater, to even run JavaTest 3 javacOpts.add("-sourcepath"); javacOpts.add(script.testSourcePath()); } - + String[] jcOpts = javacOpts.toArray(new String[javacOpts.size()]); String[] cmdArgs = StringArray.append(jcOpts, args); - + if (showCmd) JTCmd("compile", cmdArgs, section); // RUN THE COMPILER + // RUN THE COMPILER + // for direct use with JavaCompileCommand StringWriter outSW = new StringWriter(); StringWriter errSW = new StringWriter(); PrintWriter outPW = new PrintWriter(outSW); PrintWriter errPW = new PrintWriter(errSW); - + // to catch sysout and syserr ByteArrayOutputStream outOS = new ByteArrayOutputStream(); ByteArrayOutputStream errOS = new ByteArrayOutputStream(); PrintStream outPS = new PrintStream(outOS); PrintStream errPS = new PrintStream(errOS); - + PrintStream saveOut = System.out; PrintStream saveErr = System.err; - + try { Status stat = redirectOutput(outPS, errPS); if (!stat.isPassed()) return stat; - + JavaCompileCommand jcc = new JavaCompileCommand(); if (timeout > 0) script.setAlarm(timeout*1000); - + status = jcc.run(cmdArgs, errPW, outPW); } finally { Status stat = redirectOutput(saveOut, saveErr); if (!stat.isPassed()) return stat; - + script.setAlarm(0); } From dlila at redhat.com Mon May 16 07:51:10 2011 From: dlila at redhat.com (Denis Lila) Date: Mon, 16 May 2011 10:51:10 -0400 (EDT) Subject: Mutter awt fix. In-Reply-To: <4DD137BB.7070409@redhat.com> Message-ID: <774541080.227471.1305557470060.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> > AFAIK you still did not received the rights to push this change to > OpenJDK right (because the repos is in frozen state)? That's right. That's why I'm trying to push it to just icedtea7-forest. No one found anything wrong with the fix itself though (there was a suggestion that we can probably do better, but this works, so until we figure out how, we might as well push this). > Or do you have bug ID for this fix at least? Not just that - I have _two_ bug ids ;-) The red hat one is 698295. The one on bugs.sun.com (that I filed myself) is in the regression test in the patch. Regards, Denis. ----- Original Message ----- > Denis Lila wrote: > > Hi. > > > > I would like to push this to icedtea7-forest. It fixes > > RH698295. The only part of it that hasn't been reviewed > > is the regression test so, Pavel could you please take > > a look at that? You already saw a previous version of it, > > but I made some changes. > > > > This will also need to be backported into icedtea6 head. > > > > Thank you, > > Denis. > > > > Hi Denis, > > it looks ok for me, thanks you. > > > Cheers, > Pavel From ptisnovs at redhat.com Mon May 16 08:44:07 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 16 May 2011 17:44:07 +0200 Subject: Reviewer needed - fix for hotspot regression test Test6929067 in IcedTea7 Message-ID: <4DD14647.8050406@redhat.com> Hi all, I'd like to synchronize (and fix at the same moment :-) regression test Test6929067 in IcedTea7. The changes are the same as I've made in IcedTea6. hg diff for IcedTea7-forest is stored in attachment (i.e. its not regular patch as it is in IcedTea6 case) Can anybody please review that change? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110516/af57112c/hg_diff.ksh From ahughes at redhat.com Mon May 16 08:45:22 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 16 May 2011 16:45:22 +0100 Subject: Reviewer needed - fix for regression test test/sun/net/www/protocol/file/DirPermissionDenied in IcedTea7 In-Reply-To: <4DCD0084.8050203@redhat.com> References: <4DCC00D1.8030906@redhat.com> <20110512163423.GB31710@rivendell.middle-earth.co.uk> <4DCD0084.8050203@redhat.com> Message-ID: <20110516154522.GT31710@rivendell.middle-earth.co.uk> On 11:57 Fri 13 May , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > On 17:46 Thu 12 May , Pavel Tisnovsky wrote: > > > > As mentioned in http://icedtea.classpath.org/wiki/CommitPolicy IcedTea7 > > patches are applied to the IcedTea forest, not to IcedTea7 itself. For 2.0, all > > patches will be removed from IcedTea7. See: > > > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 > > > > Also, this patch is wrong anyway as it adds the patch as a bootstrapping patch. > > Hi Andrew, > > if I understand correctly, I'm able to directly change files in > jdk|hotspot|...etc...etc...| repo in IcedTea7-forest right? > Yes, on the IcedTea server. > I've created hg diff against IcedTea7-forest which is stored in an > attachment, but I'm not sure when to store Changelog entry - or are > commit messages enough to keep track of changes? > Yes, there's no ChangeLog in the forest. You'll need to make a change to IcedTea7 itself as well to bump the Mercurial revisions and checksums. This will include a ChangeLog where you can detail the actual change. See IcedTea7's ChangeLog for some examples from me. > Cheers, > Pavel > diff -r cf7c64f276c6 test/sun/net/www/protocol/file/DirPermissionDenied.sh > --- a/test/sun/net/www/protocol/file/DirPermissionDenied.sh Wed May 11 11:08:03 2011 -0400 > +++ b/test/sun/net/www/protocol/file/DirPermissionDenied.sh Fri May 13 11:44:06 2011 +0200 > @@ -37,5 +37,6 @@ > > $TESTJAVA/bin/java -classpath $TESTCLASSES DirPermissionDenied ${TESTDIR} > result=$? > +chmod u+r ${TESTDIR} > rm -rf ${TESTDIR} > exit $result -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ptisnovs at redhat.com Mon May 16 09:18:04 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 16 May 2011 18:18:04 +0200 Subject: Reviewer needed - fix for regression test test/sun/net/www/protocol/file/DirPermissionDenied in IcedTea7 In-Reply-To: <20110516154522.GT31710@rivendell.middle-earth.co.uk> References: <4DCC00D1.8030906@redhat.com> <20110512163423.GB31710@rivendell.middle-earth.co.uk> <4DCD0084.8050203@redhat.com> <20110516154522.GT31710@rivendell.middle-earth.co.uk> Message-ID: <4DD14E3C.4040703@redhat.com> Dr Andrew John Hughes wrote: > On 11:57 Fri 13 May , Pavel Tisnovsky wrote: >> Dr Andrew John Hughes wrote: > > Yes, there's no ChangeLog in the forest. > > You'll need to make a change to IcedTea7 itself as well to bump the > Mercurial revisions and checksums. This will include a ChangeLog where > you can detail the actual change. See IcedTea7's ChangeLog for some > examples from me. > Hi Andrew, thank you for the explanation, but I'm not sure how to "...bump the Mercurial revisions and checksums...". It's probably interesting thing that could be explained (or referenced) on the http://icedtea.classpath.org/wiki/CommitPolicy page (I recall you mentioned that you have some useful script to do that work) Thank you very much, Pavel Cheers, Pavel From bugzilla-daemon at icedtea.classpath.org Mon May 16 09:47:08 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 16 May 2011 16:47:08 +0000 Subject: [Bug 722] New: javaws fails to run signed application if unsigned files are present under META-INF/ Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=722 Summary: javaws fails to run signed application if unsigned files are present under META-INF/ Product: IcedTea-Web Version: hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: NetX AssignedTo: omajid at redhat.com ReportedBy: omajid at redhat.com CC: unassigned at icedtea.classpath.org Some JNLP applications consist of jars that contain mostly signed, but some unsigned files under META-INF/*. These applications work fine with the proprietary javaws, but not with icedtea-web. Arguably, having unsigned files under META-INF (other than signature related files) is wrong, but many applications rely on this this nonetheless. Some applications that demonstrate the behaviour: http://www.jgoodies.com/download/jpathreport/jpathreport.jnlp http://www.crossftp.com/crossftp.jnlp -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon May 16 10:11:12 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 16 May 2011 17:11:12 +0000 Subject: [Bug 723] New: AccessControlException while downloading resource Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=723 Summary: AccessControlException while downloading resource Product: IcedTea-Web Version: hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: NetX AssignedTo: omajid at redhat.com ReportedBy: omajid at redhat.com CC: unassigned at icedtea.classpath.org Running PasswordStore (a swing demo at:http://download.oracle.com/javase/tutorial/ui/overview/demo.html) causes an AccessControlException. This is a regression; older versions of javaws ran this fine. Steps to reproduce: $ rm -rf ~/.icedtea* $ ~/code/icedtea-web-image/bin/javaws http://download.oracle.com/javase/tutorialJWS/ui/PasswordStore.jnlp java.security.AccessControlException: access denied (java.io.FilePermission /home/omajid/.icedtea/cache/recently_used read) at java.security.AccessControlContext.checkPermission(AccessControlContext.java:393) at java.security.AccessController.checkPermission(AccessController.java:553) at java.lang.SecurityManager.checkPermission(SecurityManager.java:549) at net.sourceforge.jnlp.runtime.JNLPSecurityManager.checkPermission(JNLPSecurityManager.java:285) at java.lang.SecurityManager.checkRead(SecurityManager.java:888) at java.io.File.exists(File.java:748) at net.sourceforge.jnlp.cache.CacheLRUWrapper.lock(CacheLRUWrapper.java:185) at net.sourceforge.jnlp.cache.CacheUtil.getCacheFile(CacheUtil.java:301) at net.sourceforge.jnlp.cache.CacheEntry.(CacheEntry.java:56) at net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:765) at net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:609) at net.sourceforge.jnlp.cache.ResourceTracker.access$400(ResourceTracker.java:70) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1103) at java.lang.Thread.run(Thread.java:679) $ ll /home/omajid/.icedtea/cache/recently_used -rw-------. 1 omajid omajid 398 May 16 13:07 /home/omajid/.icedtea/cache/recently_used -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon May 16 10:34:34 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 16 May 2011 17:34:34 +0000 Subject: [Bug 724] New: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=724 Summary: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest Product: IcedTea-Web Version: hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: NetX AssignedTo: omajid at redhat.com ReportedBy: omajid at redhat.com CC: unassigned at icedtea.classpath.org Created an attachment (id=535) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=535) fix It is possible to generate NullPointerExceptions in JNLPClassLoader.getClassPathsFromManifest. A stack trace from such an exception is: java.lang.NullPointerException at net.sourceforge.jnlp.runtime.JNLPClassLoader.getClassPathsFromManifest(JNLPClassLoader.java:1378) at net.sourceforge.jnlp.runtime.JNLPClassLoader.access$1000(JNLPClassLoader.java:78) at net.sourceforge.jnlp.runtime.JNLPClassLoader$2.run(JNLPClassLoader.java:777) at net.sourceforge.jnlp.runtime.JNLPClassLoader$2.run(JNLPClassLoader.java:657) at java.security.AccessController.doPrivileged(Native Method) at net.sourceforge.jnlp.runtime.JNLPClassLoader.activateJars(JNLPClassLoader.java:799) at net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:518) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:175) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:294) at net.sourceforge.jnlp.Launcher.createApplication(Launcher.java:767) at net.sourceforge.jnlp.Launcher.launchApplication(Launcher.java:552) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:887) Strangely enough, I cant reproduce it any more. Either way, the fix looks simple enough. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Mon May 16 10:55:44 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 16 May 2011 13:55:44 -0400 Subject: [icedtea-web] RFC: Request to back out 0256de6a4bf6 Message-ID: <20110516175544.GG29490@redhat.com> Hi, http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/0256de6a4bf6 makes it so that the VM shuts down after the last applet is closed. The patch was committed with the known possibility that there could be a race condition whereby one applet was initializing while the last one closed. The probability of that was deemed to be low enough to not matter. However I think that assessment was incorrect on my part. I have come across pages where one applet tries to launch a page that loads another. In such case of programmatic switching, it is easier to end up with a case where the VM shuts down when it shouldn't. I would therefore like to back this patch out of 1.1. The proper fix is to do shutdown from C++ side, which can then also bring the VM back up if another applet is loaded. I have a patch do this, but it will need some more testing and it shouldn't go in 1.1. I will apply it to head after I am done testing it. Okay to back out and replace with just commenting out tg.stop()? Doing so may leak resources due to bad applets, but that is not really the fault of the plug-in anyway. Cheers, Deepak From dbhole at redhat.com Mon May 16 11:03:28 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 16 May 2011 14:03:28 -0400 Subject: firefox 4: problem with NPN_GetURL target=_self In-Reply-To: <4DD026DD.8010205@icyb.net.ua> References: <4DADADC8.7010404@icyb.net.ua> <4DADCF06.8080803@smedbergs.us> <4DADD105.30103@icyb.net.ua> <20110421153134.GC7494@redhat.com> <4DD026DD.8010205@icyb.net.ua> Message-ID: <20110516180328.GH29490@redhat.com> * Andriy Gapon [2011-05-15 15:18]: > on 21/04/2011 18:31 Deepak Bhole said the following: > > * Andriy Gapon [2011-04-19 14:16]: > >> on 19/04/2011 21:05 Benjamin Smedberg said the following: > >>> It sounds like this could possibly be related to the plugin process implementation > >>> in Firefox 4 > >> > >> I am not if this is really so... > >> IcedTea plugin itself spawns a JVM process to handle applet byte code. I am not > >> sure if that has any relation to what Firefox does for/on/about plugins. > >> > > > > Hi, > > > > I have modified the plugin to use NPN_GetURLNotify instead of > > NPN_GetURL. The former is non-blocking, and thus allows the plugin to > > continue to service requests. > > > > This should solve the problem in the interim. Andriy, can you please > > give it a try? > > > > Instructions to get, build and use the latest icedtea-web are here: > > http://icedtea.classpath.org/wiki/?title=IcedTea-Web#Getting_IcedTea-Web > > Sorry for disappearing for a while. > Unfortunately it seems that the issue is still there for me with the latest > icedtea-web code from hg and firefox4. > Hi Andriy, Can you please try again with the patch here applied? http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/014200.html That patch adds full recursive call support for showDocument() calls, rather than relying on FF to not make such calls. It should therefore always work. Please let me know if there are any problems. Thanks, Deepak > -- > Andriy Gapon > _______________________________________________ > dev-tech-plugins mailing list > dev-tech-plugins at lists.mozilla.org > https://lists.mozilla.org/listinfo/dev-tech-plugins From dbhole at redhat.com Mon May 16 11:42:16 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 16 May 2011 14:42:16 -0400 Subject: IcedTea-Web 1.1 release status In-Reply-To: <20110506215601.GC2485@redhat.com> References: <20110506215601.GC2485@redhat.com> Message-ID: <20110516184215.GI29490@redhat.com> * Deepak Bhole [2011-05-06 18:05]: > Hi, > > Over the past few days I have found some rather important issues in the > plugin that I feel need to be fixed. Due to me being at the Red Hat > Summit over most of this week I've only now been able to start looking > into them. > > I think it would be best to push the release to some time next week. I > will send another update on Monday/Tuesday on the status of the fixes. > > The issues that need addressing are: > - NPN_getURL attempts recursive action and hangs (FF4 only) > - FF randomly crashes due to calls from incorrect (non-main) threads to > NP* functions ... the cause was unknown to me until early this week.. > only now found a better reproducer > > I'd rather see us release a good product slightly late than a bad one > early :) > Hi, Despite my best efforts, I have been unable to work on 1.1 release due to other more time sensitive items on my plate :( We found some regressions in 1.1 recently and I am going on vacation until the 25th. Rather than hastily release 1.1 only to be followed by 1.1.1, I think it would be best to wait till after I am back. Omair and others will be working on regressions fixes in the mean time. Assuming everything is cleared, we will aim for a release on the 27th. Once again, I do apologize that 1.1 has been delayed this way -- it was not for lack of trying :/ Cheers, Deepak From bugzilla-daemon at icedtea.classpath.org Mon May 16 11:44:14 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 16 May 2011 18:44:14 +0000 Subject: [Bug 723] AccessControlException while downloading resource In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=723 Andrew Su changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |asu at redhat.com --- Comment #1 from Andrew Su 2011-05-16 18:44:13 --- It seems like revision of 225 (SHA-1: 6abf7a788f4e) had broke it -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Mon May 16 17:33:18 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 17 May 2011 01:33:18 +0100 Subject: [icedtea-web] RFC: Request to back out 0256de6a4bf6 In-Reply-To: <20110516175544.GG29490@redhat.com> References: <20110516175544.GG29490@redhat.com> Message-ID: <20110517003318.GU31710@rivendell.middle-earth.co.uk> On 13:55 Mon 16 May , Deepak Bhole wrote: > Hi, > > http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/0256de6a4bf6 > makes it so that the VM shuts down after the last applet is closed. > > The patch was committed with the known possibility that there could be a > race condition whereby one applet was initializing while the last one > closed. The probability of that was deemed to be low enough to not > matter. > > However I think that assessment was incorrect on my part. I have come > across pages where one applet tries to launch a page that loads another. > In such case of programmatic switching, it is easier to end up with a > case where the VM shuts down when it shouldn't. > > I would therefore like to back this patch out of 1.1. > > The proper fix is to do shutdown from C++ side, which can then also > bring the VM back up if another applet is loaded. I have a patch do > this, but it will need some more testing and it shouldn't go in 1.1. I > will apply it to head after I am done testing it. > > Okay to back out and replace with just commenting out tg.stop()? > > Doing so may leak resources due to bad applets, but that is not really > the fault of the plug-in anyway. > > Cheers, > Deepak Approved. Do we have a new release date for 1.1? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Mon May 16 17:41:58 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 17 May 2011 01:41:58 +0100 Subject: Mutter awt fix. In-Reply-To: <4DD137BB.7070409@redhat.com> References: <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <4DD137BB.7070409@redhat.com> Message-ID: <20110517004158.GW31710@rivendell.middle-earth.co.uk> On 16:42 Mon 16 May , Pavel Tisnovsky wrote: > > AFAIK you still did not received the rights to push this change to > OpenJDK right (because the repos is in frozen state)? Or do you have bug > ID for this fix at least? > Denis' patch was reviewed and accepted. It hasn't been pushed because Oracle seem to have decided to make up some new rules, limiting pushes to the repositories without any prior notice. If they want to play this game, then fine. But they can play it on their own. We'll use our IcedTea forest to provide the best experience we can to our users. > Cheers, > Pavel -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From dbhole at redhat.com Mon May 16 19:14:29 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 16 May 2011 22:14:29 -0400 Subject: [icedtea-web] RFC: Request to back out 0256de6a4bf6 In-Reply-To: <20110517003318.GU31710@rivendell.middle-earth.co.uk> References: <20110516175544.GG29490@redhat.com> <20110517003318.GU31710@rivendell.middle-earth.co.uk> Message-ID: <20110517021429.GA8157@redhat.com> * Dr Andrew John Hughes [2011-05-16 20:33]: > On 13:55 Mon 16 May , Deepak Bhole wrote: > > Hi, > > > > http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/0256de6a4bf6 > > makes it so that the VM shuts down after the last applet is closed. > > > > The patch was committed with the known possibility that there could be a > > race condition whereby one applet was initializing while the last one > > closed. The probability of that was deemed to be low enough to not > > matter. > > > > However I think that assessment was incorrect on my part. I have come > > across pages where one applet tries to launch a page that loads another. > > In such case of programmatic switching, it is easier to end up with a > > case where the VM shuts down when it shouldn't. > > > > I would therefore like to back this patch out of 1.1. > > > > The proper fix is to do shutdown from C++ side, which can then also > > bring the VM back up if another applet is loaded. I have a patch do > > this, but it will need some more testing and it shouldn't go in 1.1. I > > will apply it to head after I am done testing it. > > > > Okay to back out and replace with just commenting out tg.stop()? > > > > Doing so may leak resources due to bad applets, but that is not really > > the fault of the plug-in anyway. > > > > Cheers, > > Deepak > > Approved. Do we have a new release date for 1.1? Yes, I sent an email earlier today: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/014245.html Cheers, Deepak > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and IcedTea > http://www.gnu.org/software/classpath > http://icedtea.classpath.org > PGP Key: F5862A37 (https://keys.indymedia.org/) > Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at redhat.com Mon May 16 19:34:03 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 16 May 2011 22:34:03 -0400 Subject: [icedtea-web] reviewer needed - added engine for lunching reproducers In-Reply-To: <4DCAAD29.80706@redhat.com> References: <4DC2CAC1.7070802@redhat.com> <4DC484FA.1030208@redhat.com> <4DCAAD29.80706@redhat.com> Message-ID: <4DD1DE9B.30508@redhat.com> Hi Jiri, On 05/11/2011 11:37 AM, Jiri Vanek wrote: > On 05/07/2011 01:32 AM, Omair Majid wrote: >> Hi Jiri, >> >> On 05/05/2011 12:05 PM, Jiri Vanek wrote: >>> Makefile - automated compile and copy for most of reproducers, with >>> possibility to add more complex reproducers which will take care of >>> compiling themselves (I have in this way also "repaired" your >>> reproducers you send me, but because this patch is about engine itself >>> they are not commited - but are working quite fine :) ) >>> When all reproducers are prepared, junit testsuite is lunched - after >>> program is "installed". junit takes location of installed javaws and >>> location of prepared reproducers (directory jars, jnlps and other >>> resources). >>> >>> Inside junit suite virtual server is lunched and serves all resources. >>> During the testsuite individual jnlps are executed, and their >>> stderr/out/return code can be asserted. (There are helepers method for >>> this in used virtual server which provides to tester exactly std out/err >>> return code). Also possibility to timeout process is added. >>> At the end the report - same as was for unit tests - is generated (if my >>> previous patch is used :). There is also possibility of including >>> stdout/err of tests into xml-report files. >>> >> >> Sorry for taking so long to respond to this. >> >> I have got to admit, this is great! I have lots of little nitpicks [1], >> but we can argue about those _after_ you commit an initial version. >> >> I only thing I dont like is how test information is spread out. I would >> love if this was more jtreg-like: you place everything (jnlp file and >> the associated java file (and possibly a makefile or other meta >> information)) in one directory. I dont like that you have to add junit >> test methods (to another location). You have a big thumbs up from me if >> you can fix this. >> >> Thanks again for doing this! >> >> Cheers, >> Omair >> >> [1] including file paths/names, variable names, spacing and other >> details ;) > > So another round - partially based on attached communication. > The heart of patch is not changed at all. It automatically compile and > deploy individual reproducers. Still containing space for more complex > reproducers which compile and(or) deploy themselves. Run testsuite > inside junit, and contains small server (can run several instances on > different port, and contains helping methods) as singleton and lunches > by-make installed javaws. > > The crucial difference is in testing whether reproducer passed or > failed. In previous patch this was included ind > tests/dist/net/sourceforge/ (acording to tests/unit/net/sourceforge). > Now (as previewd in simpletest 1 and 2 reproducer) each reproducer have > except srcs and resources directory also testcases directory which > contains javaclass which will be added to junit testsuit to be lunched > and examined. (*** _I'm not sure about package hierarchy here_ ***). > Those testcases have tests/dist on their classpath even during compile, > so they can use helpers functions and server smoothly. > I am quite happy with this patch. I have a few recommendations below. > > > diff -r 2b1a69f4c54b Makefile.am > --- a/Makefile.am Tue May 10 11:16:17 2011 -0400 > +++ b/Makefile.am Wed May 11 13:52:03 2011 +0200 > @@ -12,11 +12,17 @@ > NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit > TESTS_STYLES_SRCDIR=$(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME) > JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner > +NETX_DIST_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/dist > +NETX_JNLP_TEST_SRCDIR=$(TESTS_SRCDIR)/jnlp_tests > > TESTS_DIR=$(abs_top_builddir)/tests.build > NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit > TESTS_STYLES_DIR=$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) > JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner > +NETX_DIST_TEST_DIR=$(TESTS_DIR)/netx/dist > +NETX_DIST_TESTCASES_DIR=$(TESTS_DIR)/netx/dist_testcases > +TESTS_SERVER_DIR=$(TESTS_DIR)/test_server > +TESTS_JNLP_DIR=$(TESTS_DIR)/jnlp_tests > I would suggest renaming these directories (and variables). I am not sure what 'dist' really signifies. The jnlp tests should probably in tests/netx/jnlp/ - they are for netx only and not for the plugin. > > JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar > @@ -459,6 +465,68 @@ > @junit-runner-source-files.txt&& \ > $(BOOT_DIR)/bin/jar cf $@ -C $(JUNIT_RUNNER_DIR) . > > +junit-jnlp-dist-dirs.txt: > + mkdir -p $(TESTS_SERVER_DIR) > + mkdir -p $(TESTS_JNLP_DIR) > + mkdir -p $(NETX_DIST_TEST_DIR) > + cd $(NETX_JNLP_TEST_SRCDIR)/simple/ ; \ > + find . -maxdepth 1 -mindepth 1 | sed "s/.\/*//"> $(abs_top_builddir)/$@ > + > +stamps/netx-dist-tests-prepare-reproducers.stamp: junit-jnlp-dist-dirs.txt > + simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-dirs.txt `); \ > + for dir in "$${simpleReproducers[@]}" ; do \ > + mkdir -p $(TESTS_JNLP_DIR)/$$dir ; \ > + $(BOOT_DIR)/bin/javac -d $(TESTS_JNLP_DIR) $(NETX_JNLP_TEST_SRCDIR)/simple/$$dir/srcs/$$dir/* ; \ > + d=`pwd` ; \ > + cd $(TESTS_JNLP_DIR) ; \ > + $(BOOT_DIR)/bin/jar cf $(TESTS_SERVER_DIR)/$$dir.jar $$dir/ ; \ > + cd $$d ; \ > + cp -R $(NETX_JNLP_TEST_SRCDIR)/simple/$$dir/resources/* $(TESTS_SERVER_DIR)/ ; \ > + done ; \ > + mkdir -p stamps&& \ > + touch $@ > + > +netx-dist-tests-source-files.txt: > + find $(NETX_DIST_TEST_SRCDIR) -name '*.java' | sort> $@ > + > +stamps/netx-dist-tests-compile.stamp: stamps/netx.stamp \ > + junit-jnlp-dist-dirs.txt netx-dist-tests-source-files.txt > + $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ > + -d $(NETX_DIST_TEST_DIR) \ > + -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar \ > + @netx-dist-tests-source-files.txt&& \ > + mkdir -p stamps&& \ > + touch $@ > + > +stamps/netx-dist-tests-compile-testcases.stamp: stamps/netx.stamp junit-jnlp-dist-dirs.txt\ > + netx-dist-tests-source-files.txt stamps/netx-dist-tests-compile.stamp > + simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-dirs.txt `); \ > + for dir in "$${simpleReproducers[@]}" ; do \ > + $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ > + -d $(NETX_DIST_TEST_DIR) \ > + -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(NETX_DIST_TEST_DIR) \ > + $(NETX_JNLP_TEST_SRCDIR)/simple/$$dir/testcases/* ; \ > + done ; \ > + mkdir -p stamps&& \ > + touch $@ > + > +run-netx-dist-tests: all-local stamps/netx.stamp junit-jnlp-dist-dirs.txt stamps/netx-dist-tests-prepare-reproducers.stamp \ > + stamps/netx-dist-tests-compile.stamp stamps/netx-dist-tests-compile-testcases.stamp $(JUNIT_RUNNER_JAR) $(TESTS_DIR)/index.html > + cd $(NETX_DIST_TEST_DIR) ; \ > + class_names= ; \ > + for test in `find -type f` ; do \ > + class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \ > + class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \ > + class_names="$$class_names $$class_name" ; \ > + done ; \ > + echo $$class_names ; \ > + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \ > + $(BOOT_DIR)/bin/java -Dtest.server.dir=$(TESTS_SERVER_DIR) -Djavaws.build.bin=$(DESTDIR)$(bindir)/javaws \ > + -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ I just realized (sometimes I can be slow ;) ) that if you are passing all these java properties, you can also pass along the values of -Dicedtea-web.bin.name and -Dicedtea-web.bin.path and avoid having to run these tests only after 'make install'. > + > stdout.log 2> stderr.log ; \ > + cat stdout.log ; \ > + cat stderr.log>&2 > + > netx-unit-tests-source-files.txt: > find $(NETX_UNIT_TEST_SRCDIR) -name '*.java' | sort> $@ > > @@ -496,7 +564,7 @@ > cat stdout.log ; \ > cat stderr.log>&2 > > -clean-netx-tests: clean-netx-unit-tests clean-junit-runner > +clean-netx-tests: clean-netx-unit-tests clean-junit-runner clean-netx-dist-tests > if [ -e $(TESTS_DIR)/netx ]; then \ > rmdir $(TESTS_DIR)/netx ; \ > fi > @@ -513,6 +581,16 @@ > rm -rf $(NETX_UNIT_TEST_DIR) > rm -f stamps/netx-unit-tests-compile.stamp > > +clean-netx-dist-tests: > + rm -f netx-dist-tests-source-files.txt > + rm -rf $(TESTS_JNLP_DIR) > + rm -rf $(TESTS_SERVER_DIR) > + rm -rf $(NETX_DIST_TEST_DIR) > + rm -f stamps/netx-dist-tests-compile.stamp > + rm -f stamps/netx-dist-tests-prepare-reproducers.stamp > + rm -f stamps/netx-dist-tests-compile-testcases.stamp > + rm -f junit-jnlp-dist-dirs.txt > + > # plugin tests I cant see a way to run these tests using a standard 'make' target. > > if ENABLE_PLUGIN > diff -r 2b1a69f4c54b tests/jnlp_tests/README > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/README Wed May 11 13:52:03 2011 +0200 > @@ -0,0 +1,1 @@ > +Each file in simple must follows naming convention and is compiled/jared automaticky into server's working directory and content of resources likewise. The name of jnlp is independent, ant there can be even more jnlps for each future jar. > diff -r 2b1a69f4c54b tests/jnlp_tests/simple/simpletest1/resources/simpletest1.jnlp Please fix the spelling error(s?). > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/simple/simpletest1/resources/simpletest1.jnlp Wed May 11 13:52:03 2011 +0200 Why the '/simple/' in the path? > @@ -0,0 +1,16 @@ > + > + If you are starting a simple http server, then codebase value should point to the server, not '.'. > + > +simpletest1 > +NetX > + > +simpletest1 > + > + > + > + > + > + > + > + > + > diff -r 2b1a69f4c54b tests/jnlp_tests/simple/simpletest1/srcs/simpletest1/SimpleTest1.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/simple/simpletest1/srcs/simpletest1/SimpleTest1.java Wed May 11 13:52:03 2011 +0200 > @@ -0,0 +1,8 @@ Please add a license here too. Well, I hope you are not committing this trivial test. But just to give an idea. And thanks for adding a concrete example to show how actual tests would be like. > +package simpletest1; > + > +public class SimpleTest1{ > + > + public static void main(String[] args){ > + System.out.println("Good simple javaws exapmle"); > + } > +} Is there an advantage to placing this class in a separate package? > diff -r 2b1a69f4c54b tests/jnlp_tests/simple/simpletest1/testcases/SimpleTest1Test.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/simple/simpletest1/testcases/SimpleTest1Test.java Wed May 11 13:52:03 2011 +0200 > @@ -0,0 +1,82 @@ > +/* ParserMalformedXml.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. > + */ > +package net.sourceforge.jnlp; > + > +import java.io.File; > +import java.io.FileFilter; > +import java.net.URL; > +import org.junit.AfterClass; > +import org.junit.Assert; > + > +import org.junit.BeforeClass; > +import org.junit.Test; > + > +public class SimpleTest1Test { > + > + private static ServerAccess server = new ServerAccess(); > + > + > + > + @Test > + public void testSimpletest1lunchOk() throws Exception { > + System.err.println("connecting simpletest1 request"); > + ServerAccess.ProcessResult pr=server.executeJavawsHeadless(null,"/simpletest1.jnlp"); > + System.err.println(pr.stdout); > + System.err.println(pr.stderr); > + Assert.assertTrue(pr.stdout.contains("Good simple javaws exapmle")); > + Assert.assertFalse(pr.stderr.contains("xception")); > + //Assert.assertEquals(0, pr.process.exitValue()); > + } > + > + > + > + > + > + } > + Please remove this extra whitespace and fix the indentation. I dont see any other issues, but I will build and test out this patch as soon as I get some extra time. Cheers, Omair From ptisnovs at icedtea.classpath.org Tue May 17 00:10:40 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 17 May 2011 07:10:40 +0000 Subject: /hg/icedtea6: Fix bashism. Message-ID: changeset c59c4a788187 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c59c4a788187 author: ptisnovs date: Tue May 17 09:15:25 2011 +0200 Fix bashism. diffstat: ChangeLog | 4 ++++ patches/jtreg-6929067-fix.patch | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diffs (23 lines): diff -r 29d688c7693d -r c59c4a788187 ChangeLog --- a/ChangeLog Mon May 16 16:19:11 2011 +0200 +++ b/ChangeLog Tue May 17 09:15:25 2011 +0200 @@ -1,3 +1,7 @@ +2011-05-17 Pavel Tisnovsky + + * patches/jtreg-6929067-fix.patch: Fix bashism. + 2011-05-16 Pavel Tisnovsky * patches/jtreg-6929067-fix.patch: fix this regression diff -r 29d688c7693d -r c59c4a788187 patches/jtreg-6929067-fix.patch --- a/patches/jtreg-6929067-fix.patch Mon May 16 16:19:11 2011 +0200 +++ b/patches/jtreg-6929067-fix.patch Tue May 17 09:15:25 2011 +0200 @@ -10,7 +10,7 @@ +# Test if JDK is 32 or 64 bits +${TESTJAVA}/bin/java -d64 + -+if [[ $? == 0 ]] ++if [ $? -eq 0 ] +then + COMP_FLAG="-m64" +fi From avg at icyb.net.ua Tue May 17 00:35:57 2011 From: avg at icyb.net.ua (Andriy Gapon) Date: Tue, 17 May 2011 10:35:57 +0300 Subject: firefox 4: problem with NPN_GetURL target=_self In-Reply-To: <20110516180328.GH29490@redhat.com> References: <4DADADC8.7010404@icyb.net.ua> <4DADCF06.8080803@smedbergs.us> <4DADD105.30103@icyb.net.ua> <20110421153134.GC7494@redhat.com> <4DD026DD.8010205@icyb.net.ua> <20110516180328.GH29490@redhat.com> Message-ID: <4DD2255D.5090704@icyb.net.ua> on 16/05/2011 21:03 Deepak Bhole said the following: > Can you please try again with the patch here applied? > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/014200.html > > That patch adds full recursive call support for showDocument() calls, > rather than relying on FF to not make such calls. It should therefore > always work. Please let me know if there are any problems. Unfortunately it still doesn't help. In my simple test http://people.freebsd.org/~avg/java_test/ I see "Attempting to go to: http://www.google.ca" printed if I press the button, but the page never changes. Please let me know if I should provide any additional debugging info. -- Andriy Gapon From aph at redhat.com Tue May 17 02:39:48 2011 From: aph at redhat.com (Andrew Haley) Date: Tue, 17 May 2011 10:39:48 +0100 Subject: Mutter awt fix. In-Reply-To: <20110517004158.GW31710@rivendell.middle-earth.co.uk> References: <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <4DD137BB.7070409@redhat.com> <20110517004158.GW31710@rivendell.middle-earth.co.uk> Message-ID: <4DD24264.3030109@redhat.com> On 17/05/11 01:41, Dr Andrew John Hughes wrote: > On 16:42 Mon 16 May , Pavel Tisnovsky wrote: >> >> AFAIK you still did not received the rights to push this change to >> OpenJDK right (because the repos is in frozen state)? Or do you have bug >> ID for this fix at least? >> > > Denis' patch was reviewed and accepted. It hasn't been pushed because > Oracle seem to have decided to make up some new rules, limiting pushes > to the repositories without any prior notice. This is presumably the OpenJDK 7 schedule, which was posted some time ago. Only higher-priority bug fixes are allowed. http://openjdk.java.net/projects/jdk7/ Andrew. From dalibor.topic at oracle.com Tue May 17 03:55:35 2011 From: dalibor.topic at oracle.com (Dalibor Topic) Date: Tue, 17 May 2011 12:55:35 +0200 Subject: Mutter awt fix. In-Reply-To: <4DD24264.3030109@redhat.com> References: <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <4DD137BB.7070409@redhat.com> <20110517004158.GW31710@rivendell.middle-earth.co.uk> <4DD24264.3030109@redhat.com> Message-ID: <4DD25427.209@oracle.com> On 5/17/11 11:39 AM, Andrew Haley wrote: > On 17/05/11 01:41, Dr Andrew John Hughes wrote: >> Oracle seem to have decided to make up some new rules, limiting pushes >> to the repositories without any prior notice. > > This is presumably the OpenJDK 7 schedule, which was posted some time ago. November 18th, 2010: http://mail.openjdk.java.net/pipermail/jdk7-dev/2010-November/001673.html cheers, dalibor topic -- Oracle Dalibor Topic | Java F/OSS Ambassador Phone: +494023646738 | Mobile: +491772664192 Oracle Java Platform Group ORACLE Deutschland B.V. & Co. KG | Nagelsweg 55 | 20097 Hamburg ORACLE Deutschland B.V. & Co. KG Hauptverwaltung: Riesstr. 25, D-80992 M?nchen Registergericht: Amtsgericht M?nchen, HRA 95603 Komplement?rin: ORACLE Deutschland Verwaltung B.V. Hertogswetering 163/167, 3543 AS Utrecht, Niederlande Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697 Gesch?ftsf?hrer: J?rgen Kunz, Marcel van de Molen, Alexander van der Ven Green Oracle Oracle is committed to developing practices and products that help protect the environment From ptisnovs at redhat.com Tue May 17 05:58:33 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 17 May 2011 14:58:33 +0200 Subject: Questionable regression test LocaleEnhanceTest in IcedTea7 Message-ID: <4DD270F9.6000305@redhat.com> Hi all, Regression test LocaleEnhanceTest.java from IcedTea7 cannot be compiled because its base class LocaleTestFmwk.java is erased as "questionable" file that contains improper(?) licence. My question is what to do with LocaleEnhanceTest itself? Erase it too (ie add it to fsg.sh?) Cheers, Pavel From jvanek at redhat.com Tue May 17 06:31:58 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 17 May 2011 15:31:58 +0200 Subject: [icedtea-web] reviewer needed - added engine for lunching reproducers In-Reply-To: <4DD1DE9B.30508@redhat.com> References: <4DC2CAC1.7070802@redhat.com> <4DC484FA.1030208@redhat.com> <4DCAAD29.80706@redhat.com> <4DD1DE9B.30508@redhat.com> Message-ID: <4DD278CE.2080005@redhat.com> On 05/17/2011 04:34 AM, Omair Majid wrote: > Hi Jiri, > >...snip... >> So another round - partially based on attached communication. >> The heart of patch is not changed at all. It automatically compile and >> deploy individual reproducers. Still containing space for more complex >> reproducers which compile and(or) deploy themselves. Run testsuite >> inside junit, and contains small server (can run several instances on >> different port, and contains helping methods) as singleton and lunches >> by-make installed javaws. >> >> The crucial difference is in testing whether reproducer passed or >> failed. In previous patch this was included ind >> tests/dist/net/sourceforge/ (acording to tests/unit/net/sourceforge). >> Now (as previewd in simpletest 1 and 2 reproducer) each reproducer have >> except srcs and resources directory also testcases directory which >> contains javaclass which will be added to junit testsuit to be lunched >> and examined. (*** _I'm not sure about package hierarchy here_ ***). >> Those testcases have tests/dist on their classpath even during compile, >> so they can use helpers functions and server smoothly. >> > > I am quite happy with this patch. I have a few recommendations below. > >> >> >> diff -r 2b1a69f4c54b Makefile.am >> --- a/Makefile.am Tue May 10 11:16:17 2011 -0400 >> +++ b/Makefile.am Wed May 11 13:52:03 2011 +0200 >> @@ -12,11 +12,17 @@ >> NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit >> TESTS_STYLES_SRCDIR=$(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME) >> JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner >> +NETX_DIST_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/dist >> +NETX_JNLP_TEST_SRCDIR=$(TESTS_SRCDIR)/jnlp_tests >> >> TESTS_DIR=$(abs_top_builddir)/tests.build >> NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit >> TESTS_STYLES_DIR=$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) >> JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner >> +NETX_DIST_TEST_DIR=$(TESTS_DIR)/netx/dist >> +NETX_TESTCASES_DIR=$(TESTS_DIR)/netx/dist_testcases >> +TESTS_SERVER_DIR=$(TESTS_DIR)/test_server >> +TESTS_JNLP_DIR=$(TESTS_DIR)/jnlp_tests >> > > I would suggest renaming these directories (and variables). I am not sure what 'dist' really signifies. The jnlp tests should probably in tests/netx/jnlp/ --they are for netx only and not for the plugin. You yourself suggested 'make check-dist' - so I took this word to signify its belongings. ok - tests/netx/jnlp/ will be more suitable NETX_JNLP_TEST_SRCDIR contains sources of reproducers applications, NETX_DIST_TEST_SRCDIR contains helping classes and virtual server sources. NETX_DIST_TEST_DIR contains compiled helping classes, server etc. NETX_DIST_TESTCASES_DIR have been removed. TESTS_SERVER_DIR - contains reproducers jars, resources... And is root directory for server. TESTS_JNLP_DIR contains compiled reproducers So since teh testcases_dir is removed, i think the names are ok. Or you can vote for: NETX_JNLP_TEST_SRCDIR -> JNLP_REPRODUCERS_SRCDIR NETX_DIST_TEST_SRCDIR - > JNLP_TESTS_HELPINGCLASSES_SRCDIR NETX_DIST_TEST_DIR -> JNLP_TESTS_HELPINGCLASSES_BUILDDIR TESTS_JNLP_DIR -> JNLP_REPRODUCERS_BUILDDIR TESTS_SERVER_DIR -> JNLP_TESTS_SERVER_DIR >> >> JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar ...snip... >> + CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \ >> + $(BOOT_DIR)/bin/java -Dtest.server.dir=$(TESTS_SERVER_DIR) -Djavaws.build.bin=$(DESTDIR)$(bindir)/javaws \ >> + -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ > > I just realized (sometimes I can be slow ;) ) that if you are passing all these java properties, you can also pass along the values of -Dicedtea-web.bin.name and -Dicedtea-web.bin.path and avoid having to run these tests only after 'make install'. Hmm.. Do not understand this very much. Is there something useful to run this tests without all-local? Where comes values of this variables from? Where are they from? From where will they come when no make all-local done? >> + > stdout.log 2> stderr.log ; \ >> + cat stdout.log ; \ >> + cat stderr.log>&2 >> + >> netx-unit-tests-source-files.txt: >> find $(NETX_UNIT_TEST_SRCDIR) -name '*.java' | sort> $@ >> >> @@ -496,7 +564,7 @@ >> cat stdout.log ; \ >> cat stderr.log>&2 >> >> -clean-netx-tests: clean-netx-unit-tests clean-junit-runner >> +clean-netx-tests: clean-netx-unit-tests clean-junit-runner clean-netx-dist-tests >> if [ -e $(TESTS_DIR)/netx ]; then \ >> rmdir $(TESTS_DIR)/netx ; \ >> fi >> @@ -513,6 +581,16 @@ >> rm -rf $(NETX_UNIT_TEST_DIR) >> rm -f stamps/netx-unit-tests-compile.stamp >> >> +clean-netx-dist-tests: >> + rm -f netx-dist-tests-source-files.txt >> + rm -rf $(TESTS_JNLP_DIR) >> + rm -rf $(TESTS_SERVER_DIR) >> + rm -rf $(NETX_DIST_TEST_DIR) >> + rm -f stamps/netx-dist-tests-compile.stamp >> + rm -f stamps/netx-dist-tests-prepare-reproducers.stamp >> + rm -f stamps/netx-dist-tests-compile-testcases.stamp >> + rm -f junit-jnlp-dist-dirs.txt >> + >> # plugin tests > > I cant see a way to run these tests using a standard 'make' target. But they are running this way now (or NOT????? -confused-) Is there any issue I can't see? > >> >> if ENABLE_PLUGIN >> diff -r 2b1a69f4c54b tests/jnlp_tests/README >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/jnlp_tests/README Wed May 11 13:52:03 2011 +0200 >> @@ -0,0 +1,1 @@ >> +Each file in simple must follows naming convention and is compiled/jared automaticky into server's working directory and content of resources likewise. The name of jnlp is independent, ant there can be even more jnlps for each future jar. >> diff -r 2b1a69f4c54b tests/jnlp_tests/simple/simpletest1/resources/simpletest1.jnlp > > Please fix the spelling error(s?). Done.. Each file in simple must follows naming convention and is compiled/jared automatically into server's working directory and content of resources likewise. The name of jnlp is independent, ant there can be even more jnlps for each future jar. Sometimes I wish to be native speaker... > >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/jnlp_tests/simple/simpletest1/resources/simpletest1.jnlp Wed May 11 13:52:03 2011 +0200 > > Why the '/simple/' in the path? As mentioned before (and ^^ :) all reproducers in simple directory will be compiled and deployed automaticly. When some reproducer is more complex and needs manual work, then it have to be placed somewhere else (eg under sibling /complex/ or maybe as sibling itself). > >> @@ -0,0 +1,16 @@ >> + >> + > > If you are starting a simple http server, then codebase value should point to the server, not '.'. I have already mentioned this - when "." Is included, then as codebase is (should be!) used url from which the jnlp was obtained. And this is quite sufficient, isn't it? If you really want to "hardcode path" Then I will need to sed all jnlp files - as port where server is runing is chosen as random-empty-one. So you can expect something like codebase="[@]address[@]" , which will then be changed in java tests or the port will be handled outside junit-run and so it will be sedded.. somwehow. > >> + >> +simpletest1 >> +NetX >> + >> +simpletest1 >> + >> + >> + >> + >> + >> + >> + >> + >> + >> diff -r 2b1a69f4c54b tests/jnlp_tests/simple/simpletest1/srcs/simpletest1/SimpleTest1.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/jnlp_tests/simple/simpletest1/srcs/simpletest1/SimpleTest1.java Wed May 11 13:52:03 2011 +0200 >> @@ -0,0 +1,8 @@ > > Please add a license here too. Well, I hope you are not committing this trivial test. But just to give an idea. And thanks for adding a concrete example to show how actual tests would be like. Licence - yes! Those trivial test are included exactly and mainly as proof of concept. But I was thinking about commitng them - as guide others and as warning that something goes very very bad (with java, javaws or testsuite or with whatever) when even those two fails. > >> +package simpletest1; >> + >> +public class SimpleTest1{ >> + >> + public static void main(String[] args){ >> + System.out.println("Good simple javaws exapmle"); >> + } >> +} > > Is there an advantage to placing this class in a separate package? Sure! I believe that classes should never be in "default" (== empty) package. In this case it also helps me to jar them clearly. > >> diff -r 2b1a69f4c54b tests/jnlp_tests/simple/simpletest1/testcases/SimpleTest1Test.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/jnlp_tests/simple/simpletest1/testcases/SimpleTest1Test.java Wed May 11 13:52:03 2011 +0200 >> @@ -0,0 +1,82 @@ >> +/* ParserMalformedXml.java >> +Copyright (C) 2011 Red Hat, Inc. >> + >> +This file is part of IcedTea. >> + >> +IcedTea is free software; you can redistribute it and/or ... snip... >> + >> + >> + >> + } >> + > > Please remove this extra whitespace and fix the indentation. yy > > I dont see any other issues, but I will build and test out this patch as soon as I get some extra time. Thank you very much for review and hints. J. > > Cheers, > Omair From ahughes at redhat.com Tue May 17 07:04:08 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 17 May 2011 15:04:08 +0100 Subject: Mutter awt fix. In-Reply-To: <4DD24264.3030109@redhat.com> References: <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <4DD137BB.7070409@redhat.com> <20110517004158.GW31710@rivendell.middle-earth.co.uk> <4DD24264.3030109@redhat.com> Message-ID: <20110517140408.GX31710@rivendell.middle-earth.co.uk> On 10:39 Tue 17 May , Andrew Haley wrote: > On 17/05/11 01:41, Dr Andrew John Hughes wrote: > > On 16:42 Mon 16 May , Pavel Tisnovsky wrote: > >> > >> AFAIK you still did not received the rights to push this change to > >> OpenJDK right (because the repos is in frozen state)? Or do you have bug > >> ID for this fix at least? > >> > > > > Denis' patch was reviewed and accepted. It hasn't been pushed because > > Oracle seem to have decided to make up some new rules, limiting pushes > > to the repositories without any prior notice. > > This is presumably the OpenJDK 7 schedule, which was posted some time ago. > Only higher-priority bug fixes are allowed. > > http://openjdk.java.net/projects/jdk7/ > And what it doesn't say is how 'higher-priority bug fixes' are determined. We've only ever been submitting bug fixes for the most part, so I would have assumed that we could go on doing so for some time. However, the reality seems to be that we now can't submit anything for the next three months to OpenJDK7, but Oracle can. I wouldn't be happy releasing IcedTea7 to our users with known issues, so we will continue making the changes we need, but locally. We also can't work on OpenJDK8 because repositories haven't been made available. Of course, this is without mentioning that I would expect such decisions to be discussed within an open source project, not handed down as a mandate. > Andrew. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Tue May 17 07:08:16 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 17 May 2011 15:08:16 +0100 Subject: Fwd: Re: FYI [icedtea-web] xml output for junit, for daily report - no styles In-Reply-To: <4DD27B32.4070101@redhat.com> References: <4DD27B32.4070101@redhat.com> Message-ID: <20110517140816.GY31710@rivendell.middle-earth.co.uk> On 15:42 Tue 17 May , Jiri Vanek wrote: snip... > >> diff -r 0e6b12424423 Makefile.am > >> --- a/Makefile.am Wed May 11 14:56:32 2011 +0100 > >> +++ b/Makefile.am Thu May 12 14:13:40 2011 +0200 > >> @@ -472,7 +472,10 @@ > >> done ; \ > >> echo $$class_names ; \ > >> CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \ > >> - $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names > >> + $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ > >> + > stdout.log 2> stderr.log ; \ > >> + cat stdout.log ; \ > >> + cat stderr.log>&2 > >> > > > > Is there any reason you want these separate and don't just use 2>&1 | tee log ? > > yap. I want to keep each stream where it belongs. > I tried something like > >(tee stdout.log) 2> >(tee stderr.log >&2) m which work fine in shell, but I was unable to make it work in make :( Ok. snip... > > > > I assume this produces the correct output. What confuses me is why you didn't use the standard XML APIs > > rather than rolling your own? > > After some rather nasty experience with standart java xml api/tools, I fell in love to love Apache axiom for everyhing worthy. And for every simple output much more rather to keep the class stright and without terrible standart api. > If you mind, I will rewrite it. But I would rather to keep it straight-forward. > Well, as it's written, you may as well commit it as is. You've already done the extra work that using the API (creating a DOM tree and outputting it) would have saved. > Regards J. > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Tue May 17 07:09:07 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 17 May 2011 15:09:07 +0100 Subject: Questionable regression test LocaleEnhanceTest in IcedTea7 In-Reply-To: <4DD270F9.6000305@redhat.com> References: <4DD270F9.6000305@redhat.com> Message-ID: <20110517140907.GZ31710@rivendell.middle-earth.co.uk> On 14:58 Tue 17 May , Pavel Tisnovsky wrote: > Hi all, > > Regression test LocaleEnhanceTest.java from IcedTea7 cannot be compiled > because its base class LocaleTestFmwk.java is erased as "questionable" > file that contains improper(?) licence. > > My question is what to do with LocaleEnhanceTest itself? Erase it too > (ie add it to fsg.sh?) > > Cheers, > Pavel What's the path to these files? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From aph at redhat.com Tue May 17 07:15:13 2011 From: aph at redhat.com (Andrew Haley) Date: Tue, 17 May 2011 15:15:13 +0100 Subject: Mutter awt fix. In-Reply-To: <20110517140408.GX31710@rivendell.middle-earth.co.uk> References: <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <4DD137BB.7070409@redhat.com> <20110517004158.GW31710@rivendell.middle-earth.co.uk> <4DD24264.3030109@redhat.com> <20110517140408.GX31710@rivendell.middle-earth.co.uk> Message-ID: <4DD282F1.60909@redhat.com> On 05/17/2011 03:04 PM, Dr Andrew John Hughes wrote: > On 10:39 Tue 17 May , Andrew Haley wrote: >> On 17/05/11 01:41, Dr Andrew John Hughes wrote: >>> On 16:42 Mon 16 May , Pavel Tisnovsky wrote: >>>> >>>> AFAIK you still did not received the rights to push this change to >>>> OpenJDK right (because the repos is in frozen state)? Or do you have bug >>>> ID for this fix at least? >>>> >>> >>> Denis' patch was reviewed and accepted. It hasn't been pushed because >>> Oracle seem to have decided to make up some new rules, limiting pushes >>> to the repositories without any prior notice. >> >> This is presumably the OpenJDK 7 schedule, which was posted some time ago. >> Only higher-priority bug fixes are allowed. >> >> http://openjdk.java.net/projects/jdk7/ > > And what it doesn't say is how 'higher-priority bug fixes' are > determined. We've only ever been submitting bug fixes for the most > part, so I would have assumed that we could go on doing so for some > time. However, the reality seems to be that we now can't submit > anything for the next three months to OpenJDK7, but Oracle can. I don't see how that follows. > I wouldn't be happy releasing IcedTea7 to our users with known > issues, so we will continue making the changes we need, but locally. That depends on the severity of the bug, surely. Sometimes you have to make the judgement call that something will not be fixed because it would potentially invalidate the test cycle and might break something else. This is all perfectly normal: there has to be a freeze window. Andrew. From ahughes at redhat.com Tue May 17 07:15:20 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 17 May 2011 15:15:20 +0100 Subject: Mutter awt fix. In-Reply-To: <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <78356398.220799.1305554368827.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <20110517141520.GB31710@rivendell.middle-earth.co.uk> On 10:10 Mon 16 May , Denis Lila wrote: > Hi. > > I would like to push this to icedtea7-forest. It fixes > RH698295. The only part of it that hasn't been reviewed > is the regression test so, Pavel could you please take > a look at that? You already saw a previous version of it, > but I made some changes. > Thought I'd already oked this, but yeah fine for IcedTea7 forest. > This will also need to be backported into icedtea6 head. > Ok, use our usual backport system for this as you have a bug ID. > Thank you, > Denis. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From dlila at redhat.com Tue May 17 07:22:37 2011 From: dlila at redhat.com (Denis Lila) Date: Tue, 17 May 2011 10:22:37 -0400 (EDT) Subject: Mutter awt fix. In-Reply-To: <20110517141520.GB31710@rivendell.middle-earth.co.uk> Message-ID: <993748924.284571.1305642157325.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> > > I would like to push this to icedtea7-forest. It fixes > > RH698295. The only part of it that hasn't been reviewed > > is the regression test so, Pavel could you please take > > a look at that? You already saw a previous version of it, > > but I made some changes. > > > > Thought I'd already oked this, but yeah fine for IcedTea7 forest. Thanks! > > This will also need to be backported into icedtea6 head. > > > > Ok, use our usual backport system for this as you have a bug ID. Sure. I'll submit an icedtea6 patch in a couple of hours. Regards, Denis. ----- Original Message ----- > On 10:10 Mon 16 May , Denis Lila wrote: > > Hi. > > > > > > Thank you, > > Denis. > > > > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and IcedTea > http://www.gnu.org/software/classpath > http://icedtea.classpath.org > PGP Key: F5862A37 (https://keys.indymedia.org/) > Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From jvanek at icedtea.classpath.org Tue May 17 07:48:05 2011 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 17 May 2011 14:48:05 +0000 Subject: /hg/icedtea-web: added posibility to export junit testsuite resu... Message-ID: changeset f1615c79971d in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f1615c79971d author: Jiri Vanek date: Tue May 17 16:43:45 2011 +0200 added posibility to export junit testsuite results as xml diffstat: ChangeLog | 9 + Makefile.am | 5 +- tests/junit-runner/CommandLine.java | 3 + tests/junit-runner/JunitLikeXmlOutputListener.java | 225 +++++++++++++++++++++ 4 files changed, 241 insertions(+), 1 deletions(-) diffs (280 lines): diff -r 0e6b12424423 -r f1615c79971d ChangeLog --- a/ChangeLog Wed May 11 14:56:32 2011 +0100 +++ b/ChangeLog Tue May 17 16:43:45 2011 +0200 @@ -1,3 +1,12 @@ +2011-05-17 Jiri Vanek + + * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports + results of junit in xml which "follows junit-output schema". Extended + for date, duration and some statististics for future purpose + * Makefile.am (run-netx-unit-tests): backuping stdout/stderr of tests + * tests/junit-runner/CommandLine.java: registered + JunitLikeXmlOutputListener + 2011-05-10 Andrew Su * netx/net/sourceforge/jnlp/controlpanel/CachePane.java: diff -r 0e6b12424423 -r f1615c79971d Makefile.am --- a/Makefile.am Wed May 11 14:56:32 2011 +0100 +++ b/Makefile.am Tue May 17 16:43:45 2011 +0200 @@ -472,7 +472,10 @@ done ; \ echo $$class_names ; \ CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. \ - $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names + $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ + > stdout.log 2> stderr.log ; \ + cat stdout.log ; \ + cat stderr.log >&2 clean-netx-tests: clean-netx-unit-tests clean-junit-runner if [ -e $(TESTS_DIR)/netx ]; then \ diff -r 0e6b12424423 -r f1615c79971d tests/junit-runner/CommandLine.java --- a/tests/junit-runner/CommandLine.java Wed May 11 14:56:32 2011 +0100 +++ b/tests/junit-runner/CommandLine.java Tue May 17 16:43:45 2011 +0200 @@ -7,6 +7,7 @@ * http://www.eclipse.org/legal/cpl-v10.html */ +import java.io.File; import java.util.ArrayList; import java.util.List; @@ -41,6 +42,8 @@ system.out().println("ERROR: Could not find class: " + each); } } + RunListener jXmlOutput = new JunitLikeXmlOutputListener(system, new File("tests-output.xml")); + addListener(jXmlOutput); RunListener listener = new LessVerboseTextListener(system); addListener(listener); Result result = run(classes.toArray(new Class[0])); diff -r 0e6b12424423 -r f1615c79971d tests/junit-runner/JunitLikeXmlOutputListener.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/junit-runner/JunitLikeXmlOutputListener.java Tue May 17 16:43:45 2011 +0200 @@ -0,0 +1,225 @@ +/* + * Copyright 2011 Red Hat, Inc. + * + * This file is made available under the terms of the Common Public License + * v1.0 which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + */ + +import java.io.BufferedWriter; +import java.io.File; + +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + + +import org.junit.internal.JUnitSystem; +import org.junit.runner.Description; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.junit.runner.notification.RunListener; +/** + * This class listens for events in junit testsuite and wrote output to xml. + * Xml tryes to follow ant-tests schema, and is enriched for by-class statistics + * stdout and err elements are added, but must be filled from elsewhere (eg tee + * in make) as junit suite and listener run from our executer have no access to + * them. + * + */ +public class JunitLikeXmlOutputListener extends RunListener { + + private BufferedWriter writer; + private Failure testFailed = null; + private static final String ROOT = "testsuite"; + private static final String DATE_ELEMENT = "date"; + private static final String TEST_ELEMENT = "testcase"; + private static final String TEST_NAME_ATTRIBUTE = "name"; + private static final String TEST_TIME_ATTRIBUTE = "time"; + private static final String TEST_ERROR_ELEMENT = "error"; + private static final String TEST_CLASS_ATTRIBUTE = "classname"; + private static final String ERROR_MESSAGE_ATTRIBUTE = "message"; + private static final String ERROR_TYPE_ATTRIBUTE = "type"; + private static final String SOUT_ELEMENT = "system-out"; + private static final String SERR_ELEMENT = "system-err"; + private static final String CDATA_START = ""; + private static final String TEST_CLASS_ELEMENT = "class"; + private static final String STATS_ELEMENT = "stats"; + private static final String CLASSES_ELEMENT = "classes"; + private static final String SUMMARY_ELEMENT = "summary"; + private static final String SUMMARY_TOTAL_ELEMENT = "total"; + private static final String SUMMARY_PASSED_ELEMENT = "passed"; + private static final String SUMMARY_FAILED_ELEMENT = "failed"; + private static final String SUMMARY_IGNORED_ELEMENT = "ignored"; + private long testStart; + + private class ClassCounter { + + int total; + int failed; + int passed; + long time = 0; + } + Map classStats = new HashMap(); + + public JunitLikeXmlOutputListener(JUnitSystem system, File f) { + try { + writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(f), "UTF-8")); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + @Override + public void testRunStarted(Description description) throws Exception { + openElement(ROOT); + writeElement(DATE_ELEMENT, new Date().toString()); + } + + private void openElement(String name) throws IOException { + openElement(name, null); + } + + private void openElement(String name, Map atts) throws IOException { + StringBuilder attString = new StringBuilder(); + if (atts != null) { + attString.append(" "); + Set> entries = atts.entrySet(); + for (Entry entry : entries) { + attString.append(entry.getKey()).append("=\"").append(attributize(entry.getValue())).append("\""); + attString.append(" "); + } + } + writer.write("<" + name + attString.toString() + ">"); + writer.newLine(); + } + + private static String attributize(String s) { + return s.replace("&", "&").replace("<", "<").replace("\"","""); + } + + private void closeElement(String name) throws IOException { + writer.newLine(); + writer.write(""); + writer.newLine(); + } + + private void writeContent(String content) throws IOException { + writer.write(CDATA_START + content + CDATA_END); + } + + private void writeElement(String name, String content) throws IOException { + writeElement(name, content, null); + } + + private void writeElement(String name, String content, Map atts) throws IOException { + openElement(name, atts); + writeContent(content); + closeElement(name); + } + + @Override + public void testStarted(Description description) throws Exception { + testFailed = null; + testStart = System.nanoTime()/1000l/1000l; + } + + @Override + public void testFailure(Failure failure) throws IOException { + testFailed = failure; + } + + @Override + public void testFinished(org.junit.runner.Description description) throws Exception { + long testTime = System.nanoTime()/1000l/1000l - testStart; + double testTimeSeconds = ((double) testTime) / 1000d; + + Map testcaseAtts = new HashMap(3); + NumberFormat formatter = new DecimalFormat("#0.0000"); + String stringedTime = formatter.format(testTimeSeconds); + stringedTime.replace(",", "."); + testcaseAtts.put(TEST_TIME_ATTRIBUTE, stringedTime); + testcaseAtts.put(TEST_CLASS_ATTRIBUTE, description.getClassName()); + testcaseAtts.put(TEST_NAME_ATTRIBUTE, description.getMethodName()); + + openElement(TEST_ELEMENT, testcaseAtts); + if (testFailed != null) { + Map errorAtts = new HashMap(3); + + errorAtts.put(ERROR_MESSAGE_ATTRIBUTE, testFailed.getMessage()); + int i = testFailed.getTrace().indexOf(":"); + if (i >= 0) { + errorAtts.put(ERROR_TYPE_ATTRIBUTE, testFailed.getTrace().substring(0, i)); + } else { + errorAtts.put(ERROR_TYPE_ATTRIBUTE, "?"); + } + + writeElement(TEST_ERROR_ELEMENT, testFailed.getTrace(), errorAtts); + } + + closeElement(TEST_ELEMENT); + writer.flush(); + + ClassCounter cc = classStats.get(description.getClassName()); + if (cc == null) { + cc = new ClassCounter(); + classStats.put(description.getClassName(), cc); + } + cc.total++; + cc.time += testTime; + if (testFailed == null) { + cc.passed++; + } else { + + cc.failed++; + } + } + + @Override + public void testRunFinished(Result result) throws Exception { + + writeElement(SOUT_ELEMENT, "@sout@"); + writeElement(SERR_ELEMENT, "@serr@"); + openElement(STATS_ELEMENT); + openElement(SUMMARY_ELEMENT); + int passed = result.getRunCount() - result.getFailureCount() - result.getIgnoreCount(); + int failed = result.getFailureCount(); + int ignored = result.getIgnoreCount(); + writeElement(SUMMARY_TOTAL_ELEMENT, String.valueOf(result.getRunCount())); + writeElement(SUMMARY_FAILED_ELEMENT, String.valueOf(failed)); + writeElement(SUMMARY_IGNORED_ELEMENT, String.valueOf(ignored)); + writeElement(SUMMARY_PASSED_ELEMENT, String.valueOf(passed)); + closeElement(SUMMARY_ELEMENT); + openElement(CLASSES_ELEMENT); + Set> e = classStats.entrySet(); + for (Entry entry : e) { + + Map testcaseAtts = new HashMap(3); + testcaseAtts.put(TEST_NAME_ATTRIBUTE, entry.getKey()); + testcaseAtts.put(TEST_TIME_ATTRIBUTE, String.valueOf(entry.getValue().time)); + + openElement(TEST_CLASS_ELEMENT, testcaseAtts); + writeElement(SUMMARY_PASSED_ELEMENT, String.valueOf(entry.getValue().passed)); + writeElement(SUMMARY_FAILED_ELEMENT, String.valueOf(entry.getValue().failed)); + writeElement(SUMMARY_IGNORED_ELEMENT, String.valueOf(entry.getValue().total - entry.getValue().failed - entry.getValue().passed)); + writeElement(SUMMARY_TOTAL_ELEMENT, String.valueOf(entry.getValue().total)); + + closeElement(TEST_CLASS_ELEMENT); + } + closeElement(CLASSES_ELEMENT); + closeElement(STATS_ELEMENT); + + closeElement(ROOT); + writer.flush(); + writer.close(); + + } +} From ptisnovs at redhat.com Tue May 17 07:53:14 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 17 May 2011 16:53:14 +0200 Subject: Questionable regression test LocaleEnhanceTest in IcedTea7 In-Reply-To: <20110517140907.GZ31710@rivendell.middle-earth.co.uk> References: <4DD270F9.6000305@redhat.com> <20110517140907.GZ31710@rivendell.middle-earth.co.uk> Message-ID: <4DD28BDA.8070207@redhat.com> Dr Andrew John Hughes wrote: > On 14:58 Tue 17 May , Pavel Tisnovsky wrote: >> Hi all, >> >> Regression test LocaleEnhanceTest.java from IcedTea7 cannot be compiled >> because its base class LocaleTestFmwk.java is erased as "questionable" >> file that contains improper(?) licence. >> >> My question is what to do with LocaleEnhanceTest itself? Erase it too >> (ie add it to fsg.sh?) >> >> Cheers, >> Pavel > > What's the path to these files? Hi Andrew, path is: openjdk/jdk/test/java/util/Locale/ here's excerpt from LocaleEnhanceTest.java: public class LocaleEnhanceTest extends LocaleTestFmwk { ... its based on class LocaleTestFmwk deleted by fsg.sh script. Cheers, Pavel From omajid at redhat.com Tue May 17 08:45:48 2011 From: omajid at redhat.com (Omair Majid) Date: Tue, 17 May 2011 11:45:48 -0400 Subject: [icedtea-web] reviewer needed - added engine for lunching reproducers In-Reply-To: <4DD278CE.2080005@redhat.com> References: <4DC2CAC1.7070802@redhat.com> <4DC484FA.1030208@redhat.com> <4DCAAD29.80706@redhat.com> <4DD1DE9B.30508@redhat.com> <4DD278CE.2080005@redhat.com> Message-ID: <4DD2982C.20607@redhat.com> On 05/17/2011 09:31 AM, Jiri Vanek wrote: >>> diff -r 2b1a69f4c54b Makefile.am >>> --- a/Makefile.am Tue May 10 11:16:17 2011 -0400 >>> +++ b/Makefile.am Wed May 11 13:52:03 2011 +0200 >>> @@ -12,11 +12,17 @@ >>> NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit >>> TESTS_STYLES_SRCDIR=$(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME) >>> JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner >>> +NETX_DIST_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/dist >>> +NETX_JNLP_TEST_SRCDIR=$(TESTS_SRCDIR)/jnlp_tests >>> >>> TESTS_DIR=$(abs_top_builddir)/tests.build >>> NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit >>> TESTS_STYLES_DIR=$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) >>> JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner >>> +NETX_DIST_TEST_DIR=$(TESTS_DIR)/netx/dist >>> +NETX_TESTCASES_DIR=$(TESTS_DIR)/netx/dist_testcases >>> +TESTS_SERVER_DIR=$(TESTS_DIR)/test_server >>> +TESTS_JNLP_DIR=$(TESTS_DIR)/jnlp_tests >>> >> >> I would suggest renaming these directories (and variables). I am not >> sure what 'dist' really signifies. The jnlp tests should probably in >> tests/netx/jnlp/ --they are for netx only and not for the plugin. > You yourself suggested 'make check-dist' - so I took this word to > signify its belongings. Well, 'make distcheck' is a commonly known target. In a source tree though, the meaning of tests/netx/dist/ is not clear. > ok - tests/netx/jnlp/ will be more suitable > > NETX_JNLP_TEST_SRCDIR contains sources of reproducers applications, > NETX_DIST_TEST_SRCDIR contains helping classes and virtual server sources. > NETX_DIST_TEST_DIR contains compiled helping classes, server etc. If you can come up with something more descriptive than DIST, then please use that. Otherwise DIST should be fine for now. > NETX_DIST_TESTCASES_DIR have been removed. > TESTS_SERVER_DIR - contains reproducers jars, resources... And is root > directory for server. TESTS_JNLP_DIR contains compiled reproducers > > So since teh testcases_dir is removed, i think the names are ok. > > Or you can vote for: > NETX_JNLP_TEST_SRCDIR -> JNLP_REPRODUCERS_SRCDIR > NETX_DIST_TEST_SRCDIR - > JNLP_TESTS_HELPINGCLASSES_SRCDIR > NETX_DIST_TEST_DIR -> JNLP_TESTS_HELPINGCLASSES_BUILDDIR > TESTS_JNLP_DIR -> JNLP_REPRODUCERS_BUILDDIR > TESTS_SERVER_DIR -> JNLP_TESTS_SERVER_DIR > I thought we were using the convention that *_SRCDIR indicates a source diretory and *_DIR indicates a build directory. Otherwise I think they are alright. I dont care too much what variables are called; I care much more about the source tree paths: / >>> >>> JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar > ...snip... >>> + >>> CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. >>> \ >>> + $(BOOT_DIR)/bin/java -Dtest.server.dir=$(TESTS_SERVER_DIR) >>> -Djavaws.build.bin=$(DESTDIR)$(bindir)/javaws \ >>> + -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ >> >> I just realized (sometimes I can be slow ;) ) that if you are passing >> all these java properties, you can also pass along the values of >> -Dicedtea-web.bin.name and -Dicedtea-web.bin.path and avoid having to >> run these tests only after 'make install'. > > Hmm.. Do not understand this very much. Is there something useful to run > this tests without all-local? Where comes values of this variables from? > Where are they from? From where will they come when no make all-local done? > Sorry if I wasn't clear: you have to build (all-local) to test of course. But I was suggesting that if you pass along all the right variables, that you could (possibly, have to double-check) run the just-built javaws binary. You might be able to skip having to install it to check. But it's not really that big a deal for now. You can ignore it :) >>> + > stdout.log 2> stderr.log ; \ >>> + cat stdout.log ; \ >>> + cat stderr.log>&2 >>> + >>> netx-unit-tests-source-files.txt: >>> find $(NETX_UNIT_TEST_SRCDIR) -name '*.java' | sort> $@ >>> >>> @@ -496,7 +564,7 @@ >>> cat stdout.log ; \ >>> cat stderr.log>&2 >>> >>> -clean-netx-tests: clean-netx-unit-tests clean-junit-runner >>> +clean-netx-tests: clean-netx-unit-tests clean-junit-runner >>> clean-netx-dist-tests >>> if [ -e $(TESTS_DIR)/netx ]; then \ >>> rmdir $(TESTS_DIR)/netx ; \ >>> fi >>> @@ -513,6 +581,16 @@ >>> rm -rf $(NETX_UNIT_TEST_DIR) >>> rm -f stamps/netx-unit-tests-compile.stamp >>> >>> +clean-netx-dist-tests: >>> + rm -f netx-dist-tests-source-files.txt >>> + rm -rf $(TESTS_JNLP_DIR) >>> + rm -rf $(TESTS_SERVER_DIR) >>> + rm -rf $(NETX_DIST_TEST_DIR) >>> + rm -f stamps/netx-dist-tests-compile.stamp >>> + rm -f stamps/netx-dist-tests-prepare-reproducers.stamp >>> + rm -f stamps/netx-dist-tests-compile-testcases.stamp >>> + rm -f junit-jnlp-dist-dirs.txt >>> + >>> # plugin tests >> >> I cant see a way to run these tests using a standard 'make' target. > > But they are running this way now (or NOT????? -confused-) > Is there any issue I can't see? > They are? Mea culpa then. As I said elsewhere in the email, I did not try and build this patch. >> >>> >>> if ENABLE_PLUGIN >>> diff -r 2b1a69f4c54b tests/jnlp_tests/README >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ b/tests/jnlp_tests/README Wed May 11 13:52:03 2011 +0200 >>> @@ -0,0 +1,1 @@ >>> +Each file in simple must follows naming convention and is >>> compiled/jared automaticky into server's working directory and >>> content of resources likewise. The name of jnlp is independent, ant >>> there can be even more jnlps for each future jar. >>> diff -r 2b1a69f4c54b >>> tests/jnlp_tests/simple/simpletest1/resources/simpletest1.jnlp >> >> Please fix the spelling error(s?). > > Done.. > > Each file in simple must follows naming convention and is compiled/jared > automatically into server's working directory and content of resources > likewise. The name of jnlp is independent, ant there can be even more > jnlps for each future jar. > More typos ;) >> >> Why the '/simple/' in the path? > > As mentioned before (and ^^ :) all reproducers in simple directory will > be compiled and deployed automaticly. When some reproducer is more > complex and needs manual work, then it have to be placed somewhere else > (eg under sibling /complex/ or maybe as sibling itself). > Ok, that makes sense. >> >>> @@ -0,0 +1,16 @@ >>> + >>> + >> >> If you are starting a simple http server, then codebase value should >> point to the server, not '.'. > > I have already mentioned this - when "." Is included, then as codebase > is (should be!) used url from which the jnlp was obtained. And this is > quite sufficient, isn't it? Sorry, I have a terrible memory :( Yes, of course it is sufficient. > If you really want to "hardcode path" Then I will need to sed all jnlp > files - as port where server is runing is chosen as random-empty-one. So > you can expect something like > > codebase="[@]address[@]" , which will then be changed in java tests or > the port will be handled outside junit-run and so it will be sedded.. > somwehow. > If it works, no need to make life more complicated :) >> >>> + >>> +simpletest1 >>> +NetX >>> + >>> +simpletest1 >>> + >>> + >>> + >>> + >>> + >>> + >>> + >>> + >>> + >>> diff -r 2b1a69f4c54b >>> tests/jnlp_tests/simple/simpletest1/srcs/simpletest1/SimpleTest1.java >>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>> +++ >>> b/tests/jnlp_tests/simple/simpletest1/srcs/simpletest1/SimpleTest1.java >>> Wed May 11 13:52:03 2011 +0200 >>> @@ -0,0 +1,8 @@ >> >> Please add a license here too. Well, I hope you are not committing >> this trivial test. But just to give an idea. And thanks for adding a >> concrete example to show how actual tests would be like. > > Licence - yes! > Those trivial test are included exactly and mainly as proof of concept. > But I was thinking about commitng them - as guide others and as warning > that something goes very very bad (with java, javaws or testsuite or > with whatever) when even those two fails. > That's actually a good idea. Can you please add a note in the README? (you probably want to do that as a separate patch). >> >>> +package simpletest1; >>> + >>> +public class SimpleTest1{ >>> + >>> + public static void main(String[] args){ >>> + System.out.println("Good simple javaws exapmle"); >>> + } >>> +} >> >> Is there an advantage to placing this class in a separate package? > > Sure! I believe that classes should never be in "default" (== empty) > package. In this case it also helps me to jar them clearly. Can you elaborate on why default package is a bad idea for test cases? > >> >> I dont see any other issues, but I will build and test out this patch >> as soon as I get some extra time. > Thank you very much for review and hints. No, thank YOU for creating the patch and testing it and bearing with my very nit-picky reviews! Cheers, Omair From dlila at redhat.com Tue May 17 09:18:04 2011 From: dlila at redhat.com (Denis Lila) Date: Tue, 17 May 2011 12:18:04 -0400 (EDT) Subject: [RFC][icedtea6-{head,1.10}] backport In-Reply-To: <1406168421.292318.1305649078781.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <38658302.292325.1305649084996.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Hi. I would like to backport to head and 1.10 the mutter patch I just pushed to icedtea7-forest/jdk. The 1.10 backport is needed because that's what is going into Fedora 15 and F15 uses mutter. The attached diff is just for head. Do you also need to see the 1.10 one? Regards, Denis. -------------- next part -------------- A non-text attachment was scrubbed... Name: mutter-it6-head.patch Type: text/x-patch Size: 13412 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110517/c57f102d/mutter-it6-head.patch From omajid at icedtea.classpath.org Tue May 17 09:20:07 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 17 May 2011 16:20:07 +0000 Subject: /hg/icedtea6: Move patches/javafiles to patches/ecj/javafiles. Message-ID: changeset 19cc9d976c7a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=19cc9d976c7a author: Omair Majid date: Tue May 17 12:19:36 2011 -0400 Move patches/javafiles to patches/ecj/javafiles. This patch is only required for bootstrapping. 2011-05-17 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Move patches/javafiles.patch to ... (ICEDTEA_ECJ_PATCHES): Add patches/ecj/javafiles.patch. * patches/javafiles.patch: Move to... * patches/ecj/javafiles.patch: New file. diffstat: ChangeLog | 8 ++ Makefile.am | 2 +- patches/ecj/javafiles.patch | 150 ++++++++++++++++++++++++++++++++++++++++++++ patches/javafiles.patch | 150 -------------------------------------------- 4 files changed, 159 insertions(+), 151 deletions(-) diffs (356 lines): diff -r c59c4a788187 -r 19cc9d976c7a ChangeLog --- a/ChangeLog Tue May 17 09:15:25 2011 +0200 +++ b/ChangeLog Tue May 17 12:19:36 2011 -0400 @@ -1,3 +1,11 @@ +2011-05-17 Omair Majid + + * Makefile.am + (ICEDTEA_PATCHES): Move patches/javafiles.patch to ... + (ICEDTEA_ECJ_PATCHES): Add patches/ecj/javafiles.patch. + * patches/javafiles.patch: Move to... + * patches/ecj/javafiles.patch: New file. + 2011-05-17 Pavel Tisnovsky * patches/jtreg-6929067-fix.patch: Fix bashism. diff -r c59c4a788187 -r 19cc9d976c7a Makefile.am --- a/Makefile.am Tue May 17 09:15:25 2011 +0200 +++ b/Makefile.am Tue May 17 12:19:36 2011 -0400 @@ -225,7 +225,6 @@ patches/hotspot/$(HSBUILD)/gcc-suffix.patch \ patches/memory-limits.patch \ patches/libraries.patch \ - patches/javafiles.patch \ patches/jvmtiEnv.patch \ patches/lcms.patch \ patches/print_lsb_release.patch \ @@ -417,6 +416,7 @@ ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \ patches/ecj/hotspot.patch \ patches/ecj/endorsed-dir-for-jvmti.patch \ + patches/ecj/javafiles.patch \ patches/ecj/spp.patch \ patches/ecj/jopt.patch \ patches/ecj/jaxp-dependency.patch \ diff -r c59c4a788187 -r 19cc9d976c7a patches/ecj/javafiles.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/javafiles.patch Tue May 17 12:19:36 2011 -0400 @@ -0,0 +1,157 @@ +--- openjdk-ecj/jdk/make/java/java/FILES_java.gmk.orig 2008-08-28 10:10:48.000000000 +0200 ++++ openjdk-ecj/jdk/make/java/java/FILES_java.gmk 2008-09-12 21:12:23.000000000 +0200 +@@ -29,6 +29,80 @@ + # will generate header files + # + JAVA_JAVA_java = \ ++ java/lang/reflect/AccessibleObject.java \ ++ java/lang/reflect/AnnotatedElement.java \ ++ java/lang/reflect/Array.java \ ++ java/lang/reflect/Constructor.java \ ++ java/lang/reflect/Field.java \ ++ java/lang/reflect/GenericArrayType.java \ ++ java/lang/reflect/GenericDeclaration.java \ ++ java/lang/reflect/GenericSignatureFormatError.java \ ++ java/lang/reflect/InvocationHandler.java \ ++ java/lang/reflect/InvocationTargetException.java \ ++ java/lang/reflect/MalformedParameterizedTypeException.java \ ++ java/lang/reflect/Member.java \ ++ java/lang/reflect/Method.java \ ++ java/lang/reflect/Modifier.java \ ++ java/lang/reflect/package-info.java \ ++ java/lang/reflect/ParameterizedType.java \ ++ java/lang/reflect/Proxy.java \ ++ java/lang/reflect/ReflectAccess.java \ ++ java/lang/reflect/ReflectPermission.java \ ++ java/lang/reflect/Type.java \ ++ java/lang/reflect/TypeVariable.java \ ++ java/lang/reflect/UndeclaredThrowableException.java \ ++ java/lang/reflect/WildcardType.java \ ++ java/lang/ref/Finalizer.java \ ++ java/lang/ref/FinalReference.java \ ++ java/lang/ref/PhantomReference.java \ ++ java/lang/ref/Reference.java \ ++ java/lang/ref/ReferenceQueue.java \ ++ java/lang/ref/SoftReference.java \ ++ java/lang/ref/WeakReference.java \ ++ java/lang/management/ClassLoadingMXBean.java \ ++ java/lang/management/CompilationMXBean.java \ ++ java/lang/management/GarbageCollectorMXBean.java \ ++ java/lang/management/LockInfo.java \ ++ java/lang/management/ManagementFactory.java \ ++ java/lang/management/ManagementPermission.java \ ++ java/lang/management/MemoryManagerMXBean.java \ ++ java/lang/management/MemoryMXBean.java \ ++ java/lang/management/MemoryNotificationInfo.java \ ++ java/lang/management/MemoryPoolMXBean.java \ ++ java/lang/management/MemoryType.java \ ++ java/lang/management/MemoryUsage.java \ ++ java/lang/management/MonitorInfo.java \ ++ java/lang/management/OperatingSystemMXBean.java \ ++ java/lang/management/RuntimeMXBean.java \ ++ java/lang/management/ThreadInfo.java \ ++ java/lang/management/ThreadMXBean.java \ ++ java/lang/instrument/ClassDefinition.java \ ++ java/lang/instrument/ClassFileTransformer.java \ ++ java/lang/instrument/IllegalClassFormatException.java \ ++ java/lang/instrument/Instrumentation.java \ ++ java/lang/instrument/UnmodifiableClassException.java \ ++ java/lang/annotation/AnnotationFormatError.java \ ++ java/lang/annotation/Annotation.java \ ++ java/lang/annotation/AnnotationTypeMismatchException.java \ ++ java/lang/annotation/Documented.java \ ++ java/lang/annotation/ElementType.java \ ++ java/lang/annotation/IncompleteAnnotationException.java \ ++ java/lang/annotation/Inherited.java \ ++ java/lang/annotation/package-info.java \ ++ java/lang/annotation/Retention.java \ ++ java/lang/annotation/RetentionPolicy.java \ ++ java/lang/annotation/Target.java \ ++ java/io/IOError.java \ ++ java/lang/Deprecated.java \ ++ java/lang/Iterable.java \ ++ java/util/RandomAccess.java \ ++ java/lang/CharacterData00.java \ ++ java/lang/CharacterData01.java \ ++ java/lang/CharacterData02.java \ ++ java/lang/CharacterData0E.java \ ++ java/lang/CharacterDataLatin1.java \ ++ java/lang/CharacterDataPrivateUse.java \ ++ java/lang/CharacterDataUndefined.java \ + java/lang/Object.java \ + java/lang/Class.java \ + java/lang/Thread.java \ +@@ -135,13 +209,6 @@ + java/lang/Readable.java \ + java/lang/Override.java \ + java/lang/SuppressWarnings.java \ +- java/lang/ref/Reference.java \ +- java/lang/ref/SoftReference.java \ +- java/lang/ref/WeakReference.java \ +- java/lang/ref/FinalReference.java \ +- java/lang/ref/PhantomReference.java \ +- java/lang/ref/ReferenceQueue.java \ +- java/lang/ref/Finalizer.java \ + java/util/BitSet.java \ + java/util/Calendar.java \ + java/util/GregorianCalendar.java \ +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -62,7 +62,6 @@ + com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \ + com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \ + com/sun/corba/se/impl/encoding/TypeCodeReader.java \ +- com/sun/corba/se/impl/encoding/WrapperInputStream.java +- +- +- ++ com/sun/corba/se/impl/encoding/WrapperInputStream.java \ ++ com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \ ++ com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -29,5 +29,6 @@ + com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \ + com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ + com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \ ++ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ + com/sun/corba/se/spi/presentation/rmi/StubAdapter.java + +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -81,5 +81,5 @@ + com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \ + com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \ + com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \ +- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java +- ++ com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java \ ++ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -30,6 +30,7 @@ + com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \ + com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \ + com/sun/corba/se/spi/monitoring/MonitoringFactories.java \ ++ com/sun/corba/se/spi/monitoring/MonitoringConstants.java \ + com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \ + com/sun/corba/se/spi/monitoring/MonitoredObject.java \ + com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \ +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -66,4 +66,5 @@ + com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \ + com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \ + com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \ +- com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java ++ com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java \ ++ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -81,4 +81,5 @@ + com/sun/corba/se/impl/orbutil/graph/Node.java \ + com/sun/corba/se/impl/orbutil/graph/NodeData.java \ + com/sun/corba/se/impl/orbutil/graph/Graph.java \ +- com/sun/corba/se/impl/orbutil/graph/GraphImpl.java ++ com/sun/corba/se/impl/orbutil/graph/GraphImpl.java \ ++ com/sun/corba/se/impl/orbutil/GetPropertyAction.java diff -r c59c4a788187 -r 19cc9d976c7a patches/javafiles.patch --- a/patches/javafiles.patch Tue May 17 09:15:25 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,157 +0,0 @@ ---- openjdk/jdk/make/java/java/FILES_java.gmk.orig 2008-08-28 10:10:48.000000000 +0200 -+++ openjdk/jdk/make/java/java/FILES_java.gmk 2008-09-12 21:12:23.000000000 +0200 -@@ -29,6 +29,80 @@ - # will generate header files - # - JAVA_JAVA_java = \ -+ java/lang/reflect/AccessibleObject.java \ -+ java/lang/reflect/AnnotatedElement.java \ -+ java/lang/reflect/Array.java \ -+ java/lang/reflect/Constructor.java \ -+ java/lang/reflect/Field.java \ -+ java/lang/reflect/GenericArrayType.java \ -+ java/lang/reflect/GenericDeclaration.java \ -+ java/lang/reflect/GenericSignatureFormatError.java \ -+ java/lang/reflect/InvocationHandler.java \ -+ java/lang/reflect/InvocationTargetException.java \ -+ java/lang/reflect/MalformedParameterizedTypeException.java \ -+ java/lang/reflect/Member.java \ -+ java/lang/reflect/Method.java \ -+ java/lang/reflect/Modifier.java \ -+ java/lang/reflect/package-info.java \ -+ java/lang/reflect/ParameterizedType.java \ -+ java/lang/reflect/Proxy.java \ -+ java/lang/reflect/ReflectAccess.java \ -+ java/lang/reflect/ReflectPermission.java \ -+ java/lang/reflect/Type.java \ -+ java/lang/reflect/TypeVariable.java \ -+ java/lang/reflect/UndeclaredThrowableException.java \ -+ java/lang/reflect/WildcardType.java \ -+ java/lang/ref/Finalizer.java \ -+ java/lang/ref/FinalReference.java \ -+ java/lang/ref/PhantomReference.java \ -+ java/lang/ref/Reference.java \ -+ java/lang/ref/ReferenceQueue.java \ -+ java/lang/ref/SoftReference.java \ -+ java/lang/ref/WeakReference.java \ -+ java/lang/management/ClassLoadingMXBean.java \ -+ java/lang/management/CompilationMXBean.java \ -+ java/lang/management/GarbageCollectorMXBean.java \ -+ java/lang/management/LockInfo.java \ -+ java/lang/management/ManagementFactory.java \ -+ java/lang/management/ManagementPermission.java \ -+ java/lang/management/MemoryManagerMXBean.java \ -+ java/lang/management/MemoryMXBean.java \ -+ java/lang/management/MemoryNotificationInfo.java \ -+ java/lang/management/MemoryPoolMXBean.java \ -+ java/lang/management/MemoryType.java \ -+ java/lang/management/MemoryUsage.java \ -+ java/lang/management/MonitorInfo.java \ -+ java/lang/management/OperatingSystemMXBean.java \ -+ java/lang/management/RuntimeMXBean.java \ -+ java/lang/management/ThreadInfo.java \ -+ java/lang/management/ThreadMXBean.java \ -+ java/lang/instrument/ClassDefinition.java \ -+ java/lang/instrument/ClassFileTransformer.java \ -+ java/lang/instrument/IllegalClassFormatException.java \ -+ java/lang/instrument/Instrumentation.java \ -+ java/lang/instrument/UnmodifiableClassException.java \ -+ java/lang/annotation/AnnotationFormatError.java \ -+ java/lang/annotation/Annotation.java \ -+ java/lang/annotation/AnnotationTypeMismatchException.java \ -+ java/lang/annotation/Documented.java \ -+ java/lang/annotation/ElementType.java \ -+ java/lang/annotation/IncompleteAnnotationException.java \ -+ java/lang/annotation/Inherited.java \ -+ java/lang/annotation/package-info.java \ -+ java/lang/annotation/Retention.java \ -+ java/lang/annotation/RetentionPolicy.java \ -+ java/lang/annotation/Target.java \ -+ java/io/IOError.java \ -+ java/lang/Deprecated.java \ -+ java/lang/Iterable.java \ -+ java/util/RandomAccess.java \ -+ java/lang/CharacterData00.java \ -+ java/lang/CharacterData01.java \ -+ java/lang/CharacterData02.java \ -+ java/lang/CharacterData0E.java \ -+ java/lang/CharacterDataLatin1.java \ -+ java/lang/CharacterDataPrivateUse.java \ -+ java/lang/CharacterDataUndefined.java \ - java/lang/Object.java \ - java/lang/Class.java \ - java/lang/Thread.java \ -@@ -135,13 +209,6 @@ - java/lang/Readable.java \ - java/lang/Override.java \ - java/lang/SuppressWarnings.java \ -- java/lang/ref/Reference.java \ -- java/lang/ref/SoftReference.java \ -- java/lang/ref/WeakReference.java \ -- java/lang/ref/FinalReference.java \ -- java/lang/ref/PhantomReference.java \ -- java/lang/ref/ReferenceQueue.java \ -- java/lang/ref/Finalizer.java \ - java/util/BitSet.java \ - java/util/Calendar.java \ - java/util/GregorianCalendar.java \ ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -62,7 +62,6 @@ - com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \ - com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \ - com/sun/corba/se/impl/encoding/TypeCodeReader.java \ -- com/sun/corba/se/impl/encoding/WrapperInputStream.java -- -- -- -+ com/sun/corba/se/impl/encoding/WrapperInputStream.java \ -+ com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \ -+ com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -29,5 +29,6 @@ - com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \ - com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ - com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \ -+ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ - com/sun/corba/se/spi/presentation/rmi/StubAdapter.java - ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -81,5 +81,5 @@ - com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \ - com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \ - com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \ -- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java -- -+ com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java \ -+ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -30,6 +30,7 @@ - com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \ - com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \ - com/sun/corba/se/spi/monitoring/MonitoringFactories.java \ -+ com/sun/corba/se/spi/monitoring/MonitoringConstants.java \ - com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \ - com/sun/corba/se/spi/monitoring/MonitoredObject.java \ - com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \ ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -66,4 +66,5 @@ - com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \ - com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \ - com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \ -- com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java -+ com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java \ -+ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -81,4 +81,5 @@ - com/sun/corba/se/impl/orbutil/graph/Node.java \ - com/sun/corba/se/impl/orbutil/graph/NodeData.java \ - com/sun/corba/se/impl/orbutil/graph/Graph.java \ -- com/sun/corba/se/impl/orbutil/graph/GraphImpl.java -+ com/sun/corba/se/impl/orbutil/graph/GraphImpl.java \ -+ com/sun/corba/se/impl/orbutil/GetPropertyAction.java From omajid at icedtea.classpath.org Tue May 17 09:38:38 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 17 May 2011 16:38:38 +0000 Subject: /hg/icedtea6: Move patches/shark-llvm-2.9.patch to patches/openj... Message-ID: changeset 35c0f8ca88b6 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=35c0f8ca88b6 author: Omair Majid date: Tue May 17 12:38:23 2011 -0400 Move patches/shark-llvm-2.9.patch to patches/openjdk/ and add hg changeset information This patch was upstreamed a while back. Move it to a new location to reflect its current status. 2011-05-17 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace patches/shark- llvm-2.9.patch with patches/openjdk/7036220-shark_llvm_29_headers.patch. * patches/shark-llvm-2.9.patch: Move to... * patches/openjdk/7036220-shark_llvm_29_headers.patch: New file. Contains contents of patches/shark-llvm-2.9.patch as well as hg metadata. diffstat: ChangeLog | 9 ++++ Makefile.am | 2 +- patches/openjdk/7036220-shark_llvm_29_headers.patch | 43 +++++++++++++++++++++ patches/shark-llvm-2.9.patch | 28 ------------- 4 files changed, 53 insertions(+), 29 deletions(-) diffs (109 lines): diff -r 19cc9d976c7a -r 35c0f8ca88b6 ChangeLog --- a/ChangeLog Tue May 17 12:19:36 2011 -0400 +++ b/ChangeLog Tue May 17 12:38:23 2011 -0400 @@ -1,3 +1,12 @@ +2011-05-17 Omair Majid + + * Makefile.am + (ICEDTEA_PATCHES): Replace patches/shark-llvm-2.9.patch with + patches/openjdk/7036220-shark_llvm_29_headers.patch. + * patches/shark-llvm-2.9.patch: Move to... + * patches/openjdk/7036220-shark_llvm_29_headers.patch: New file. Contains + contents of patches/shark-llvm-2.9.patch as well as hg metadata. + 2011-05-17 Omair Majid * Makefile.am diff -r 19cc9d976c7a -r 35c0f8ca88b6 Makefile.am --- a/Makefile.am Tue May 17 12:19:36 2011 -0400 +++ b/Makefile.am Tue May 17 12:38:23 2011 -0400 @@ -333,7 +333,7 @@ patches/revert-6885123.patch \ patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ - patches/shark-llvm-2.9.patch \ + patches/openjdk/7036220-shark_llvm_29_headers.patch \ patches/openjdk/6986968-crash_on_xim_restart.patch \ patches/openjdk/7036754-stroker-nan.patch \ patches/openjdk/pgram-pipe-regression.patch \ diff -r 19cc9d976c7a -r 35c0f8ca88b6 patches/openjdk/7036220-shark_llvm_29_headers.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7036220-shark_llvm_29_headers.patch Tue May 17 12:38:23 2011 -0400 @@ -0,0 +1,44 @@ +# HG changeset patch +# User twisti +# Date 1302771192 25200 +# Node ID 1fcd6e9c3965f4bf23f6a8f4fbb77fdf74de37a7 +# Parent 3a808be061ffc10da5647e50cc28252d70f21883 +7036220: Shark fails to find LLVM 2.9 System headers during build +Reviewed-by: gbenson, twisti +Contributed-by: Xerxes Ranby + +diff -r 3a808be061ff -r 1fcd6e9c3965 src/share/vm/shark/llvmHeaders.hpp +--- openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp Wed Apr 13 14:33:03 2011 -0700 ++++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp Thu Apr 14 01:53:12 2011 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright 2008, 2009, 2010 Red Hat, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * +@@ -46,7 +46,11 @@ + #include + #endif + #include ++#if SHARK_LLVM_VERSION >= 29 ++#include ++#else + #include ++#endif + #include + #include + #include +@@ -55,8 +59,12 @@ + #include + #include + #include ++#if SHARK_LLVM_VERSION >= 29 ++#include ++#else + #include + #endif ++#endif + + #include + diff -r 19cc9d976c7a -r 35c0f8ca88b6 patches/shark-llvm-2.9.patch --- a/patches/shark-llvm-2.9.patch Tue May 17 12:19:36 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -Index: openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp -=================================================================== ---- openjdk.orig/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-04-08 11:48:09.270716001 +0200 -+++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp 2011-04-08 11:49:54.714716002 +0200 -@@ -43,7 +43,11 @@ - #include - #endif - #include -+#if SHARK_LLVM_VERSION >= 29 -+#include -+#else - #include -+#endif - #include - #include - #include -@@ -52,8 +56,12 @@ - #include - #include - #include -+#if SHARK_LLVM_VERSION >= 29 -+#include -+#else - #include - #endif -+#endif - - #include - From omajid at icedtea.classpath.org Tue May 17 10:56:34 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 17 May 2011 17:56:34 +0000 Subject: /hg/icedtea6: Drop patches/tools.patch Message-ID: changeset 210ce974c3a3 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=210ce974c3a3 author: Omair Majid date: Tue May 17 13:55:58 2011 -0400 Drop patches/tools.patch The patch patches/tools.patch is redundant. The changes to classlist are not required and are not complete (other classes are missing too). The Makefile changes had no effect. 2011-05-17 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Remove patches/tools.patch. * patches/tools.patch: Remove file. Not required anymore. diffstat: ChangeLog | 5 +++ Makefile.am | 1 - patches/tools.patch | 79 ----------------------------------------------------- 3 files changed, 5 insertions(+), 80 deletions(-) diffs (110 lines): diff -r 35c0f8ca88b6 -r 210ce974c3a3 ChangeLog --- a/ChangeLog Tue May 17 12:38:23 2011 -0400 +++ b/ChangeLog Tue May 17 13:55:58 2011 -0400 @@ -1,3 +1,8 @@ +2011-05-17 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Remove patches/tools.patch. + * patches/tools.patch: Remove file. Not required anymore. + 2011-05-17 Omair Majid * Makefile.am diff -r 35c0f8ca88b6 -r 210ce974c3a3 Makefile.am --- a/Makefile.am Tue May 17 12:38:23 2011 -0400 +++ b/Makefile.am Tue May 17 13:55:58 2011 -0400 @@ -218,7 +218,6 @@ patches/version-hotspot.patch \ patches/hotspot/$(HSBUILD)/text-relocations.patch \ patches/openjdk/7043921-java_rmi_cgi.patch \ - patches/tools.patch \ patches/use-system-tzdata.patch \ patches/headers.patch \ patches/gcc-suffix.patch \ diff -r 35c0f8ca88b6 -r 210ce974c3a3 patches/tools.patch --- a/patches/tools.patch Tue May 17 12:38:23 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.linux openjdk/jdk/make/tools/sharing/classlist.linux ---- openjdk-ecj/jdk/make/tools/sharing/classlist.linux 2007-08-30 03:19:44.000000000 -0400 -+++ openjdk/jdk/make/tools/sharing/classlist.linux 2007-09-04 13:33:52.000000000 -0400 -@@ -330,7 +330,6 @@ - java/beans/PropertyChangeEvent - java/util/EventObject - java/awt/Component$AWTTreeLock --sun/awt/DebugHelper - sun/awt/NativeLibLoader - sun/security/action/LoadLibraryAction - java/awt/GraphicsEnvironment -@@ -341,7 +340,6 @@ - java/lang/ProcessEnvironment$Value - java/lang/ProcessEnvironment$StringEnvironment - java/util/Collections$UnmodifiableMap --sun/awt/DebugHelperStub - java/awt/Toolkit - java/awt/Toolkit$3 - sun/util/CoreResourceBundleControl -diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.solaris openjdk/jdk/make/tools/sharing/classlist.solaris ---- openjdk-ecj/jdk/make/tools/sharing/classlist.solaris 2007-08-30 03:19:44.000000000 -0400 -+++ openjdk/jdk/make/tools/sharing/classlist.solaris 2007-09-04 13:34:17.000000000 -0400 -@@ -332,7 +332,6 @@ - java/beans/PropertyChangeEvent - java/util/EventObject - java/awt/Component$AWTTreeLock --sun/awt/DebugHelper - sun/awt/NativeLibLoader - sun/security/action/LoadLibraryAction - java/awt/GraphicsEnvironment -@@ -343,7 +342,6 @@ - java/lang/ProcessEnvironment$Value - java/lang/ProcessEnvironment$StringEnvironment - java/util/Collections$UnmodifiableMap --sun/awt/DebugHelperStub - java/awt/Toolkit - java/awt/Toolkit$3 - sun/util/CoreResourceBundleControl -diff -ruN openjdk-ecj/jdk/make/tools/sharing/classlist.windows openjdk/jdk/make/tools/sharing/classlist.windows ---- openjdk-ecj/jdk/make/tools/sharing/classlist.windows 2007-08-30 03:19:44.000000000 -0400 -+++ openjdk/jdk/make/tools/sharing/classlist.windows 2007-09-04 13:34:05.000000000 -0400 -@@ -333,10 +333,8 @@ - java/beans/PropertyChangeEvent - java/util/EventObject - java/awt/Component$AWTTreeLock --sun/awt/DebugHelper - sun/awt/NativeLibLoader - sun/security/action/LoadLibraryAction --sun/awt/DebugHelperStub - java/awt/Toolkit - java/awt/Toolkit$3 - sun/util/CoreResourceBundleControl ---- openjdk.orig/jdk/make/java/awt/Makefile 2008-02-28 04:39:42.000000000 -0500 -+++ openjdk/jdk/make/java/awt/Makefile 2008-02-29 14:58:50.000000000 -0500 -@@ -34,7 +34,7 @@ - # - AUTO_FILES_JAVA_DIRS = java/awt sun/awt/geom - --build: properties cursors -+build: sources properties cursors - - # - # Resources -@@ -47,9 +47,11 @@ - # - include $(BUILDDIR)/common/Classes.gmk - -+sources: - - clean:: properties.clean sun.geom.clean cursors.clean - -+ - _LIBPROPS = \ - flavormap.properties - -@@ -102,6 +104,6 @@ - cursors.clean : - $(RM) -r $(CURSORDIR) - --.PHONY: properties properties.clean \ -+.PHONY: sources properties properties.clean \ - cursors sun.geom.clean cursors.clean - From ahughes at redhat.com Tue May 17 13:16:56 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 17 May 2011 21:16:56 +0100 Subject: [RFC][icedtea6-{head,1.10}] backport In-Reply-To: <38658302.292325.1305649084996.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <1406168421.292318.1305649078781.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <38658302.292325.1305649084996.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <20110517201656.GC31710@rivendell.middle-earth.co.uk> On 12:18 Tue 17 May , Denis Lila wrote: > Hi. > > I would like to backport to head and 1.10 the mutter > patch I just pushed to icedtea7-forest/jdk. > > The 1.10 backport is needed because that's what is > going into Fedora 15 and F15 uses mutter. > > The attached diff is just for head. Do you also need > to see the 1.10 one? > > Regards, > Denis. I'm fine with just seeing this one, assuming they both build fine and the appropriate adjustments are made to ChangeLog + NEWS. For future reference, please don't include the ChangeLog in the patch but in the body of the e-mail, so the patch can be more easily applied. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Tue May 17 13:38:04 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 17 May 2011 20:38:04 +0000 Subject: [Bug 725] New: JNLP applications will prompt for creating desktop shortcuts every time they are run Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=725 Summary: JNLP applications will prompt for creating desktop shortcuts every time they are run Product: IcedTea-Web Version: hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: NetX AssignedTo: omajid at redhat.com ReportedBy: omajid at redhat.com CC: unassigned at icedtea.classpath.org To reproduce the bug: $ javaws http://www.sweethome3d.com/SweetHome3D.jnlp You should see a prompt to add a desktop entry/shortcut. Accept it. If you run this program again: $ javaws http://www.sweethome3d.com/SweetHome3D.jnlp You still get a prompt to add a desktop entry/shortcut. The expected behaviour is that the decision the first time a program is run is remembered. A user should be able to accept or decline the creation of a desktop shortcut/entry the first time an application is run and never be prompted again. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at icedtea.classpath.org Tue May 17 16:50:45 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 17 May 2011 23:50:45 +0000 Subject: /hg/icedtea6: Drop unapplied patch patches/linux-separate-debugi... Message-ID: changeset 17744d45962a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=17744d45962a author: Omair Majid date: Tue May 17 19:50:30 2011 -0400 Drop unapplied patch patches/linux-separate-debuginfo.patch We stopped applying this patch since 5bc57773f41d. Upstream hotspot has an improved version of this patch which works without requiring debuginfo pcakges. 2011-05-17 Omair Majid * patches/linux-separate-debuginfo.patch: Remove unapplied patch. An improved version of this patch (which allows running jmap -heap) without debuginfo packages is already included in openjdk6. diffstat: ChangeLog | 6 + patches/linux-separate-debuginfo.patch | 376 --------------------------------- 2 files changed, 6 insertions(+), 376 deletions(-) diffs (396 lines): diff -r 210ce974c3a3 -r 17744d45962a ChangeLog --- a/ChangeLog Tue May 17 13:55:58 2011 -0400 +++ b/ChangeLog Tue May 17 19:50:30 2011 -0400 @@ -1,3 +1,9 @@ +2011-05-17 Omair Majid + + * patches/linux-separate-debuginfo.patch: Remove unapplied patch. An + improved version of this patch (which allows running jmap -heap) without + debuginfo packages is already included in openjdk6. + 2011-05-17 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Remove patches/tools.patch. diff -r 210ce974c3a3 -r 17744d45962a patches/linux-separate-debuginfo.patch --- a/patches/linux-separate-debuginfo.patch Tue May 17 13:55:58 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,379 +0,0 @@ -2009-12-09 Andrew Haley - - * openjdk/hotspot/agent/src/os/linux/symtab.c (debug_file_directory): - New variable. - (gnu_debuglink_crc32): New. - (build_symtab_internal): Rename from build_symtab, make static. - Add logic to look inside debuginfo files. - (open_debug_file, find_section_by_name, open_file_from_debug_link, - build_id_to_debug_filename, build_symtab_from_build_id, - build_symtab): New. - * openjdk/hotspot/agent/src/os/linux/libproc_impl.c (add_lib_info_fd): - Pass FILENAME to build_symtab(). - * openjdk/hotspot/agent/src/os/linux/symtab.h (build_symtab): - Add FILENAME arg. - -2009-12-16 Andrew Haley - - * openjdk/hotspot/agent/src/os/linux/symtab.c (open_file_from_debug_link): - Check for NULL. - Fix off by one error in aligning the CRC: the offset is 4 bytes, - not 3. - -diff -u ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/libproc_impl.c openjdk/hotspot/agent/src/os/linux/libproc_impl.c ---- ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/libproc_impl.c 2009-05-15 00:36:38.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/linux/libproc_impl.c 2009-12-04 16:29:27.552837905 +0000 -@@ -174,7 +174,7 @@ - return NULL; - } - -- newlib->symtab = build_symtab(newlib->fd); -+ newlib->symtab = build_symtab(newlib->fd, libname); - if (newlib->symtab == NULL) { - print_debug("symbol table build failed for %s\n", newlib->name); - } -diff -u ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/symtab.h openjdk/hotspot/agent/src/os/linux/symtab.h ---- ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/symtab.h 2009-05-15 00:36:38.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/linux/symtab.h 2009-12-04 16:30:38.797838015 +0000 -@@ -32,7 +32,7 @@ - struct symtab; - - // build symbol table for a given ELF file descriptor --struct symtab* build_symtab(int fd); -+struct symtab* build_symtab(int fd, const char *filename); - - // destroy the symbol table - void destroy_symtab(struct symtab* symtab); - ---- openjdk/hotspot/agent/src/os/linux/symtab.c 2009-12-16 17:13:28.879599584 +0000 -+++ openjdk/hotspot/agent/src/os/linux/symtab.c 2009-12-16 17:14:15.871601226 +0000 -@@ -53,8 +53,274 @@ - struct hsearch_data *hash_table; - } symtab_t; - --// read symbol table from given fd. --struct symtab* build_symtab(int fd) { -+ -+// Directory that contains global debuginfo files. In theory it -+// should be possible to change this, but in a Java environment there -+// is no obvious place to put a user interface to do it. Maybe this -+// could be set with an environment variable. -+static const char debug_file_directory[] = "/usr/lib/debug"; -+ -+/* The CRC used in gnu_debuglink, retrieved from -+ http://sourceware.org/gdb/current/onlinedocs/gdb/Separate-Debug-Files.html#Separate-Debug-Files. */ -+unsigned long gnu_debuglink_crc32 (unsigned long crc, -+ unsigned char *buf, size_t len) -+{ -+ static const unsigned long crc32_table[256] = -+ { -+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, -+ 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, -+ 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, -+ 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, -+ 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, -+ 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, -+ 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, -+ 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, -+ 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, -+ 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, -+ 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, -+ 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, -+ 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, -+ 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, -+ 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, -+ 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, -+ 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, -+ 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, -+ 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, -+ 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, -+ 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, -+ 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, -+ 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, -+ 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, -+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, -+ 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, -+ 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, -+ 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, -+ 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, -+ 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, -+ 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, -+ 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, -+ 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, -+ 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, -+ 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, -+ 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, -+ 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, -+ 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, -+ 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, -+ 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, -+ 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, -+ 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, -+ 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, -+ 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, -+ 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, -+ 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, -+ 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, -+ 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, -+ 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, -+ 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, -+ 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, -+ 0x2d02ef8d -+ }; -+ unsigned char *end; -+ -+ crc = ~crc & 0xffffffff; -+ for (end = buf + len; buf < end; ++buf) -+ crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8); -+ return ~crc & 0xffffffff; -+} -+ -+/* Open a debuginfo file and check its CRC. If it exists and the CRC -+ matches return its fd. */ -+static int -+open_debug_file (const char *pathname, unsigned int crc) -+{ -+ unsigned int file_crc = 0; -+ unsigned char buffer[8 * 1024]; -+ -+ int fd = pathmap_open(pathname); -+ -+ if (fd < 0) -+ return -1; -+ -+ lseek(fd, 0, SEEK_SET); -+ -+ for (;;) { -+ int len = read(fd, buffer, sizeof buffer); -+ if (len <= 0) -+ break; -+ file_crc = gnu_debuglink_crc32(file_crc, buffer, len); -+ } -+ -+ if (crc == file_crc) -+ return fd; -+ else { -+ close(fd); -+ return -1; -+ } -+} -+ -+/* Find an ELF section. */ -+static struct elf_section *find_section_by_name(char *name, -+ int fd, -+ ELF_EHDR *ehdr, -+ ELF_SHDR *shbuf, -+ struct elf_section *scn_cache) -+{ -+ ELF_SHDR* cursct = NULL; -+ char *strtab; -+ int cnt; -+ -+ if (scn_cache[ehdr->e_shstrndx].c_data == NULL) { -+ if ((scn_cache[ehdr->e_shstrndx].c_data -+ = read_section_data(fd, ehdr, cursct)) == NULL) { -+ return NULL; -+ } -+ } -+ -+ strtab = scn_cache[ehdr->e_shstrndx].c_data; -+ -+ for (cursct = shbuf, cnt = 0; -+ cnt < ehdr->e_shnum; -+ cnt++, cursct++) { -+ if (strcmp(cursct->sh_name + strtab, name) == 0) { -+ scn_cache[cnt].c_data = read_section_data(fd, ehdr, cursct); -+ return &scn_cache[cnt]; -+ } -+ } -+ -+ return NULL; -+} -+ -+/* Look for a ".gnu_debuglink" section. If one exists, try to open a -+ suitable debuginfo file. */ -+static int open_file_from_debug_link(const char *name, -+ int fd, -+ ELF_EHDR *ehdr, -+ ELF_SHDR *shbuf, -+ struct elf_section *scn_cache) -+{ -+ int debug_fd; -+ struct elf_section *debug_link = find_section_by_name(".gnu_debuglink", fd, ehdr, -+ shbuf, scn_cache); -+ if (debug_link == NULL) -+ return -1; -+ char *debug_filename = debug_link->c_data; -+ int offset = (strlen(debug_filename) + 4) >> 2; -+ static unsigned int crc; -+ crc = ((unsigned int*)debug_link->c_data)[offset]; -+ char *debug_pathname = malloc(strlen(debug_filename) -+ + strlen(name) -+ + strlen(".debug/") -+ + strlen(debug_file_directory) -+ + 2); -+ strcpy(debug_pathname, name); -+ char *last_slash = strrchr(debug_pathname, '/'); -+ if (last_slash == NULL) -+ return -1; -+ -+ /* Look in the same directory as the object. */ -+ strcpy(last_slash+1, debug_filename); -+ -+ debug_fd = open_debug_file(debug_pathname, crc); -+ if (debug_fd >= 0) { -+ free(debug_pathname); -+ return debug_fd; -+ } -+ -+ /* Look in a subdirectory named ".debug". */ -+ strcpy(last_slash+1, ".debug/"); -+ strcat(last_slash, debug_filename); -+ -+ debug_fd = open_debug_file(debug_pathname, crc); -+ if (debug_fd >= 0) { -+ free(debug_pathname); -+ return debug_fd; -+ } -+ -+ /* Look in /usr/lib/debug + the full pathname. */ -+ strcpy(debug_pathname, debug_file_directory); -+ strcat(debug_pathname, name); -+ last_slash = strrchr(debug_pathname, '/'); -+ strcpy(last_slash+1, debug_filename); -+ -+ debug_fd = open_debug_file(debug_pathname, crc); -+ if (debug_fd >= 0) { -+ free(debug_pathname); -+ return debug_fd; -+ } -+ -+ free(debug_pathname); -+ return -1; -+} -+ -+static struct symtab* build_symtab_internal(int fd, const char *filename, bool try_debuginfo); -+ -+/* Look for a ".gnu_debuglink" section. If one exists, try to open a -+ suitable debuginfo file and read a symbol table from it. */ -+static struct symtab *build_symtab_from_debug_link(const char *name, -+ int fd, -+ ELF_EHDR *ehdr, -+ ELF_SHDR *shbuf, -+ struct elf_section *scn_cache) -+{ -+ fd = open_file_from_debug_link(name, fd, ehdr, shbuf, scn_cache); -+ -+ if (fd >= 0) { -+ struct symtab *symtab = build_symtab_internal(fd, NULL, /* try_debuginfo */ false); -+ close(fd); -+ return symtab; -+ } -+ -+ return NULL; -+} -+ -+// Given a build_id, find the associated debuginfo file -+static char * -+build_id_to_debug_filename (size_t size, unsigned char *data) -+{ -+ char *filename, *s; -+ -+ filename = malloc(strlen (debug_file_directory) + (sizeof "/.build-id/" - 1) + 1 -+ + 2 * size + (sizeof ".debug" - 1) + 1); -+ s = filename + sprintf (filename, "%s/.build-id/", debug_file_directory); -+ if (size > 0) -+ { -+ size--; -+ s += sprintf (s, "%02x", *data++); -+ } -+ if (size > 0) -+ *s++ = '/'; -+ while (size-- > 0) -+ s += sprintf (s, "%02x", *data++); -+ strcpy (s, ".debug"); -+ -+ return filename; -+} -+ -+// Read a build ID note. Try to open any associated debuginfo file -+// and return its symtab -+static struct symtab* build_symtab_from_build_id(Elf64_Nhdr *note) -+{ -+ int fd; -+ struct symtab *symtab = NULL; -+ -+ unsigned char *bytes -+ = (unsigned char*)(note+1) + note->n_namesz; -+ unsigned char *filename -+ = (build_id_to_debug_filename (note->n_descsz, bytes)); -+ -+ fd = pathmap_open(filename); -+ if (fd >= 0) { -+ symtab = build_symtab_internal(fd, NULL, /* try_debuginfo */ false); -+ close(fd); -+ } -+ free(filename); -+ -+ return symtab; -+} -+ -+// read symbol table from given fd. If try_debuginfo) is true, also -+// try to open an associated debuginfo file -+static struct symtab* build_symtab_internal(int fd, const char *filename, bool try_debuginfo) { - ELF_EHDR ehdr; - char *names = NULL; - struct symtab* symtab = NULL; -@@ -90,7 +356,8 @@ - - for (cursct = shbuf, cnt = 0; cnt < ehdr.e_shnum; cnt++) { - scn_cache[cnt].c_shdr = cursct; -- if (cursct->sh_type == SHT_SYMTAB || cursct->sh_type == SHT_STRTAB) { -+ if (cursct->sh_type == SHT_SYMTAB || cursct->sh_type == SHT_STRTAB -+ || cursct->sh_type == SHT_NOTE) { - if ( (scn_cache[cnt].c_data = read_section_data(fd, &ehdr, cursct)) == NULL) { - goto quit; - } -@@ -163,6 +430,30 @@ - } - } - -+ // If we have no symtab in this file, look for a separate debuginfo file -+ if (try_debuginfo) { -+#ifdef NT_GNU_BUILD_ID -+ // First we look for a Build ID -+ for (cursct = shbuf, cnt = 0; -+ symtab == NULL && cnt < ehdr.e_shnum; -+ cnt++) { -+ if (cursct->sh_type == SHT_NOTE) { -+ Elf64_Nhdr *note = (Elf64_Nhdr *)scn_cache[cnt].c_data; -+ if (note->n_type == NT_GNU_BUILD_ID) { -+ symtab = build_symtab_from_build_id(note); -+ } -+ } -+ cursct++; -+ } -+#endif -+ -+ // Then, if that doesn't work, the debug link -+ if (symtab == NULL) { -+ symtab = build_symtab_from_debug_link(filename, fd, &ehdr, shbuf, -+ scn_cache); -+ } -+ } -+ - quit: - if (shbuf) free(shbuf); - if (phbuf) free(phbuf); -@@ -177,6 +468,11 @@ - return symtab; - } - -+struct symtab* build_symtab(int fd, const char *filename) { -+ return build_symtab_internal(fd, filename, /* try_debuginfo */ true); -+} -+ -+ - void destroy_symtab(struct symtab* symtab) { - if (!symtab) return; - if (symtab->strs) free(symtab->strs); From bugzilla-daemon at icedtea.classpath.org Tue May 17 17:45:40 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 18 May 2011 00:45:40 +0000 Subject: [Bug 709] Crash in native code, problematic frame: libfreetype.so.6 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=709 --- Comment #4 from Reinout van Schouwen 2011-05-18 00:45:40 --- (In reply to comment #3) > (In reply to comment #2) > > Please attach the hserr file for this. I reproduced the crash, but there is no hs_err file written. Even though the working directory is writable, the terminal output says 'can not save log file, dump to screen'. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ptisnovs at redhat.com Wed May 18 01:51:53 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 18 May 2011 10:51:53 +0200 Subject: Reviewer needed - fix of regression test PrintAllXcheckJNI in IcedTea7 Message-ID: <4DD388A9.6060302@redhat.com> Hi all, I've prepared fix for regression test PrintAllXcheckJNI for IcedTea7. This test now explicitly checks if frame is really displayed. Without this check the frame size is 0x0 for some time interval due to X-async behaviour and the test fails because BufferedImage (or Raster to be more precise) can not have zero-dimensions. I'd like to push this fix to IcedTea7-forest, hg diff is stored in attachment. Can anybody please review this change? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110518/7b8d361f/hg_diff.ksh From jvanek at redhat.com Wed May 18 02:28:11 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 18 May 2011 11:28:11 +0200 Subject: RFC [icedtea-web] transformation sheet, styles for preview and daily report In-Reply-To: <4DCBDA4D.10402@redhat.com> References: <4DC8172F.7020009@redhat.com> <20110509192447.GF22437@rivendell.middle-earth.co.uk> <4DCA866C.1070204@redhat.com> <20110511135224.GF5351@rivendell.middle-earth.co.uk> <4DCAA611.5000909@redhat.com> <20110511212149.GT5351@rivendell.middle-earth.co.uk> <4DCBC298.50300@redhat.com> <4DCBDA4D.10402@redhat.com> Message-ID: <4DD3912B.9010508@redhat.com> On 05/12/2011 03:02 PM, Jiri Vanek wrote: > 2011-05-10 Jiri Vanek ...snip... > > If not. Then there is question whether include css+xsl in repository or just kept it locally on torment (for now I believe (-I know :) it is useful for both). Without preview it will be (probably) useful only locally on torment for genertaing html of single output. > > > Regards J. based on http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/014185.html and http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/014165.html discussions, refactored patch for report html Now transformation is handled in make using xsltproc so both xml and html files are available with full content. As generating of html is not crucial, it is marked as '-' so its fail will not break build. As css and javasccript files will be shared between unit tests and dist test they are still kept separately. Sheet is littlebit modified because xsltproc did not like selfclosed divs (
). The former question above is still valid, but I'm for have it inside, as it is more comfortable to see "red" and "green" lines instead of looking for them in pure xml. Regards J. 2011-05-18 Jiri Vanek * tests/report-styles/index.js: fast navigation functions * tests/report-styles/report.css: styles for transformed result * tests/report-styles/jreport.xsl: template for human-readable xml->html transformation. * Makefile.am: New variable for report-styles directory; ($(TESTS_DIR)/$(REPORT_STYLES_DIRNAME)): goal for copying styles and javascripts; (run-netx-unit-tests): added nonfaling xsltproc transformation of sheet and unit-tests' xml report to index_unit.html; (clean-netx-unit-tests): now depends also on clean_tests_reports; (clean_tests_reports): new goal to remove report styles directory and indexs html files. -------------- next part -------------- A non-text attachment was scrubbed... Name: tests_report.patch Type: text/x-patch Size: 11674 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110518/67812cd0/tests_report.patch From ptisnovs at redhat.com Wed May 18 03:48:48 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 18 May 2011 12:48:48 +0200 Subject: RFC: make IcedTea-web to be compatible with RHEL5 libraries Message-ID: <4DD3A410.3090301@redhat.com> Hi all, I've found that IcedTea-web can not be build on RHEL5 because this system has older glibc libraries (2.5-*) and some code in IcedTeaNPPlugin.cc depends on newer functions. I've tried to rewrite this class not to use these functions. Can anybody please look at these changes? They are stored in an attachments as patch file. Any comments are welcome! Cheers, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110518/6fb69e70/hg_diff.ksh From jvanek at redhat.com Wed May 18 04:56:54 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Wed, 18 May 2011 13:56:54 +0200 Subject: RFC: make IcedTea-web to be compatible with RHEL5 libraries In-Reply-To: <4DD3A410.3090301@redhat.com> References: <4DD3A410.3090301@redhat.com> Message-ID: <4DD3B406.7010501@redhat.com> On 05/18/2011 12:48 PM, Pavel Tisnovsky wrote: > Hi all, > > I've found that IcedTea-web can not be build on RHEL5 because this > system has older glibc libraries (2.5-*) and some code in > IcedTeaNPPlugin.cc depends on newer functions. > > I've tried to rewrite this class not to use these functions. Can anybody > please look at these changes? They are stored in an attachments as patch > file. > > Any comments are welcome! > > Cheers, > Pavel > My knowledge of C languages is not your match, but Those changes gives sense to me. > > hg_diff > > > diff -r f1615c79971d plugin/icedteanp/IcedTeaNPPlugin.cc > --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Tue May 17 16:43:45 2011 +0200 > +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed May 18 12:36:44 2011 +0200 > @@ -46,6 +46,7 @@ > #include > #include > #include > +#include I wonder how it was buildable without it. > > // Liveconnect extension > #include "IcedTeaScriptablePluginObject.h" > @@ -863,6 +864,14 @@ > PLUGIN_DEBUG ("ITNP_URLNotify return\n"); > } > > +// Returns key from first item stored in hashtable > +gboolean > +find_first_item_in_hash_table(gpointer key, gpointer value, gpointer user_data) > +{ > + user_data = key; > + return (gboolean)TRUE; > +} > + > NPError > get_cookie_info(const char* siteAddr, char** cookieString, uint32_t* len) > { > @@ -909,11 +918,13 @@ > > if (browser_functions.getvalueforurl) > { > - GHashTableIter iter; > + //GHashTableIter iter; > gpointer id, instance; > > - g_hash_table_iter_init (&iter, instance_to_id_map); > - g_hash_table_iter_next (&iter,&instance,&id); > + g_hash_table_find(instance_to_id_map, (GHRFunc)find_first_item_in_hash_table,&instance); > + As previous implemetation just returned first found value, then semas ok. But - how will this behave when nothing found? > + //g_hash_table_iter_init (&iter, instance_to_id_map); > + //g_hash_table_iter_next (&iter,&instance,&id); > > return browser_functions.getvalueforurl((NPP) instance, NPNURLVCookie, siteAddr, cookieString, len); > } else > @@ -1380,11 +1391,13 @@ > { > > // As in get_cookie_info, we use the first active instance > - GHashTableIter iter; > + //GHashTableIter iter; > gpointer id, instance; > > - g_hash_table_iter_init (&iter, instance_to_id_map); > - g_hash_table_iter_next (&iter,&instance,&id); same as above > + //g_hash_table_iter_init (&iter, instance_to_id_map); > + //g_hash_table_iter_next (&iter,&instance,&id); > + > + g_hash_table_find(instance_to_id_map, (GHRFunc)find_first_item_in_hash_table,&instance); > > browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len); > } else > @@ -1416,6 +1429,15 @@ > return FALSE; > } > > +int > +strcmp0(char *str1, char *str2) > +{ > + if (str1 != NULL) > + return str2 != NULL ? strcmp(str1, str2) : 1; > + else // str1 == NULL > + return str2 != NULL ? 1 : 0; > +} > + > // remove all components from LD_LIBRARY_PATH, which start with > // MOZILLA_FIVE_HOME; firefox has its own NSS based security provider, > // which conflicts with the one configured in nss.cfg. > @@ -1437,7 +1459,7 @@ > components = g_strsplit (path_old, ":", -1); > for (i1 = 0, i2 = 0; components[i1] != NULL; i1++) > { > - if (g_strcmp0 (components[i1], moz_home) == 0 > + if (strcmp0 (components[i1], moz_home) == 0 > || g_str_has_prefix (components[i1], moz_home)) > components[i2] = components[i1]; > else From dlila at icedtea.classpath.org Wed May 18 06:11:29 2011 From: dlila at icedtea.classpath.org (dlila at icedtea.classpath.org) Date: Wed, 18 May 2011 13:11:29 +0000 Subject: /hg/release/icedtea6-1.10: Let AWT know about Mutter as a window... Message-ID: changeset 711c59eac969 in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=711c59eac969 author: Denis Lila date: Wed May 18 09:06:00 2011 -0400 Let AWT know about Mutter as a window manager. diffstat: ChangeLog | 7 + Makefile.am | 3 +- NEWS | 1 + patches/openjdk/mutter.patch | 307 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 317 insertions(+), 1 deletions(-) diffs (353 lines): diff -r 3cf29ba320c1 -r 711c59eac969 ChangeLog --- a/ChangeLog Thu May 12 13:36:41 2011 -0400 +++ b/ChangeLog Wed May 18 09:06:00 2011 -0400 @@ -1,3 +1,10 @@ +2011-05-17 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/mutter.patch: Add Mutter as a window manager, + so that a WM specific workaround keeps working. + 2011-05-12 Denis Lila * Makefile.am: Apply patch. diff -r 3cf29ba320c1 -r 711c59eac969 Makefile.am --- a/Makefile.am Thu May 12 13:36:41 2011 -0400 +++ b/Makefile.am Wed May 18 09:06:00 2011 -0400 @@ -331,7 +331,8 @@ patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ patches/shark-llvm-2.9.patch \ - patches/openjdk/pgram-pipe-regression.patch + patches/openjdk/pgram-pipe-regression.patch \ + patches/openjdk/mutter.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ diff -r 3cf29ba320c1 -r 711c59eac969 NEWS --- a/NEWS Thu May 12 13:36:41 2011 -0400 +++ b/NEWS Wed May 18 09:06:00 2011 -0400 @@ -15,6 +15,7 @@ - PR689: Shark fails to find LLVM 2.9 System headers during build. * Backports - S7043054: REGRESSION - wrong userBounds in Paint.createContext() + - S7043963, RH698295: Window manager workaround in AWT was not applied to mutter. Now it is. New in release 1.10.1 (2011-04-04): diff -r 3cf29ba320c1 -r 711c59eac969 patches/openjdk/mutter.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/mutter.patch Wed May 18 09:06:00 2011 -0400 @@ -0,0 +1,311 @@ +# HG changeset patch +# User Denis Lila +# Date 1305642927 14400 +# Node ID 49098163596b4e2972ddad36550e0b9801d3170b +# Parent cf7c64f276c60d1bab5b26b87a4e337dadbb4888 +Add mutter as a window manager. + +diff -r cf7c64f276c6 -r 49098163596b src/solaris/classes/sun/awt/X11/XDecoratedPeer.java +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java Wed May 11 11:08:03 2011 -0400 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java Tue May 17 10:35:27 2011 -0400 +@@ -721,7 +721,7 @@ + // Location, Client size + insets + newLocation = new Point(xe.get_x() - currentInsets.left, xe.get_y() - currentInsets.top); + } else { +- // CDE/MWM/Metacity/Sawfish bug: if shell is resized using ++ // CDE/MWM/Metacity/Sawfish/Mutter bug: if shell is resized using + // top or left border, we don't receive synthetic + // ConfigureNotify, only the one from X with zero + // coordinates. This is the workaround to get real +@@ -731,6 +731,7 @@ + case XWM.MOTIF_WM: + case XWM.METACITY_WM: + case XWM.SAWFISH_WM: ++ case XWM.MUTTER_WM: + { + Point xlocation = queryXLocation(); + if (log.isLoggable(PlatformLogger.FINE)) log.fine("New X location: {0}", xlocation); +diff -r cf7c64f276c6 -r 49098163596b src/solaris/classes/sun/awt/X11/XWM.java +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XWM.java Wed May 11 11:08:03 2011 -0400 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java Tue May 17 10:35:27 2011 -0400 +@@ -101,7 +101,8 @@ + ICE_WM = 10, + METACITY_WM = 11, + COMPIZ_WM = 12, +- LG3D_WM = 13; ++ LG3D_WM = 13, ++ MUTTER_WM = 14; + public String toString() { + switch (WMID) { + case NO_WM: +@@ -128,6 +129,8 @@ + return "Compiz"; + case LG3D_WM: + return "LookingGlass"; ++ case MUTTER_WM: ++ return "Mutter"; + case UNDETERMINED_WM: + default: + return "Undetermined WM"; +@@ -566,6 +569,12 @@ + // getIntProperty(XToolkit.getDefaultRootWindow(), XAtom.XA_CARDINAL)) == 0); + } + ++ static boolean isMutter() { ++ return isNetWMName("Mutter"); ++ } ++ ++ // TODO: according to wikipedia, compiz is now reparenting. This should ++ // probably be updated. + static boolean isNonReparentingWM() { + return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM); + } +@@ -735,10 +744,12 @@ + awt_wmgr = XWM.ENLIGHTEN_WM; + } else if (isMetacity()) { + awt_wmgr = XWM.METACITY_WM; ++ } else if (isMutter()) { ++ awt_wmgr = XWM.MUTTER_WM; + } else if (isSawfish()) { + awt_wmgr = XWM.SAWFISH_WM; + } else if (isKDE2()) { +- awt_wmgr =XWM.KDE2_WM; ++ awt_wmgr = XWM.KDE2_WM; + } else if (isCompiz()) { + awt_wmgr = XWM.COMPIZ_WM; + } else if (isLookingGlass()) { +@@ -1036,6 +1047,8 @@ + + boolean supportsDynamicLayout() { + int wm = getWMID(); ++ // TODO: does mutter support this? It's a fancy new WM, so it probably ++ // does. Confirm and fix this. + switch (wm) { + case XWM.ENLIGHTEN_WM: + case XWM.KDE2_WM: +@@ -1360,6 +1373,7 @@ + return insets; + } + } ++ // TODO: figure out if Mutter implements the insets property. + switch(getWMID()) { + case XWM.KDE2_WM: + return getInsetsFromProp(window, XA_KDE_NET_WM_FRAME_STRUT); +@@ -1554,6 +1568,9 @@ + correctWM.bottom = correctWM.left; + break; + } ++ case XWM.MUTTER_WM: ++ // TODO: Figure out if Mutter is double reparenting. ++ // For now the fallback code is good enough. + case XWM.OTHER_WM: + default: { /* this is very similar to the E! case above */ + insLog.finest("Getting correct insets for OTHER_WM/default, parent: {0}", parent); +diff -r cf7c64f276c6 -r 49098163596b test/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/awt/WMSpecificTests/Mutter/MutterMaximizeTest.java Tue May 17 10:35:27 2011 -0400 +@@ -0,0 +1,161 @@ ++/* ++ * Copyright 2011 Red Hat, Inc. All Rights Reserved. ++ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code 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 ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ */ ++ ++ ++/* ++ @test ++ @bug 7043963 ++ @summary Tests that the screen location of windows is ++ updated properly after a maximize. ++ @author Denis Lila ++ @library ../../regtesthelpers ++ @build Util ++ @run main MutterMaximizeTest ++*/ ++ ++import java.awt.AWTException; ++import java.awt.Dimension; ++import java.awt.Frame; ++import java.awt.Point; ++import java.awt.Robot; ++import java.awt.Window; ++import java.awt.event.InputEvent; ++import java.awt.event.WindowAdapter; ++import java.awt.event.WindowEvent; ++ ++import test.java.awt.regtesthelpers.Util; ++ ++ at SuppressWarnings("serial") ++public class MutterMaximizeTest extends Frame { ++ ++ public static void main(String[] args) throws InterruptedException { ++ if (Util.getWMID() != Util.MUTTER_WM) { ++ System.out.println("This test is only useful on Mutter"); ++ return; ++ } ++ MutterMaximizeTest frame = new MutterMaximizeTest(); ++ frame.addWindowListener(Util.getClosingWindowAdapter()); ++ ++ //Display the window. ++ frame.pack(); ++ frame.setSize(500, 500); ++ Util.showWindowWait(frame); ++ runRobotTest(frame); ++ } ++ ++ private static void runRobotTest(Frame frame) { ++ try { ++ Thread robotThread = startRegTest(frame); ++ robotThread.start(); ++ waitForThread(robotThread); ++ } finally { ++ frame.dispose(); ++ } ++ } ++ ++ private static void waitForThread(Thread t) { ++ while (t.isAlive()) { ++ try { ++ t.join(); ++ } catch (InterruptedException e) { ++ } ++ } ++ } ++ ++ private static void sleepFor(long millis) { ++ long dT = 0; ++ long start = System.nanoTime(); ++ while (dT < millis) { ++ try { ++ long toSleep = millis - dT/1000000; ++ if (toSleep > 0) { ++ Thread.sleep(toSleep); ++ } ++ // if this ends without an interrupted exception, ++ // that's good enough. ++ break; ++ } catch (InterruptedException e) { ++ long now = System.nanoTime(); ++ dT = now - start; ++ } ++ } ++ } ++ ++ private static void rmove(Robot robot, Point p) { ++ robot.mouseMove(p.x, p.y); ++ } ++ private static void rdown(Robot robot) { ++ robot.mousePress(InputEvent.BUTTON1_MASK); ++ robot.delay(50); ++ } ++ private static void rup(Robot robot) { ++ robot.mouseRelease(InputEvent.BUTTON1_MASK); ++ robot.delay(50); ++ } ++ ++ public static void click(Robot robot) { ++ rdown(robot); ++ rup(robot); ++ } ++ ++ public static void doubleClick(Robot robot) { ++ click(robot); ++ click(robot); ++ } ++ ++ private static void dragWindow(Window w, int dx, int dy, Robot robot) { ++ Point p = Util.getTitlePoint(w); ++ rmove(robot, p); ++ rdown(robot); ++ p.translate(dx, dy); ++ rmove(robot, p); ++ rup(robot); ++ } ++ ++ // f must be visible ++ private static Thread startRegTest(final Frame f) { ++ Thread robot = new Thread(new Runnable() { ++ public void run() { ++ Robot r = Util.createRobot(); ++ dragWindow(f, 100, 100, r); ++ // wait for the location to be set. ++ sleepFor(2000); ++ ++ final Point l2 = f.getLocationOnScreen(); ++ ++ // double click should maximize the frame ++ doubleClick(r); ++ ++ // wait for location again. ++ sleepFor(2000); ++ final Point l3 = f.getLocationOnScreen(); ++ if (l3.equals(l2)) { ++ throw new RuntimeException("Bad location after maximize. Window location has not moved"); ++ } ++ } ++ }); ++ return robot; ++ } ++} ++ +diff -r cf7c64f276c6 -r 49098163596b test/java/awt/regtesthelpers/Util.java +--- openjdk.orig/jdk/test/java/awt/regtesthelpers/Util.java Wed May 11 11:08:03 2011 -0400 ++++ openjdk/jdk/test/java/awt/regtesthelpers/Util.java Tue May 17 10:35:27 2011 -0400 +@@ -140,6 +140,13 @@ + robot.mouseMove(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2); + } + ++ public static Point getTitlePoint(Window decoratedWindow) { ++ Point p = decoratedWindow.getLocationOnScreen(); ++ Dimension d = decoratedWindow.getSize(); ++ return new Point(p.x + (int)(d.getWidth()/2), ++ p.y + (int)decoratedWindow.getInsets().top/2); ++ } ++ + /** + * Moves mouse pointer in the center of a given {@code comp} component + * and performs a left mouse button click using the {@code robot} parameter +@@ -167,11 +174,9 @@ + * WARNING: it may fail on some platforms when the window is not wide enough. + */ + public static void clickOnTitle(final Window decoratedWindow, final Robot robot) { +- Point p = decoratedWindow.getLocationOnScreen(); +- Dimension d = decoratedWindow.getSize(); +- + if (decoratedWindow instanceof Frame || decoratedWindow instanceof Dialog) { +- robot.mouseMove(p.x + (int)(d.getWidth()/2), p.y + (int)decoratedWindow.getInsets().top/2); ++ Point p = getTitlePoint(decoratedWindow); ++ robot.mouseMove(p.x, p.y); + robot.delay(50); + robot.mousePress(InputEvent.BUTTON1_MASK); + robot.delay(50); +@@ -409,7 +414,8 @@ + ICE_WM = 10, + METACITY_WM = 11, + COMPIZ_WM = 12, +- LG3D_WM = 13; ++ LG3D_WM = 13, ++ MUTTER_WM = 14; + + /* + * Returns -1 in case of not X Window or any problems. +exporting patch: + From dlila at icedtea.classpath.org Wed May 18 06:54:14 2011 From: dlila at icedtea.classpath.org (dlila at icedtea.classpath.org) Date: Wed, 18 May 2011 13:54:14 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset aa99e0230f34 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=aa99e0230f34 author: Denis Lila date: Wed May 18 08:58:20 2011 -0400 Let AWT know about Mutter as a window manager. changeset 9cd3b8769614 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9cd3b8769614 author: Denis Lila date: Wed May 18 09:04:01 2011 -0400 merge diffstat: ChangeLog | 35 + Makefile.am | 8 +- NEWS | 1 + patches/ecj/javafiles.patch | 150 +++++++ patches/javafiles.patch | 150 ------- patches/linux-separate-debuginfo.patch | 376 -------------------- patches/openjdk/7036220-shark_llvm_29_headers.patch | 43 ++ patches/openjdk/mutter.patch | 307 ++++++++++++++++ patches/shark-llvm-2.9.patch | 28 - patches/tools.patch | 79 ---- 10 files changed, 540 insertions(+), 637 deletions(-) diffs (truncated from 1284 to 500 lines): diff -r c59c4a788187 -r 9cd3b8769614 ChangeLog --- a/ChangeLog Tue May 17 09:15:25 2011 +0200 +++ b/ChangeLog Wed May 18 09:04:01 2011 -0400 @@ -1,3 +1,38 @@ +2011-05-17 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/mutter.patch: Add Mutter as a window manager, + so that a WM specific workaround keeps working. + +2011-05-17 Omair Majid + + * patches/linux-separate-debuginfo.patch: Remove unapplied patch. An + improved version of this patch (which allows running jmap -heap) without + debuginfo packages is already included in openjdk6. + +2011-05-17 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Remove patches/tools.patch. + * patches/tools.patch: Remove file. Not required anymore. + +2011-05-17 Omair Majid + + * Makefile.am + (ICEDTEA_PATCHES): Replace patches/shark-llvm-2.9.patch with + patches/openjdk/7036220-shark_llvm_29_headers.patch. + * patches/shark-llvm-2.9.patch: Move to... + * patches/openjdk/7036220-shark_llvm_29_headers.patch: New file. Contains + contents of patches/shark-llvm-2.9.patch as well as hg metadata. + +2011-05-17 Omair Majid + + * Makefile.am + (ICEDTEA_PATCHES): Move patches/javafiles.patch to ... + (ICEDTEA_ECJ_PATCHES): Add patches/ecj/javafiles.patch. + * patches/javafiles.patch: Move to... + * patches/ecj/javafiles.patch: New file. + 2011-05-17 Pavel Tisnovsky * patches/jtreg-6929067-fix.patch: Fix bashism. diff -r c59c4a788187 -r 9cd3b8769614 Makefile.am --- a/Makefile.am Tue May 17 09:15:25 2011 +0200 +++ b/Makefile.am Wed May 18 09:04:01 2011 -0400 @@ -218,14 +218,12 @@ patches/version-hotspot.patch \ patches/hotspot/$(HSBUILD)/text-relocations.patch \ patches/openjdk/7043921-java_rmi_cgi.patch \ - patches/tools.patch \ patches/use-system-tzdata.patch \ patches/headers.patch \ patches/gcc-suffix.patch \ patches/hotspot/$(HSBUILD)/gcc-suffix.patch \ patches/memory-limits.patch \ patches/libraries.patch \ - patches/javafiles.patch \ patches/jvmtiEnv.patch \ patches/lcms.patch \ patches/print_lsb_release.patch \ @@ -334,13 +332,14 @@ patches/revert-6885123.patch \ patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ - patches/shark-llvm-2.9.patch \ + patches/openjdk/7036220-shark_llvm_29_headers.patch \ patches/openjdk/6986968-crash_on_xim_restart.patch \ patches/openjdk/7036754-stroker-nan.patch \ patches/openjdk/pgram-pipe-regression.patch \ patches/openjdk/7034464-hugepage.patch \ patches/openjdk/7037939-hugepage.patch \ - patches/openjdk/7043564-hugepage.patch + patches/openjdk/7043564-hugepage.patch \ + patches/openjdk/mutter.patch if WITH_ALT_HSBUILD ICEDTEA_PATCHES += \ @@ -417,6 +416,7 @@ ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \ patches/ecj/hotspot.patch \ patches/ecj/endorsed-dir-for-jvmti.patch \ + patches/ecj/javafiles.patch \ patches/ecj/spp.patch \ patches/ecj/jopt.patch \ patches/ecj/jaxp-dependency.patch \ diff -r c59c4a788187 -r 9cd3b8769614 NEWS --- a/NEWS Tue May 17 09:15:25 2011 +0200 +++ b/NEWS Wed May 18 09:04:01 2011 -0400 @@ -28,6 +28,7 @@ - S7036754: Stroked quads sometimes contain NaN - S7042040: Remove disk space sanity check - S7043054: REGRESSION - wrong userBounds in Paint.createContext() + - S7043963, RH698295: Window manager workaround in AWT was not applied to mutter. Now it is. * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - G356743: Support libpng 1.5. diff -r c59c4a788187 -r 9cd3b8769614 patches/ecj/javafiles.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/javafiles.patch Wed May 18 09:04:01 2011 -0400 @@ -0,0 +1,157 @@ +--- openjdk-ecj/jdk/make/java/java/FILES_java.gmk.orig 2008-08-28 10:10:48.000000000 +0200 ++++ openjdk-ecj/jdk/make/java/java/FILES_java.gmk 2008-09-12 21:12:23.000000000 +0200 +@@ -29,6 +29,80 @@ + # will generate header files + # + JAVA_JAVA_java = \ ++ java/lang/reflect/AccessibleObject.java \ ++ java/lang/reflect/AnnotatedElement.java \ ++ java/lang/reflect/Array.java \ ++ java/lang/reflect/Constructor.java \ ++ java/lang/reflect/Field.java \ ++ java/lang/reflect/GenericArrayType.java \ ++ java/lang/reflect/GenericDeclaration.java \ ++ java/lang/reflect/GenericSignatureFormatError.java \ ++ java/lang/reflect/InvocationHandler.java \ ++ java/lang/reflect/InvocationTargetException.java \ ++ java/lang/reflect/MalformedParameterizedTypeException.java \ ++ java/lang/reflect/Member.java \ ++ java/lang/reflect/Method.java \ ++ java/lang/reflect/Modifier.java \ ++ java/lang/reflect/package-info.java \ ++ java/lang/reflect/ParameterizedType.java \ ++ java/lang/reflect/Proxy.java \ ++ java/lang/reflect/ReflectAccess.java \ ++ java/lang/reflect/ReflectPermission.java \ ++ java/lang/reflect/Type.java \ ++ java/lang/reflect/TypeVariable.java \ ++ java/lang/reflect/UndeclaredThrowableException.java \ ++ java/lang/reflect/WildcardType.java \ ++ java/lang/ref/Finalizer.java \ ++ java/lang/ref/FinalReference.java \ ++ java/lang/ref/PhantomReference.java \ ++ java/lang/ref/Reference.java \ ++ java/lang/ref/ReferenceQueue.java \ ++ java/lang/ref/SoftReference.java \ ++ java/lang/ref/WeakReference.java \ ++ java/lang/management/ClassLoadingMXBean.java \ ++ java/lang/management/CompilationMXBean.java \ ++ java/lang/management/GarbageCollectorMXBean.java \ ++ java/lang/management/LockInfo.java \ ++ java/lang/management/ManagementFactory.java \ ++ java/lang/management/ManagementPermission.java \ ++ java/lang/management/MemoryManagerMXBean.java \ ++ java/lang/management/MemoryMXBean.java \ ++ java/lang/management/MemoryNotificationInfo.java \ ++ java/lang/management/MemoryPoolMXBean.java \ ++ java/lang/management/MemoryType.java \ ++ java/lang/management/MemoryUsage.java \ ++ java/lang/management/MonitorInfo.java \ ++ java/lang/management/OperatingSystemMXBean.java \ ++ java/lang/management/RuntimeMXBean.java \ ++ java/lang/management/ThreadInfo.java \ ++ java/lang/management/ThreadMXBean.java \ ++ java/lang/instrument/ClassDefinition.java \ ++ java/lang/instrument/ClassFileTransformer.java \ ++ java/lang/instrument/IllegalClassFormatException.java \ ++ java/lang/instrument/Instrumentation.java \ ++ java/lang/instrument/UnmodifiableClassException.java \ ++ java/lang/annotation/AnnotationFormatError.java \ ++ java/lang/annotation/Annotation.java \ ++ java/lang/annotation/AnnotationTypeMismatchException.java \ ++ java/lang/annotation/Documented.java \ ++ java/lang/annotation/ElementType.java \ ++ java/lang/annotation/IncompleteAnnotationException.java \ ++ java/lang/annotation/Inherited.java \ ++ java/lang/annotation/package-info.java \ ++ java/lang/annotation/Retention.java \ ++ java/lang/annotation/RetentionPolicy.java \ ++ java/lang/annotation/Target.java \ ++ java/io/IOError.java \ ++ java/lang/Deprecated.java \ ++ java/lang/Iterable.java \ ++ java/util/RandomAccess.java \ ++ java/lang/CharacterData00.java \ ++ java/lang/CharacterData01.java \ ++ java/lang/CharacterData02.java \ ++ java/lang/CharacterData0E.java \ ++ java/lang/CharacterDataLatin1.java \ ++ java/lang/CharacterDataPrivateUse.java \ ++ java/lang/CharacterDataUndefined.java \ + java/lang/Object.java \ + java/lang/Class.java \ + java/lang/Thread.java \ +@@ -135,13 +209,6 @@ + java/lang/Readable.java \ + java/lang/Override.java \ + java/lang/SuppressWarnings.java \ +- java/lang/ref/Reference.java \ +- java/lang/ref/SoftReference.java \ +- java/lang/ref/WeakReference.java \ +- java/lang/ref/FinalReference.java \ +- java/lang/ref/PhantomReference.java \ +- java/lang/ref/ReferenceQueue.java \ +- java/lang/ref/Finalizer.java \ + java/util/BitSet.java \ + java/util/Calendar.java \ + java/util/GregorianCalendar.java \ +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -62,7 +62,6 @@ + com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \ + com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \ + com/sun/corba/se/impl/encoding/TypeCodeReader.java \ +- com/sun/corba/se/impl/encoding/WrapperInputStream.java +- +- +- ++ com/sun/corba/se/impl/encoding/WrapperInputStream.java \ ++ com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \ ++ com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -29,5 +29,6 @@ + com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \ + com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ + com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \ ++ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ + com/sun/corba/se/spi/presentation/rmi/StubAdapter.java + +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -81,5 +81,5 @@ + com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \ + com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \ + com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \ +- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java +- ++ com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java \ ++ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -30,6 +30,7 @@ + com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \ + com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \ + com/sun/corba/se/spi/monitoring/MonitoringFactories.java \ ++ com/sun/corba/se/spi/monitoring/MonitoringConstants.java \ + com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \ + com/sun/corba/se/spi/monitoring/MonitoredObject.java \ + com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \ +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -66,4 +66,5 @@ + com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \ + com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \ + com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \ +- com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java ++ com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java \ ++ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java +--- openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig 2008-08-28 10:24:03.000000000 +0200 ++++ openjdk-ecj/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2008-09-12 21:12:23.000000000 +0200 +@@ -81,4 +81,5 @@ + com/sun/corba/se/impl/orbutil/graph/Node.java \ + com/sun/corba/se/impl/orbutil/graph/NodeData.java \ + com/sun/corba/se/impl/orbutil/graph/Graph.java \ +- com/sun/corba/se/impl/orbutil/graph/GraphImpl.java ++ com/sun/corba/se/impl/orbutil/graph/GraphImpl.java \ ++ com/sun/corba/se/impl/orbutil/GetPropertyAction.java diff -r c59c4a788187 -r 9cd3b8769614 patches/javafiles.patch --- a/patches/javafiles.patch Tue May 17 09:15:25 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,157 +0,0 @@ ---- openjdk/jdk/make/java/java/FILES_java.gmk.orig 2008-08-28 10:10:48.000000000 +0200 -+++ openjdk/jdk/make/java/java/FILES_java.gmk 2008-09-12 21:12:23.000000000 +0200 -@@ -29,6 +29,80 @@ - # will generate header files - # - JAVA_JAVA_java = \ -+ java/lang/reflect/AccessibleObject.java \ -+ java/lang/reflect/AnnotatedElement.java \ -+ java/lang/reflect/Array.java \ -+ java/lang/reflect/Constructor.java \ -+ java/lang/reflect/Field.java \ -+ java/lang/reflect/GenericArrayType.java \ -+ java/lang/reflect/GenericDeclaration.java \ -+ java/lang/reflect/GenericSignatureFormatError.java \ -+ java/lang/reflect/InvocationHandler.java \ -+ java/lang/reflect/InvocationTargetException.java \ -+ java/lang/reflect/MalformedParameterizedTypeException.java \ -+ java/lang/reflect/Member.java \ -+ java/lang/reflect/Method.java \ -+ java/lang/reflect/Modifier.java \ -+ java/lang/reflect/package-info.java \ -+ java/lang/reflect/ParameterizedType.java \ -+ java/lang/reflect/Proxy.java \ -+ java/lang/reflect/ReflectAccess.java \ -+ java/lang/reflect/ReflectPermission.java \ -+ java/lang/reflect/Type.java \ -+ java/lang/reflect/TypeVariable.java \ -+ java/lang/reflect/UndeclaredThrowableException.java \ -+ java/lang/reflect/WildcardType.java \ -+ java/lang/ref/Finalizer.java \ -+ java/lang/ref/FinalReference.java \ -+ java/lang/ref/PhantomReference.java \ -+ java/lang/ref/Reference.java \ -+ java/lang/ref/ReferenceQueue.java \ -+ java/lang/ref/SoftReference.java \ -+ java/lang/ref/WeakReference.java \ -+ java/lang/management/ClassLoadingMXBean.java \ -+ java/lang/management/CompilationMXBean.java \ -+ java/lang/management/GarbageCollectorMXBean.java \ -+ java/lang/management/LockInfo.java \ -+ java/lang/management/ManagementFactory.java \ -+ java/lang/management/ManagementPermission.java \ -+ java/lang/management/MemoryManagerMXBean.java \ -+ java/lang/management/MemoryMXBean.java \ -+ java/lang/management/MemoryNotificationInfo.java \ -+ java/lang/management/MemoryPoolMXBean.java \ -+ java/lang/management/MemoryType.java \ -+ java/lang/management/MemoryUsage.java \ -+ java/lang/management/MonitorInfo.java \ -+ java/lang/management/OperatingSystemMXBean.java \ -+ java/lang/management/RuntimeMXBean.java \ -+ java/lang/management/ThreadInfo.java \ -+ java/lang/management/ThreadMXBean.java \ -+ java/lang/instrument/ClassDefinition.java \ -+ java/lang/instrument/ClassFileTransformer.java \ -+ java/lang/instrument/IllegalClassFormatException.java \ -+ java/lang/instrument/Instrumentation.java \ -+ java/lang/instrument/UnmodifiableClassException.java \ -+ java/lang/annotation/AnnotationFormatError.java \ -+ java/lang/annotation/Annotation.java \ -+ java/lang/annotation/AnnotationTypeMismatchException.java \ -+ java/lang/annotation/Documented.java \ -+ java/lang/annotation/ElementType.java \ -+ java/lang/annotation/IncompleteAnnotationException.java \ -+ java/lang/annotation/Inherited.java \ -+ java/lang/annotation/package-info.java \ -+ java/lang/annotation/Retention.java \ -+ java/lang/annotation/RetentionPolicy.java \ -+ java/lang/annotation/Target.java \ -+ java/io/IOError.java \ -+ java/lang/Deprecated.java \ -+ java/lang/Iterable.java \ -+ java/util/RandomAccess.java \ -+ java/lang/CharacterData00.java \ -+ java/lang/CharacterData01.java \ -+ java/lang/CharacterData02.java \ -+ java/lang/CharacterData0E.java \ -+ java/lang/CharacterDataLatin1.java \ -+ java/lang/CharacterDataPrivateUse.java \ -+ java/lang/CharacterDataUndefined.java \ - java/lang/Object.java \ - java/lang/Class.java \ - java/lang/Thread.java \ -@@ -135,13 +209,6 @@ - java/lang/Readable.java \ - java/lang/Override.java \ - java/lang/SuppressWarnings.java \ -- java/lang/ref/Reference.java \ -- java/lang/ref/SoftReference.java \ -- java/lang/ref/WeakReference.java \ -- java/lang/ref/FinalReference.java \ -- java/lang/ref/PhantomReference.java \ -- java/lang/ref/ReferenceQueue.java \ -- java/lang/ref/Finalizer.java \ - java/util/BitSet.java \ - java/util/Calendar.java \ - java/util/GregorianCalendar.java \ ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -62,7 +62,6 @@ - com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \ - com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \ - com/sun/corba/se/impl/encoding/TypeCodeReader.java \ -- com/sun/corba/se/impl/encoding/WrapperInputStream.java -- -- -- -+ com/sun/corba/se/impl/encoding/WrapperInputStream.java \ -+ com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \ -+ com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -29,5 +29,6 @@ - com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \ - com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ - com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \ -+ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \ - com/sun/corba/se/spi/presentation/rmi/StubAdapter.java - ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -81,5 +81,5 @@ - com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \ - com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \ - com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \ -- com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java -- -+ com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java \ -+ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -30,6 +30,7 @@ - com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \ - com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \ - com/sun/corba/se/spi/monitoring/MonitoringFactories.java \ -+ com/sun/corba/se/spi/monitoring/MonitoringConstants.java \ - com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \ - com/sun/corba/se/spi/monitoring/MonitoredObject.java \ - com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \ ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -66,4 +66,5 @@ - com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \ - com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \ - com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \ -- com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java -+ com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java \ -+ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java ---- openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig 2008-08-28 10:24:03.000000000 +0200 -+++ openjdk/corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2008-09-12 21:12:23.000000000 +0200 -@@ -81,4 +81,5 @@ - com/sun/corba/se/impl/orbutil/graph/Node.java \ - com/sun/corba/se/impl/orbutil/graph/NodeData.java \ - com/sun/corba/se/impl/orbutil/graph/Graph.java \ -- com/sun/corba/se/impl/orbutil/graph/GraphImpl.java -+ com/sun/corba/se/impl/orbutil/graph/GraphImpl.java \ -+ com/sun/corba/se/impl/orbutil/GetPropertyAction.java diff -r c59c4a788187 -r 9cd3b8769614 patches/linux-separate-debuginfo.patch --- a/patches/linux-separate-debuginfo.patch Tue May 17 09:15:25 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,379 +0,0 @@ -2009-12-09 Andrew Haley - - * openjdk/hotspot/agent/src/os/linux/symtab.c (debug_file_directory): - New variable. - (gnu_debuglink_crc32): New. - (build_symtab_internal): Rename from build_symtab, make static. - Add logic to look inside debuginfo files. - (open_debug_file, find_section_by_name, open_file_from_debug_link, - build_id_to_debug_filename, build_symtab_from_build_id, - build_symtab): New. - * openjdk/hotspot/agent/src/os/linux/libproc_impl.c (add_lib_info_fd): - Pass FILENAME to build_symtab(). - * openjdk/hotspot/agent/src/os/linux/symtab.h (build_symtab): - Add FILENAME arg. - -2009-12-16 Andrew Haley - - * openjdk/hotspot/agent/src/os/linux/symtab.c (open_file_from_debug_link): - Check for NULL. - Fix off by one error in aligning the CRC: the offset is 4 bytes, - not 3. - -diff -u ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/libproc_impl.c openjdk/hotspot/agent/src/os/linux/libproc_impl.c ---- ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/libproc_impl.c 2009-05-15 00:36:38.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/linux/libproc_impl.c 2009-12-04 16:29:27.552837905 +0000 -@@ -174,7 +174,7 @@ - return NULL; - } - -- newlib->symtab = build_symtab(newlib->fd); -+ newlib->symtab = build_symtab(newlib->fd, libname); - if (newlib->symtab == NULL) { - print_debug("symbol table build failed for %s\n", newlib->name); - } -diff -u ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/symtab.h openjdk/hotspot/agent/src/os/linux/symtab.h ---- ../openjdk/icedtea6/openjdk/hotspot/agent/src/os/linux/symtab.h 2009-05-15 00:36:38.000000000 +0100 -+++ openjdk/hotspot/agent/src/os/linux/symtab.h 2009-12-04 16:30:38.797838015 +0000 -@@ -32,7 +32,7 @@ - struct symtab; - - // build symbol table for a given ELF file descriptor --struct symtab* build_symtab(int fd); -+struct symtab* build_symtab(int fd, const char *filename); - - // destroy the symbol table - void destroy_symtab(struct symtab* symtab); - ---- openjdk/hotspot/agent/src/os/linux/symtab.c 2009-12-16 17:13:28.879599584 +0000 -+++ openjdk/hotspot/agent/src/os/linux/symtab.c 2009-12-16 17:14:15.871601226 +0000 -@@ -53,8 +53,274 @@ - struct hsearch_data *hash_table; - } symtab_t; - --// read symbol table from given fd. --struct symtab* build_symtab(int fd) { -+ -+// Directory that contains global debuginfo files. In theory it -+// should be possible to change this, but in a Java environment there -+// is no obvious place to put a user interface to do it. Maybe this -+// could be set with an environment variable. -+static const char debug_file_directory[] = "/usr/lib/debug"; -+ -+/* The CRC used in gnu_debuglink, retrieved from -+ http://sourceware.org/gdb/current/onlinedocs/gdb/Separate-Debug-Files.html#Separate-Debug-Files. */ -+unsigned long gnu_debuglink_crc32 (unsigned long crc, -+ unsigned char *buf, size_t len) -+{ -+ static const unsigned long crc32_table[256] = -+ { -+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, -+ 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, -+ 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, -+ 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, -+ 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, -+ 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, -+ 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, -+ 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, -+ 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, From ahughes at redhat.com Wed May 18 10:08:22 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 18 May 2011 18:08:22 +0100 Subject: RFC: make IcedTea-web to be compatible with RHEL5 libraries In-Reply-To: <4DD3A410.3090301@redhat.com> References: <4DD3A410.3090301@redhat.com> Message-ID: <20110518170822.GE31710@rivendell.middle-earth.co.uk> On 12:48 Wed 18 May , Pavel Tisnovsky wrote: > Hi all, > > I've found that IcedTea-web can not be build on RHEL5 because this > system has older glibc libraries (2.5-*) and some code in > IcedTeaNPPlugin.cc depends on newer functions. > > I've tried to rewrite this class not to use these functions. Can anybody > please look at these changes? They are stored in an attachments as patch > file. > > Any comments are welcome! > > Cheers, > Pavel Looking at the changes, I think you mean glib not glibc. I don't think this is the right way to fix this. If RHEL5 is missing these glib functions, we should test for that in configure and use local definitions of those functions, rather than using inferior functions on all platforms. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Wed May 18 12:11:17 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 18 May 2011 19:11:17 +0000 Subject: [Bug 716] IcedTea7 should bootstrap with IcedTea6 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=716 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|695 |712 Status|NEW |ASSIGNED Target Milestone|7-1.14 |7-2.0 --- Comment #2 from Andrew John Hughes 2011-05-18 19:11:17 --- This looks like it will be considerable work, so I'm going to delay this until 2.0, allowing us to get 1.14 out the door. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 18 12:11:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 18 May 2011 19:11:18 +0000 Subject: [Bug 712] [TRACKER] IcedTea7 2.0 release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |716 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 18 12:11:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 18 May 2011 19:11:18 +0000 Subject: [Bug 695] [TRACKER] IcedTea7 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|716 | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Wed May 18 12:13:04 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 18 May 2011 20:13:04 +0100 Subject: IcedTea7 1.14 Release Message-ID: <20110518191304.GF31710@rivendell.middle-earth.co.uk> There are a small number of forwardports remaining for IcedTea7 1.14 on: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 I'm going to attend to these and then I'd like to release, hopefully today. Are there any objections to this? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From andrew at icedtea.classpath.org Wed May 18 12:59:36 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 18 May 2011 19:59:36 +0000 Subject: /hg/icedtea: Provide tools.jar in first stage bootstrap. Message-ID: changeset 280e9959fbea in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=280e9959fbea author: Andrew John Hughes date: Wed May 18 20:50:26 2011 +0100 Provide tools.jar in first stage bootstrap. 2011-05-18 Andrew John Hughes * Makefile.am: (bootstrap-directory-stage1): Link tools.jar if available. Otherwise, link to existing rt.jar. diffstat: ChangeLog | 6 ++++++ Makefile.am | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diffs (31 lines): diff -r 0bea9271a681 -r 280e9959fbea ChangeLog --- a/ChangeLog Mon May 16 16:52:29 2011 +0200 +++ b/ChangeLog Wed May 18 20:50:26 2011 +0100 @@ -1,3 +1,9 @@ +2011-05-18 Andrew John Hughes + + * Makefile.am: + (bootstrap-directory-stage1): Link tools.jar + if available. Otherwise, link to existing rt.jar. + 2011-05-16 Pavel Tisnovsky * test/jtreg/README: diff -r 0bea9271a681 -r 280e9959fbea Makefile.am --- a/Makefile.am Mon May 16 16:52:29 2011 +0200 +++ b/Makefile.am Wed May 18 20:50:26 2011 +0100 @@ -1601,7 +1601,13 @@ mkdir -p $(STAGE1_BOOT_DIR)/jre/lib && \ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ $(STAGE1_BOOT_DIR)/jre/lib/rt.jar && \ - chmod u+w $(STAGE1_BOOT_DIR)/jre/lib/rt.jar && \ + chmod u+w $(STAGE1_BOOT_DIR)/jre/lib/rt.jar + mkdir -p $(STAGE1_BOOT_DIR)/lib && \ + if [ -e $(SYSTEM_JDK_DIR)/lib/tools.jar ] ; then \ + ln -sf $(SYSTEM_JDK_DIR)/lib/tools.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \ + else \ + ln -sf $(STAGE1_BOOT_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \ + fi ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \ $(STAGE1_BOOT_DIR)/jre/lib/ && \ if ! test -d $(STAGE1_BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \ From andrew at icedtea.classpath.org Wed May 18 14:00:41 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 18 May 2011 21:00:41 +0000 Subject: /hg/icedtea: Backout OpenJDK6 fix of 6664512 and include Mutter ... Message-ID: changeset fac8966dc7fb in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fac8966dc7fb author: Andrew John Hughes date: Wed May 18 22:00:35 2011 +0100 Backout OpenJDK6 fix of 6664512 and include Mutter fix. 2011-05-18 Denis Lila * Makefile.am: (JDK_CHANGESET): Updated to backout OpenJDK6 fix of 6664512 and include Mutter fix. (JDK_SHA256SUM): Likewise. diffstat: ChangeLog | 7 +++++++ Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diffs (35 lines): diff -r 280e9959fbea -r fac8966dc7fb ChangeLog --- a/ChangeLog Wed May 18 20:50:26 2011 +0100 +++ b/ChangeLog Wed May 18 22:00:35 2011 +0100 @@ -1,3 +1,10 @@ +2011-05-18 Denis Lila + + * Makefile.am: + (JDK_CHANGESET): Updated to backout OpenJDK6 fix + of 6664512 and include Mutter fix. + (JDK_SHA256SUM): Likewise. + 2011-05-18 Andrew John Hughes * Makefile.am: diff -r 280e9959fbea -r fac8966dc7fb Makefile.am --- a/Makefile.am Wed May 18 20:50:26 2011 +0100 +++ b/Makefile.am Wed May 18 22:00:35 2011 +0100 @@ -6,7 +6,7 @@ HOTSPOT_CHANGESET = ef8632d52263 JAXP_CHANGESET = 1c2f25bf36b1 JAXWS_CHANGESET = 339c2d381d80 -JDK_CHANGESET = 6a3e0bc5471d +JDK_CHANGESET = 49098163596b LANGTOOLS_CHANGESET = 8e26c4aee63c OPENJDK_CHANGESET = d4aea1a51d62 @@ -14,7 +14,7 @@ HOTSPOT_SHA256SUM = d939f29993a75c263b9b0bed8ccb74340860681ec8be1a62a76946ca9502255d JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0 JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c -JDK_SHA256SUM = 278edd55e7dacb51a4b2411f17f437f7bf54acae468c6f63804e485bd192aa93 +JDK_SHA256SUM = b8f78ac3aeb61a5ccf214f5d1f962a052e127c26a6096186938766bd8ba8a871 LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39 OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d From andrew at icedtea.classpath.org Wed May 18 14:12:56 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 18 May 2011 21:12:56 +0000 Subject: /hg/icedtea: Add scripts to ease updating checksums and changese... Message-ID: changeset 3c2676fe374a in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3c2676fe374a author: Andrew John Hughes date: Wed May 18 22:12:51 2011 +0100 Add scripts to ease updating checksums and changeset IDs. 2011-05-18 Andrew John Hughes * scripts/gen_changeset_and_sha256sums.sh, * scripts/update_tarballs.sh: Add scripts to ease updating changeset IDs and checksums. diffstat: ChangeLog | 7 +++++++ scripts/gen_changeset_and_sha256sums.sh | 19 +++++++++++++++++++ scripts/update_tarballs.sh | 20 ++++++++++++++++++++ 3 files changed, 46 insertions(+), 0 deletions(-) diffs (61 lines): diff -r fac8966dc7fb -r 3c2676fe374a ChangeLog --- a/ChangeLog Wed May 18 22:00:35 2011 +0100 +++ b/ChangeLog Wed May 18 22:12:51 2011 +0100 @@ -1,3 +1,10 @@ +2011-05-18 Andrew John Hughes + + * scripts/gen_changeset_and_sha256sums.sh, + * scripts/update_tarballs.sh: + Add scripts to ease updating changeset IDs + and checksums. + 2011-05-18 Denis Lila * Makefile.am: diff -r fac8966dc7fb -r 3c2676fe374a scripts/gen_changeset_and_sha256sums.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/gen_changeset_and_sha256sums.sh Wed May 18 22:12:51 2011 +0100 @@ -0,0 +1,19 @@ +#!/bin/bash + +DOWNLOAD_DIR=$1 + +if test "x$DOWNLOAD_DIR" = "x"; then + DOWNLOAD_DIR=/home/downloads/java/icedtea ; +fi + +rm -f /tmp/changesets /tmp/sums +for repos in corba hotspot jaxp jaxws jdk langtools openjdk +do + echo Generating changeset and checksum for $repos using $DOWNLOAD_DIR/$repos.tar.gz + file=$DOWNLOAD_DIR/$repos.tar.gz + id=$(echo $repos|tr '[a-z]' '[A-Z]') + sha256sum=$(sha256sum $file|awk '{print $1}') + changeset=$(tar tzf $file|head -n1|sed -r "s#[a-z0-9-]*-([0-9a-z]*)/.*#\1#") + echo "${id}_CHANGESET = $changeset" >> /tmp/changesets + echo "${id}_SHA256SUM = $sha256sum" >> /tmp/sums +done diff -r fac8966dc7fb -r 3c2676fe374a scripts/update_tarballs.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/update_tarballs.sh Wed May 18 22:12:51 2011 +0100 @@ -0,0 +1,20 @@ +#!/bin/bash + +DOWNLOAD_DIR=$1 +RUNNING_DIR=$(dirname $0) +echo $PWD + +if test "x$DOWNLOAD_DIR" = "x"; then + DOWNLOAD_DIR=/home/downloads/java/icedtea ; +fi + +echo Downloading new tarballs to $DOWNLOAD_DIR +pushd $DOWNLOAD_DIR +for repos in corba jaxp jaxws langtools hotspot jdk; +do + wget -O $repos.tar.gz http://icedtea.classpath.org/hg/icedtea7-forest/$repos/archive/tip.tar.gz +done +wget -O openjdk.tar.gz http://icedtea.classpath.org/hg/icedtea7-forest/archive/tip.tar.gz +echo Generating new changeset IDs and SHA256 sums +popd +$RUNNING_DIR/gen_changeset_and_sha256sums.sh From andrew at icedtea.classpath.org Wed May 18 14:38:43 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 18 May 2011 21:38:43 +0000 Subject: /hg/icedtea: Pass $DOWNLOAD_DIR between scripts. Message-ID: changeset 9106cbc93669 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9106cbc93669 author: Andrew John Hughes date: Wed May 18 22:38:38 2011 +0100 Pass $DOWNLOAD_DIR between scripts. 2011-05-18 Andrew John Hughes * scripts/update_tarballs.sh: Pass $DOWNLOAD_DIR through to gen_changeset_and_sha256sums.sh. diffstat: ChangeLog | 6 ++++++ scripts/update_tarballs.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 3c2676fe374a -r 9106cbc93669 ChangeLog --- a/ChangeLog Wed May 18 22:12:51 2011 +0100 +++ b/ChangeLog Wed May 18 22:38:38 2011 +0100 @@ -1,3 +1,9 @@ +2011-05-18 Andrew John Hughes + + * scripts/update_tarballs.sh: + Pass $DOWNLOAD_DIR through to + gen_changeset_and_sha256sums.sh. + 2011-05-18 Andrew John Hughes * scripts/gen_changeset_and_sha256sums.sh, diff -r 3c2676fe374a -r 9106cbc93669 scripts/update_tarballs.sh --- a/scripts/update_tarballs.sh Wed May 18 22:12:51 2011 +0100 +++ b/scripts/update_tarballs.sh Wed May 18 22:38:38 2011 +0100 @@ -17,4 +17,4 @@ wget -O openjdk.tar.gz http://icedtea.classpath.org/hg/icedtea7-forest/archive/tip.tar.gz echo Generating new changeset IDs and SHA256 sums popd -$RUNNING_DIR/gen_changeset_and_sha256sums.sh +$RUNNING_DIR/gen_changeset_and_sha256sums.sh $DOWNLOAD_DIR From andrew at icedtea.classpath.org Wed May 18 14:49:36 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 18 May 2011 21:49:36 +0000 Subject: /hg/icedtea6-hg: 48 new changesets Message-ID: changeset a2f35c839a52 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a2f35c839a52 author: Andrew John Hughes date: Thu Mar 31 01:47:21 2011 +0100 Separate HotSpot downloading into a separate target so it works with --enable-hg. 2011-03-31 Andrew John Hughes * Makefile.am: Add missing download-openjdk and new download-hotspot aliases. (.PHONY): Add clean-download- hotspot. (download-openjdk): Move HotSpot download to... (clean-download-openjdk): Don't delete hotspot zip. (download-hotspot): ...here. (clean-download-hotspot): Remove hotspot zip and stamp. (download): Add download- hotspot as a dependency. (clean-download): Add clean- download-hotspot as a dependency. changeset 449a27a644bd in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=449a27a644bd author: Andrew John Hughes date: Thu Mar 31 01:52:25 2011 +0100 Revert changes in 478d3f5f6a59409078b1adcfba24150158b92695 which were still under discussion. 2011-03-31 Andrew John Hughes * Makefile.am: Revert broken changes in 478d3f5f6a59409078b1adcfba24150158b92695 (.PHONY): Remove jtregcheck-summary. (jtregcheck): Revert to version before last change. Remove pointless touch invocation. changeset 8321d1aab4c6 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8321d1aab4c6 author: ptisnovs date: Thu Mar 31 11:12:35 2011 +0200 Fixed test shell script to work on POSIX shells. This patch also deletes now defunct regression test: openjdk/langtools/test/tools/javac/api/6411310/Test.java changeset 64437a39a9c8 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=64437a39a9c8 author: Andrew John Hughes date: Thu Mar 31 15:34:49 2011 +0100 S7032388, PR682: Make HotSpot work on machines without cmov instruction again 2011-03-31 Andrew John Hughes S7032388, PR682: Make HotSpot work on machines without cmov instruction again * Makefile.am: Add new patch. * NEWS: Mention patch. * patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch, * patches/hotspot/original/7032388-work_without_cmov_instruction.patch : Versions of patch for each HotSpot version. changeset 0239a181c7a0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0239a181c7a0 author: Deepak Bhole date: Thu Mar 31 19:23:12 2011 -0400 S7031385, PR680: Incorrect register allocation in orderAccess_linux_x86.inline.hpp changeset ddd219edd416 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ddd219edd416 author: Mark Wielaard date: Sun Apr 10 22:51:11 2011 +0200 Fix missing clazz argument to all hotspot.jni.CallNonvirtual* stap probes. 2011-04-10 Yasumasa Suenaga * tapset/hotspot_jni.stp.in (hotspot.jni.CallNonvirtual*): Add missing clazz argument to all probes. Fix methodid to be last argument. Add clazz to probestr. changeset 307d19e0cca0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=307d19e0cca0 author: Xerxes R?nby date: Tue Apr 12 15:56:56 2011 +0200 PR689: Shark fails to find LLVM 2.9 System headers during build 2011-04-12 Xerxes R?nby PR689: Shark fails to find LLVM 2.9 System headers during build * Makefile.am: Add patch. * patches/shark-llvm-2.9.patch: In LLVM 2.9 System headers are moved to Support. * NEWS: Updated. changeset 92ce3a01d889 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=92ce3a01d889 author: Omair Majid date: Thu Apr 21 19:59:32 2011 -0400 Drop bytebuffer-compact.patch The bytebuffer-compact patch adds a (package-private) method clearMark to reset the mark. Upstream already addressed this problem: 6593946: (bf) X-Buffer.compact() does not discard mark as specified. The upstream fix adds a method discardMark(), and updates the rest of the JDK to use that method. The clearMark() method added by this patch is not used anywhere and can be dropped safely. changeset bc0a045bf271 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=bc0a045bf271 author: Omair Majid date: Fri Apr 22 17:35:11 2011 -0400 Revert previous commmit - it broke bootstrap. changeset ad45dd8bcf45 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ad45dd8bcf45 author: Denis Lila date: Thu Apr 28 08:36:21 2011 -0400 Speed up AA rendering to screen. changeset c82aadb00357 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c82aadb00357 author: Omair Majid date: Thu Apr 28 12:55:41 2011 -0400 Drop patches/ssl.patch 2011-04-28 Omair Majid Drop ssl.patch * Makefile.am (ICEDTEA_PATCHES): Remove ssl.patch. * patches/ssl.patch: Removed. changeset c66866782611 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c66866782611 author: Omair Majid date: Fri Apr 29 11:46:01 2011 -0400 Backport S7029905: demo applets missing some html files Also drop local patch patches/demo-swingapplet.patch in favor of upstream's fix changeset 6b2f514d7874 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6b2f514d7874 author: Omair Majid date: Mon May 02 12:05:50 2011 -0400 Backport S6986968: Crash on XIM server restart changeset 6bf942777964 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6bf942777964 author: aph date: Tue May 03 12:50:36 2011 +0100 Don't fail if sed command to clean jvm.cfg fails. changeset b6472fccd0ec in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b6472fccd0ec author: aph date: Tue May 03 13:05:05 2011 +0100 2011-05-03 Andrew Haley * Makefile.am: Don't fail if sed command to clean jvm.cfg fails. changeset e12e69d3e09c in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e12e69d3e09c author: Omair Majid date: Tue May 03 17:58:19 2011 -0400 Backport S7018387: Xrender pipeline may leak GC's Replace patches/xrender-gc-cleanup.patch with identical but upstreamed fix patches/openjdk/7018387-xrender_gc_leak.patch changeset 74bcdece2162 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=74bcdece2162 author: Xerxes R?nby date: Wed May 04 15:06:24 2011 +0200 .hgtags Update, icedtea6-1.8-branchpoint corrected to rev 1997:1188b1a313b9 2011-05-04 Xerxes R?nby * .hgtags Update. icedtea6-1.6-branchpoint renamed from icedtea-1.6-branchpoint icedtea6-1.7-branchpoint renamed from icedtea-1.7-branchpoint icedtea6-1.8-branchpoint corrected to rev 1997:1188b1a313b9 changeset b71a752b9762 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b71a752b9762 author: Denis Lila date: Wed May 04 10:09:47 2011 -0400 Fix problem where NaNs could appear in stroked quad paths. Improve performance of quad stroking. changeset 45472ac9981b in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=45472ac9981b author: Omair Majid date: Wed May 04 10:11:54 2011 -0400 Remove unapplied/upstreamed patch nss-debug.patch This patch was pushed upstream some time ago. The patch has not been applied since changeset e545400a3022. Drop it completely. changeset 2afcd8dd14a0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2afcd8dd14a0 author: Omair Majid date: Wed May 04 16:22:47 2011 -0400 Drop bytebuffer-compact.patch; it serves no purpose 2011-05-04 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Drop bytebuffer-compact.patch. The original issue this patch used to address was fixed upstream. Now this patch just adds another method clearMark in addition to upstream's discardMark. * generated/java/nio/DirectByteBuffer.java, * generated/java/nio/DirectCharBufferS.java, * generated/java/nio/DirectCharBufferU.java, * generated/java/nio/DirectDoubleBufferS.java, * generated/java/nio/DirectDoubleBufferU.java, * generated/java/nio/DirectFloatBufferS.java, * generated/java/nio/DirectFloatBufferU.java, * generated/java/nio/DirectIntBufferS.java, * generated/java/nio/DirectIntBufferU.java, * generated/java/nio/DirectLongBufferS.java, * generated/java/nio/DirectLongBufferU.java, * generated/java/nio/DirectShortBufferS.java, * generated/java/nio/DirectShortBufferU.java, * generated/java/nio/HeapByteBuffer.java, * generated/java/nio/HeapCharBuffer.java, * generated/java/nio/HeapDoubleBuffer.java, * generated/java/nio/HeapFloatBuffer.java, * generated/java/nio/HeapIntBuffer.java, * generated/java/nio/HeapLongBuffer.java, * generated/java/nio/HeapShortBuffer.java: Replace all uses of clearMark with discardMark. * patches/bytebuffer-compact.patch: Remove. changeset 50ed8053ec2f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=50ed8053ec2f author: Xerxes R?nby date: Thu May 05 14:26:49 2011 +0200 CACAO threadlist & threadobject improvements. 2011-05-05 Xerxes R?nby CACAO threadlist & threadobject improvements. * NEWS: Updated. * Makefile.am (CACAO_VERSION): Updated to latest CACAO revision. (CACAO_SHA256SUM): Updated. changeset 012505ce3d0d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=012505ce3d0d author: Omair Majid date: Thu May 05 17:57:53 2011 -0400 Backport S7019808. Replace gcc-stack-markings.patch with upstream's fix 2011-05-05 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace patches/gcc-stack- markings.patch with patches/openjdk/7019808-stack_noexec.patch. * patches/gcc-stack-markings.patch: Remove * patches/openjdk/7019808-stack_noexec.patch: Fix from upstream. changeset 90783fa340bb in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=90783fa340bb author: Omair Majid date: Thu May 05 18:40:02 2011 -0400 Drop shark patches already in hotspot 19 (and later) These patches were not being applied. 2011-05-05 Omair Majid * patches/shark-build-hotspot.patch, * patches/shark-debug-option.patch, * patches/shark_do_nothing_on_stub_frame.patch: Drop upstreamed/unapplied patches. These were not being applied. changeset 9f374bb0cb94 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9f374bb0cb94 author: Omair Majid date: Fri May 06 10:59:07 2011 -0400 Replace rh676659-gcc-export-dynamic.patch with upstream's fix. 2011-05-06 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace patches/rh676659-gcc-export-dynamic.patch with the upstream fix patches/openjdk/7041156-gcc_export_dynamic.patch. * patches/openjdk/7041156-gcc_export_dynamic.patch: New file. * patches/rh676659-gcc-export-dynamic.patch: Remove file. changeset 8720a7df46e3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8720a7df46e3 author: Andrew Su date: Tue May 10 09:41:12 2011 -0400 Added basic support for using JPEGCodec to encode and decode jpeg files. changeset e080e9d33821 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e080e9d33821 author: Omair Majid date: Tue May 10 13:35:19 2011 -0400 Replace fix for S6599601 with a proper backport 2011-05-10 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Update patch location and name. * patches/mark_sun_toolkit_privileged_code.patch: Remove. * patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch: New file. Backport from OpenJDK6. changeset d778bb012d22 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d778bb012d22 author: Omair Majid date: Tue May 10 16:46:30 2011 -0400 Backport S7021314. Replace pr633-no_javaws_man_page.patch with upstream fix 2011-05-10 Omair Majid Move pr633-no_javaws_man_page.patch to proper location * Makefile.am (ICEDTEA_PATCHES): Update patch location and name. * patches/pr633-no_javaws_man_page.patch: Remove. * patches/openjdk/7021314-no_javaws_man_page.patch: New file. Backport from OpenJDK7. changeset e32979d54978 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e32979d54978 author: aph date: Mon May 09 17:14:05 2011 +0100 Add icedtea-hugepage patches. 2011-05-09 Andrew Haley * Makefile (ICEDTEA_PATCHES): Add icedtea- hugepage-7034464.patch, patches/icedtea- hugepage-7037939.patch * patches/icedtea-hugepage-7034464.patch: Support transparent huge pages on Linux available since 2.6.38 * patches/icedtea-hugepage-7037939.patch: Disable adaptive resizing if SHM large pages are used. * NEWS: Add S7037939, S7034464. changeset bfbacc38e2ca in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=bfbacc38e2ca author: aph date: Wed May 11 15:23:27 2011 +0100 merge changeset 84df81e017c4 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=84df81e017c4 author: Andrew Su date: Wed May 11 11:19:34 2011 -0400 Updated AUTHORS. changeset 439a9cd78f8c in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=439a9cd78f8c author: Omair Majid date: Wed May 11 13:11:03 2011 -0400 Backport S7042040: Remove disk space sanity check Replace custom patch patches/no-sync.patch with upstream's fix. 2011-05-11 Omair Majid Backport S7042040: Remove disk space sanity check * Makefile.am (ICEDTEA_PATCHES): Add patches/openjdk/7042040-no_disk_space_check.patch. Remove patches/no-sync.patch. * patches/openjdk/7042040-no_disk_space_check.patch: New file. * patches/no-sync.patch: Remove. Upstream's fix is an improved version. changeset d8750486e54c in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d8750486e54c author: Omair Majid date: Wed May 11 20:27:41 2011 -0400 Only use non-jdk xml parsers for bootstrap This patch moves patches/headers-hotspot.patch to patches/ecj /endorsed-dir-for-jvmti.patch and only applies it on a bootstrap build. The xerces/xalan parsers should only be required for bootstrap builds. OpenJDK's built-in xml parsers are good enough to handle the rest of the build. 2011-05-11 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Move headers-hotspot.patch to ... (ICEDTEA_ECJ_PATCHES): New patch. (ICEDTEA_ENV): Moves endorsed dir varaibles to ... (ICEDTEA_ENV_ECJ): Here. * patches/headers-hotspot.patch: Move to ... * patches/ecj/endorsed-dir-for-jvmti.patch: New file. changeset 0dad4d8420ac in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0dad4d8420ac author: Omair Majid date: Thu May 12 11:22:12 2011 -0400 Move patches/libpng.patch to patches/openjdk/6959123-libpng_14.patch This patch has been acceppted upstream. Move patch to openjdk dir and add commit information to clarify that it is upstream. 2011-05-12 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace patches/libpng.patch with patches/openjdk/6959123-libpng_14.patch. * patches/libpng.patch: Remove. * patches/openjdk/6959123-libpng_14.patch: New file. changeset 57518374feba in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=57518374feba author: Omair Majid date: Thu May 12 13:28:05 2011 -0400 Replace rmi_amd64.patch with upstream's improved fix Upstream applied an improved version of the fix which also addressed duplicate binaries on solaris-64. Replace our custom patch with upstream's fix. 2011-05-12 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Remove rmi_amd64.patch. Add 7043921-java_rmi_cgi.patch * patches/openjdk/7043921-java_rmi_cgi.patch: New file. * patches/rmi_amd64.patch: Remove. changeset 55217d6f7533 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=55217d6f7533 author: Denis Lila date: Thu May 12 13:27:51 2011 -0400 Fix regression. changeset d41db027b4ea in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d41db027b4ea author: Denis Lila date: Thu May 12 13:33:06 2011 -0400 merge changeset 320b7ef798ed in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=320b7ef798ed author: aph date: Fri May 13 12:16:44 2011 +0100 Fix Debian gcc problem, move huge page patches. 2011-05-12 Andrew Haley Rename icedtea-hugepage-7034464.patch -> openjdk/7034464-hugepage.patch icedtea- hugepage-7037939.patch -> openjdk/7037939-hugepage.patch * patches/openjdk/7043564-hugepage.patch: Import from upstream. * Makefile.am: move patches, add new patch. changeset 73869cc50c8c in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=73869cc50c8c author: Andrew Su date: Fri May 13 09:05:45 2011 -0400 Updated AUTHORS. changeset 29d688c7693d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=29d688c7693d author: ptisnovs date: Mon May 16 16:19:11 2011 +0200 Fixed patch for regression test test/runtime/6929067/Test6929067.sh changeset c59c4a788187 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c59c4a788187 author: ptisnovs date: Tue May 17 09:15:25 2011 +0200 Fix bashism. changeset 19cc9d976c7a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=19cc9d976c7a author: Omair Majid date: Tue May 17 12:19:36 2011 -0400 Move patches/javafiles to patches/ecj/javafiles. This patch is only required for bootstrapping. 2011-05-17 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Move patches/javafiles.patch to ... (ICEDTEA_ECJ_PATCHES): Add patches/ecj/javafiles.patch. * patches/javafiles.patch: Move to... * patches/ecj/javafiles.patch: New file. changeset 35c0f8ca88b6 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=35c0f8ca88b6 author: Omair Majid date: Tue May 17 12:38:23 2011 -0400 Move patches/shark-llvm-2.9.patch to patches/openjdk/ and add hg changeset information This patch was upstreamed a while back. Move it to a new location to reflect its current status. 2011-05-17 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Replace patches/shark- llvm-2.9.patch with patches/openjdk/7036220-shark_llvm_29_headers.patch. * patches/shark-llvm-2.9.patch: Move to... * patches/openjdk/7036220-shark_llvm_29_headers.patch: New file. Contains contents of patches/shark-llvm-2.9.patch as well as hg metadata. changeset 210ce974c3a3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=210ce974c3a3 author: Omair Majid date: Tue May 17 13:55:58 2011 -0400 Drop patches/tools.patch The patch patches/tools.patch is redundant. The changes to classlist are not required and are not complete (other classes are missing too). The Makefile changes had no effect. 2011-05-17 Omair Majid * Makefile.am (ICEDTEA_PATCHES): Remove patches/tools.patch. * patches/tools.patch: Remove file. Not required anymore. changeset 17744d45962a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=17744d45962a author: Omair Majid date: Tue May 17 19:50:30 2011 -0400 Drop unapplied patch patches/linux-separate-debuginfo.patch We stopped applying this patch since 5bc57773f41d. Upstream hotspot has an improved version of this patch which works without requiring debuginfo pcakges. 2011-05-17 Omair Majid * patches/linux-separate-debuginfo.patch: Remove unapplied patch. An improved version of this patch (which allows running jmap -heap) without debuginfo packages is already included in openjdk6. changeset aa99e0230f34 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=aa99e0230f34 author: Denis Lila date: Wed May 18 08:58:20 2011 -0400 Let AWT know about Mutter as a window manager. changeset 9cd3b8769614 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9cd3b8769614 author: Denis Lila date: Wed May 18 09:04:01 2011 -0400 merge changeset 83034f3f172f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=83034f3f172f author: Andrew John Hughes date: Wed May 18 15:46:37 2011 +0100 Merge changeset 36e7e97a3702 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=36e7e97a3702 author: Andrew John Hughes date: Wed May 18 22:49:21 2011 +0100 Update due to inclusion of hs20, 6599601, 6997495, 7029905 and 7042040. 2011-05-18 Andrew John Hughes * patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch, * patches/hotspot/hs20/arm.patch, * patches/hotspot/hs20/gcc-suffix.patch, * patches/hotspot/hs20/ia64-fix.patch, * patches/hotspot/hs20/params-cast-size_t.patch, * patches/hotspot/hs20/powerpc-stacksize.patch, * patches/hotspot/hs20/sparc-buildfixes.patch, * patches/hotspot/hs20/systemtap.patch, * patches/hotspot/hs20/text-relocations.patch: Moved to main tree. * patches/hotspot/original/7032388-work_without_cmov_instruction.patch , * patches/hotspot/original/arm.patch, * patches/hotspot/original/gcc-suffix.patch, * patches/hotspot/original/ia64-fix.patch, * patches/hotspot/original/no-precompiled-headers.patch, * patches/hotspot/original/params-cast-size_t.patch, * patches/hotspot/original/sparc-buildfixes.patch, * patches/hotspot/original/systemtap.patch, * patches/hotspot/original/text-relocations.patch, * patches/hotspot/original/too-many-args.patch: Dropped; hs19 no longer supported. * patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch, * patches/openjdk/6997495-test_correction_6857159.patch, * patches/openjdk/7029905-demo_applet_html_files.patch, * patches/openjdk/7042040-no_disk_space_check.patch: Removed; upstream in OpenJDK6. * INSTALL: Update HotSpot documentation. * Makefile.am: (ICEDTEA_PATCHES): Updated. * acinclude.m4: (IT_WITH_HOTSPOT_BUILD): Set default back to original. * hotspot.map: Remove hs19. * patches/arm.patch, * patches/gcc-suffix.patch, * patches/ia64-fix.patch: Extended with HotSpot segments from hotspot/hs20. * patches/openjdk/6633275-shaped_translucent_windows.patch: Recreated due to copyright header change in Component.java. * patches/openjdk/7032388-work_without_cmov_instruction.patch, * patches/params-cast-size_t.patch, * patches/powerpc-stacksize.patch, * patches/sparc-buildfixes.patch, * patches/systemtap.patch, * patches/text-relocations.patch: Moved from hotspot/hs20. diffstat: .hgtags | 6 +- AUTHORS | 3 + ChangeLog | 407 +++++ INSTALL | 16 +- Makefile.am | 118 +- NEWS | 16 + acinclude.m4 | 4 +- generated/java/lang/CharacterData00.java | 12 +- generated/java/lang/CharacterData01.java | 12 +- generated/java/lang/CharacterData02.java | 12 +- generated/java/lang/CharacterData0E.java | 12 +- generated/java/lang/CharacterDataLatin1.java | 12 +- generated/java/nio/DirectByteBuffer.java | 2 +- generated/java/nio/DirectCharBufferS.java | 2 +- generated/java/nio/DirectCharBufferU.java | 2 +- generated/java/nio/DirectDoubleBufferS.java | 2 +- generated/java/nio/DirectDoubleBufferU.java | 2 +- generated/java/nio/DirectFloatBufferS.java | 2 +- generated/java/nio/DirectFloatBufferU.java | 2 +- generated/java/nio/DirectIntBufferS.java | 2 +- generated/java/nio/DirectIntBufferU.java | 2 +- generated/java/nio/DirectLongBufferS.java | 2 +- generated/java/nio/DirectLongBufferU.java | 2 +- generated/java/nio/DirectShortBufferS.java | 2 +- generated/java/nio/DirectShortBufferU.java | 2 +- generated/java/nio/HeapByteBuffer.java | 2 +- generated/java/nio/HeapCharBuffer.java | 2 +- generated/java/nio/HeapDoubleBuffer.java | 2 +- generated/java/nio/HeapFloatBuffer.java | 2 +- generated/java/nio/HeapIntBuffer.java | 2 +- generated/java/nio/HeapLongBuffer.java | 2 +- generated/java/nio/HeapShortBuffer.java | 2 +- generated/sun/awt/X11/AwtGraphicsConfigData.java | 69 +- generated/sun/awt/X11/AwtScreenData.java | 30 +- generated/sun/awt/X11/ColorData.java | 62 +- generated/sun/awt/X11/ColorEntry.java | 4 +- generated/sun/awt/X11/Depth.java | 8 +- generated/sun/awt/X11/PropMwmHints.java | 22 +- generated/sun/awt/X11/Screen.java | 90 +- generated/sun/awt/X11/ScreenFormat.java | 20 +- generated/sun/awt/X11/Visual.java | 36 +- generated/sun/awt/X11/XAnyEvent.java | 22 +- generated/sun/awt/X11/XArc.java | 4 +- generated/sun/awt/X11/XButtonEvent.java | 62 +- generated/sun/awt/X11/XChar2b.java | 4 +- generated/sun/awt/X11/XCharStruct.java | 4 +- generated/sun/awt/X11/XCirculateEvent.java | 30 +- generated/sun/awt/X11/XCirculateRequestEvent.java | 30 +- generated/sun/awt/X11/XClassHint.java | 12 +- generated/sun/awt/X11/XClientMessageEvent.java | 36 +- generated/sun/awt/X11/XColor.java | 26 +- generated/sun/awt/X11/XColormapEvent.java | 34 +- generated/sun/awt/X11/XComposeStatus.java | 10 +- generated/sun/awt/X11/XConfigureEvent.java | 54 +- generated/sun/awt/X11/XConfigureRequestEvent.java | 58 +- generated/sun/awt/X11/XCreateWindowEvent.java | 50 +- generated/sun/awt/X11/XCrossingEvent.java | 70 +- generated/sun/awt/X11/XDestroyWindowEvent.java | 26 +- generated/sun/awt/X11/XErrorEvent.java | 30 +- generated/sun/awt/X11/XEvent.java | 6 +- generated/sun/awt/X11/XExposeEvent.java | 42 +- generated/sun/awt/X11/XExtCodes.java | 4 +- generated/sun/awt/X11/XExtData.java | 24 +- generated/sun/awt/X11/XFocusChangeEvent.java | 30 +- generated/sun/awt/X11/XFontProp.java | 10 +- generated/sun/awt/X11/XFontSetExtents.java | 4 +- generated/sun/awt/X11/XFontStruct.java | 64 +- generated/sun/awt/X11/XGCValues.java | 94 +- generated/sun/awt/X11/XGraphicsExposeEvent.java | 50 +- generated/sun/awt/X11/XGravityEvent.java | 34 +- generated/sun/awt/X11/XHostAddress.java | 6 +- generated/sun/awt/X11/XIMCallback.java | 12 +- generated/sun/awt/X11/XIMHotKeyTrigger.java | 14 +- generated/sun/awt/X11/XIMHotKeyTriggers.java | 12 +- generated/sun/awt/X11/XIMPreeditCaretCallbackStruct.java | 4 +- generated/sun/awt/X11/XIMPreeditDrawCallbackStruct.java | 12 +- generated/sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java | 6 +- generated/sun/awt/X11/XIMStatusDrawCallbackStruct.java | 10 +- generated/sun/awt/X11/XIMStringConversionCallbackStruct.java | 12 +- generated/sun/awt/X11/XIMStringConversionText.java | 22 +- generated/sun/awt/X11/XIMStyles.java | 12 +- generated/sun/awt/X11/XIMText.java | 22 +- generated/sun/awt/X11/XIMValuesList.java | 12 +- generated/sun/awt/X11/XIconSize.java | 4 +- generated/sun/awt/X11/XImage.java | 88 +- generated/sun/awt/X11/XKeyEvent.java | 62 +- generated/sun/awt/X11/XKeyboardControl.java | 4 +- generated/sun/awt/X11/XKeyboardState.java | 16 +- generated/sun/awt/X11/XKeymapEvent.java | 28 +- generated/sun/awt/X11/XMapEvent.java | 30 +- generated/sun/awt/X11/XMapRequestEvent.java | 26 +- generated/sun/awt/X11/XMappingEvent.java | 34 +- generated/sun/awt/X11/XModifierKeymap.java | 12 +- generated/sun/awt/X11/XMotionEvent.java | 62 +- generated/sun/awt/X11/XNoExposeEvent.java | 30 +- generated/sun/awt/X11/XOMCharSetList.java | 12 +- generated/sun/awt/X11/XOMFontInfo.java | 18 +- generated/sun/awt/X11/XOMOrientation.java | 12 +- generated/sun/awt/X11/XPixmapFormatValues.java | 4 +- generated/sun/awt/X11/XPoint.java | 4 +- generated/sun/awt/X11/XPropertyEvent.java | 34 +- generated/sun/awt/X11/XRectangle.java | 4 +- generated/sun/awt/X11/XReparentEvent.java | 42 +- generated/sun/awt/X11/XResizeRequestEvent.java | 30 +- generated/sun/awt/X11/XSegment.java | 4 +- generated/sun/awt/X11/XSelectionClearEvent.java | 30 +- generated/sun/awt/X11/XSelectionEvent.java | 38 +- generated/sun/awt/X11/XSelectionRequestEvent.java | 42 +- generated/sun/awt/X11/XSetWindowAttributes.java | 62 +- generated/sun/awt/X11/XSizeHints.java | 74 +- generated/sun/awt/X11/XStandardColormap.java | 42 +- generated/sun/awt/X11/XTextItem.java | 18 +- generated/sun/awt/X11/XTextItem16.java | 18 +- generated/sun/awt/X11/XTextProperty.java | 18 +- generated/sun/awt/X11/XTimeCoord.java | 14 +- generated/sun/awt/X11/XUnmapEvent.java | 30 +- generated/sun/awt/X11/XVisibilityEvent.java | 26 +- generated/sun/awt/X11/XVisualInfo.java | 42 +- generated/sun/awt/X11/XWMHints.java | 40 +- generated/sun/awt/X11/XWindowAttributes.java | 74 +- generated/sun/awt/X11/XWindowChanges.java | 14 +- generated/sun/awt/X11/XdbeSwapInfo.java | 10 +- generated/sun/awt/X11/XmbTextItem.java | 20 +- generated/sun/awt/X11/XwcTextItem.java | 20 +- generated/sun/awt/X11/awtImageData.java | 6 +- generated/sun/misc/Version.java | 63 +- generated/sun/nio/cs/StandardCharsets.java | 12 +- hotspot.map | 1 - overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java | 49 + overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java | 191 ++ overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java | 390 +++++ overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java | 307 ++++ overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGHuffmanTable.java | 97 + overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java | 102 + overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java | 208 ++ overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java | 118 + overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java | 54 + overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageDecoderImpl.java | 103 + overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageEncoderImpl.java | 183 ++ overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGParam.java | 750 ++++++++++ patches/arm.patch | 56 + patches/bytebuffer-compact.patch | 61 - patches/demo-swingapplet.patch | 10 - patches/ecj/endorsed-dir-for-jvmti.patch | 12 + patches/ecj/javafiles.patch | 150 ++ patches/gcc-stack-markings.patch | 12 - patches/gcc-suffix.patch | 29 + patches/headers-hotspot.patch | 12 - patches/hotspot/hs20/arm.patch | 56 - patches/hotspot/hs20/gcc-suffix.patch | 29 - patches/hotspot/hs20/ia64-fix.patch | 14 - patches/hotspot/hs20/params-cast-size_t.patch | 259 --- patches/hotspot/hs20/powerpc-stacksize.patch | 39 - patches/hotspot/hs20/sparc-buildfixes.patch | 24 - patches/hotspot/hs20/systemtap.patch | 99 - patches/hotspot/hs20/text-relocations.patch | 60 - patches/hotspot/original/arm.patch | 54 - patches/hotspot/original/gcc-suffix.patch | 29 - patches/hotspot/original/ia64-fix.patch | 28 - patches/hotspot/original/no-precompiled-headers.patch | 33 - patches/hotspot/original/params-cast-size_t.patch | 284 --- patches/hotspot/original/sparc-buildfixes.patch | 32 - patches/hotspot/original/systemtap.patch | 97 - patches/hotspot/original/text-relocations.patch | 58 - patches/hotspot/original/too-many-args.patch | 45 - patches/ia64-fix.patch | 14 + patches/javafiles.patch | 150 -- patches/jaxp-serial-version-uid.patch | 51 - patches/jpegclasses.patch | 643 -------- patches/jtreg-6929067-fix.patch | 23 +- patches/libpng.patch | 11 - patches/linux-separate-debuginfo.patch | 376 ----- patches/mark_sun_toolkit_privileged_code.patch | 11 - patches/no-sync.patch | 13 - patches/nss-debug.patch | 54 - patches/openjdk/6307603-xrender-01.patch | 6 +- patches/openjdk/6633275-shaped_translucent_windows.patch | 117 +- patches/openjdk/6708580-exa_slow.patch | 99 + patches/openjdk/6748082-isDisplayLocal.patch | 111 + patches/openjdk/6768387-jtable_not_serializable.patch | 104 - patches/openjdk/6959123-libpng_14.patch | 20 + patches/openjdk/6986968-crash_on_xim_restart.patch | 22 + patches/openjdk/6997495-test_correction_6857159.patch | 20 - patches/openjdk/7018387-xrender_gc_leak.patch | 20 + patches/openjdk/7019808-stack_noexec.patch | 22 + patches/openjdk/7021314-no_javaws_man_page.patch | 23 + patches/openjdk/7031385-gcc-register-allocation-fix.patch | 20 + patches/openjdk/7032388-work_without_cmov_instruction.patch | 173 ++ patches/openjdk/7034464-hugepage.patch | 454 ++++++ patches/openjdk/7036220-shark_llvm_29_headers.patch | 43 + patches/openjdk/7036754-stroker-nan.patch | 488 ++++++ patches/openjdk/7037939-hugepage.patch | 69 + patches/openjdk/7041156-gcc_export_dynamic.patch | 21 + patches/openjdk/7043564-hugepage.patch | 20 + patches/openjdk/7043921-java_rmi_cgi.patch | 39 + patches/openjdk/mutter.patch | 307 ++++ patches/openjdk/pgram-pipe-regression.patch | 543 +++++++ patches/params-cast-size_t.patch | 259 +++ patches/powerpc-stacksize.patch | 39 + patches/pr633-no_javaws_man_page.patch | 14 - patches/revert-6885123.patch | 268 +++- patches/rh676659-gcc-export-dynamic.patch | 11 - patches/rmi_amd64.patch | 14 - patches/shark-build-hotspot.patch | 260 --- patches/shark-debug-option.patch | 28 - patches/shark_do_nothing_on_stub_frame.patch | 13 - patches/sparc-buildfixes.patch | 24 + patches/ssl.patch | 41 - patches/systemtap.patch | 99 + patches/text-relocations.patch | 60 + patches/tools.patch | 79 - patches/xrender-gc-cleanup.patch | 11 - tapset/hotspot_jni.stp.in | 180 +- 213 files changed, 8136 insertions(+), 4850 deletions(-) diffs (truncated from 17790 to 500 lines): diff -r 44dde878b860 -r 36e7e97a3702 .hgtags --- a/.hgtags Tue Mar 29 10:44:35 2011 +0200 +++ b/.hgtags Wed May 18 22:49:21 2011 +0100 @@ -15,8 +15,8 @@ a7b9087df36ee2c9fe2831f9ff08d0e9070abffd icedtea6-1.5rc1 07de70c5883a637ea2ef4aba3f8472edd7e12f1e icedtea6-1.5rc2 926c38e2b2830971f6ca0dff2ce25f78a694b178 icedtea6-1.5rc3 -9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea-1.6-branchpoint -8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea-1.7-branchpoint -9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.8-branchpoint +9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.6-branchpoint +8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea6-1.7-branchpoint +1188b1a313b9e968d57ff44eb879d70f543b20fd icedtea6-1.8-branchpoint cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint diff -r 44dde878b860 -r 36e7e97a3702 AUTHORS --- a/AUTHORS Tue Mar 29 10:44:35 2011 +0200 +++ b/AUTHORS Wed May 18 22:49:21 2011 +0100 @@ -19,9 +19,11 @@ Ioana Ivan Matthias Klose Francis Kung +Denis Lila DJ Lucas Omair Majid Casey Marshall +Paul Maurer Dan Munckton Raif Naffah Parag Nemade @@ -30,6 +32,7 @@ Bernhard Rosenkr??nzer Marc Schoenefeld Keith Seitz +Andrew Su Joshua Sumali Pavel Tisnovsky Christian Thalinger diff -r 44dde878b860 -r 36e7e97a3702 ChangeLog --- a/ChangeLog Tue Mar 29 10:44:35 2011 +0200 +++ b/ChangeLog Wed May 18 22:49:21 2011 +0100 @@ -1,3 +1,405 @@ +2011-05-18 Andrew John Hughes + + * patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch, + * patches/hotspot/hs20/arm.patch, + * patches/hotspot/hs20/gcc-suffix.patch, + * patches/hotspot/hs20/ia64-fix.patch, + * patches/hotspot/hs20/params-cast-size_t.patch, + * patches/hotspot/hs20/powerpc-stacksize.patch, + * patches/hotspot/hs20/sparc-buildfixes.patch, + * patches/hotspot/hs20/systemtap.patch, + * patches/hotspot/hs20/text-relocations.patch: + Moved to main tree. + * patches/hotspot/original/7032388-work_without_cmov_instruction.patch, + * patches/hotspot/original/arm.patch, + * patches/hotspot/original/gcc-suffix.patch, + * patches/hotspot/original/ia64-fix.patch, + * patches/hotspot/original/no-precompiled-headers.patch, + * patches/hotspot/original/params-cast-size_t.patch, + * patches/hotspot/original/sparc-buildfixes.patch, + * patches/hotspot/original/systemtap.patch, + * patches/hotspot/original/text-relocations.patch, + * patches/hotspot/original/too-many-args.patch: + Dropped; hs19 no longer supported. + * patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch, + * patches/openjdk/6997495-test_correction_6857159.patch, + * patches/openjdk/7029905-demo_applet_html_files.patch, + * patches/openjdk/7042040-no_disk_space_check.patch: + Removed; upstream in OpenJDK6. + * INSTALL: Update HotSpot documentation. + * Makefile.am: + (ICEDTEA_PATCHES): Updated. + * acinclude.m4: + (IT_WITH_HOTSPOT_BUILD): Set default back to original. + * hotspot.map: Remove hs19. + * patches/arm.patch, + * patches/gcc-suffix.patch, + * patches/ia64-fix.patch: + Extended with HotSpot segments from hotspot/hs20. + * patches/openjdk/6633275-shaped_translucent_windows.patch: + Recreated due to copyright header change in Component.java. + * patches/openjdk/7032388-work_without_cmov_instruction.patch, + * patches/params-cast-size_t.patch, + * patches/powerpc-stacksize.patch, + * patches/sparc-buildfixes.patch, + * patches/systemtap.patch, + * patches/text-relocations.patch: + Moved from hotspot/hs20. + +2011-05-17 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/mutter.patch: Add Mutter as a window manager, + so that a WM specific workaround keeps working. + +2011-05-17 Omair Majid + + * patches/linux-separate-debuginfo.patch: Remove unapplied patch. An + improved version of this patch (which allows running jmap -heap) without + debuginfo packages is already included in openjdk6. + +2011-05-17 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Remove patches/tools.patch. + * patches/tools.patch: Remove file. Not required anymore. + +2011-05-17 Omair Majid + + * Makefile.am + (ICEDTEA_PATCHES): Replace patches/shark-llvm-2.9.patch with + patches/openjdk/7036220-shark_llvm_29_headers.patch. + * patches/shark-llvm-2.9.patch: Move to... + * patches/openjdk/7036220-shark_llvm_29_headers.patch: New file. Contains + contents of patches/shark-llvm-2.9.patch as well as hg metadata. + +2011-05-17 Omair Majid + + * Makefile.am + (ICEDTEA_PATCHES): Move patches/javafiles.patch to ... + (ICEDTEA_ECJ_PATCHES): Add patches/ecj/javafiles.patch. + * patches/javafiles.patch: Move to... + * patches/ecj/javafiles.patch: New file. + +2011-05-17 Pavel Tisnovsky + + * patches/jtreg-6929067-fix.patch: Fix bashism. + +2011-05-16 Pavel Tisnovsky + + * patches/jtreg-6929067-fix.patch: fix this regression + test so it works on any combination of JVM and platform + (32 bit and 64 bit) + +2011-05-12 Andrew Su + + * AUTHORS: Updated name. + +2011-05-12 Andrew Haley + + Rename icedtea-hugepage-7034464.patch -> openjdk/7034464-hugepage.patch + icedtea-hugepage-7037939.patch -> openjdk/7037939-hugepage.patch + * patches/openjdk/7043564-hugepage.patch: Import from upstream. + * Makefile.am: move patches, add new patch. + +2011-05-12 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/pgram-pipe-regression.patch: Fix regression a + where the wrong user space bounds would be passed to user supplied + paint object. + +2011-05-12 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Remove rmi_amd64.patch. Add + 7043921-java_rmi_cgi.patch + * patches/openjdk/7043921-java_rmi_cgi.patch: New file. + * patches/rmi_amd64.patch: Remove. + +2011-05-12 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Replace patches/libpng.patch with + patches/openjdk/6959123-libpng_14.patch. + * patches/libpng.patch: Remove. + * patches/openjdk/6959123-libpng_14.patch: New file. + +2011-05-11 Omair Majid + + * Makefile.am + (ICEDTEA_PATCHES): Move headers-hotspot.patch to ... + (ICEDTEA_ECJ_PATCHES): New patch. + (ICEDTEA_ENV): Moves endorsed dir varaibles to ... + (ICEDTEA_ENV_ECJ): Here. + * patches/headers-hotspot.patch: Move to ... + * patches/ecj/endorsed-dir-for-jvmti.patch: New file. + +2011-05-11 Omair Majid + + Backport S7042040: Remove disk space sanity check + * Makefile.am (ICEDTEA_PATCHES): Add + patches/openjdk/7042040-no_disk_space_check.patch. Remove + patches/no-sync.patch. + * patches/openjdk/7042040-no_disk_space_check.patch: New file. + * patches/no-sync.patch: Remove. Upstream's fix is an improved version. + +2011-05-11 Andrew Su + + * AUTHORS: Added Denis Lila, Marathon, and Andrew Su. + +2011-05-10 Omair Majid + + Move pr633-no_javaws_man_page.patch to proper location + * Makefile.am (ICEDTEA_PATCHES): Update patch location and name. + * patches/pr633-no_javaws_man_page.patch: Remove. + * patches/openjdk/7021314-no_javaws_man_page.patch: New file. Backport + from OpenJDK7. + +2011-05-10 Omair Majid + + Move fix for S6599601 to proper location. + * Makefile.am (ICEDTEA_PATCHES): Update patch location and name. + * patches/mark_sun_toolkit_privileged_code.patch: Remove. + * patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch: New + file. Backport from OpenJDK6. + +2011-05-10 Andrew Su + + * Makefile.am: + (ICEDTEA_PATCHES): Removed patch jpegclasses.patch. + (stamps/overlay.stamp): Added jpeg class overlay path. + * patches/jpegclasses.patch: Removed + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGHuffmanTable.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageDecoderImpl.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGImageEncoderImpl.java, + * overlays/jpeg/openjdk/jdk/src/share/classes/sun/awt/image/codec/JPEGParam.java: New classes. + +2011-05-09 Andrew Haley + + * Makefile (ICEDTEA_PATCHES): Add icedtea-hugepage-7034464.patch, + patches/icedtea-hugepage-7037939.patch + * patches/icedtea-hugepage-7034464.patch: Support transparent huge + pages on Linux available since 2.6.38 + * patches/icedtea-hugepage-7037939.patch: Disable adaptive + resizing if SHM large pages are used. + * NEWS: Add S7037939, S7034464. + +2011-05-06 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Replace + patches/rh676659-gcc-export-dynamic.patch with the upstream fix + patches/openjdk/7041156-gcc_export_dynamic.patch. + * patches/openjdk/7041156-gcc_export_dynamic.patch: New file. + * patches/rh676659-gcc-export-dynamic.patch: Remove file. + +2011-05-05 Omair Majid + + * patches/shark-build-hotspot.patch, + * patches/shark-debug-option.patch, + * patches/shark_do_nothing_on_stub_frame.patch: Drop upstreamed/unapplied + patches. These were not being applied. + +2011-05-05 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Replace patches/gcc-stack-markings.patch + with patches/openjdk/7019808-stack_noexec.patch. + * patches/gcc-stack-markings.patch: Remove + * patches/openjdk/7019808-stack_noexec.patch: Fix from upstream. + +2011-05-05 Xerxes R??nby + + CACAO threadlist & threadobject improvements. + * NEWS: Updated. + * Makefile.am + (CACAO_VERSION): Updated to latest CACAO revision. + (CACAO_SHA256SUM): Updated. + +2011-05-04 Omair Majid + + * Makefile.am (ICEDTEA_PATCHES): Drop bytebuffer-compact.patch. The + original issue this patch used to address was fixed upstream. Now this + patch just adds another method clearMark in addition to upstream's + discardMark. + * generated/java/nio/DirectByteBuffer.java, + * generated/java/nio/DirectCharBufferS.java, + * generated/java/nio/DirectCharBufferU.java, + * generated/java/nio/DirectDoubleBufferS.java, + * generated/java/nio/DirectDoubleBufferU.java, + * generated/java/nio/DirectFloatBufferS.java, + * generated/java/nio/DirectFloatBufferU.java, + * generated/java/nio/DirectIntBufferS.java, + * generated/java/nio/DirectIntBufferU.java, + * generated/java/nio/DirectLongBufferS.java, + * generated/java/nio/DirectLongBufferU.java, + * generated/java/nio/DirectShortBufferS.java, + * generated/java/nio/DirectShortBufferU.java, + * generated/java/nio/HeapByteBuffer.java, + * generated/java/nio/HeapCharBuffer.java, + * generated/java/nio/HeapDoubleBuffer.java, + * generated/java/nio/HeapFloatBuffer.java, + * generated/java/nio/HeapIntBuffer.java, + * generated/java/nio/HeapLongBuffer.java, + * generated/java/nio/HeapShortBuffer.java: Replace all uses of clearMark + with discardMark. + * patches/bytebuffer-compact.patch: Remove. + +2011-05-04 Omair Majid + + * patches/nss-debug.patch: Remove file. It was upstreamed and was not + being applied locally. + +2011-05-04 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/7036754-stroker-nan.patch: New patch. Fix NaN + quad stroking problem. + +2011-05-04 Xerxes R??nby + + * .hgtags Update. + icedtea6-1.6-branchpoint renamed from icedtea-1.6-branchpoint + icedtea6-1.7-branchpoint renamed from icedtea-1.7-branchpoint + icedtea6-1.8-branchpoint corrected to rev 1997:1188b1a313b9 + +2011-05-03 Omair Majid + + Replace xrender patch with (identical) upstream fix. + * NEWS: Document backport of S7018387. + * Makefile.am (ICEDTEA_PATCHES): Replace patches/xrender-gc-cleanup.patch + with patches/openjdk/7018387-xrender_gc_leak.patch. + * patches/openjdk/7018387-xrender_gc_leak.patch: New file. + * patches/xrender-gc-cleanup.patch: Remove. + +2011-05-03 Andrew Haley + + * Makefile.am: Don't fail if sed command to clean jvm.cfg fails. + +2011-05-02 Omair Majid + + * NEWS: Update. + * Makefile.am (ICEDTEA_PATCHES): Add new patch. + * patches/openjdk/6986968-crash_on_xim_restart.patch: New file. + +2011-04-29 Omair Majid + + * NEWS: Update. + * Makefile.am (ICEDTEA_PATCHES): Replace patches/demo-swingapplet.patch + with patches/openjdk/7029905-demo_applet_html_files.patch. + * patches/demo-swingapplet.patch: Remove. + * patches/openjdk/7029905-demo_applet_html_files.patch: New patch. + +2011-04-28 Omair Majid + + Drop ssl.patch + * Makefile.am (ICEDTEA_PATCHES): Remove ssl.patch. + * patches/ssl.patch: Removed. + +2011-04-28 Denis Lila + + * Makefile.am: Apply patches. + * NEWS: Update with backports. + * patches/openjdk/6748082-isDisplayLocal.patch: New patch. + * patches/openjdk/6708580-exa_slow.patch: New patch. Speeds + up certain rendering operations. + * patches/openjdk/6307603-xrender-01.patch: Make it apply when + the previous patch has been applied before it. + +2011-04-22 Omair Majid + + Revert previous patch. + * Makefile.am (ICEDTEA_PATCHES): Apply patch. + * patches/bytebuffer-compact.patch: Add back patch file. + +2011-04-21 Omair Majid + + * patches/bytebuffer-compact.patch: Drop useless patch. + * Makefile.am (ICEDTEA_PATCHES): Do not apply dropped patch. + +2011-04-12 Xerxes R??nby + + PR689: Shark fails to find LLVM 2.9 System headers during build + * Makefile.am: Add patch. + * patches/shark-llvm-2.9.patch: + In LLVM 2.9 System headers are moved to Support. + * NEWS: Updated. + +2011-04-10 Yasumasa Suenaga + + * tapset/hotspot_jni.stp.in (hotspot.jni.CallNonvirtual*): + Add missing clazz argument to all probes. Fix methodid + to be last argument. Add clazz to probestr. + +2011-03-31 Deepak Bhole + + S7031385, PR680: Incorrect register allocation in + orderAccess_linux_x86.inline.hpp + * Makefile.am: Apply patch. + * NEWS: Updated + * patches/openjdk/7031385-gcc-register-allocation-fix.patch: New patch. + Fixes register allocation by constraining output to one of a/b/c/d + registers. + +2011-03-31 Andrew John Hughes + + * patches/jaxp-serial-version-uid.patch, + * patches/openjdk/6768387-jtable_not_serializable.patch: + Dropped, upstream. + +2011-03-31 Andrew John Hughes + + S7032388, PR682: Make HotSpot work on machines without + cmov instruction again + * Makefile.am: Add new patch. + * NEWS: Mention patch. + * patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch, + * patches/hotspot/original/7032388-work_without_cmov_instruction.patch: + Versions of patch for each HotSpot version. + +2011-03-31 Pavel Tisnovsky + + * patches/revert-6885123.patch: + Fixed test shell script to work on POSIX shells. + This patch also deletes now defunct regression + test: + openjdk/langtools/test/tools/javac/api/6411310/Test.java + +2011-03-31 Andrew John Hughes + + * Makefile.am: + (JAXP_DROP_ZIP): Update. + (JAXP_DROP_SHA256SUM): Likewise. + (ICEDTEA_PATCHES): Drop above. + +2011-03-31 Andrew John Hughes + + * Makefile.am: + Revert broken changes in + 478d3f5f6a59409078b1adcfba24150158b92695 + (.PHONY): Remove jtregcheck-summary. + (jtregcheck): Revert to version before last change. + Remove pointless touch invocation. + +2011-03-31 Andrew John Hughes + + * Makefile.am: + Add missing download-openjdk and new download-hotspot aliases. + (.PHONY): Add clean-download-hotspot. + (download-openjdk): Move HotSpot download to... + (clean-download-openjdk): Don't delete hotspot zip. + (download-hotspot): ...here. + (clean-download-hotspot): Remove hotspot zip and stamp. + (download): Add download-hotspot as a dependency. + (clean-download): Add clean-download-hotspot as a dependency. + 2011-03-29 Pavel Tisnovsky * Makefile.am: Add new patch. @@ -218,6 +620,11 @@ 2011-03-03 Andrew John Hughes + * Makefile.am: + Bump to b23. + +2011-03-03 Andrew John Hughes + * INSTALL: Update documentation to match current settings. * NEWS: Mention change to hs20. diff -r 44dde878b860 -r 36e7e97a3702 INSTALL --- a/INSTALL Tue Mar 29 10:44:35 2011 +0200 +++ b/INSTALL Wed May 18 22:49:21 2011 +0100 @@ -318,16 +318,13 @@ download stage and just verifies that the zip's MD5 sum matches that of the requested build. -At present, IcedTea6 supports the 'original' HotSpot 19 provided as -part of the upstream tarball and HotSpot 20 ('hs20') from the stable -hs20 tree at http://hg.openjdk.java.net/hsx/hsx20/master. The default -is 'hs20' which will use the version of hs20 specified in hotspot.map. -Note that the norm. is for up to one alternate (non-default) build to -be supported and just passing --with-hotspot-build (equivalent to ---with-hotspot-build=yes) will always provide the alternate build -(currently hs20). Conversely, passing --without-hotspot-build -(equivalent to --with-hotspot-build=no) provides the original build -from the OpenJDK tarball (currently hs19). +At present, IcedTea6 supports the 'original' HotSpot 20 provided as +part of the upstream tarball. Note that the norm. is for up to one +alternate (non-default) build to be supported and just passing +--with-hotspot-build (equivalent to --with-hotspot-build=yes) will +always provide the alternate build. Conversely, passing +--without-hotspot-build (equivalent to --with-hotspot-build=no) +provides the original build from the OpenJDK tarball. Javascript Support ================== diff -r 44dde878b860 -r 36e7e97a3702 Makefile.am --- a/Makefile.am Tue Mar 29 10:44:35 2011 +0200 +++ b/Makefile.am Wed May 18 22:49:21 2011 +0100 @@ -2,11 +2,11 @@ OPENJDK_DATE = 28_feb_2011 OPENJDK_MD5SUM = 2d2bbbb0f9b81f1fec41ec730da8a933 -OPENJDK_VERSION = b22 +OPENJDK_VERSION = b23 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ -CACAO_VERSION = c7bf150bfa46 -CACAO_SHA256SUM = 73629f5ac9514afbcf63b6cdf58556e889a5f6a22d4bd70de1dd2816c6500aee +CACAO_VERSION = d6264eb66506 From ptisnovs at icedtea.classpath.org Wed May 18 14:58:17 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 18 May 2011 21:58:17 +0000 Subject: /hg/icedtea: Included fix of two regression tests. Message-ID: changeset eda93e00ce53 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=eda93e00ce53 author: ptisnovs date: Wed May 18 23:57:28 2011 +0200 Included fix of two regression tests. diffstat: ChangeLog | 10 ++++++++++ Makefile.am | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diffs (43 lines): diff -r 9106cbc93669 -r eda93e00ce53 ChangeLog --- a/ChangeLog Wed May 18 22:38:38 2011 +0100 +++ b/ChangeLog Wed May 18 23:57:28 2011 +0200 @@ -1,3 +1,13 @@ +2011-05-18 Pavel Tisnovsky + + * Makefile.am: + (JDK_CHANGESET): Include fix of regression test + sun/net/www/protocol/file/DirPermissionDenied.sh + (JDK_SHA256SUM): Likewise. + (HOTSPOT_CHANGESET): Include fix of regression + test runtime/6929067/Test6929067.sh + (HOTSPOT_SHA256SUM): Likewise + 2011-05-18 Andrew John Hughes * scripts/update_tarballs.sh: diff -r 9106cbc93669 -r eda93e00ce53 Makefile.am --- a/Makefile.am Wed May 18 22:38:38 2011 +0100 +++ b/Makefile.am Wed May 18 23:57:28 2011 +0200 @@ -3,18 +3,18 @@ OPENJDK_VERSION = b136 CORBA_CHANGESET = b62418551e20 -HOTSPOT_CHANGESET = ef8632d52263 +HOTSPOT_CHANGESET = 74ff0c608935 JAXP_CHANGESET = 1c2f25bf36b1 JAXWS_CHANGESET = 339c2d381d80 -JDK_CHANGESET = 49098163596b +JDK_CHANGESET = fcc5e53dca33 LANGTOOLS_CHANGESET = 8e26c4aee63c OPENJDK_CHANGESET = d4aea1a51d62 CORBA_SHA256SUM = 60f8494b1ebf58db75fe8871dcbee1f6e4bd1d8d6c9b6ce49dad7a6a6340c4ac -HOTSPOT_SHA256SUM = d939f29993a75c263b9b0bed8ccb74340860681ec8be1a62a76946ca9502255d +HOTSPOT_SHA256SUM = fe5d240d87a5680f05a80236a087a67ad7ab190d8ea92057bf5180a50d233765 JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0 JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c -JDK_SHA256SUM = b8f78ac3aeb61a5ccf214f5d1f962a052e127c26a6096186938766bd8ba8a871 +JDK_SHA256SUM = 128026428ea4aa9068964e50df25013971c80f1ba63c600f7d15418e49031627 LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39 OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d From bugzilla-daemon at icedtea.classpath.org Wed May 18 15:54:25 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 18 May 2011 22:54:25 +0000 Subject: [Bug 722] javaws fails to run signed application if unsigned files are present under META-INF/ In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=722 --- Comment #1 from Omair Majid 2011-05-18 22:54:25 --- Another example: http://webalive.biz/cms_2_9_2/WebCommerce.jnlp The problematic jar is http://webalive.biz/cms_2_9_2/lib/editlivejava.jar -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From andrew at icedtea.classpath.org Wed May 18 17:25:12 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 19 May 2011 00:25:12 +0000 Subject: /hg/icedtea: JamVM: Taste the New --enable-jamvm Flavour! Message-ID: changeset 0f78ff523f7f in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0f78ff523f7f author: Andrew John Hughes date: Thu May 19 01:25:06 2011 +0100 JamVM: Taste the New --enable-jamvm Flavour! 2011-05-18 Andrew John Hughes * Makefile.am: (clean-jamvm): Don't remove clean- extract-jamvm.stamp here; use its own target. (clean-extract-jamvm): Added. 2011-02-22 Xerxes Ranby JamVM: Taste the New --enable-jamvm Flavour! * NEWS: Updated. * Makefile.am (JAMVM_VERSION): New variable. (JAMVM_SHA256SUM): Likewise. (JAMVM_BASE_URL): Likewise. (JAMVM_URL): Likewise. (JAMVM_SRC_ZIP): Likewise. (JAMVM_IMPORT_PATH): Likewise. (ICEDTEA_BUILD_TARGET): Build only jdk if jamvm are enabled. (ICEDTEA_DEBUG_BUILD_TARGET): Likewise. (ICEDTEA_ENV): Set ALT_HOTSPOT_IMPORT_PATH to JAMVM_IMPORT_PATH if jamvm are enabled. (PRODUCT_NAME): Make -version report IcedTea6 Runtime Environment if jamvm are enabled. (JDK_DERIVATIVE_NAME): Only show IcedTea version if jamvm are enabled. (stamps/download-jamvm.stamp): New make target. (clean-download-jamvm): Likewise. (stamps/extract- jamvm.stamp): Likewise. (stamps/jamvm.stamp): Likewise. (clean-jamvm): Likewise. (.PHONY): Add clean-jamvm. (stamps/download.stamp): Add stamps/download-jamvm.stamp. (clean-download): Add clean-download-jamvm. (stamps/extract.stamp): Add stamps/extract-jamvm.stamp. (clean-extract): Add clean-jamvm. (stamps/icedtea.stamp): Add stamps/jamvm.stamp. (download-jamvm): Alias to stamps /download-jamvm.stamp. (jamvm): Alias to stamps/jamvm.stamp. * configure.ac (IT_CHECK_ENABLE_JAMVM): Use new macro. * acinclude.m4: (ENABLE_ZERO_BUILD): Do not use zero if jamvm are enabled. (IT_CHECK_ENABLE_JAMVM): New macro. (BUILD_JAMVM): New conditional. (ENABLE_JAMVM): New conditional. diffstat: ChangeLog | 46 ++++++++++++++++++++++ Makefile.am | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- NEWS | 1 + acinclude.m4 | 23 ++++++++++- configure.ac | 2 + 5 files changed, 179 insertions(+), 12 deletions(-) diffs (362 lines): diff -r eda93e00ce53 -r 0f78ff523f7f ChangeLog --- a/ChangeLog Wed May 18 23:57:28 2011 +0200 +++ b/ChangeLog Thu May 19 01:25:06 2011 +0100 @@ -1,3 +1,49 @@ +2011-05-18 Andrew John Hughes + + * Makefile.am: + (clean-jamvm): Don't remove clean-extract-jamvm.stamp + here; use its own target. + (clean-extract-jamvm): Added. + +2011-02-22 Xerxes Ranby + + JamVM: Taste the New --enable-jamvm Flavour! + * NEWS: Updated. + * Makefile.am (JAMVM_VERSION): New variable. + (JAMVM_SHA256SUM): Likewise. + (JAMVM_BASE_URL): Likewise. + (JAMVM_URL): Likewise. + (JAMVM_SRC_ZIP): Likewise. + (JAMVM_IMPORT_PATH): Likewise. + (ICEDTEA_BUILD_TARGET): + Build only jdk if jamvm are enabled. + (ICEDTEA_DEBUG_BUILD_TARGET): Likewise. + (ICEDTEA_ENV): Set ALT_HOTSPOT_IMPORT_PATH to JAMVM_IMPORT_PATH + if jamvm are enabled. + (PRODUCT_NAME): Make -version report IcedTea6 Runtime Environment + if jamvm are enabled. + (JDK_DERIVATIVE_NAME): Only show IcedTea version + if jamvm are enabled. + (stamps/download-jamvm.stamp): New make target. + (clean-download-jamvm): Likewise. + (stamps/extract-jamvm.stamp): Likewise. + (stamps/jamvm.stamp): Likewise. + (clean-jamvm): Likewise. + (.PHONY): Add clean-jamvm. + (stamps/download.stamp): Add stamps/download-jamvm.stamp. + (clean-download): Add clean-download-jamvm. + (stamps/extract.stamp): Add stamps/extract-jamvm.stamp. + (clean-extract): Add clean-jamvm. + (stamps/icedtea.stamp): Add stamps/jamvm.stamp. + (download-jamvm): Alias to stamps/download-jamvm.stamp. + (jamvm): Alias to stamps/jamvm.stamp. + * configure.ac (IT_CHECK_ENABLE_JAMVM): Use new macro. + * acinclude.m4: + (ENABLE_ZERO_BUILD): Do not use zero if jamvm are enabled. + (IT_CHECK_ENABLE_JAMVM): New macro. + (BUILD_JAMVM): New conditional. + (ENABLE_JAMVM): New conditional. + 2011-05-18 Pavel Tisnovsky * Makefile.am: diff -r eda93e00ce53 -r 0f78ff523f7f Makefile.am --- a/Makefile.am Wed May 18 23:57:28 2011 +0200 +++ b/Makefile.am Thu May 19 01:25:06 2011 +0100 @@ -24,6 +24,17 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 +# The jamvm-3f02679901ac46985c9c3ac3f1b99e8eaf6a7e27.tar.gz got fetched from +# http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/snapshot/jamvm-3f02679901ac46985c9c3ac3f1b99e8eaf6a7e27.tar.gz +# Unfortunally the generated .tar.gz by the berlios cgit snapshot function +# keeps changing sha256sum. I have hosted a snapshot on labb.zafena.se +# while we wait for the final JamVM 1.6.0 release. +JAMVM_VERSION = 3f02679901ac46985c9c3ac3f1b99e8eaf6a7e27 +JAMVM_SHA256SUM = 396daf08896a71cfcddfabfbaf2d8b3f07557d8143eaaa93be25e2d80f30e165 +JAMVM_BASE_URL = http://labb.zafena.se/jamvm +JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz +JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz + JAXWS_DROP_URL = http://icedtea.classpath.org/download/drops JAXWS_DROP_ZIP = jdk7-jaxws2_2_2-2010_12_14.zip JAXWS_DROP_SHA256SUM = ef3115dde8ed9a7129e65aab8b1499e11621e343559e6e5a8df9c4542848fb9b @@ -67,6 +78,7 @@ REWRITER_BUILD_DIR = $(abs_top_builddir)/rewriter.build STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea +JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot # Source directories @@ -173,8 +185,13 @@ ICEDTEA_BUILD_TARGET = jdk_only ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only else +if ENABLE_JAMVM + ICEDTEA_BUILD_TARGET=jdk_only + ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only +else ICEDTEA_DEBUG_BUILD_TARGET = debug_build endif +endif if BOOTSTRAPPING BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory-stage2.stamp @@ -469,6 +486,11 @@ ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)" endif +if ENABLE_JAMVM +ICEDTEA_ENV += \ + ALT_HOTSPOT_IMPORT_PATH="$(JAMVM_IMPORT_PATH)" +endif + if DISABLE_OPTIMIZATIONS ICEDTEA_ENV += \ NO_OPTIMIZATIONS="true" \ @@ -732,7 +754,8 @@ clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \ clean-icedtea icedtea-stage2 clean-icedtea-boot \ clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \ - clean-drops jtregcheck clean-remove-intree-libraries + clean-drops jtregcheck clean-remove-intree-libraries \ + clean-jamvm clean-extract-jamvm env: @echo 'unset JAVA_HOME' @@ -778,11 +801,11 @@ # Download OpenJDK sources. stamps/download.stamp: stamps/download-drops.stamp stamps/download-openjdk.stamp \ - stamps/download-cacao.stamp + stamps/download-cacao.stamp stamps/download-jamvm.stamp mkdir -p stamps touch $@ -clean-download: clean-drops clean-download-openjdk clean-download-cacao +clean-download: clean-drops clean-download-openjdk clean-download-cacao clean-download-jamvm rm -f stamps/download.stamp stamps/download-jaxp-drop.stamp: @@ -1074,13 +1097,37 @@ rm -f $(CACAO_SRC_ZIP) rm -f stamps/download-cacao.stamp -stamps/extract.stamp: stamps/extract-openjdk.stamp \ - stamps/extract-cacao.stamp stamps/extract-jaxws.stamp \ - stamps/remove-intree-libraries.stamp +stamps/download-jamvm.stamp: +if BUILD_JAMVM + if ! echo "$(JAMVM_SHA256SUM) $(JAMVM_SRC_ZIP)" \ + | $(SHA256SUM) --check ; \ + then \ + if [ $(JAMVM_SRC_ZIP) ] ; \ + then \ + mv $(JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(JAMVM_URL) -O $(JAMVM_SRC_ZIP); \ + if ! echo "$(JAMVM_SHA256SUM) $(JAMVM_SRC_ZIP)" \ + | $(SHA256SUM) --check ; \ + then echo "ERROR: Bad download of JamVM zip"; false; \ + fi; \ + fi +endif mkdir -p stamps touch $@ -clean-extract: clean-extract-openjdk clean-extract-cacao clean-extract-jaxws +clean-download-jamvm: + rm -f $(JAMVM_SRC_ZIP) + rm -f stamps/download-jamvm.stamp + +stamps/extract.stamp: stamps/extract-openjdk.stamp \ + stamps/extract-cacao.stamp stamps/extract-jaxws.stamp \ + stamps/remove-intree-libraries.stamp stamps/extract-jamvm.stamp + mkdir -p stamps + touch $@ + +clean-extract: clean-extract-openjdk clean-extract-cacao clean-extract-jaxws \ + clean-extract-jamvm rm -f stamps/extract.stamp stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp @@ -1219,6 +1266,23 @@ clean-extract-cacao: clean-cacao rm -f stamps/extract-cacao.stamp +stamps/extract-jamvm.stamp: +if BUILD_JAMVM + set -e ; \ + if ! test -d jamvm ; \ + then \ + mkdir jamvm ; \ + $(TAR) xf $(JAMVM_SRC_ZIP) -C jamvm ; \ + dir=$$(basename jamvm/jamvm-*) ; \ + ln -s $$dir jamvm/jamvm ; \ + fi +endif + mkdir -p stamps + touch stamps/extract-jamvm.stamp + +clean-extract-jamvm: clean-jamvm + rm -f stamps/extract-jamvm.stamp + stamps/extract-jaxws.stamp: stamps/download-jaxws-drop.stamp \ stamps/download-jaf-drop.stamp stamps/extract-openjdk.stamp set -e ; \ @@ -1393,7 +1457,8 @@ mv openjdk/jdk/make/common/shared/Defs.gmk Defs.gmk.bak cat Defs.gmk.bak > openjdk/jdk/make/common/shared/Defs.gmk icedtea_version="$(PACKAGE_VERSION)$(ICEDTEA_REV)" ; \ - if ! test "x$(WITH_CACAO)" = "xno"; then \ + if test "x$(WITH_CACAO)" = "xyes" || \ + test "x$(ENABLE_JAMVM)" = "xyes"; then \ echo "JDK_DERIVATIVE_NAME=$${icedtea_version}" \ >>openjdk/jdk/make/common/shared/Defs.gmk ; \ echo "PRODUCT_NAME=$(ICEDTEA_NAME)" \ @@ -1679,7 +1744,8 @@ # you change it in the icedtea-debug target as well. stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \ - stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp + stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \ + stamps/jamvm.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/ \ @@ -1734,13 +1800,17 @@ cp $(abs_top_builddir)/tz.properties \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; endif +if ENABLE_JAMVM + printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) mkdir -p stamps touch $@ stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \ - stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp + stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \ + stamps/jamvm.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/ \ @@ -1795,6 +1865,9 @@ cp $(abs_top_builddir)/tz.properties \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; endif +if ENABLE_JAMVM + printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif @echo "IcedTea (debug build) is served:" \ $(DEBUG_BUILD_OUTPUT_DIR) mkdir -p stamps @@ -1988,6 +2061,28 @@ fi rm -f stamps/rewrite-rhino.stamp +# JamVM + +stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp +if BUILD_JAMVM + cd jamvm/jamvm && \ + ./autogen.sh --with-java-runtime-library=openjdk \ + --prefix=$(abs_top_builddir)/jamvm/install ; \ + $(MAKE) ; \ + $(MAKE) install + mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server + cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server + ln -s server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client + touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt + touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so +endif + mkdir -p stamps + touch stamps/jamvm.stamp + +clean-jamvm: + rm -rf jamvm + rm -f stamps/jamvm.stamp + # CACAO stamps/cacao.stamp: stamps/rt.stamp @@ -2343,6 +2438,8 @@ download-drops: stamps/download-drops.stamp +download-jamvm: stamps/download-jamvm.stamp + download-jaf-drop: stamps/download-jaf-drop.stamp download-jaxp-drop: stamps/download-jaxp-drop.stamp @@ -2371,6 +2468,8 @@ icedtea-stage2: stamps/icedtea-stage2.stamp +jamvm: stamps/jamvm.stamp + jtreg: stamps/jtreg.stamp native-ecj: stamps/native-ecj.stamp diff -r eda93e00ce53 -r 0f78ff523f7f NEWS --- a/NEWS Wed May 18 23:57:28 2011 +0200 +++ b/NEWS Thu May 19 01:25:06 2011 +0100 @@ -2,6 +2,7 @@ * NetX and the plugin moved to the IcedTea-Web project with a separate release cycle. +* Added out-of-the-box JamVM support using --enable-jamvm * Bug fixes - PR616, PR99: Don't statically link libstdc++ * Zero/Shark diff -r eda93e00ce53 -r 0f78ff523f7f acinclude.m4 --- a/acinclude.m4 Wed May 18 23:57:28 2011 +0200 +++ b/acinclude.m4 Thu May 19 01:25:06 2011 +0100 @@ -714,7 +714,8 @@ sparc*-*-*) ;; x86_64-*-*) ;; *) - if test "x${WITH_CACAO}" != xno; then + if test "x${WITH_CACAO}" != xno || \ + test "x${ENABLE_JAMVM}" = xyes; then use_zero=no else use_zero=yes @@ -1293,6 +1294,7 @@ AM_CONDITIONAL(ADD_CACAO_BUILD, test x$add_vm_cacao != x) AM_CONDITIONAL(ADD_ZERO_BUILD, test x$add_vm_zero != x || test x$add_vm_shark != x) AM_CONDITIONAL(ADD_SHARK_BUILD, test x$add_vm_shark != x) +AM_CONDITIONAL(BUILD_JAMVM, test "x${ENABLE_JAMVM}" = xyes) AM_CONDITIONAL(BUILD_CACAO, test x$add_vm_cacao != x || test "x${WITH_CACAO}" = xyes) if test "x${WITH_CACAO}" = xyes && test "x${ADD_CACAO_BUILD_TRUE}" = x; then @@ -1880,4 +1882,21 @@ fi AM_CONDITIONAL(USE_SYSTEM_LCMS, test x"${ENABLE_SYSTEM_LCMS}" = "xyes") AC_SUBST(ENABLE_SYSTEM_LCMS) -]) \ No newline at end of file +]) + +AC_DEFUN([IT_CHECK_ENABLE_JAMVM], +[ + AC_MSG_CHECKING(whether to use JamVM as VM) + AC_ARG_ENABLE([jamvm], + [AS_HELP_STRING(--enable-jamvm,use JamVM as VM [[default=no]])], + [ + ENABLE_JAMVM="${enableval}" + ], + [ + ENABLE_JAMVM=no + ]) + + AC_MSG_RESULT(${ENABLE_JAMVM}) + AM_CONDITIONAL(ENABLE_JAMVM, test x"${ENABLE_JAMVM}" = "xyes") + AC_SUBST(ENABLE_JAMVM) +]) diff -r eda93e00ce53 -r 0f78ff523f7f configure.ac --- a/configure.ac Wed May 18 23:57:28 2011 +0200 +++ b/configure.ac Thu May 19 01:25:06 2011 +0100 @@ -149,6 +149,8 @@ AC_CHECK_ENABLE_CACAO AC_CHECK_WITH_CACAO_HOME AC_CHECK_WITH_CACAO_SRC_ZIP +IT_CHECK_ENABLE_JAMVM + DISABLE_OPTIMIZATIONS SET_SHARK_BUILD ENABLE_ZERO_BUILD From gbenson at redhat.com Thu May 19 01:57:41 2011 From: gbenson at redhat.com (Gary Benson) Date: Thu, 19 May 2011 09:57:41 +0100 Subject: Error: caught unhandled signal 11 In-Reply-To: <298044.6548.qm@web161406.mail.bf1.yahoo.com> References: <298044.6548.qm@web161406.mail.bf1.yahoo.com> Message-ID: <20110519085740.GA3321@redhat.com> Hi Paulo, Did the JVM save an hs_err_pid*.log file somewhere? Thanks, Gary Paulo E. W. wrote: > Hello, > > I'm having problems with Tomcat6 in Debian (arm in a processor). > It starts fine, runs a few moments, and then aborts. > > The JVM creates an error log: > > # > # A fatal error has been detected by the Java Runtime Environment: > # > # Internal Error (os_linux_zero.cpp:236), pid=841, tid=1332900976 > # Error: caught unhandled signal 11 > # > # JRE version: 6.0_18-b18 > # Java VM: OpenJDK Zero VM (14.0-b16 mixed mode linux-arm ) > # Derivative: IcedTea6 1.8.3 > # Distribution: Debian GNU/Linux unstable (sid), package 6b18-1.8.3-2 > # If you would like to submit a bug report, please include > # instructions how to reproduce the bug and visit: > # http://icedtea.classpath.org/bugzilla > # > > I appreciate if someone can help me! > > Thanks, > Paul. From ptisnovs at icedtea.classpath.org Thu May 19 03:34:34 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 19 May 2011 10:34:34 +0000 Subject: /hg/icedtea6: Test enhancement - make the test compatible with O... Message-ID: changeset cb5177de9f0b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cb5177de9f0b author: ptisnovs date: Thu May 19 12:39:01 2011 +0200 Test enhancement - make the test compatible with OpenJDK7/IcedTea7, disabling printing unnecessary information to error output. diffstat: ChangeLog | 6 ++++++ patches/jtreg-6929067-fix.patch | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diffs (25 lines): diff -r 9cd3b8769614 -r cb5177de9f0b ChangeLog --- a/ChangeLog Wed May 18 09:04:01 2011 -0400 +++ b/ChangeLog Thu May 19 12:39:01 2011 +0200 @@ -1,3 +1,9 @@ +2011-05-19 Pavel Tisnovsky + + * patches/jtreg-6929067-fix.patch: Test enhancement - + make the test compatible with OpenJDK7/IcedTea7, disabling printing + unnecessary information to error output. + 2011-05-17 Denis Lila * Makefile.am: Apply patch. diff -r 9cd3b8769614 -r cb5177de9f0b patches/jtreg-6929067-fix.patch --- a/patches/jtreg-6929067-fix.patch Wed May 18 09:04:01 2011 -0400 +++ b/patches/jtreg-6929067-fix.patch Thu May 19 12:39:01 2011 +0200 @@ -8,7 +8,7 @@ +COMP_FLAG="-m32" + +# Test if JDK is 32 or 64 bits -+${TESTJAVA}/bin/java -d64 ++${TESTJAVA}/bin/java -d64 -version 2> /dev/null + +if [ $? -eq 0 ] +then From ptisnovs at icedtea.classpath.org Thu May 19 04:44:20 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 19 May 2011 11:44:20 +0000 Subject: /hg/icedtea: Test enhancement - make the test compatible with Op... Message-ID: changeset 2713916e1aac in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2713916e1aac author: ptisnovs date: Thu May 19 13:49:24 2011 +0200 Test enhancement - make the test compatible with OpenJDK7/IcedTea7, disabling printing unnecessary information to error output. diffstat: ChangeLog | 8 ++++++++ Makefile.am | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diffs (36 lines): diff -r 0f78ff523f7f -r 2713916e1aac ChangeLog --- a/ChangeLog Thu May 19 01:25:06 2011 +0100 +++ b/ChangeLog Thu May 19 13:49:24 2011 +0200 @@ -1,3 +1,11 @@ +2011-05-19 Pavel Tisnovsky + + * Makefile.am: + (HOTSPOT_CHANGESET): Test enhancement - make the test compatible with + OpenJDK7/IcedTea7, disabling printing unnecessary information to error + output. + (HOTSPOT_SHA256SUM): Likewise + 2011-05-18 Andrew John Hughes * Makefile.am: diff -r 0f78ff523f7f -r 2713916e1aac Makefile.am --- a/Makefile.am Thu May 19 01:25:06 2011 +0100 +++ b/Makefile.am Thu May 19 13:49:24 2011 +0200 @@ -3,7 +3,7 @@ OPENJDK_VERSION = b136 CORBA_CHANGESET = b62418551e20 -HOTSPOT_CHANGESET = 74ff0c608935 +HOTSPOT_CHANGESET = 591c7dc0b2ee JAXP_CHANGESET = 1c2f25bf36b1 JAXWS_CHANGESET = 339c2d381d80 JDK_CHANGESET = fcc5e53dca33 @@ -11,7 +11,7 @@ OPENJDK_CHANGESET = d4aea1a51d62 CORBA_SHA256SUM = 60f8494b1ebf58db75fe8871dcbee1f6e4bd1d8d6c9b6ce49dad7a6a6340c4ac -HOTSPOT_SHA256SUM = fe5d240d87a5680f05a80236a087a67ad7ab190d8ea92057bf5180a50d233765 +HOTSPOT_SHA256SUM = 6b2c5c9f5c1c603f742ddabb567d4abac23b91186ead4c1fc9d9643a07798e82 JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0 JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c JDK_SHA256SUM = 128026428ea4aa9068964e50df25013971c80f1ba63c600f7d15418e49031627 From dlila at redhat.com Thu May 19 06:38:44 2011 From: dlila at redhat.com (Denis Lila) Date: Thu, 19 May 2011 09:38:44 -0400 (EDT) Subject: Reviewer needed - fix of regression test PrintAllXcheckJNI in IcedTea7 In-Reply-To: <4DD388A9.6060302@redhat.com> Message-ID: <354376727.368666.1305812324806.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Hi Pavel. The fix looks good, but I would do + while (frame.getWidth() == 0 || frame.getHeight() == 0) { instead of + while (frame.getWidth() == 0) { The width probably can't be updated independently of the height, but we can't be sure of this unless we spend a lot of time reading the implementation. Just adding "|| frame.getHeight() == 0" is more efficient ;-) Regards, Denis. ----- Original Message ----- > Hi all, > > I've prepared fix for regression test PrintAllXcheckJNI for IcedTea7. > This test now explicitly checks if frame is really displayed. Without > this check the frame size is 0x0 for some time interval due to X-async > behaviour and the test fails because BufferedImage (or Raster to be > more > precise) can not have zero-dimensions. > > I'd like to push this fix to IcedTea7-forest, hg diff is stored in > attachment. > > Can anybody please review this change? > > Thank you in advance, > Pavel > > > [Text File:hg_diff] From doko at ubuntu.com Thu May 19 06:54:06 2011 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 19 May 2011 15:54:06 +0200 Subject: RFC: JamVM sync with upstream 2011-04-28 In-Reply-To: <4DC2A940.2010209@zafena.se> References: <4DC2A940.2010209@zafena.se> Message-ID: <4DD520FE.4050308@ubuntu.com> On 05/05/2011 03:42 PM, Xerxes R?nby wrote: > Hi the attached patch updates Icedtea6 to stay in sync with JamVM upstream. > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=2e52a601883dda84c824b43363c02881def3e06d > > I have made the ChangeLog more verbose to make it obvious which new JamVM improvements that have got included by this update. > > Ok to push? test built on i686, amd64 and armel. the segfault on i686 was tracked down to the use of GCC-4.6, and is unrelated to the update. looks ok. now that 7 has jamvm support, there too. Matthias From aph at redhat.com Thu May 19 09:13:30 2011 From: aph at redhat.com (Andrew Haley) Date: Thu, 19 May 2011 17:13:30 +0100 Subject: PING: Re: Patch: improve huge page support Message-ID: <4DD541AA.9000507@redhat.com> -------------- next part -------------- An embedded message was scrubbed... From: Andrew Haley Subject: Re: Patch: improve huge page support Date: Fri, 13 May 2011 16:03:59 +0100 Size: 24039 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110519/89bb0f6f/improvehugepagesupport.eml From aph at redhat.com Thu May 19 09:13:28 2011 From: aph at redhat.com (Andrew Haley) Date: Thu, 19 May 2011 17:13:28 +0100 Subject: PING: Re: Patch: improve huge page support Message-ID: <4DD541A8.3040900@redhat.com> -------------- next part -------------- An embedded message was scrubbed... From: Andrew Haley Subject: Re: Patch: improve huge page support Date: Fri, 13 May 2011 18:17:16 +0100 Size: 39581 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110519/f00a85d6/improvehugepagesupport.eml From ptisnovs at icedtea.classpath.org Thu May 19 09:22:37 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 19 May 2011 16:22:37 +0000 Subject: /hg/icedtea: Fixed behaviour of regression test PrintAllXcheckJN... Message-ID: changeset 094536f66773 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=094536f66773 author: ptisnovs date: Thu May 19 18:27:03 2011 +0200 Fixed behaviour of regression test PrintAllXcheckJNI.java, added check if test frame is really initialized to avoid exception thrown when BufferedImage is created. diffstat: ChangeLog | 8 ++++++++ Makefile.am | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diffs (36 lines): diff -r 2713916e1aac -r 094536f66773 ChangeLog --- a/ChangeLog Thu May 19 13:49:24 2011 +0200 +++ b/ChangeLog Thu May 19 18:27:03 2011 +0200 @@ -1,3 +1,11 @@ +2011-05-20 Pavel Tisnovsky + + * Makefile.am: + (JDK_CHANGESET): Fixed behaviour of regression test + PrintAllXcheckJNI.java, added check if test frame is really initialized + to avoid exception thrown when BufferedImage is created. + (JDK_SHA256SUM): Likewise + 2011-05-19 Pavel Tisnovsky * Makefile.am: diff -r 2713916e1aac -r 094536f66773 Makefile.am --- a/Makefile.am Thu May 19 13:49:24 2011 +0200 +++ b/Makefile.am Thu May 19 18:27:03 2011 +0200 @@ -6,7 +6,7 @@ HOTSPOT_CHANGESET = 591c7dc0b2ee JAXP_CHANGESET = 1c2f25bf36b1 JAXWS_CHANGESET = 339c2d381d80 -JDK_CHANGESET = fcc5e53dca33 +JDK_CHANGESET = 1571aa7abe47 LANGTOOLS_CHANGESET = 8e26c4aee63c OPENJDK_CHANGESET = d4aea1a51d62 @@ -14,7 +14,7 @@ HOTSPOT_SHA256SUM = 6b2c5c9f5c1c603f742ddabb567d4abac23b91186ead4c1fc9d9643a07798e82 JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0 JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c -JDK_SHA256SUM = 128026428ea4aa9068964e50df25013971c80f1ba63c600f7d15418e49031627 +JDK_SHA256SUM = 6d12de7cecd01c4ddef1a28fc393dfe5f8d66dea80b7d1484e028e8b921ac219 LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39 OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d From bugzilla-daemon at icedtea.classpath.org Thu May 19 10:33:44 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 19 May 2011 17:33:44 +0000 Subject: [Bug 721] IcedTeaPlugin.so cannot run g_main_context_iteration on a different thread unless a different GMainContext *context is used [Crashes Mozilla Nightly] In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=721 Daniel Richard G. changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |skunk at iSKUNK.ORG --- Comment #6 from Daniel Richard G. 2011-05-19 17:33:43 --- This bug report, on the Mozilla side, appears relevant: https://bugzilla.mozilla.org/show_bug.cgi?id=640908 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Thu May 19 11:32:41 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 19 May 2011 19:32:41 +0100 Subject: PING: Re: Patch: improve huge page support In-Reply-To: <4DD541A8.3040900@redhat.com> References: <4DD541A8.3040900@redhat.com> Message-ID: <20110519183241.GK31710@rivendell.middle-earth.co.uk> On 17:13 Thu 19 May , Andrew Haley wrote: > Date: Fri, 13 May 2011 18:17:16 +0100 > From: Andrew Haley > To: distro-pkg-dev at openjdk.java.net > Subject: Re: Patch: improve huge page support > User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) > Gecko/20110428 Fedora/3.1.10-1.fc14 Thunderbird/3.1.10 > > On 05/13/2011 04:03 PM, Andrew Haley wrote: > > On 05/12/2011 05:47 PM, Dr Andrew John Hughes wrote: > >> Looks ok for HEAD to me, assuming it still builds. > >> > >> Post patches for 1.9 and 1.10 and I'll approve them. There's likely to be some > >> churn between HotSpot versions so I wouldn't be surprised if the patch had > >> to be rejigged. Probably worth checking it even still works on old versions, > >> as I don't know if this has dependencies on other changes. > > > > I've checked with HS19 and 20. This is the patch for icedtea6-1.10, 1.9 > > to follow. This is the same as trunk, 1.9 had to be reworked. > > 1.9 is problematic in that we need different patches for HotSpot. This is > a slightly tweaked version form hs18, the hs19 patch is the same as 1.10. > > Andrew. > > 2011-05-13 Andrew Haley > > * patches/hotspot/*/7034464-hugepage.patch, > * patches/openjdk/7037939-hugepage.patch, > * patches/openjdk/7043564-hugepage.patch: Import from upstream. > * Makefile.am: add patches. > Looks good. Can you mention the fix in NEWS too? With that, it's fine to commit. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 19 11:33:43 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 19 May 2011 19:33:43 +0100 Subject: PING: Re: Patch: improve huge page support In-Reply-To: <4DD541AA.9000507@redhat.com> References: <4DD541AA.9000507@redhat.com> Message-ID: <20110519183343.GL31710@rivendell.middle-earth.co.uk> On 17:13 Thu 19 May , Andrew Haley wrote: > Date: Fri, 13 May 2011 16:03:59 +0100 > From: Andrew Haley > To: distro-pkg-dev > Subject: Re: Patch: improve huge page support > User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) > Gecko/20110428 Fedora/3.1.10-1.fc14 Thunderbird/3.1.10 > > On 05/12/2011 05:47 PM, Dr Andrew John Hughes wrote: > > Looks ok for HEAD to me, assuming it still builds. > > > > Post patches for 1.9 and 1.10 and I'll approve them. There's likely to be some > > churn between HotSpot versions so I wouldn't be surprised if the patch had > > to be rejigged. Probably worth checking it even still works on old versions, > > as I don't know if this has dependencies on other changes. > > I've checked with HS19 and 20. This is the patch for icedtea6-1.10, 1.9 > to follow. This is the same as trunk, 1.9 had to be reworked. > > Andrew. > As with the 1.9 patch, this looks fine. Just needs an addition to NEWS prior to commit. Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 19 11:40:41 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 19 May 2011 19:40:41 +0100 Subject: Questionable regression test LocaleEnhanceTest in IcedTea7 In-Reply-To: <4DD28BDA.8070207@redhat.com> References: <4DD270F9.6000305@redhat.com> <20110517140907.GZ31710@rivendell.middle-earth.co.uk> <4DD28BDA.8070207@redhat.com> Message-ID: <20110519184041.GM31710@rivendell.middle-earth.co.uk> On 16:53 Tue 17 May , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > On 14:58 Tue 17 May , Pavel Tisnovsky wrote: > >> Hi all, > >> > >> Regression test LocaleEnhanceTest.java from IcedTea7 cannot be compiled > >> because its base class LocaleTestFmwk.java is erased as "questionable" > >> file that contains improper(?) licence. > >> > >> My question is what to do with LocaleEnhanceTest itself? Erase it too > >> (ie add it to fsg.sh?) > >> > >> Cheers, > >> Pavel > > > > What's the path to these files? > > Hi Andrew, > > path is: > openjdk/jdk/test/java/util/Locale/ > > here's excerpt from LocaleEnhanceTest.java: > > public class LocaleEnhanceTest extends LocaleTestFmwk { > > ... its based on class LocaleTestFmwk deleted by fsg.sh script. > > Cheers, > Pavel This is the problematic license: * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved * (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved * * Portions copyright (c) 2007 Sun Microsystems, Inc. * All Rights Reserved. * * The original version of this source code and documentation * is copyrighted and owned by Taligent, Inc., a wholly-owned * subsidiary of IBM. These materials are provided under terms * of a License Agreement between Taligent and Sun. This technology * is protected by multiple US and International patents. * * This notice and attribution to Taligent may not be removed. * Taligent is a registered trademark of Taligent, Inc. * * Permission to use, copy, modify, and distribute this software * and its documentation for NON-COMMERCIAL purposes and without * fee is hereby granted provided that this copyright notice * appears in all copies. Please refer to the file "copyright.html" * for further important copyright and licensing information. * * SUN MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF * THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * PARTICULAR PURPOSE, OR NON-INFRINGEMENT. SUN SHALL NOT BE LIABLE FOR * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. * */ IANAL, but the 'NON-COMMERCIAL' provision clearly makes this non-Free. There is a standard Oracle GPLv2+Classpath exception license above it so I'm not sure what's going on here. We need someone from Oracle to clarify this. In the meantime, doesn't jtreg have an 'ignore' facility so we can set the dependent test as to be ignored with an appropriate reason? Then we can just turn it back on if this class is allowed back in. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 19 12:53:24 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 19 May 2011 20:53:24 +0100 Subject: RFC: JamVM sync with upstream 2011-04-28 In-Reply-To: <4DD520FE.4050308@ubuntu.com> References: <4DC2A940.2010209@zafena.se> <4DD520FE.4050308@ubuntu.com> Message-ID: <20110519195324.GT31710@rivendell.middle-earth.co.uk> On 15:54 Thu 19 May , Matthias Klose wrote: > On 05/05/2011 03:42 PM, Xerxes R?nby wrote: > > Hi the attached patch updates Icedtea6 to stay in sync with JamVM upstream. > > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=2e52a601883dda84c824b43363c02881def3e06d > > > > I have made the ChangeLog more verbose to make it obvious which new JamVM improvements that have got included by this update. > > > > Ok to push? > > test built on i686, amd64 and armel. the segfault on i686 was tracked down to > the use of GCC-4.6, and is unrelated to the update. > > looks ok. now that 7 has jamvm support, there too. > Please wait until I push the other fixes to 7... only one of the forwardports is in so far. Working on it now. > Matthias -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 19 13:04:16 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 19 May 2011 21:04:16 +0100 Subject: Reviewer needed: second fix for regression hotspot test hotspot/test/runtime/6929067/Test6929067 for IcedTea6 In-Reply-To: <4DCCF7F0.5000907@redhat.com> References: <4DCBE1FE.9080309@redhat.com> <20110512163023.GA31710@rivendell.middle-earth.co.uk> <4DCCF7F0.5000907@redhat.com> Message-ID: <20110519200416.GV31710@rivendell.middle-earth.co.uk> On 11:20 Fri 13 May , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > On 15:34 Thu 12 May , Pavel Tisnovsky wrote: > >> Hi all, > >> > >> > > > > Looks fine to me. Did you manage to get it upstream or are they still playing games? > > > > Hi Andrew, > > Chris found a typo in the test script ("i585" was used instead of "i587" > in a case control statement). Can you please review and approve new > changes in the tests please? I've only changed the string mentioned > above and date in the changelog entry: > > 2011-05-13 Pavel Tisnovsky > > * patches/jtreg-6929067-fix.patch: fix this test > so it works on any combination of JVM and platform > (32 bit and 64 bit) > > Thank you in advance, > Pavel Huh? I don't see either i585 or i587 in the patch, just i586. > diff -r d8750486e54c patches/jtreg-6929067-fix.patch > --- a/patches/jtreg-6929067-fix.patch Wed May 11 20:27:41 2011 -0400 > +++ b/patches/jtreg-6929067-fix.patch Thu May 12 14:50:58 2011 +0200 > @@ -1,26 +1,25 @@ > --- openjdk-old/hotspot/test/runtime/6929067/Test6929067.sh 2010-10-08 22:29:24.000000000 +0200 > +++ openjdk/hotspot/test/runtime/6929067/Test6929067.sh 2010-12-08 13:45:18.000000000 +0100 > -@@ -7,6 +7,7 @@ > - ## @run shell Test6929067.sh > - ## > - > -+ > - if [ "${TESTSRC}" = "" ] > - then TESTSRC=. > - fi > -@@ -42,7 +43,24 @@ > +@@ -42,7 +42,31 @@ > ;; > esac > > -LD_LIBRARY_PATH=.:${TESTJAVA}/jre/lib/i386/client:/usr/openwin/lib:/usr/dt/lib:/usr/lib:$LD_LIBRARY_PATH > +COMP_FLAG="-m32" > + > ++# Test if JDK is 32 or 64 bits > ++${TESTJAVA}/bin/java -d64 > ++ > ++if [[ $? == 0 ]] > ++then > ++ COMP_FLAG="-m64" > ++fi > ++ > +# Get ARCH specifics > +ARCH=`uname -m` > +case "$ARCH" in > + x86_64) > + ARCH=amd64 > -+ COMP_FLAG="-m64" > + ;; > + i586) > + ARCH=i386 > @@ -34,7 +33,7 @@ > export LD_LIBRARY_PATH > > THIS_DIR=`pwd` > -@@ -55,6 +73,13 @@ > +@@ -55,6 +79,13 @@ > > ${TESTJAVA}${FS}bin${FS}javac T.java > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 19 13:11:25 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 19 May 2011 21:11:25 +0100 Subject: Reviewer needed - fix for regression test test/sun/net/www/protocol/file/DirPermissionDenied in IcedTea7 In-Reply-To: <4DD14E3C.4040703@redhat.com> References: <4DCC00D1.8030906@redhat.com> <20110512163423.GB31710@rivendell.middle-earth.co.uk> <4DCD0084.8050203@redhat.com> <20110516154522.GT31710@rivendell.middle-earth.co.uk> <4DD14E3C.4040703@redhat.com> Message-ID: <20110519201124.GW31710@rivendell.middle-earth.co.uk> On 18:18 Mon 16 May , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > On 11:57 Fri 13 May , Pavel Tisnovsky wrote: > >> Dr Andrew John Hughes wrote: > > > > > Yes, there's no ChangeLog in the forest. > > > > You'll need to make a change to IcedTea7 itself as well to bump the > > Mercurial revisions and checksums. This will include a ChangeLog where > > you can detail the actual change. See IcedTea7's ChangeLog for some > > examples from me. > > > > Hi Andrew, > > thank you for the explanation, but I'm not sure how to "...bump the > Mercurial revisions and checksums...". It's probably interesting thing > that could be explained (or referenced) on the > http://icedtea.classpath.org/wiki/CommitPolicy page > > (I recall you mentioned that you have some useful script to do that work) > How about: "In IcedTea7, patches for OpenJDK are applied directly to our OpenJDK forest. Again, when conducting backports, use exact patches (via hg export/import) and do not mix in additional changes. Once a change has been made to the forest, IcedTea7 needs to be updated to download the new changeset(s), which involves updating the changeset identifiers and checksums in Makefile.am. A script called update_tarballs.sh is provided in the scripts subdirectory of the IcedTea7 repository for this purpose. This is run by specifying the path to download the tarballs to as an argument. If the tarballs have already been downloaded, gen_changeset_and_sha256sums.sh can be used directly to generate the changeset identifers and checksums. Once the script(s) have been run, the new values can be find in /tmp/changesets and /tmp/sums, ready for import into Makefile.am. The change to Makefile.am requires a ChangeLog entry as usual, and should describe the new changeset(s) being imported." If that sounds fine, I'll add it to the wiki. > Thank you very much, > Pavel > > Cheers, > Pavel > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From dlila at redhat.com Thu May 19 13:41:26 2011 From: dlila at redhat.com (Denis Lila) Date: Thu, 19 May 2011 16:41:26 -0400 (EDT) Subject: [RFC]: backport request for 1.10 and head In-Reply-To: <1273361360.377789.1305836323064.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <774841606.378320.1305837686793.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Hi. The last changeset I pushed had a test in it that used a method from some file (Util.java). That method isn't there yet in icedtea6, so the test was failing to compile. Therefore I would like to backport this: http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/a9b5b5d105a8 to head and 1.10. It introduces the missing method and fixes a bug. ChangeLog: 2011-05-19 Denis Lila * Makefile.am: Apply patch. * NEWS: Update with backport. * patches/openjdk/4685768-focus.patchpatch: The restore focus procedure now skips disabled components. The patches are attached. Ok to push? Regards, Denis. -------------- next part -------------- A non-text attachment was scrubbed... Name: head.patch Type: text/x-patch Size: 17611 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110519/b6e4753f/head.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: 1.10.patch Type: text/x-patch Size: 17574 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110519/b6e4753f/1.10.patch From bugzilla-daemon at icedtea.classpath.org Thu May 19 15:04:31 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 19 May 2011 22:04:31 +0000 Subject: [Bug 726] New: Exception after closing javaws -about window Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=726 Summary: Exception after closing javaws -about window Product: IcedTea-Web Version: hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: NetX AssignedTo: asu at redhat.com ReportedBy: omajid at redhat.com CC: unassigned at icedtea.classpath.org Steps to reproduce $ rm -rf ~/.icedtea/cache $ javaws -about icedtea-web 1.2pre+rf1615c79971d Launching about window... Now close the about window. (I did it by hitting ctrl-c on the terminal) ^Cjava.io.FileNotFoundException: /home/omajid/.icedtea/cache/recently_used (No such file or directory) at java.io.FileOutputStream.open(Native Method) at java.io.FileOutputStream.(FileOutputStream.java:209) at java.io.FileOutputStream.(FileOutputStream.java:160) at net.sourceforge.jnlp.util.PropertiesFile.store(PropertiesFile.java:137) at net.sourceforge.jnlp.cache.CacheLRUWrapper.store(CacheLRUWrapper.java:102) at net.sourceforge.jnlp.cache.CacheUtil.cleanCache(CacheUtil.java:602) at net.sourceforge.jnlp.runtime.JNLPRuntime$1.run(JNLPRuntime.java:704) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at redhat.com Thu May 19 15:20:19 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 19 May 2011 18:20:19 -0400 Subject: [icedtea-web] RFC: make splash screen a JDialog instead of a JFrame Message-ID: <4DD597A3.9050803@redhat.com> Hi, The attached patch makes the splash screen a JDialog instead of a JFrame. The patch makes the splash screen play nice with tiling window managers. Okay to commit? Is this suitable for inclusion in 1.1? ChangeLog: 2011-05-19 Omair Majid * netx/net/sourceforge/jnlp/JNLPSplashScreen.java: Subclass JDialog, not JFrame. Thanks, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea-web-jframe-to-jdialog.patch Type: text/x-patch Size: 637 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110519/2a919b85/icedtea-web-jframe-to-jdialog.patch From bugzilla-daemon at icedtea.classpath.org Thu May 19 15:31:25 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 19 May 2011 22:31:25 +0000 Subject: [Bug 727] New: Transient failures when running JNLP applications Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=727 Summary: Transient failures when running JNLP applications Product: IcedTea-Web Version: hg Platform: all URL: http://www.sweethome3d.com/SweetHome3D.jnlp OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: NetX AssignedTo: asu at redhat.com ReportedBy: omajid at redhat.com CC: unassigned at icedtea.classpath.org Steps to reproduce: $ ~/code/icedtea-web-image/bin/javaws http://www.sweethome3d.com/SweetHome3D.jnlp $ ~/code/icedtea-web-image/bin/javaws http://www.sweethome3d.com/SweetHome3D.jnlp $ ~/code/icedtea-web-image/bin/javaws http://www.sweethome3d.com/SweetHome3D.jnlp (yes, just run this multiple times). Here is what happened with me: $ ~/code/icedtea-web-image/bin/javaws SweetHome3D.jnlp Starts up fine the first time. So run it again. $ ~/code/icedtea-web-image/bin/javaws SweetHome3D.jnlp java.io.FileNotFoundException: /home/omajid/.icedtea/cache/0/http/www.sweethome3d.com/SweetHome3D.jnlp.info (No such file or directory) at java.io.RandomAccessFile.open(Native Method) at java.io.RandomAccessFile.(RandomAccessFile.java:233) at java.io.RandomAccessFile.(RandomAccessFile.java:118) at net.sourceforge.jnlp.util.FileUtils.getFileLock(FileUtils.java:310) at net.sourceforge.jnlp.cache.CacheUtil.lockFile(CacheUtil.java:634) at net.sourceforge.jnlp.cache.CacheEntry.lock(CacheEntry.java:176) at net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:766) at net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:609) at net.sourceforge.jnlp.cache.ResourceTracker.access$400(ResourceTracker.java:70) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1103) at java.lang.Thread.run(Thread.java:679) java.io.FileNotFoundException: /home/omajid/.icedtea/cache/0/http/www.sweethome3d.com/SweetHome3D.jnlp.info (No such file or directory) at java.io.FileOutputStream.open(Native Method) at java.io.FileOutputStream.(FileOutputStream.java:209) at java.io.FileOutputStream.(FileOutputStream.java:160) at net.sourceforge.jnlp.util.PropertiesFile.store(PropertiesFile.java:137) at net.sourceforge.jnlp.cache.CacheEntry.store(CacheEntry.java:162) at net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:808) at net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:609) at net.sourceforge.jnlp.cache.ResourceTracker.access$400(ResourceTracker.java:70) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1103) at java.lang.Thread.run(Thread.java:679) .... snip .... java.io.FileNotFoundException: /home/omajid/.icedtea/cache/10/http/www.sweethome3d.com/lib/linux/x64/java3d.jar.info (No such file or directory) at java.io.RandomAccessFile.open(Native Method) at java.io.RandomAccessFile.(RandomAccessFile.java:233) at java.io.RandomAccessFile.(RandomAccessFile.java:118) at net.sourceforge.jnlp.util.FileUtils.getFileLock(FileUtils.java:310) at net.sourceforge.jnlp.cache.CacheUtil.lockFile(CacheUtil.java:634) at net.sourceforge.jnlp.cache.CacheEntry.lock(CacheEntry.java:176) at net.sourceforge.jnlp.cache.ResourceTracker.downloadResource(ResourceTracker.java:633) at net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:621) at net.sourceforge.jnlp.cache.ResourceTracker.access$400(ResourceTracker.java:70) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1103) at java.lang.Thread.run(Thread.java:679) JAR http://www.sweethome3d.com/lib/linux/x64/java3d.jar not found. Continuing. net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not initialize application. at net.sourceforge.jnlp.Launcher.createApplication(Launcher.java:773) at net.sourceforge.jnlp.Launcher.launchApplication(Launcher.java:551) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:884) Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Cannot grant permissions to unsigned jars. at net.sourceforge.jnlp.runtime.JNLPClassLoader.setSecurity(JNLPClassLoader.java:260) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:180) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:294) at net.sourceforge.jnlp.Launcher.createApplication(Launcher.java:765) ... 2 more Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Application Error: Cannot grant permissions to unsigned jars. at net.sourceforge.jnlp.runtime.JNLPClassLoader.setSecurity(JNLPClassLoader.java:260) at net.sourceforge.jnlp.runtime.JNLPClassLoader.(JNLPClassLoader.java:180) at net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:294) at net.sourceforge.jnlp.Launcher.createApplication(Launcher.java:765) at net.sourceforge.jnlp.Launcher.launchApplication(Launcher.java:551) at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:884) Failed Starting the application. Lets run it again. $ ~/code/icedtea-web-image/bin/javaws SweetHome3D.jnlp java.io.FileNotFoundException: /home/omajid/.icedtea/cache/0/http/www.sweethome3d.com/SweetHome3D.jnlp.info (No such file or directory) at java.io.RandomAccessFile.open(Native Method) at java.io.RandomAccessFile.(RandomAccessFile.java:233) at java.io.RandomAccessFile.(RandomAccessFile.java:118) at net.sourceforge.jnlp.util.FileUtils.getFileLock(FileUtils.java:310) at net.sourceforge.jnlp.cache.CacheUtil.lockFile(CacheUtil.java:634) at net.sourceforge.jnlp.cache.CacheEntry.lock(CacheEntry.java:176) at net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:766) at net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:609) at net.sourceforge.jnlp.cache.ResourceTracker.access$400(ResourceTracker.java:70) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1103) at java.lang.Thread.run(Thread.java:679) java.io.FileNotFoundException: /home/omajid/.icedtea/cache/0/http/www.sweethome3d.com/SweetHome3D.jnlp.info (No such file or directory) at java.io.FileOutputStream.open(Native Method) at java.io.FileOutputStream.(FileOutputStream.java:209) at java.io.FileOutputStream.(FileOutputStream.java:160) at net.sourceforge.jnlp.util.PropertiesFile.store(PropertiesFile.java:137) at net.sourceforge.jnlp.cache.CacheEntry.store(CacheEntry.java:162) at net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:808) at net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:609) at net.sourceforge.jnlp.cache.ResourceTracker.access$400(ResourceTracker.java:70) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1103) at java.lang.Thread.run(Thread.java:679) java.io.FileNotFoundException: /home/omajid/.icedtea/cache/0/http/www.sweethome3d.com/SweetHome3D.jnlp.info (No such file or directory) at java.io.RandomAccessFile.open(Native Method) at java.io.RandomAccessFile.(RandomAccessFile.java:233) at java.io.RandomAccessFile.(RandomAccessFile.java:118) at net.sourceforge.jnlp.util.FileUtils.getFileLock(FileUtils.java:310) at net.sourceforge.jnlp.cache.CacheUtil.lockFile(CacheUtil.java:634) at net.sourceforge.jnlp.cache.CacheEntry.lock(CacheEntry.java:176) at net.sourceforge.jnlp.cache.ResourceTracker.downloadResource(ResourceTracker.java:633) at net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:621) at net.sourceforge.jnlp.cache.ResourceTracker.access$400(ResourceTracker.java:70) at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1103) at java.lang.Thread.run(Thread.java:679) I get a few exceptions on startup, but the application itself works fine. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From andrew at icedtea.classpath.org Thu May 19 15:32:37 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 19 May 2011 22:32:37 +0000 Subject: /hg/icedtea: 5 new changesets Message-ID: changeset c718b8720581 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c718b8720581 author: Xerxes R?nby date: Thu May 19 23:19:12 2011 +0100 Fix icedtea-boot build with --enable-jamvm. 2011-02-22 Xerxes Ranby Fix icedtea-boot build with --enable-jamvm (stamps /icedtea-boot.stamp): Add stamps/jamvm.stamp changeset 8e028745e884 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8e028745e884 author: Xerxes R?nby date: Thu May 19 23:26:01 2011 +0100 JamVM: Try --with-additional-vms=jamvm topping! 2011-02-23 Xerxes Ranby JamVM: Try --with-additional-vms=jamvm topping! * NEWS: Updated. * Makefile.am (stamps/add-jamvm.stamp): New make target. (clean-add-jamvm): Likewise. (stamps/add-jamvm-debug.stamp): Likewise. (clean-add-jamvm-debug): Likewise. (.PHONY): Add clean-add-jamvm and clean-add-jamvm-debug. (stamps/icedtea-stage2.stamp): Add stamps/add-jamvm.stamp. (clean-icedtea-stage2): Add clean-add-jamvm. (stamps /icedtea-debug-stage2.stamp): Add stamps/add-jamvm- debug.stamp. (clean-icedtea-debug-stage2): Add clean-add- jamvm-debug. * acinclude.m4 (IT_CHECK_ADDITIONAL_VMS): Set add_vm_jamvm if jamvm are found. (BUILD_JAMVM): Add check for add_vm_jamvm. (ADD_JAMVM_BUILD): New conditional dependent on add_vm_jamvm. changeset d327a9da4588 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d327a9da4588 author: Xerxes R?nby date: Wed Feb 23 16:54:17 2011 +0100 Switch to using IcedTea server for JamVM drops too. 2011-02-23 Xerxes Ranby * Makefile.am: (JAMVM_BASE_URL): Switch to using IcedTea server for JamVM drops too. (JAMVM_VERSION): Updated to latest JamVM revision. (JAMVM_SHA256SUM): Updated. changeset bc3f282f0bc5 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=bc3f282f0bc5 author: Xerxes R?nby date: Thu May 19 23:28:51 2011 +0100 Add --with-jamvm-src-zip support. 2011-02-23 Xerxes Ranby JamVM: configure --with-jamvm-src-zip * NEWS: Updated. * Makefile.am (stamps/download-jamvm.stamp): Link in jamvm source zip dependent on USE_ALT_JAMVM_SRC_ZIP * acinclude.m4 (IT_CHECK_WITH_JAMVM_SRC_ZIP): New macro. (USE_ALT_JAMVM_SRC_ZIP): New conditional. (ALT_JAMVM_SRC_ZIP): New variable. * configure.ac: Call IT_CHECK_WITH_JAMVM_SRC_ZIP. changeset 526e140c51c9 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=526e140c51c9 author: Andrew John Hughes date: Thu May 19 23:32:31 2011 +0100 Merge diffstat: ChangeLog | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 68 ++++++++++++++++++++++++++++++++++++++++++++--------------- NEWS | 2 + acinclude.m4 | 26 +++++++++++++++++++++- configure.ac | 1 + 5 files changed, 135 insertions(+), 20 deletions(-) diffs (284 lines): diff -r 0f78ff523f7f -r 526e140c51c9 ChangeLog --- a/ChangeLog Thu May 19 01:25:06 2011 +0100 +++ b/ChangeLog Thu May 19 23:32:31 2011 +0100 @@ -1,3 +1,61 @@ +2011-02-23 Xerxes Ranby + + JamVM: configure --with-jamvm-src-zip + * NEWS: Updated. + * Makefile.am (stamps/download-jamvm.stamp): + Link in jamvm source zip dependent on USE_ALT_JAMVM_SRC_ZIP + * acinclude.m4 (IT_CHECK_WITH_JAMVM_SRC_ZIP): New macro. + (USE_ALT_JAMVM_SRC_ZIP): New conditional. + (ALT_JAMVM_SRC_ZIP): New variable. + * configure.ac: Call IT_CHECK_WITH_JAMVM_SRC_ZIP. + +2011-02-23 Xerxes Ranby + + * Makefile.am: (JAMVM_BASE_URL): Switch to using IcedTea + server for JamVM drops too. + (JAMVM_VERSION): Updated to latest JamVM revision. + (JAMVM_SHA256SUM): Updated. + +2011-02-23 Xerxes Ranby + + JamVM: Try --with-additional-vms=jamvm topping! + * NEWS: Updated. + * Makefile.am (stamps/add-jamvm.stamp): New make target. + (clean-add-jamvm): Likewise. + (stamps/add-jamvm-debug.stamp): Likewise. + (clean-add-jamvm-debug): Likewise. + (.PHONY): Add clean-add-jamvm and clean-add-jamvm-debug. + (stamps/icedtea-stage2.stamp): Add stamps/add-jamvm.stamp. + (clean-icedtea-stage2): Add clean-add-jamvm. + (stamps/icedtea-debug-stage2.stamp): + Add stamps/add-jamvm-debug.stamp. + (clean-icedtea-debug-stage2): Add clean-add-jamvm-debug. + * acinclude.m4 (IT_CHECK_ADDITIONAL_VMS): + Set add_vm_jamvm if jamvm are found. + (BUILD_JAMVM): Add check for add_vm_jamvm. + (ADD_JAMVM_BUILD): New conditional dependent on add_vm_jamvm. + +2011-02-22 Xerxes Ranby + + Fix icedtea-boot build with --enable-jamvm + (stamps/icedtea-boot.stamp): Add stamps/jamvm.stamp + +2011-05-20 Pavel Tisnovsky + + * Makefile.am: + (HOTSPOT_CHANGESET): Test enhancement - make the test compatible with + OpenJDK7/IcedTea7, disabling printing unnecessary information to error + output. + (HOTSPOT_SHA256SUM): Likewise + +2011-05-19 Pavel Tisnovsky + + * Makefile.am: + (JDK_CHANGESET): Fixed behaviour of regression test + PrintAllXcheckJNI.java, added check if test frame is really initialized + to avoid exception thrown when BufferedImage is created. + (JDK_SHA256SUM): Likewise + 2011-05-18 Andrew John Hughes * Makefile.am: diff -r 0f78ff523f7f -r 526e140c51c9 Makefile.am --- a/Makefile.am Thu May 19 01:25:06 2011 +0100 +++ b/Makefile.am Thu May 19 23:32:31 2011 +0100 @@ -3,18 +3,18 @@ OPENJDK_VERSION = b136 CORBA_CHANGESET = b62418551e20 -HOTSPOT_CHANGESET = 74ff0c608935 +HOTSPOT_CHANGESET = 591c7dc0b2ee JAXP_CHANGESET = 1c2f25bf36b1 JAXWS_CHANGESET = 339c2d381d80 -JDK_CHANGESET = fcc5e53dca33 +JDK_CHANGESET = 1571aa7abe47 LANGTOOLS_CHANGESET = 8e26c4aee63c OPENJDK_CHANGESET = d4aea1a51d62 CORBA_SHA256SUM = 60f8494b1ebf58db75fe8871dcbee1f6e4bd1d8d6c9b6ce49dad7a6a6340c4ac -HOTSPOT_SHA256SUM = fe5d240d87a5680f05a80236a087a67ad7ab190d8ea92057bf5180a50d233765 +HOTSPOT_SHA256SUM = 6b2c5c9f5c1c603f742ddabb567d4abac23b91186ead4c1fc9d9643a07798e82 JAXP_SHA256SUM = 9db874ee86a073776674b138c3bcd0b1b2bc90d31ed48d59f88021e93ac8a8d0 JAXWS_SHA256SUM = 078ad45ced056d147344418e72dce6dca65e01c4ebf2b7008b74733774bcb24c -JDK_SHA256SUM = 128026428ea4aa9068964e50df25013971c80f1ba63c600f7d15418e49031627 +JDK_SHA256SUM = 6d12de7cecd01c4ddef1a28fc393dfe5f8d66dea80b7d1484e028e8b921ac219 LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39 OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d @@ -24,14 +24,9 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -# The jamvm-3f02679901ac46985c9c3ac3f1b99e8eaf6a7e27.tar.gz got fetched from -# http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/snapshot/jamvm-3f02679901ac46985c9c3ac3f1b99e8eaf6a7e27.tar.gz -# Unfortunally the generated .tar.gz by the berlios cgit snapshot function -# keeps changing sha256sum. I have hosted a snapshot on labb.zafena.se -# while we wait for the final JamVM 1.6.0 release. -JAMVM_VERSION = 3f02679901ac46985c9c3ac3f1b99e8eaf6a7e27 -JAMVM_SHA256SUM = 396daf08896a71cfcddfabfbaf2d8b3f07557d8143eaaa93be25e2d80f30e165 -JAMVM_BASE_URL = http://labb.zafena.se/jamvm +JAMVM_VERSION = 10329d9f3205698af125bba131b4f47339e81d90 +JAMVM_SHA256SUM = 0e87f22bc6a35c327ab343e7ca0e89512e3797aff93ee8a5539f0babfbd40f9b +JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz @@ -755,7 +750,7 @@ clean-icedtea icedtea-stage2 clean-icedtea-boot \ clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \ clean-drops jtregcheck clean-remove-intree-libraries \ - clean-jamvm clean-extract-jamvm + clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug env: @echo 'unset JAVA_HOME' @@ -1099,6 +1094,9 @@ stamps/download-jamvm.stamp: if BUILD_JAMVM +if USE_ALT_JAMVM_SRC_ZIP + ln -sf $(ALT_JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP) +endif if ! echo "$(JAMVM_SHA256SUM) $(JAMVM_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \ @@ -1878,19 +1876,19 @@ rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ - stamps/add-zero.stamp + stamps/add-zero.stamp stamps/add-jamvm.stamp mkdir -p stamps touch $@ -clean-icedtea-stage2: +clean-icedtea-stage2: clean-add-jamvm rm -f stamps/icedtea-stage2.stamp stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \ - stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp + stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp mkdir -p stamps touch $@ -clean-icedtea-debug-stage2: +clean-icedtea-debug-stage2: clean-add-jamvm-debug rm -f stamps/icedtea-debug-stage2.stamp # OpenJDK boot Targets @@ -1898,7 +1896,7 @@ stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \ stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/cacao.stamp \ - stamps/rewrite-rhino.stamp + stamps/rewrite-rhino.stamp stamps/jamvm.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV_BOOT) \ -C openjdk-boot \ @@ -2083,6 +2081,40 @@ rm -rf jamvm rm -f stamps/jamvm.stamp +# Targets for additional VMs + +stamps/add-jamvm.stamp: stamps/icedtea.stamp stamps/jamvm.stamp +if ADD_JAMVM_BUILD + mkdir -p $(BUILD_JRE_ARCH_DIR)/jamvm + install -m 644 jamvm/install/lib/libjvm.so \ + $(BUILD_JRE_ARCH_DIR)/jamvm/ + printf -- '-jamvm KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +else + printf -- '-jamvm ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif + touch $@ + +clean-add-jamvm: + rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm + sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg + rm -f stamps/add-jamvm.stamp + +stamps/add-jamvm-debug.stamp: stamps/icedtea-debug.stamp stamps/jamvm.stamp +if ADD_JAMVM_BUILD + mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm + install -m 644 jamvm/install/lib/libjvm.so \ + $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm/ + printf -- '-jamvm KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +else + printf -- '-jamvm ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif + touch $@ + +clean-add-jamvm-debug: + rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm + sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg + rm -f stamps/add-jamvm-debug.stamp + # CACAO stamps/cacao.stamp: stamps/rt.stamp diff -r 0f78ff523f7f -r 526e140c51c9 NEWS --- a/NEWS Thu May 19 01:25:06 2011 +0100 +++ b/NEWS Thu May 19 23:32:31 2011 +0100 @@ -3,6 +3,8 @@ * NetX and the plugin moved to the IcedTea-Web project with a separate release cycle. * Added out-of-the-box JamVM support using --enable-jamvm +* Allow building of JamVM beside the default VM by using --with-additional-vms=jamvm +* Allow the location of the JamVM source zip to be specified using --with-jamvm-src-zip * Bug fixes - PR616, PR99: Don't statically link libstdc++ * Zero/Shark diff -r 0f78ff523f7f -r 526e140c51c9 acinclude.m4 --- a/acinclude.m4 Thu May 19 01:25:06 2011 +0100 +++ b/acinclude.m4 Thu May 19 23:32:31 2011 +0100 @@ -1272,7 +1272,7 @@ AC_MSG_CHECKING([for additional virtual machines to build]) AC_ARG_WITH(additional-vms, AC_HELP_STRING([--with-additional-vms=VM-LIST], - [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `zero' and `shark'.]), + [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `jamvm', `zero' and `shark'.]), [ if test "x${withval}" != x ; then with_additional_vms=${withval} @@ -1281,6 +1281,7 @@ xcacao) add_vm_cacao=yes;; xzero) add_vm_zero=yes;; xshark) add_vm_shark=yes;; + xjamvm) add_vm_jamvm=yes;; *) AC_MSG_ERROR([proper usage is --with-additional-vms=vm1,vm2,...]) esac done @@ -1291,12 +1292,16 @@ fi AC_MSG_RESULT($with_additional_vms) +AM_CONDITIONAL(ADD_JAMVM_BUILD, test x$add_vm_jamvm != x) AM_CONDITIONAL(ADD_CACAO_BUILD, test x$add_vm_cacao != x) AM_CONDITIONAL(ADD_ZERO_BUILD, test x$add_vm_zero != x || test x$add_vm_shark != x) AM_CONDITIONAL(ADD_SHARK_BUILD, test x$add_vm_shark != x) -AM_CONDITIONAL(BUILD_JAMVM, test "x${ENABLE_JAMVM}" = xyes) +AM_CONDITIONAL(BUILD_JAMVM, test x$add_vm_jamvm != x || test "x${ENABLE_JAMVM}" = xyes) AM_CONDITIONAL(BUILD_CACAO, test x$add_vm_cacao != x || test "x${WITH_CACAO}" = xyes) +if test "x${ENABLE_JAMVM}" = xyes && test "x${ADD_JAMVM_BUILD_TRUE}" = x; then + AC_MSG_ERROR([additional vm is the default vm]) +fi if test "x${WITH_CACAO}" = xyes && test "x${ADD_CACAO_BUILD_TRUE}" = x; then AC_MSG_ERROR([additional vm is the default vm]) fi @@ -1900,3 +1905,20 @@ AM_CONDITIONAL(ENABLE_JAMVM, test x"${ENABLE_JAMVM}" = "xyes") AC_SUBST(ENABLE_JAMVM) ]) + +AC_DEFUN([IT_CHECK_WITH_JAMVM_SRC_ZIP], +[ + AC_MSG_CHECKING([for a JamVM source zip]) + AC_ARG_WITH([jamvm-src-zip], + [AS_HELP_STRING(--with-jamvm-src-zip,specify the location of the JamVM source zip)], + [ + ALT_JAMVM_SRC_ZIP=${withval} + AM_CONDITIONAL(USE_ALT_JAMVM_SRC_ZIP, test x = x) + ], + [ + ALT_JAMVM_SRC_ZIP="not specified" + AM_CONDITIONAL(USE_ALT_JAMVM_SRC_ZIP, test x != x) + ]) + AC_MSG_RESULT(${ALT_JAMVM_SRC_ZIP}) + AC_SUBST(ALT_JAMVM_SRC_ZIP) +]) diff -r 0f78ff523f7f -r 526e140c51c9 configure.ac --- a/configure.ac Thu May 19 01:25:06 2011 +0100 +++ b/configure.ac Thu May 19 23:32:31 2011 +0100 @@ -150,6 +150,7 @@ AC_CHECK_WITH_CACAO_HOME AC_CHECK_WITH_CACAO_SRC_ZIP IT_CHECK_ENABLE_JAMVM +IT_CHECK_WITH_JAMVM_SRC_ZIP DISABLE_OPTIMIZATIONS SET_SHARK_BUILD From andrew at icedtea.classpath.org Thu May 19 15:39:27 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 19 May 2011 22:39:27 +0000 Subject: /hg/icedtea: 6 new changesets Message-ID: changeset decad30090ca in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=decad30090ca author: Xerxes R?nby date: Thu Feb 24 21:43:07 2011 +0100 Fix warnings, check if files exist before renaming. 2011-02-24 Xerxes Ranby * Makefile.am (stamps/download-cacao.stamp): Fix warning, check if the CACAO_SRC_ZIP file exist before trying to rename it. (stamps/download-jamvm.stamp): Likewise for JAMVM_SRC_ZIP. (stamps/download-openjdk.stamp): Likewise for OPENJDK_SRC_ZIP and HOTSPOT_SRC_ZIP. changeset e90fab517c39 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e90fab517c39 author: Xerxes R?nby date: Thu May 19 23:34:43 2011 +0100 PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. 2011-02-24 Xerxes Ranby PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. * NEWS: Updated. * Makefile.am (ICEDTEA_PATCHES): Add JamVM patches if BUILD_JAMVM are defined. * patches/jamvm/ignore-more-XX-options.patch: New JamVM patch. changeset 7fa3d3774850 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7fa3d3774850 author: Xerxes R?nby date: Thu May 19 23:36:26 2011 +0100 JamVM: Fix configure --enable-jamvm full bootstrap build. 2011-02-27 Xerxes Ranby JamVM: Fix configure --enable-jamvm full bootstrap build. * NEWS: Updated. * Makefile.am: (JAMVM_VERSION): Updated to latest JamVM revision. (JAMVM_SHA256SUM): Updated. changeset 474b01bedbd0 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=474b01bedbd0 author: Xerxes R?nby date: Wed Mar 02 23:28:59 2011 +0100 Make JamVM ignore 29 more unrecognised options that fail on jtreg. 2011-03-02 Xerxes Ranby * patches/jamvm/ignore-more-XX-options.patch: Make JamVM ignore more unrecognised options that fail on jtreg. -esa, -Xbatch, -Xcomp, -Xverify:all, -XX:+AggressiveOpts, -XX:-BlockLayoutRotateLoops, -XX:CompileCommand=, -XX:CompileOnly=, -XX:CompileThreshold, -XX:+DeoptimizeALot, -XX:+DoEscapeAnalysis, -XX:HeapBaseMinAddress, -XX:+IgnoreUnrecognizedVMOptions, -XX:-Inline, -XX:-InlineObjectHash, -XX:InlineSmallCode=, -XX:LoopUnrollLimit=, -XX:-LoopUnswitching, -XX:MaxInlineSize=, -XX:+OptimizeFill, -XX:+PrintCompilation, -XX:-ProfileInterpreter, -XX:+ScavengeALot, -XX:+UnlockDiagnosticVMOptions, -XX:-UseCompressedOops, -XX:+UseCompressedOops, -XX:+UseConcMarkSweepGC, -XX:UseSSE= and -XX:+VerifyBeforeGC changeset d8aa2906143e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d8aa2906143e author: Xerxes R?nby date: Thu Mar 03 15:32:46 2011 +0100 JamVM: Ignore all unknown options. 2011-03-03 Xerxes Ranby JamVM: Ignore all unknown options. * Makefile.am: Replaced JamVM patch. * patches/jamvm/ignore-more-XX-options.patch: Removed. * patches/jamvm/ignore-unknown-options.patch: Added. changeset 1a8a40f21e15 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1a8a40f21e15 author: Xerxes R?nby date: Thu May 19 23:39:17 2011 +0100 CACAO: Ignore all unknown options. 2011-03-04 Xerxes Ranby CACAO: Ignore all unknown options. * Makefile.am: Add CACAO patch. * patches/cacao/ignore-unknown-options.patch: Added. diffstat: ChangeLog | 53 ++++++++++++++++++++++++++++++ Makefile.am | 20 +++++++--- NEWS | 2 + patches/cacao/ignore-unknown-options.patch | 16 +++++++++ patches/jamvm/ignore-unknown-options.patch | 12 ++++++ 5 files changed, 96 insertions(+), 7 deletions(-) diffs (184 lines): diff -r 526e140c51c9 -r 1a8a40f21e15 ChangeLog --- a/ChangeLog Thu May 19 23:32:31 2011 +0100 +++ b/ChangeLog Thu May 19 23:39:17 2011 +0100 @@ -1,3 +1,56 @@ +2011-03-04 Xerxes Ranby + + CACAO: Ignore all unknown options. + * Makefile.am: Add CACAO patch. + * patches/cacao/ignore-unknown-options.patch: Added. + +2011-03-03 Xerxes Ranby + + JamVM: Ignore all unknown options. + * Makefile.am: Replaced JamVM patch. + * patches/jamvm/ignore-more-XX-options.patch: Removed. + * patches/jamvm/ignore-unknown-options.patch: Added. + +2011-03-02 Xerxes Ranby + + * patches/jamvm/ignore-more-XX-options.patch: + Make JamVM ignore more unrecognised options that fail on jtreg. + -esa, -Xbatch, -Xcomp, -Xverify:all, -XX:+AggressiveOpts, + -XX:-BlockLayoutRotateLoops, -XX:CompileCommand=, -XX:CompileOnly=, + -XX:CompileThreshold, -XX:+DeoptimizeALot, -XX:+DoEscapeAnalysis, + -XX:HeapBaseMinAddress, -XX:+IgnoreUnrecognizedVMOptions, -XX:-Inline, + -XX:-InlineObjectHash, -XX:InlineSmallCode=, -XX:LoopUnrollLimit=, + -XX:-LoopUnswitching, -XX:MaxInlineSize=, -XX:+OptimizeFill, + -XX:+PrintCompilation, -XX:-ProfileInterpreter, -XX:+ScavengeALot, + -XX:+UnlockDiagnosticVMOptions, -XX:-UseCompressedOops, + -XX:+UseCompressedOops, -XX:+UseConcMarkSweepGC, -XX:UseSSE= and + -XX:+VerifyBeforeGC + +2011-02-27 Xerxes Ranby + + JamVM: Fix configure --enable-jamvm full bootstrap build. + * NEWS: Updated. + * Makefile.am: + (JAMVM_VERSION): Updated to latest JamVM revision. + (JAMVM_SHA256SUM): Updated. + +2011-02-24 Xerxes Ranby + + PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. + * NEWS: Updated. + * Makefile.am (ICEDTEA_PATCHES): + Add JamVM patches if BUILD_JAMVM are defined. + * patches/jamvm/ignore-more-XX-options.patch: New JamVM patch. + +2011-02-24 Xerxes Ranby + + * Makefile.am (stamps/download-cacao.stamp): + Fix warning, check if the CACAO_SRC_ZIP file exist + before trying to rename it. + (stamps/download-jamvm.stamp): Likewise for JAMVM_SRC_ZIP. + (stamps/download-openjdk.stamp): + Likewise for OPENJDK_SRC_ZIP and HOTSPOT_SRC_ZIP. + 2011-02-23 Xerxes Ranby JamVM: configure --with-jamvm-src-zip diff -r 526e140c51c9 -r 1a8a40f21e15 Makefile.am --- a/Makefile.am Thu May 19 23:32:31 2011 +0100 +++ b/Makefile.am Thu May 19 23:39:17 2011 +0100 @@ -24,8 +24,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -JAMVM_VERSION = 10329d9f3205698af125bba131b4f47339e81d90 -JAMVM_SHA256SUM = 0e87f22bc6a35c327ab343e7ca0e89512e3797aff93ee8a5539f0babfbd40f9b +JAMVM_VERSION = 30c4a6b93ffa385833360921bfc613829fb081c9 +JAMVM_SHA256SUM = e77434a7d02d75de7fe44e9e1d7d6a3fd7ddcd5447ddd175fde2a7ccb40f8838 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz @@ -302,7 +302,8 @@ patches/cacao/arm-arch-defines.patch \ patches/cacao/jsig.patch \ patches/cacao/6714758.patch \ - patches/cacao/memory.patch + patches/cacao/memory.patch \ + patches/cacao/ignore-unknown-options.patch endif if WITH_CACAO @@ -310,6 +311,11 @@ patches/cacao/ignore-tests.patch endif +if BUILD_JAMVM +ICEDTEA_PATCHES += \ + patches/jamvm/ignore-unknown-options.patch +endif + if ENABLE_PULSE_JAVA ICEDTEA_PATCHES += \ patches/pulse-soundproperties.patch @@ -923,7 +929,7 @@ if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \ - if [ $(OPENJDK_SRC_ZIP) ] ; \ + if [ -e $(OPENJDK_SRC_ZIP) ] ; \ then \ mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \ fi ; \ @@ -1019,7 +1025,7 @@ if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \ - if [ $(HOTSPOT_SRC_ZIP) ] ; \ + if [ -e $(HOTSPOT_SRC_ZIP) ] ; \ then \ mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \ fi ; \ @@ -1073,7 +1079,7 @@ if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \ - if [ $(CACAO_SRC_ZIP) ] ; \ + if [ -e $(CACAO_SRC_ZIP) ] ; \ then \ mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \ fi ; \ @@ -1100,7 +1106,7 @@ if ! echo "$(JAMVM_SHA256SUM) $(JAMVM_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \ - if [ $(JAMVM_SRC_ZIP) ] ; \ + if [ -e $(JAMVM_SRC_ZIP) ] ; \ then \ mv $(JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP).old ; \ fi ; \ diff -r 526e140c51c9 -r 1a8a40f21e15 NEWS --- a/NEWS Thu May 19 23:32:31 2011 +0100 +++ b/NEWS Thu May 19 23:39:17 2011 +0100 @@ -5,8 +5,10 @@ * Added out-of-the-box JamVM support using --enable-jamvm * Allow building of JamVM beside the default VM by using --with-additional-vms=jamvm * Allow the location of the JamVM source zip to be specified using --with-jamvm-src-zip +* JamVM builds can bootstrap and are self-hosting. * Bug fixes - PR616, PR99: Don't statically link libstdc++ + - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. * Zero/Shark - Match Shark in icedtea6, makes OSR work by removing vestigal check. - LLVM 2.7 non-product fixes. diff -r 526e140c51c9 -r 1a8a40f21e15 patches/cacao/ignore-unknown-options.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/ignore-unknown-options.patch Thu May 19 23:39:17 2011 +0100 @@ -0,0 +1,17 @@ +Index: cacao/cacao/src/vm/vm.cpp +=================================================================== +--- cacao.orig/cacao/src/vm/vm.cpp 2011-03-04 00:20:24.000000000 +0100 ++++ cacao/cacao/src/vm/vm.cpp 2011-03-04 01:12:45.000000000 +0100 +@@ -1239,9 +1239,10 @@ + + #endif + default: +- printf("Unknown option: %s\n", ++ fprintf(stderr,"Unknown option: %s\n", + vm_args->options[opt_index].optionString); +- usage(); ++ opt_index++; ++ /* Ignore */ + } + } + diff -r 526e140c51c9 -r 1a8a40f21e15 patches/jamvm/ignore-unknown-options.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/jamvm/ignore-unknown-options.patch Thu May 19 23:39:17 2011 +0100 @@ -0,0 +1,13 @@ +Index: jamvm/jamvm/src/jni.c +=================================================================== +--- jamvm.orig/jamvm/src/jni.c 2011-02-27 04:35:37.000000000 +0100 ++++ jamvm/jamvm/src/jni.c 2011-03-03 13:48:31.897900208 +0100 +@@ -1642,7 +1642,7 @@ + /* Ignore */ + } else if(!vm_args->ignoreUnrecognized) { + optError(args, "Unrecognised option: %s\n", string); +- goto error; ++ /* Ignore */ + } + } + From andrew at icedtea.classpath.org Thu May 19 16:26:14 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 19 May 2011 23:26:14 +0000 Subject: /hg/icedtea: 9 new changesets Message-ID: changeset 709acc7941bf in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=709acc7941bf author: Xerxes R?nby date: Fri May 20 00:08:24 2011 +0100 CACAO PR157: ARM SMP Assertion thinlock failed. 2011-03-11 Xerxes Ranby CACAO PR157: ARM SMP Assertion thinlock failed. * NEWS: Updated. * Makefile.am: Add new CACAO patch. * patches/cacao/arm-memory-barrier.patch: New patch. changeset 58b8da72031a in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=58b8da72031a author: Xerxes R?nby date: Fri May 20 00:16:49 2011 +0100 JamVM: mips 2011-03-11 Xerxes Ranby JamVM: mips * NEWS: Updated. * Makefile.am: Add new JamVM patch. (JAMVM_VERSION): Updated to latest JamVM revision. (JAMVM_SHA256SUM): Updated. * patches/jamvm/mips64el.patch: New patch. changeset 8a8ff2600f18 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8a8ff2600f18 author: Xerxes R?nby date: Sun Mar 13 01:00:55 2011 +0100 JamVM: Compile interp using -marm to work on ARM Thumb2 systems. 2011-03-13 Xerxes Ranby Robert Loughter JamVM: Compile interp using -marm to work on ARM Thumb2 systems. * Makefile.am: Add new JamVM patch. * patches/jamvm/arm-interp_cflags-marm.patch: New patch. changeset 4caadf3a7f13 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4caadf3a7f13 author: Xerxes R?nby date: Fri May 20 00:19:55 2011 +0100 JamVM: Update to latest JamVM revision and remove upstreamed pathes. 2011-03-17 Xerxes Ranby JamVM: Update to latest JamVM revision and remove upstreamed pathes. Update contains the following new JamVM improvements: Handle O_DELETE in JVM_Open Minor performance improvement on ARM First set of changes to support JamVM/OpenJDK on MacOS X Minor memory leak (missing free) Handle integer overflow on i386/amd64 * NEWS: Updated. * Makefile.am: Remove upstreamed JamVM patches. (JAMVM_VERSION): Updated to latest JamVM revision. (JAMVM_SHA256SUM): Updated. * patches/jamvm/arm-interp_cflags-marm.patch: Deleted. * patches/jamvm/mips64el.patch: Deleted. changeset 1128225eff23 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1128225eff23 author: Xerxes R?nby date: Fri May 20 00:22:49 2011 +0100 CACAO: Update to latest CACAO revision and remove upstreamed pathes. 2011-03-17 Xerxes Ranby CACAO: Update to latest CACAO revision and remove upstreamed pathes. Update contains the following new CACAO improvements: Fixes build for newer gcc (at least 4.4) on PPC64, breaks older gcc. CA123: LD_LIBRARY_PATH and java.library.path. CA143: don't hang with invalid locale. CA144: aligned patchers on x86_64. CA148: support for LCMP bytecode. CA152: Calling Policy.setPolicy with a new Policy object has no effect on the DefaultSecurityManager. CA156: uncaughtExceptionHandler doesn't work with OpenJDK 6 b21. * NEWS: Updated. * Makefile.am: Remove upstreamed CACAO patches. (CACAO_VERSION): Updated to latest CACAO revision. (CACAO_SHA256SUM): Updated. * patches/cacao/arm-arch-defines.patch: Deleted. * patches/cacao/arm-memory-barrier.patch: Deleted. * patches/cacao/ignore-unknown-options.patch: Deleted. changeset 801c26ed308b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=801c26ed308b author: Xerxes R?nby date: Mon Mar 21 15:42:53 2011 +0100 JamVM: Fix reflective array access. 2011-03-21 Xerxes Ranby JamVM: Fix reflective array access. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated to latest JamVM revision. (JAMVM_SHA256SUM): Updated. changeset 14141aa5f9e7 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=14141aa5f9e7 author: Xerxes R?nby date: Thu Mar 24 13:05:27 2011 +0100 JamVM: Base default min and max heap size on physical memory. 2011-03-24 Xerxes Ranby JamVM: Base default min and max heap size on physical memory. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated to latest JamVM revision. (JAMVM_SHA256SUM): Updated. changeset 49296ef62eeb in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=49296ef62eeb author: Xerxes R?nby date: Sat Mar 26 08:30:50 2011 +0100 JamVM: Handle overflow in getPhysicalMemory(). 2011-03-26 Xerxes Ranby JamVM: Handle overflow in getPhysicalMemory(). * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated to latest JamVM revision. (JAMVM_SHA256SUM): Updated. changeset fe53d17d70d9 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fe53d17d70d9 author: Xerxes R?nby date: Fri May 20 00:26:08 2011 +0100 CACAO threadlist & threadobject improvements. 2011-05-05 Xerxes R?nby CACAO threadlist & threadobject improvements. * NEWS: Updated. * Makefile.am (CACAO_VERSION): Updated to latest CACAO revision. (CACAO_SHA256SUM): Updated. diffstat: ChangeLog | 91 ++++++++++++++++++++++++++++++ Makefile.am | 12 +-- NEWS | 26 ++++++++ patches/cacao/arm-arch-defines.patch | 30 --------- patches/cacao/ignore-unknown-options.patch | 16 ----- 5 files changed, 122 insertions(+), 53 deletions(-) diffs (232 lines): diff -r 1a8a40f21e15 -r fe53d17d70d9 ChangeLog --- a/ChangeLog Thu May 19 23:39:17 2011 +0100 +++ b/ChangeLog Fri May 20 00:26:08 2011 +0100 @@ -1,3 +1,94 @@ +2011-05-05 Xerxes R??nby + + CACAO threadlist & threadobject improvements. + * NEWS: Updated. + * Makefile.am + (CACAO_VERSION): Updated to latest CACAO revision. + (CACAO_SHA256SUM): Updated. + +2011-03-26 Xerxes Ranby + + JamVM: Handle overflow in getPhysicalMemory(). + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated to latest JamVM revision. + (JAMVM_SHA256SUM): Updated. + +2011-03-24 Xerxes Ranby + + JamVM: Base default min and max heap size on physical memory. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated to latest JamVM revision. + (JAMVM_SHA256SUM): Updated. + +2011-03-21 Xerxes Ranby + + JamVM: Fix reflective array access. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated to latest JamVM revision. + (JAMVM_SHA256SUM): Updated. + +2011-03-17 Xerxes Ranby + + CACAO: Update to latest CACAO revision and remove upstreamed pathes. + Update contains the following new CACAO improvements: + Fixes build for newer gcc (at least 4.4) on PPC64, breaks older gcc. + CA123: LD_LIBRARY_PATH and java.library.path. + CA143: don't hang with invalid locale. + CA144: aligned patchers on x86_64. + CA148: support for LCMP bytecode. + CA152: Calling Policy.setPolicy with a new Policy object + has no effect on the DefaultSecurityManager. + CA156: uncaughtExceptionHandler doesn't work with OpenJDK 6 b21. + * NEWS: Updated. + * Makefile.am: Remove upstreamed CACAO patches. + (CACAO_VERSION): Updated to latest CACAO revision. + (CACAO_SHA256SUM): Updated. + * patches/cacao/arm-arch-defines.patch: Deleted. + * patches/cacao/arm-memory-barrier.patch: Deleted. + * patches/cacao/ignore-unknown-options.patch: Deleted. + +2011-03-17 Xerxes Ranby + + JamVM: Update to latest JamVM revision and remove upstreamed pathes. + Update contains the following new JamVM improvements: + Handle O_DELETE in JVM_Open + Minor performance improvement on ARM + First set of changes to support JamVM/OpenJDK on MacOS X + Minor memory leak (missing free) + Handle integer overflow on i386/amd64 + * NEWS: Updated. + * Makefile.am: Remove upstreamed JamVM patches. + (JAMVM_VERSION): Updated to latest JamVM revision. + (JAMVM_SHA256SUM): Updated. + * patches/jamvm/arm-interp_cflags-marm.patch: Deleted. + * patches/jamvm/mips64el.patch: Deleted. + +2011-03-13 Xerxes Ranby + Robert Loughter + + JamVM: Compile interp using -marm to work on ARM Thumb2 systems. + * Makefile.am: Add new JamVM patch. + * patches/jamvm/arm-interp_cflags-marm.patch: New patch. + +2011-03-11 Xerxes Ranby + + JamVM: mips + * NEWS: Updated. + * Makefile.am: Add new JamVM patch. + (JAMVM_VERSION): Updated to latest JamVM revision. + (JAMVM_SHA256SUM): Updated. + * patches/jamvm/mips64el.patch: New patch. + +2011-03-11 Xerxes Ranby + + CACAO PR157: ARM SMP Assertion thinlock failed. + * NEWS: Updated. + * Makefile.am: Add new CACAO patch. + * patches/cacao/arm-memory-barrier.patch: New patch. + 2011-03-04 Xerxes Ranby CACAO: Ignore all unknown options. diff -r 1a8a40f21e15 -r fe53d17d70d9 Makefile.am --- a/Makefile.am Thu May 19 23:39:17 2011 +0100 +++ b/Makefile.am Fri May 20 00:26:08 2011 +0100 @@ -18,14 +18,14 @@ LANGTOOLS_SHA256SUM = e1beab78534a3a0fb18404c3c200e8866da275c7c656172c9f295f11203e5f39 OPENJDK_SHA256SUM = 856b791751e56f64cc10e4826eefc9af9882969b179595c9642f7c9771965e7d -CACAO_VERSION = e321b101a9ee -CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444 +CACAO_VERSION = d6264eb66506 +CACAO_SHA256SUM = 94ea7899e806ccbc33a732b5113a8f969d8b1f4ce7ffd27cf04577054f65f63c CACAO_BASE_URL = http://mips.complang.tuwien.ac.at/hg/cacao/archive CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -JAMVM_VERSION = 30c4a6b93ffa385833360921bfc613829fb081c9 -JAMVM_SHA256SUM = e77434a7d02d75de7fe44e9e1d7d6a3fd7ddcd5447ddd175fde2a7ccb40f8838 +JAMVM_VERSION = a95ca049d3bb257d730535a5d5ec3f73a943d0aa +JAMVM_SHA256SUM = 18bb5c97c03fb73f70b481440e3e11803448d327c024d4570a338b899693fefd JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz @@ -299,11 +299,9 @@ ICEDTEA_PATCHES += \ patches/cacao/launcher.patch \ patches/cacao/version.patch \ - patches/cacao/arm-arch-defines.patch \ patches/cacao/jsig.patch \ patches/cacao/6714758.patch \ - patches/cacao/memory.patch \ - patches/cacao/ignore-unknown-options.patch + patches/cacao/memory.patch endif if WITH_CACAO diff -r 1a8a40f21e15 -r fe53d17d70d9 NEWS --- a/NEWS Thu May 19 23:39:17 2011 +0100 +++ b/NEWS Fri May 20 00:26:08 2011 +0100 @@ -1,3 +1,5 @@ +CAX - http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=X + New in release 1.14 (XXXX-XX-XX) * NetX and the plugin moved to the IcedTea-Web project with a separate @@ -9,6 +11,30 @@ * Bug fixes - PR616, PR99: Don't statically link libstdc++ - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. +* JamVM + - Ignore all unknown options. + - Handle overflow in getPhysicalMemory(). + - Base default min and max heap size on physical memory. + - Fix reflective array access. + - Handle O_DELETE in JVM_Open. + - Minor performance improvement on ARM. + - First set of changes to support JamVM/OpenJDK on MacOS X. + - Minor memory leak (missing free). + - Handle integer overflow on i386/amd64. + - On ARM, force interpreter to be built in ARM mode. + - MIPS: 64-bit and interpreter inlining by default. + - Trivial implementation of stubs for MIPS. +* CACAO + - Threadlist & threadobject improvements. + - Ignore all unknown options, but report them. + - Fixes build for newer gcc (at least 4.4) on PPC64, breaks older gcc. + - CA123: LD_LIBRARY_PATH and java.library.path. + - CA143: don't hang with invalid locale. + - CA144: aligned patchers on x86_64. + - CA148: support for LCMP bytecode. + - CA152: Calling Policy.setPolicy with a new Policy object has no effect on the DefaultSecurityManager. + - CA156: uncaughtExceptionHandler doesn't work with OpenJDK 6 b21. + - CA157: ARM SMP Assertion thinlock failed. * Zero/Shark - Match Shark in icedtea6, makes OSR work by removing vestigal check. - LLVM 2.7 non-product fixes. diff -r 1a8a40f21e15 -r fe53d17d70d9 patches/cacao/arm-arch-defines.patch --- a/patches/cacao/arm-arch-defines.patch Thu May 19 23:39:17 2011 +0100 +++ b/patches/cacao/arm-arch-defines.patch Fri May 20 00:26:08 2011 +0100 @@ -16,34 +16,3 @@ AO_INLINE void AO_nop_full() { -diff -Nru cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp cacao/cacao/src/vm/jit/arm/md-atomic.hpp ---- cacao.orig/cacao/src/vm/jit/arm/md-atomic.hpp 2010-05-19 12:14:46.000000000 +0100 -+++ cacao/cacao/src/vm/jit/arm/md-atomic.hpp 2010-06-21 18:35:53.000000000 +0100 -@@ -45,26 +45,7 @@ - */ - inline uint32_t compare_and_swap(volatile uint32_t *p, uint32_t oldval, uint32_t newval) - { -- uint32_t result; -- uint32_t temp; -- -- /* TODO: improve this one! */ -- __asm__ __volatile__ ( -- "1:\t" -- "ldr %0,[%2]\n\t" -- "cmp %0,%4\n\t" -- "bne 2f\n\t" -- "swp %1,%3,[%2]\n\t" -- "cmp %1,%0\n\t" -- "swpne %0,%1,[%2]\n\t" -- "bne 1b\n\t" -- "2:" -- : "=&r" (result), "=&r" (temp) -- : "r" (p), "r" (newval), "r" (oldval) -- : "cc", "memory" -- ); -- -- return result; -+ return __sync_val_compare_and_swap (p, oldval, newval); - } - - diff -r 1a8a40f21e15 -r fe53d17d70d9 patches/cacao/ignore-unknown-options.patch --- a/patches/cacao/ignore-unknown-options.patch Thu May 19 23:39:17 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -Index: cacao/cacao/src/vm/vm.cpp -=================================================================== ---- cacao.orig/cacao/src/vm/vm.cpp 2011-03-04 00:20:24.000000000 +0100 -+++ cacao/cacao/src/vm/vm.cpp 2011-03-04 01:12:45.000000000 +0100 -@@ -1239,9 +1239,10 @@ - - #endif - default: -- printf("Unknown option: %s\n", -+ fprintf(stderr,"Unknown option: %s\n", - vm_args->options[opt_index].optionString); -- usage(); -+ opt_index++; -+ /* Ignore */ - } - } - From bugzilla-daemon at icedtea.classpath.org Thu May 19 16:27:34 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 19 May 2011 23:27:34 +0000 Subject: [Bug 725] JNLP applications will prompt for creating desktop shortcuts every time they are run In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=725 --- Comment #1 from Omair Majid 2011-05-19 23:27:34 --- Created an attachment (id=536) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=536) a possible fix -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 19 17:03:57 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 20 May 2011 00:03:57 +0000 Subject: [Bug 713] Port JamVM support to IcedTea7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=713 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #1 from Andrew John Hughes 2011-05-20 00:03:57 --- All changesets ported. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 19 17:03:57 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 20 May 2011 00:03:57 +0000 Subject: [Bug 695] [TRACKER] IcedTea7 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 Bug 695 depends on bug 713, which changed state. Bug 713 Summary: Port JamVM support to IcedTea7 http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=713 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From andrew at icedtea.classpath.org Thu May 19 18:02:26 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 20 May 2011 01:02:26 +0000 Subject: /hg/icedtea: PR714: Forwardport replace-hotspot support from Ice... Message-ID: changeset c6037f7a2964 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c6037f7a2964 author: Andrew John Hughes date: Fri May 20 02:02:00 2011 +0100 PR714: Forwardport replace-hotspot support from IcedTea6. Also separates out sanitisation. 2011-05-18 Andrew John Hughes PR714: Forwardport replace-hotspot support. * Makefile.am: (.PHONY): Add clean-extract-hotspot and clean-sanitise-openjdk. (extract-openjdk): Remove deletion of hotspot directory which won't appear from an OpenJDK root tarball. Fix typo: openjdk/langtools. (clean-extract- openjdk): Add new dependencies. (extract-hotspot): Handle extracting HotSpot as a separate target. (clean- extract-hotspot): Cleanup for extract-hotspot. (sanitise- openjdk): Handle chmod and running of fsg.sh as a separate target. (clean-sanitise-openjdk): Cleanup for sanitise- openjdk. * NEWS: Updated. diffstat: ChangeLog | 18 ++++++++++++++++++ Makefile.am | 56 +++++++++++++++++++++++++++++++++++++++----------------- NEWS | 1 + 3 files changed, 58 insertions(+), 17 deletions(-) diffs (145 lines): diff -r fe53d17d70d9 -r c6037f7a2964 ChangeLog --- a/ChangeLog Fri May 20 00:26:08 2011 +0100 +++ b/ChangeLog Fri May 20 02:02:00 2011 +0100 @@ -1,3 +1,21 @@ +2011-05-18 Andrew John Hughes + + PR714: Forwardport replace-hotspot support. + * Makefile.am: + (.PHONY): Add clean-extract-hotspot and + clean-sanitise-openjdk. + (extract-openjdk): Remove deletion of hotspot + directory which won't appear from an OpenJDK + root tarball. Fix typo: openjdk/langtools. + (clean-extract-openjdk): Add new dependencies. + (extract-hotspot): Handle extracting HotSpot as + a separate target. + (clean-extract-hotspot): Cleanup for extract-hotspot. + (sanitise-openjdk): Handle chmod and running of + fsg.sh as a separate target. + (clean-sanitise-openjdk): Cleanup for sanitise-openjdk. + * NEWS: Updated. + 2011-05-05 Xerxes R??nby CACAO threadlist & threadobject improvements. diff -r fe53d17d70d9 -r c6037f7a2964 Makefile.am --- a/Makefile.am Fri May 20 00:26:08 2011 +0100 +++ b/Makefile.am Fri May 20 02:02:00 2011 +0100 @@ -754,7 +754,8 @@ clean-icedtea icedtea-stage2 clean-icedtea-boot \ clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \ clean-drops jtregcheck clean-remove-intree-libraries \ - clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug + clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \ + clean-extract-hotspot clean-sanitise-openjdk env: @echo 'unset JAVA_HOME' @@ -1144,9 +1145,6 @@ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \ esac; \ mv $(ICEDTEA_PREFIX)-$(OPENJDK_CHANGESET) openjdk ; \ - if test "x${HSBUILD}" != "xdefault"; then \ - rm -rf openjdk/hotspot ; \ - fi ; \ else \ echo "ERROR: Couldn't extract OpenJDK"; \ false; \ @@ -1212,7 +1210,7 @@ if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \ if test -e ${LANGTOOLS_SRC_ZIP} ; \ then \ - if ! test -d openjdk/hotspot ; \ + if ! test -d openjdk/langtools ; \ then \ case "$(LANGTOOLS_SRC_ZIP)" in \ *.zip) $(UNZIP) -q $(LANGTOOLS_SRC_ZIP) ;; \ @@ -1223,29 +1221,49 @@ fi ; \ fi endif + touch stamps/extract-openjdk.stamp + +clean-extract-openjdk: clean-overlay clean-versioning \ + clean-patch-fsg clean-remove-intree-libraries \ + clean-sanitise-openjdk clean-extract-hotspot + rm -rf openjdk + rm -f stamps/extract-openjdk.stamp + +stamps/extract-hotspot.stamp: stamps/extract-openjdk.stamp set -e ; \ if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \ if test -e ${HOTSPOT_SRC_ZIP} ; \ then \ + case "$(HOTSPOT_SRC_ZIP)" in \ + *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \ + *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \ + esac; \ + if test "x${HSBUILD}" != "xdefault"; then \ + rm -rf openjdk/hotspot ; \ + fi ; \ if ! test -d openjdk/hotspot ; \ then \ - case "$(HOTSPOT_SRC_ZIP)" in \ - *.zip) $(UNZIP) -q $(HOTSPOT_SRC_ZIP) ;; \ - *.tar.*) $(TAR) xf $(HOTSPOT_SRC_ZIP) ;; \ - esac; \ - mv hotspot-$(HS_CHANGESET) openjdk/hotspot ; \ + ln -s hotspot-$(HS_CHANGESET) openjdk/hotspot ; \ fi ; \ fi ; \ fi + touch stamps/extract-hotspot.stamp + +clean-extract-hotspot: + if test -L openjdk/hotspot ; then \ + rm -f openjdk/hotspot + fi + rm -rf hotspot-$(HS_CHANGESET) + rm -f stamps/extract-hotspot.stamp + +stamps/sanitise-openjdk.stamp: stamps/extract-openjdk.stamp \ + stamps/extract-hotspot.stamp chmod -R ug+w openjdk - sh $(srcdir)/fsg.sh ; - mkdir -p stamps - touch $@ + sh $(srcdir)/fsg.sh + touch stamps/sanitise-openjdk.stamp -clean-extract-openjdk: clean-overlay clean-versioning \ - clean-patch-fsg clean-remove-intree-libraries - rm -rf openjdk - rm -f stamps/extract-openjdk.stamp +clean-sanitise-openjdk: + rm -f stamps/sanitise-openjdk.stamp stamps/extract-cacao.stamp: stamps/download-cacao.stamp if BUILD_CACAO @@ -2490,6 +2508,8 @@ extract-openjdk: stamps/extract-openjdk.stamp +extract-hotspot: stamps/extract-hotspot.stamp + generated: stamps/generated.stamp icedtea: stamps/icedtea.stamp @@ -2529,3 +2549,5 @@ rt: stamps/rt.stamp rt-class-files: stamps/rt-class-files.stamp + +sanitise-openjdk: stamps/sanitise-openjdk.stamp diff -r fe53d17d70d9 -r c6037f7a2964 NEWS --- a/NEWS Fri May 20 00:26:08 2011 +0100 +++ b/NEWS Fri May 20 02:02:00 2011 +0100 @@ -11,6 +11,7 @@ * Bug fixes - PR616, PR99: Don't statically link libstdc++ - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. + - PR714: Forwardport replace-hotspot support from IcedTea6. * JamVM - Ignore all unknown options. - Handle overflow in getPhysicalMemory(). From bugzilla-daemon at icedtea.classpath.org Thu May 19 18:05:23 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 20 May 2011 01:05:23 +0000 Subject: [Bug 714] Forwardport replace-hotspot target from IcedTea6 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=714 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #1 from Andrew John Hughes 2011-05-20 01:05:22 --- http://icedtea.classpath.org/hg/icedtea/rev/c6037f7a2964 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 19 18:05:23 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 20 May 2011 01:05:23 +0000 Subject: [Bug 695] [TRACKER] IcedTea7 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 Bug 695 depends on bug 714, which changed state. Bug 714 Summary: Forwardport replace-hotspot target from IcedTea6 http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=714 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Thu May 19 18:21:59 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 20 May 2011 02:21:59 +0100 Subject: IcedTea7 1.14 Release In-Reply-To: <20110518191304.GF31710@rivendell.middle-earth.co.uk> References: <20110518191304.GF31710@rivendell.middle-earth.co.uk> Message-ID: <20110520012159.GB31710@rivendell.middle-earth.co.uk> On 20:13 Wed 18 May , Dr Andrew John Hughes wrote: > There are a small number of forwardports remaining for IcedTea7 1.14 on: > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 > > I'm going to attend to these and then I'd like to release, hopefully today. > > Are there any objections to this? > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and IcedTea > http://www.gnu.org/software/classpath > http://icedtea.classpath.org > PGP Key: F5862A37 (https://keys.indymedia.org/) > Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 Most of the work is now in, but to allow time for further testing, I'm going to push the release back to Wednesday the 25th, at around 13h00 UTC. Let me know if that is a problem for anyone. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Thu May 19 18:22:51 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 20 May 2011 02:22:51 +0100 Subject: [RFC]: backport request for 1.10 and head In-Reply-To: <774841606.378320.1305837686793.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> References: <1273361360.377789.1305836323064.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <774841606.378320.1305837686793.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> Message-ID: <20110520012251.GC31710@rivendell.middle-earth.co.uk> On 16:41 Thu 19 May , Denis Lila wrote: > Hi. > > The last changeset I pushed had a test in it that > used a method from some file (Util.java). That method > isn't there yet in icedtea6, so the test was failing to > compile. > > Therefore I would like to backport this: > http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/a9b5b5d105a8 > to head and 1.10. > > It introduces the missing method and fixes a bug. > > ChangeLog: > 2011-05-19 Denis Lila > > * Makefile.am: Apply patch. > * NEWS: Update with backport. > * patches/openjdk/4685768-focus.patchpatch: The restore focus > procedure now skips disabled components. > > The patches are attached. > Ok to push? > > > Regards, > Denis. Looks fine, please commit. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From andrew at icedtea.classpath.org Thu May 19 18:50:28 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 20 May 2011 01:50:28 +0000 Subject: /hg/icedtea: 2 new changesets Message-ID: changeset 32c0d08ab7b3 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=32c0d08ab7b3 author: Andrew John Hughes date: Fri May 20 02:40:36 2011 +0100 Ensure all macros have an IT_ prefix. 2011-05-20 Andrew John Hughes Ensure all our macros have an IT_ prefix. * acinclude.m4: (IT_WITH_VERSION_SUFFIX): Renamed from WITH_VERSION_SUFFIX. (IT_WITH_PROJECT): Renamed from WITH_PROJECT. (IT_WITH_CORBA_SRC_ZIP): Renamed from WITH_CORBA_SRC_ZIP. (IT_WITH_JAXP_SRC_ZIP): Renamed from WITH_JAXP_SRC_ZIP. (IT_WITH_JAXWS_SRC_ZIP): Renamed from WITH_JAXWS_SRC_ZIP. (IT_WITH_JDK_SRC_ZIP): Renamed from WITH_JDK_SRC_ZIP. (IT_WITH_LANGTOOLS_SRC_ZIP): Renamed from WITH_LANGTOOLS_SRC_ZIP. (IT_ENABLE_HG): Fix dependence of IT_WITH_PROJECT. * configure.ac: Use renamed macros throughout. 2011-02-21 Andrew John Hughes Ensure all our macros have an IT_ prefix. * acinclude.m4: (IT_SET_OS_DIRS): Renamed from SET_OS_DIRS. (IT_FIND_JAVAC): Renamed from FIND_JAVAC. (IT_FIND_JAVA): Renamed from FIND_JAVA. (IT_WITH_OPENJDK_SRC_DIR): Renamed from WITH_OPENJDK_SRC_DIR. (IT_FIND_ECJ_JAR): Renamed from FIND_ECJ_JAR. (IT_CHECK_GCC_VERSION): Renamed from AC_CHECK_GCC_VERSION. (IT_FIND_JAVAH): Renamed from FIND_JAVAH. (IT_FIND_JAR): Renamed from FIND_JAR. (IT_FIND_RMIC): Renamed from FIND_RMIC. (IT_WITH_OPENJDK_SRC_ZIP): Renamed from WITH_OPENJDK_SRC_ZIP. (IT_WITH_ALT_JAR_BINARY): Renamed from WITH_ALT_JAR_BINARY. (IT_FIND_XALAN2_JAR): Renamed from FIND_XALAN2_JAR. (IT_FIND_XALAN2_SERIALIZER_JAR): Renamed from FIND_XALAN2_SERIALIZER_JAR. (IT_FIND_XERCES2_JAR): Renamed from FIND_XERCES2_JAR. (IT_FIND_RHINO_JAR): Renamed from FIND_RHINO_JAR. (IT_DISABLE_OPTIMIZATIONS): Renamed from DISABLE_OPTIMIZATIONS. (IT_FIND_TOOL): Renamed from FIND_TOOL. (IT_ENABLE_ZERO_BUILD): Renamed from ENABLE_ZERO_BUILD. (IT_SET_SHARK_BUILD): Renamed from SET_SHARK_BUILD. (IT_CHECK_ENABLE_CACAO): Renamed from AC_CHECK_ENABLE_CACAO. (IT_CHECK_WITH_CACAO_HOME): Renamed from AC_CHECK_WITH_CACAO_HOME. (IT_CHECK_WITH_CACAO_SRC_ZIP): Renamed from AC_CHECK_WITH_CACAO_SRC_ZIP. (IT_CHECK_WITH_GCJ): Renamed from AC_CHECK_WITH_GCJ. (IT_CHECK_WITH_HOTSPOT_BUILD): Renamed from AC_CHECK_WITH_HOTSPOT_BUILD. (IT_WITH_HOTSPOT_SRC_ZIP): Renamed from WITH_HOTSPOT_SRC_ZIP. (IT_WITH_JAXP_DROP_ZIP): Renamed from WITH_JAXP_DROP_ZIP. (IT_WITH_JAF_DROP_ZIP): Renamed from WITH_JAF_DROP_ZIP. (IT_WITH_JAXWS_DROP_ZIP): Renamed from WITH_JAXWS_DROP_ZIP. (IT_ENABLE_HG): Renamed from ENABLE_HG. (IT_CHECK_WITH_HG_REVISION): Renamed from AC_CHECK_WITH_HG_REVISION. (IT_CHECK_WITH_TZDATA_DIR): Renamed from AC_CHECK_WITH_TZDATA_DIR. (IT_FIND_NUMBER_OF_PROCESSORS): Fix use of FIND_TOOL. (IT_OBTAIN_HG_REVISIONS): Fix dependence on WITH_OPENJDK_SRC_DIR. * configure.ac: Use renamed macros throughout. changeset 12beb2f3e5fc in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=12beb2f3e5fc author: Andrew John Hughes date: Fri May 20 02:50:23 2011 +0100 Cleanup dependencies in extracting the OpenJDK tree. 2011-05-20 Andrew John Hughes * Makefile.am: (extract): Depend on extract-hotspot and sanitise-hotspot. (extract-jaxws): Depend on sanitise-openjdk rather than extract-openjdk to get the complete version. (remove-intree-libraries): Likewise. (generated): Remove dependencies. Doesn't require anything. (patch-fsg): Depend on sanitise-openjdk. (icedtea-boot): Depend on generated. diffstat: ChangeLog | 67 ++++++++++++++++++++++++++++++++++++++ Makefile.am | 13 +++--- acinclude.m4 | 82 +++++++++++++++++++++++----------------------- configure.ac | 104 ++++++++++++++++++++++++++++------------------------------ 4 files changed, 166 insertions(+), 100 deletions(-) diffs (truncated from 670 to 500 lines): diff -r c6037f7a2964 -r 12beb2f3e5fc ChangeLog --- a/ChangeLog Fri May 20 02:02:00 2011 +0100 +++ b/ChangeLog Fri May 20 02:50:23 2011 +0100 @@ -1,3 +1,70 @@ +2011-05-20 Andrew John Hughes + + * Makefile.am: + (extract): Depend on extract-hotspot and + sanitise-hotspot. + (extract-jaxws): Depend on sanitise-openjdk + rather than extract-openjdk to get the + complete version. + (remove-intree-libraries): Likewise. + (generated): Remove dependencies. Doesn't + require anything. + (patch-fsg): Depend on sanitise-openjdk. + (icedtea-boot): Depend on generated. + +2011-05-20 Andrew John Hughes + + Ensure all our macros have an IT_ prefix. + * acinclude.m4: + (IT_WITH_VERSION_SUFFIX): Renamed from WITH_VERSION_SUFFIX. + (IT_WITH_PROJECT): Renamed from WITH_PROJECT. + (IT_WITH_CORBA_SRC_ZIP): Renamed from WITH_CORBA_SRC_ZIP. + (IT_WITH_JAXP_SRC_ZIP): Renamed from WITH_JAXP_SRC_ZIP. + (IT_WITH_JAXWS_SRC_ZIP): Renamed from WITH_JAXWS_SRC_ZIP. + (IT_WITH_JDK_SRC_ZIP): Renamed from WITH_JDK_SRC_ZIP. + (IT_WITH_LANGTOOLS_SRC_ZIP): Renamed from WITH_LANGTOOLS_SRC_ZIP. + (IT_ENABLE_HG): Fix dependence of IT_WITH_PROJECT. + * configure.ac: Use renamed macros throughout. + +2011-02-21 Andrew John Hughes + + Ensure all our macros have an IT_ prefix. + * acinclude.m4: + (IT_SET_OS_DIRS): Renamed from SET_OS_DIRS. + (IT_FIND_JAVAC): Renamed from FIND_JAVAC. + (IT_FIND_JAVA): Renamed from FIND_JAVA. + (IT_WITH_OPENJDK_SRC_DIR): Renamed from WITH_OPENJDK_SRC_DIR. + (IT_FIND_ECJ_JAR): Renamed from FIND_ECJ_JAR. + (IT_CHECK_GCC_VERSION): Renamed from AC_CHECK_GCC_VERSION. + (IT_FIND_JAVAH): Renamed from FIND_JAVAH. + (IT_FIND_JAR): Renamed from FIND_JAR. + (IT_FIND_RMIC): Renamed from FIND_RMIC. + (IT_WITH_OPENJDK_SRC_ZIP): Renamed from WITH_OPENJDK_SRC_ZIP. + (IT_WITH_ALT_JAR_BINARY): Renamed from WITH_ALT_JAR_BINARY. + (IT_FIND_XALAN2_JAR): Renamed from FIND_XALAN2_JAR. + (IT_FIND_XALAN2_SERIALIZER_JAR): Renamed from FIND_XALAN2_SERIALIZER_JAR. + (IT_FIND_XERCES2_JAR): Renamed from FIND_XERCES2_JAR. + (IT_FIND_RHINO_JAR): Renamed from FIND_RHINO_JAR. + (IT_DISABLE_OPTIMIZATIONS): Renamed from DISABLE_OPTIMIZATIONS. + (IT_FIND_TOOL): Renamed from FIND_TOOL. + (IT_ENABLE_ZERO_BUILD): Renamed from ENABLE_ZERO_BUILD. + (IT_SET_SHARK_BUILD): Renamed from SET_SHARK_BUILD. + (IT_CHECK_ENABLE_CACAO): Renamed from AC_CHECK_ENABLE_CACAO. + (IT_CHECK_WITH_CACAO_HOME): Renamed from AC_CHECK_WITH_CACAO_HOME. + (IT_CHECK_WITH_CACAO_SRC_ZIP): Renamed from AC_CHECK_WITH_CACAO_SRC_ZIP. + (IT_CHECK_WITH_GCJ): Renamed from AC_CHECK_WITH_GCJ. + (IT_CHECK_WITH_HOTSPOT_BUILD): Renamed from AC_CHECK_WITH_HOTSPOT_BUILD. + (IT_WITH_HOTSPOT_SRC_ZIP): Renamed from WITH_HOTSPOT_SRC_ZIP. + (IT_WITH_JAXP_DROP_ZIP): Renamed from WITH_JAXP_DROP_ZIP. + (IT_WITH_JAF_DROP_ZIP): Renamed from WITH_JAF_DROP_ZIP. + (IT_WITH_JAXWS_DROP_ZIP): Renamed from WITH_JAXWS_DROP_ZIP. + (IT_ENABLE_HG): Renamed from ENABLE_HG. + (IT_CHECK_WITH_HG_REVISION): Renamed from AC_CHECK_WITH_HG_REVISION. + (IT_CHECK_WITH_TZDATA_DIR): Renamed from AC_CHECK_WITH_TZDATA_DIR. + (IT_FIND_NUMBER_OF_PROCESSORS): Fix use of FIND_TOOL. + (IT_OBTAIN_HG_REVISIONS): Fix dependence on WITH_OPENJDK_SRC_DIR. + * configure.ac: Use renamed macros throughout. + 2011-05-18 Andrew John Hughes PR714: Forwardport replace-hotspot support. diff -r c6037f7a2964 -r 12beb2f3e5fc Makefile.am --- a/Makefile.am Fri May 20 02:02:00 2011 +0100 +++ b/Makefile.am Fri May 20 02:50:23 2011 +0100 @@ -1125,7 +1125,8 @@ stamps/extract.stamp: stamps/extract-openjdk.stamp \ stamps/extract-cacao.stamp stamps/extract-jaxws.stamp \ - stamps/remove-intree-libraries.stamp stamps/extract-jamvm.stamp + stamps/remove-intree-libraries.stamp stamps/extract-jamvm.stamp \ + stamps/extract-hotspot.stamp stamps/sanitise-openjdk.stamp mkdir -p stamps touch $@ @@ -1304,7 +1305,7 @@ rm -f stamps/extract-jamvm.stamp stamps/extract-jaxws.stamp: stamps/download-jaxws-drop.stamp \ - stamps/download-jaf-drop.stamp stamps/extract-openjdk.stamp + stamps/download-jaf-drop.stamp stamps/sanitise-openjdk.stamp set -e ; \ if test "x$(NEED_JAXWS_SRC)" = "xtrue"; then \ (cd openjdk/jaxws ; \ @@ -1324,14 +1325,14 @@ mkdir -p stamps rm -f stamps/extract-jaxws.stamp -stamps/remove-intree-libraries.stamp: stamps/extract-openjdk.stamp +stamps/remove-intree-libraries.stamp: stamps/sanitise-openjdk.stamp sh $(abs_top_builddir)/remove-intree-libraries.sh touch stamps/remove-intree-libraries.stamp clean-remove-intree-libraries: rm -f stamps/remove-intree-libraries.stamp -stamps/generated.stamp: stamps/extract.stamp +stamps/generated.stamp: set -e ; \ if [ ! -e $(abs_top_builddir)/generated.build ]; then \ cp -pPR $(abs_top_srcdir)/generated $(abs_top_builddir)/generated.build; \ @@ -1344,7 +1345,7 @@ rm -rf $(abs_top_builddir)/generated.build rm -f stamps/generated.stamp -stamps/patch-fsg.stamp: stamps/generated.stamp +stamps/patch-fsg.stamp: stamps/sanitise-openjdk.stamp mkdir -p stamps ; \ rm -f stamps/patch-fsg.stamp.tmp ; \ touch stamps/patch-fsg.stamp.tmp ; \ @@ -1918,7 +1919,7 @@ stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \ stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/cacao.stamp \ - stamps/rewrite-rhino.stamp stamps/jamvm.stamp + stamps/rewrite-rhino.stamp stamps/jamvm.stamp stamps/generated.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV_BOOT) \ -C openjdk-boot \ diff -r c6037f7a2964 -r 12beb2f3e5fc acinclude.m4 --- a/acinclude.m4 Fri May 20 02:02:00 2011 +0100 +++ b/acinclude.m4 Fri May 20 02:50:23 2011 +0100 @@ -94,7 +94,7 @@ AC_SUBST(ARCHFLAG) ]) -AC_DEFUN([SET_OS_DIRS], +AC_DEFUN([IT_SET_OS_DIRS], [ case "${host_os}" in *linux*) @@ -117,7 +117,7 @@ AC_SUBST(OS_PATH) ]) -AC_DEFUN([FIND_JAVAC], +AC_DEFUN([IT_FIND_JAVAC], [ JAVAC=${SYSTEM_JDK_DIR}/bin/javac IT_FIND_JAVAC @@ -207,7 +207,7 @@ fi ]) -AC_DEFUN([FIND_JAVA], +AC_DEFUN([IT_FIND_JAVA], [ AC_MSG_CHECKING(for java) AC_ARG_WITH([java], @@ -248,7 +248,7 @@ AM_CONDITIONAL([CP_SUPPORTS_REFLINK], test x"${it_cv_reflink}" = "xyes") ]) -AC_DEFUN_ONCE([WITH_OPENJDK_SRC_DIR], +AC_DEFUN_ONCE([IT_WITH_OPENJDK_SRC_DIR], [ DEFAULT_SRC_DIR=${abs_top_builddir}/openjdk AC_MSG_CHECKING([for an OpenJDK source directory]) @@ -302,7 +302,7 @@ AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" = "xyes") ]) -AC_DEFUN([FIND_ECJ_JAR], +AC_DEFUN([IT_FIND_ECJ_JAR], [ AC_MSG_CHECKING([for an ecj JAR file]) AC_ARG_WITH([ecj-jar], @@ -337,7 +337,7 @@ AC_SUBST(ECJ_JAR) ]) -AC_DEFUN([AC_CHECK_GCC_VERSION], +AC_DEFUN([IT_CHECK_GCC_VERSION], [ AC_MSG_CHECKING([version of GCC]) gcc_ver=`${CC} -dumpversion` @@ -347,7 +347,7 @@ AC_MSG_RESULT([${gcc_ver} (major version ${gcc_major_ver}, minor version ${gcc_minor_ver})]) ]) -AC_DEFUN([FIND_JAVAH], +AC_DEFUN([IT_FIND_JAVAH], [ JAVAH_DEFAULT=${SYSTEM_JDK_DIR}/bin/javah AC_MSG_CHECKING([if a javah executable is specified]) @@ -380,7 +380,7 @@ AC_SUBST(JAVAH) ]) -AC_DEFUN([FIND_JAR], +AC_DEFUN([IT_FIND_JAR], [ JAR_DEFAULT=${SYSTEM_JDK_DIR}/bin/jar AC_MSG_CHECKING([if a jar executable is specified]) @@ -446,7 +446,7 @@ AC_SUBST(JAR_KNOWS_J_OPTIONS) ]) -AC_DEFUN([FIND_RMIC], +AC_DEFUN([IT_FIND_RMIC], [ RMIC_DEFAULT=${SYSTEM_JDK_DIR}/bin/rmic AC_MSG_CHECKING(if an rmic executable is specified) @@ -479,7 +479,7 @@ AC_SUBST(RMIC) ]) -AC_DEFUN([WITH_OPENJDK_SRC_ZIP], +AC_DEFUN([IT_WITH_OPENJDK_SRC_ZIP], [ AC_MSG_CHECKING([for an OpenJDK source zip]) AC_ARG_WITH([openjdk-src-zip], @@ -497,7 +497,7 @@ AC_SUBST(ALT_OPENJDK_SRC_ZIP) ]) -AC_DEFUN([WITH_ALT_JAR_BINARY], +AC_DEFUN([IT_WITH_ALT_JAR_BINARY], [ AC_MSG_CHECKING([for an alternate jar command]) AC_ARG_WITH([alt-jar], @@ -514,7 +514,7 @@ AC_SUBST(ALT_JAR_CMD) ]) -AC_DEFUN([FIND_XALAN2_JAR], +AC_DEFUN([IT_FIND_XALAN2_JAR], [ AC_MSG_CHECKING([for a xalan2 jar]) AC_ARG_WITH([xalan2-jar], @@ -545,7 +545,7 @@ AC_SUBST(XALAN2_JAR) ]) -AC_DEFUN([FIND_XALAN2_SERIALIZER_JAR], +AC_DEFUN([IT_FIND_XALAN2_SERIALIZER_JAR], [ AC_MSG_CHECKING([for a xalan2 serializer jar]) AC_ARG_WITH([xalan2-serializer-jar], @@ -576,7 +576,7 @@ AC_SUBST(XALAN2_SERIALIZER_JAR) ]) -AC_DEFUN([FIND_XERCES2_JAR], +AC_DEFUN([IT_FIND_XERCES2_JAR], [ AC_MSG_CHECKING([for a xerces2 jar]) AC_ARG_WITH([xerces2-jar], @@ -609,7 +609,7 @@ AC_SUBST(XERCES2_JAR) ]) -AC_DEFUN([FIND_RHINO_JAR], +AC_DEFUN([IT_FIND_RHINO_JAR], [ AC_MSG_CHECKING([whether to include Javascript support via Rhino]) AC_ARG_WITH([rhino], @@ -657,7 +657,7 @@ AC_SUBST(RHINO_JAR) ]) -AC_DEFUN([DISABLE_OPTIMIZATIONS], +AC_DEFUN([IT_DISABLE_OPTIMIZATIONS], [ AC_MSG_CHECKING([whether to disable optimizations and build with -O0 -g]) AC_ARG_ENABLE([optimizations], @@ -679,7 +679,7 @@ AM_CONDITIONAL([DISABLE_OPTIMIZATIONS], test x"${disable_optimizations}" = "xyes") ]) -AC_DEFUN([FIND_TOOL], +AC_DEFUN([IT_FIND_TOOL], [AC_PATH_TOOL([$1],[$2]) if test x"$$1" = x ; then AC_MSG_ERROR([$2 program not found in PATH]) @@ -687,7 +687,7 @@ AC_SUBST([$1]) ]) -AC_DEFUN([ENABLE_ZERO_BUILD], +AC_DEFUN([IT_ENABLE_ZERO_BUILD], [ AC_REQUIRE([IT_SET_ARCH_SETTINGS]) AC_MSG_CHECKING([whether to use the zero-assembler port]) @@ -763,7 +763,7 @@ AC_SUBST(ZERO_ARCHDEF) ]) -AC_DEFUN([SET_SHARK_BUILD], +AC_DEFUN([IT_SET_SHARK_BUILD], [ AC_MSG_CHECKING(whether to use the Shark JIT) shark_selected=no @@ -787,7 +787,7 @@ AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes) ]) -AC_DEFUN([AC_CHECK_ENABLE_CACAO], +AC_DEFUN([IT_CHECK_ENABLE_CACAO], [ AC_MSG_CHECKING(whether to use CACAO as VM) AC_ARG_ENABLE([cacao], @@ -804,7 +804,7 @@ AC_SUBST(WITH_CACAO) ]) -AC_DEFUN([AC_CHECK_WITH_CACAO_HOME], +AC_DEFUN([IT_CHECK_WITH_CACAO_HOME], [ AC_MSG_CHECKING([for a CACAO home directory]) AC_ARG_WITH([cacao-home], @@ -829,7 +829,7 @@ AC_SUBST(CACAO_IMPORT_PATH) ]) -AC_DEFUN([AC_CHECK_WITH_CACAO_SRC_ZIP], +AC_DEFUN([IT_CHECK_WITH_CACAO_SRC_ZIP], [ AC_MSG_CHECKING([for a CACAO source zip]) AC_ARG_WITH([cacao-src-zip], @@ -846,9 +846,9 @@ AC_SUBST(ALT_CACAO_SRC_ZIP) ]) -AC_DEFUN([ENABLE_HG], +AC_DEFUN([IT_ENABLE_HG], [ - AC_REQUIRE([WITH_PROJECT]) + AC_REQUIRE([IT_WITH_PROJECT]) AC_MSG_CHECKING(whether to retrieve the source code from Mercurial) AC_ARG_ENABLE([hg], [AS_HELP_STRING(--enable-hg,download source code from Mercurial [[default=depends on project]])], @@ -876,7 +876,7 @@ AM_CONDITIONAL([USE_HG], test x"${enable_hg}" = "xyes") ]) -AC_DEFUN([WITH_VERSION_SUFFIX], +AC_DEFUN([IT_WITH_VERSION_SUFFIX], [ AC_MSG_CHECKING(if a version suffix has been specified) AC_ARG_WITH([version-suffix], @@ -904,7 +904,7 @@ AC_SUBST(VERSION_SUFFIX, $version_suffix) ]) -AC_DEFUN([WITH_PROJECT], +AC_DEFUN([IT_WITH_PROJECT], [ AC_MSG_CHECKING(which OpenJDK project is being used) AC_ARG_WITH([project], @@ -935,7 +935,7 @@ AM_CONDITIONAL([USE_JDK7], test x"${project}" = "xjdk7") ]) -AC_DEFUN([AC_CHECK_WITH_GCJ], +AC_DEFUN([IT_CHECK_WITH_GCJ], [ AC_MSG_CHECKING([whether to compile ecj natively]) AC_ARG_WITH([gcj], @@ -954,7 +954,7 @@ AC_SUBST([GCJ]) ]) -AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD], +AC_DEFUN([IT_CHECK_WITH_HOTSPOT_BUILD], [ DEFAULT_BUILD="default" AC_MSG_CHECKING([which HotSpot build to use]) @@ -976,7 +976,7 @@ AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "xdefault") ]) -AC_DEFUN([WITH_HOTSPOT_SRC_ZIP], +AC_DEFUN([IT_WITH_HOTSPOT_SRC_ZIP], [ AC_MSG_CHECKING(for a HotSpot source zip) AC_ARG_WITH([hotspot-src-zip], @@ -993,7 +993,7 @@ AC_SUBST(ALT_HOTSPOT_SRC_ZIP) ]) -AC_DEFUN([WITH_CORBA_SRC_ZIP], +AC_DEFUN([IT_WITH_CORBA_SRC_ZIP], [ AC_MSG_CHECKING(for a CORBA source zip) AC_ARG_WITH([corba-src-zip], @@ -1010,7 +1010,7 @@ AC_SUBST(ALT_CORBA_SRC_ZIP) ]) -AC_DEFUN([WITH_JAXP_SRC_ZIP], +AC_DEFUN([IT_WITH_JAXP_SRC_ZIP], [ AC_MSG_CHECKING(for a JAXP source zip) AC_ARG_WITH([jaxp-src-zip], @@ -1027,7 +1027,7 @@ AC_SUBST(ALT_JAXP_SRC_ZIP) ]) -AC_DEFUN([WITH_JAXWS_SRC_ZIP], +AC_DEFUN([IT_WITH_JAXWS_SRC_ZIP], [ AC_MSG_CHECKING(for a JAXWS source zip) AC_ARG_WITH([jaxws-src-zip], @@ -1044,7 +1044,7 @@ AC_SUBST(ALT_JAXWS_SRC_ZIP) ]) -AC_DEFUN([WITH_JDK_SRC_ZIP], +AC_DEFUN([IT_WITH_JDK_SRC_ZIP], [ AC_MSG_CHECKING(for a JDK source zip) AC_ARG_WITH([jdk-src-zip], @@ -1061,7 +1061,7 @@ AC_SUBST(ALT_JDK_SRC_ZIP) ]) -AC_DEFUN([WITH_LANGTOOLS_SRC_ZIP], +AC_DEFUN([IT_WITH_LANGTOOLS_SRC_ZIP], [ AC_MSG_CHECKING(for a langtools source zip) AC_ARG_WITH([langtools-src-zip], @@ -1078,7 +1078,7 @@ AC_SUBST(ALT_LANGTOOLS_SRC_ZIP) ]) -AC_DEFUN([WITH_JAXP_DROP_ZIP], +AC_DEFUN([IT_WITH_JAXP_DROP_ZIP], [ AC_MSG_CHECKING(for a JAXP drop zip) AC_ARG_WITH([jaxp-drop-zip], @@ -1095,7 +1095,7 @@ AC_SUBST(ALT_JAXP_DROP_ZIP) ]) -AC_DEFUN([WITH_JAF_DROP_ZIP], +AC_DEFUN([IT_WITH_JAF_DROP_ZIP], [ AC_MSG_CHECKING(for a JAF drop zip) AC_ARG_WITH([jaf-drop-zip], @@ -1112,7 +1112,7 @@ AC_SUBST(ALT_JAF_DROP_ZIP) ]) -AC_DEFUN([WITH_JAXWS_DROP_ZIP], +AC_DEFUN([IT_WITH_JAXWS_DROP_ZIP], [ AC_MSG_CHECKING(for a JAXWS drop zip) AC_ARG_WITH([jaxws-drop-zip], @@ -1129,7 +1129,7 @@ AC_SUBST(ALT_JAXWS_DROP_ZIP) ]) -AC_DEFUN([AC_CHECK_WITH_HG_REVISION], +AC_DEFUN([IT_CHECK_WITH_HG_REVISION], [ AC_MSG_CHECKING([which Mercurial revision to use]) AC_ARG_WITH([hg-revision], @@ -1428,7 +1428,7 @@ AC_SUBST(ENABLE_WARNINGS) ]) -AC_DEFUN([AC_CHECK_WITH_TZDATA_DIR], +AC_DEFUN([IT_CHECK_WITH_TZDATA_DIR], [ DEFAULT="/usr/share/javazi" AC_MSG_CHECKING([which Java timezone data directory to use]) @@ -1633,7 +1633,7 @@ AC_DEFUN_ONCE([IT_OBTAIN_HG_REVISIONS], [ AC_REQUIRE([IT_CHECK_FOR_MERCURIAL]) - AC_REQUIRE([WITH_OPENJDK_SRC_DIR]) + AC_REQUIRE([IT_WITH_OPENJDK_SRC_DIR]) ICEDTEA_REVISION="none"; JDK_REVISION="none"; HOTSPOT_REVISION="none"; @@ -1736,7 +1736,7 @@ # Finds number of available processors using sysconf AC_DEFUN_ONCE([IT_FIND_NUMBER_OF_PROCESSORS],[ - FIND_TOOL([GETCONF], [getconf]) + IT_FIND_TOOL([GETCONF], [getconf]) AC_CACHE_CHECK([the number of online processors], it_cv_proc, [ if number=$($GETCONF _NPROCESSORS_ONLN); then it_cv_proc=$number; diff -r c6037f7a2964 -r 12beb2f3e5fc configure.ac --- a/configure.ac Fri May 20 02:02:00 2011 +0100 +++ b/configure.ac Fri May 20 02:50:23 2011 +0100 From andrew at icedtea.classpath.org Thu May 19 19:23:51 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 20 May 2011 02:23:51 +0000 Subject: /hg/icedtea: 2 new changesets Message-ID: changeset e7b97b6e8ece in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e7b97b6e8ece author: Andrew John Hughes date: Fri May 20 02:58:30 2011 +0100 Use absolute path when creating symbolic link to extracted HotSpot directory. 2011-05-20 Andrew John Hughes * Makefile.am: (extract-hotspot): Use absolute path when creating symbolic link. changeset 1af45d3c1f92 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1af45d3c1f92 author: Andrew John Hughes date: Fri May 20 03:23:45 2011 +0100 Avoid having two IT_FIND_JAVAC macros; rename one to IT_FIND_JAVA_COMPILER. 2011-05-20 Andrew John Hughes * acinclude.m4: Rename top-level IT_FIND_JAVAC to IT_FIND_JAVA_COMPILER. * configure.ac: Call IT_FIND_JAVA_COMPILER not IT_FIND_JAVAC. diffstat: ChangeLog | 15 +++++++++++++++ Makefile.am | 3 ++- acinclude.m4 | 2 +- configure.ac | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diffs (59 lines): diff -r 12beb2f3e5fc -r 1af45d3c1f92 ChangeLog --- a/ChangeLog Fri May 20 02:50:23 2011 +0100 +++ b/ChangeLog Fri May 20 03:23:45 2011 +0100 @@ -1,3 +1,18 @@ +2011-05-20 Andrew John Hughes + + * acinclude.m4: + Rename top-level IT_FIND_JAVAC + to IT_FIND_JAVA_COMPILER. + * configure.ac: + Call IT_FIND_JAVA_COMPILER not + IT_FIND_JAVAC. + +2011-05-20 Andrew John Hughes + + * Makefile.am: + (extract-hotspot): Use absolute path when + creating symbolic link. + 2011-05-20 Andrew John Hughes * Makefile.am: diff -r 12beb2f3e5fc -r 1af45d3c1f92 Makefile.am --- a/Makefile.am Fri May 20 02:50:23 2011 +0100 +++ b/Makefile.am Fri May 20 03:23:45 2011 +0100 @@ -1244,7 +1244,8 @@ fi ; \ if ! test -d openjdk/hotspot ; \ then \ - ln -s hotspot-$(HS_CHANGESET) openjdk/hotspot ; \ + ln -s $(abs_top_builddir)/hotspot-$(HS_CHANGESET) \ + openjdk/hotspot ; \ fi ; \ fi ; \ fi diff -r 12beb2f3e5fc -r 1af45d3c1f92 acinclude.m4 --- a/acinclude.m4 Fri May 20 02:50:23 2011 +0100 +++ b/acinclude.m4 Fri May 20 03:23:45 2011 +0100 @@ -117,7 +117,7 @@ AC_SUBST(OS_PATH) ]) -AC_DEFUN([IT_FIND_JAVAC], +AC_DEFUN([IT_FIND_JAVA_COMPILER], [ JAVAC=${SYSTEM_JDK_DIR}/bin/javac IT_FIND_JAVAC diff -r 12beb2f3e5fc -r 1af45d3c1f92 configure.ac --- a/configure.ac Fri May 20 02:50:23 2011 +0100 +++ b/configure.ac Fri May 20 03:23:45 2011 +0100 @@ -108,7 +108,7 @@ IT_CHECK_IF_BOOTSTRAPPING IT_CHECK_FOR_JDK IT_FIND_JAVA -IT_FIND_JAVAC +IT_FIND_JAVA_COMPILER IT_FIND_JAVAH IT_FIND_JAR IT_FIND_RMIC From ptisnovs at redhat.com Fri May 20 00:32:17 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 20 May 2011 09:32:17 +0200 Subject: Reviewer needed - fix for regression test test/sun/net/www/protocol/file/DirPermissionDenied in IcedTea7 In-Reply-To: <20110519201124.GW31710@rivendell.middle-earth.co.uk> References: <4DCC00D1.8030906@redhat.com> <20110512163423.GB31710@rivendell.middle-earth.co.uk> <4DCD0084.8050203@redhat.com> <20110516154522.GT31710@rivendell.middle-earth.co.uk> <4DD14E3C.4040703@redhat.com> <20110519201124.GW31710@rivendell.middle-earth.co.uk> Message-ID: <4DD61901.8040003@redhat.com> Dr Andrew John Hughes wrote: > On 18:18 Mon 16 May , Pavel Tisnovsky wrote: >> Dr Andrew John Hughes wrote: >>> On 11:57 Fri 13 May , Pavel Tisnovsky wrote: >>>> Dr Andrew John Hughes wrote: >>> Yes, there's no ChangeLog in the forest. >>> >>> You'll need to make a change to IcedTea7 itself as well to bump the >>> Mercurial revisions and checksums. This will include a ChangeLog where >>> you can detail the actual change. See IcedTea7's ChangeLog for some >>> examples from me. >>> >> Hi Andrew, >> >> thank you for the explanation, but I'm not sure how to "...bump the >> Mercurial revisions and checksums...". It's probably interesting thing >> that could be explained (or referenced) on the >> http://icedtea.classpath.org/wiki/CommitPolicy page >> >> (I recall you mentioned that you have some useful script to do that work) >> > > How about: > > "In IcedTea7, patches for OpenJDK are applied directly to our OpenJDK forest. > Again, when conducting backports, use exact patches (via hg export/import) and > do not mix in additional changes. > > Once a change has been made to the forest, IcedTea7 needs to be > updated to download the new changeset(s), which involves updating the > changeset identifiers and checksums in Makefile.am. A script called > update_tarballs.sh is provided in the scripts subdirectory of the > IcedTea7 repository for this purpose. This is run by specifying the > path to download the tarballs to as an argument. If the tarballs > have already been downloaded, gen_changeset_and_sha256sums.sh can > be used directly to generate the changeset identifers and checksums. > Once the script(s) have been run, the new values can be find in > /tmp/changesets and /tmp/sums, ready for import into Makefile.am. > The change to Makefile.am requires a ChangeLog entry as usual, and > should describe the new changeset(s) being imported." > > If that sounds fine, I'll add it to the wiki. It's IMHO perfectly acceptable and understandable. Thank you. From ptisnovs at redhat.com Fri May 20 01:50:28 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 20 May 2011 10:50:28 +0200 Subject: Questionable regression test LocaleEnhanceTest in IcedTea7 In-Reply-To: <20110519184041.GM31710@rivendell.middle-earth.co.uk> References: <4DD270F9.6000305@redhat.com> <20110517140907.GZ31710@rivendell.middle-earth.co.uk> <4DD28BDA.8070207@redhat.com> <20110519184041.GM31710@rivendell.middle-earth.co.uk> Message-ID: <4DD62B54.1030109@redhat.com> Dr Andrew John Hughes wrote: > There is a standard Oracle GPLv2+Classpath exception license above it > so I'm not sure what's going on here. We need someone from Oracle to > clarify this. Hi Andrew, thank you for your clarification. > > In the meantime, doesn't jtreg have an 'ignore' facility so we can > set the dependent test as to be ignored with an appropriate reason? > Then we can just turn it back on if this class is allowed back in. I've added this test to a exclude list with an explanation why this test is "blacklisted". hg diff with the proposed change for IcedTea7 is stored in an attachment and here is ChangeLog entry: 2011-05-20 Pavel Tisnovsky * test/jtreg/excludelist.jdk.jtx: Added LocaleEnhanceTest to a JTreg exclude list, because the test base class can not be used in IcedTea due to questionable licence. Do you think it is ok to push this change to IcedTea7? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110520/4c73ab44/hg_diff.ksh From ptisnovs at redhat.com Fri May 20 02:29:17 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 20 May 2011 11:29:17 +0200 Subject: Reviewer needed: fix for regression test test/com/sun/org/apache/xml/internal/ws/server/Test.java Message-ID: <4DD6346D.9030903@redhat.com> Hi all, I'd like to push fix for patch using to create regression test /test/com/sun/org/apache/xml/internal/ws/server/Test.java to IcedTea7. The existing patch "patches/security/6592792.patch" creates only one part of this test, but it does not contain shell script used to run the test itself. hg diff containing fixed patch is stored in an attachment. Here's ChangeLog entry: 2011-05-20 Pavel Tisnovsky * patches/security/6592792.patch: Added missing script used to start this regression test. Can anybody review it please? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110520/fb834149/hg_diff.ksh From jvanek at redhat.com Fri May 20 03:28:05 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 20 May 2011 12:28:05 +0200 Subject: [icedtea-web] reviewer needed - added engine for lunching reproducers In-Reply-To: <4DD2982C.20607@redhat.com> References: <4DC2CAC1.7070802@redhat.com> <4DC484FA.1030208@redhat.com> <4DCAAD29.80706@redhat.com> <4DD1DE9B.30508@redhat.com> <4DD278CE.2080005@redhat.com> <4DD2982C.20607@redhat.com> Message-ID: <4DD64235.4060705@redhat.com> On 05/17/2011 05:45 PM, Omair Majid wrote: > On 05/17/2011 09:31 AM, Jiri Vanek wrote: >>>> diff -r 2b1a69f4c54b Makefile.am >>>> --- a/Makefile.am Tue May 10 11:16:17 2011 -0400 >>>> +++ b/Makefile.am Wed May 11 13:52:03 2011 +0200 >>>> @@ -12,11 +12,17 @@ >>>> NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit >>>> TESTS_STYLES_SRCDIR=$(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME) >>>> JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner >>>> +NETX_DIST_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/dist >>>> +NETX_JNLP_TEST_SRCDIR=$(TESTS_SRCDIR)/jnlp_tests >>>> >>>> TESTS_DIR=$(abs_top_builddir)/tests.build >>>> NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit >>>> TESTS_STYLES_DIR=$(TESTS_DIR)/$(REPORT_STYLES_DIRNAME) >>>> JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner >>>> +NETX_DIST_TEST_DIR=$(TESTS_DIR)/netx/dist >>>> +NETX_TESTCASES_DIR=$(TESTS_DIR)/netx/dist_testcases >>>> +TESTS_SERVER_DIR=$(TESTS_DIR)/test_server >>>> +TESTS_JNLP_DIR=$(TESTS_DIR)/jnlp_tests >>>> >>> >>> I would suggest renaming these directories (and variables). I am not >>> sure what 'dist' really signifies. The jnlp tests should probably in >>> tests/netx/jnlp/ --they are for netx only and not for the plugin. >> You yourself suggested 'make check-dist' - so I took this word to >> signify its belongings. > > Well, 'make distcheck' is a commonly known target. In a source tree though, the meaning of tests/netx/dist/ is not clear. > >> ok - tests/netx/jnlp/ will be more suitable >> >> NETX_JNLP_TEST_SRCDIR contains sources of reproducers applications, >> NETX_DIST_TEST_SRCDIR contains helping classes and virtual server sources. >> NETX_DIST_TEST_DIR contains compiled helping classes, server etc. > > If you can come up with something more descriptive than DIST, then please use that. Otherwise DIST should be fine for now. > >> NETX_DIST_TESTCASES_DIR have been removed. >> TESTS_SERVER_DIR - contains reproducers jars, resources... And is root >> directory for server. TESTS_JNLP_DIR contains compiled reproducers >> >> So since teh testcases_dir is removed, i think the names are ok. >> >> Or you can vote for: >> NETX_JNLP_TEST_SRCDIR -> JNLP_REPRODUCERS_SRCDIR >> NETX_DIST_TEST_SRCDIR - > JNLP_TESTS_HELPINGCLASSES_SRCDIR >> NETX_DIST_TEST_DIR -> JNLP_TESTS_HELPINGCLASSES_BUILDDIR >> TESTS_JNLP_DIR -> JNLP_REPRODUCERS_BUILDDIR >> TESTS_SERVER_DIR -> JNLP_TESTS_SERVER_DIR >> > > I thought we were using the convention that *_SRCDIR indicates a source diretory and *_DIR indicates a build directory. Otherwise I think they are alright. I dont care too much what variables are called; I care much more about the source tree paths: / > renamed, hoe that good enough! >>>> >>>> JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar >> ...snip... >>>> + >>>> CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):. >>>> \ >>>> + $(BOOT_DIR)/bin/java -Dtest.server.dir=$(TESTS_SERVER_DIR) >>>> -Djavaws.build.bin=$(DESTDIR)$(bindir)/javaws \ >>>> + -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ >>> >>> I just realized (sometimes I can be slow ;) ) that if you are passing >>> all these java properties, you can also pass along the values of >>> -Dicedtea-web.bin.name and -Dicedtea-web.bin.path and avoid having to >>> run these tests only after 'make install'. >> >> Hmm.. Do not understand this very much. Is there something useful to run >> this tests without all-local? Where comes values of this variables from? >> Where are they from? From where will they come when no make all-local done? >> > > Sorry if I wasn't clear: you have to build (all-local) to test of course. But I was suggesting that if you pass along all the right variables, that you could (possibly, have to double-check) run the just-built javaws binary. You might be able to skip having to install it to check. But it's not really that big a deal for now. You can ignore it :) > ignored:) >>>> + > stdout.log 2> stderr.log ; \ >>>> + cat stdout.log ; \ >>>> + cat stderr.log>&2 >>>> + >>>> netx-unit-tests-source-files.txt: >>>> find $(NETX_UNIT_TEST_SRCDIR) -name '*.java' | sort> $@ >>>> >>>> @@ -496,7 +564,7 @@ >>>> cat stdout.log ; \ >>>> cat stderr.log>&2 >>>> >>>> -clean-netx-tests: clean-netx-unit-tests clean-junit-runner >>>> +clean-netx-tests: clean-netx-unit-tests clean-junit-runner >>>> clean-netx-dist-tests >>>> if [ -e $(TESTS_DIR)/netx ]; then \ >>>> rmdir $(TESTS_DIR)/netx ; \ >>>> fi >>>> @@ -513,6 +581,16 @@ >>>> rm -rf $(NETX_UNIT_TEST_DIR) >>>> rm -f stamps/netx-unit-tests-compile.stamp >>>> >>>> +clean-netx-dist-tests: >>>> + rm -f netx-dist-tests-source-files.txt >>>> + rm -rf $(TESTS_JNLP_DIR) >>>> + rm -rf $(TESTS_SERVER_DIR) >>>> + rm -rf $(NETX_DIST_TEST_DIR) >>>> + rm -f stamps/netx-dist-tests-compile.stamp >>>> + rm -f stamps/netx-dist-tests-prepare-reproducers.stamp >>>> + rm -f stamps/netx-dist-tests-compile-testcases.stamp >>>> + rm -f junit-jnlp-dist-dirs.txt >>>> + >>>> # plugin tests >>> >>> I cant see a way to run these tests using a standard 'make' target. >> >> But they are running this way now (or NOT????? -confused-) >> Is there any issue I can't see? >> > > They are? Mea culpa then. As I said elsewhere in the email, I did not try and build this patch. no change here > >>> >>>> >>>> if ENABLE_PLUGIN >>>> diff -r 2b1a69f4c54b tests/jnlp_tests/README >>>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >>>> +++ b/tests/jnlp_tests/README Wed May 11 13:52:03 2011 +0200 >>>> @@ -0,0 +1,1 @@ >>>> +Each file in simple must follows naming convention and is >>>> compiled/jared automaticky into server's working directory and >>>> content of resources likewise. The name of jnlp is independent, ant >>>> there can be even more jnlps for each future jar. >>>> diff -r 2b1a69f4c54b >>>> tests/jnlp_tests/simple/simpletest1/resources/simpletest1.jnlp >>> >>> Please fix the spelling error(s?). >> >> Done.. >> >> Each file in simple must follows naming convention and is compiled/jared >> automatically into server's working directory and content of resources >> likewise. The name of jnlp is independent, ant there can be even more >> jnlps for each future jar. >> > > More typos ;) Enlarged (because of ??) and hope that fixed :) > >>> >>> Why the '/simple/' in the path? >> ...anip... >> codebase="[@]address[@]" , which will then be changed in java tests or >> the port will be handled outside junit-run and so it will be sedded.. >> somwehow. >> > > If it works, no need to make life more complicated :) > >>> >>>> + >>>> +simpletest1 >>>> +NetX >>>> + ..snip.. >>> this trivial test. But just to give an idea. And thanks for adding a >>> concrete example to show how actual tests would be like. >> >> Licence - yes! >> Those trivial test are included exactly and mainly as proof of concept. >> But I was thinking about commitng them - as guide others and as warning >> that something goes very very bad (with java, javaws or testsuite or >> with whatever) when even those two fails. >> > > That's actually a good idea. Can you please add a note in the README? (you probably want to do that as a separate patch). > done >>> >>>> +package simpletest1; >>>> + >>>> +public class SimpleTest1{ >>>> + >>>> + public static void main(String[] args){ >>>> + System.out.println("Good simple javaws exapmle"); >>>> + } >>>> +} >>> >>> Is there an advantage to placing this class in a separate package? >> >> Sure! I believe that classes should never be in "default" (== empty) >> package. In this case it also helps me to jar them clearly. > > Can you elaborate on why default package is a bad idea for test cases? > >> as agreed. Now it is simple/name/srcs|resources|testcases/whatever (resources copied recursively, rest compiled by *) >>> >>> I dont see any other issues, but I will build and test out this patch >>> as soon as I get some extra time. >> Thank you very much for review and hints. > > No, thank YOU for creating the patch and testing it and bearing with my very nit-picky reviews! > > Cheers, > Omair new patch attached, and except following gissue I consider it as final. You can test it as make run-netx-dist-tests after apply. but - as discussed yesterday - process assasin is working BAD with javaws. The behaviour is quite curious and I'm afradid it can be hidden bug (feature?) of javaws. The javaws process is never finished (no retur value from it) But its streams ARE closed (or at least -1 char received). So the way how I'm getting std out/err, however strange- works best. Process assasin ca not work - it kill javaws(or somethig?), lost its stdout/err but is still haging something else. I'm ashamed for this drawback and I will investigate this in future. For now I think it must be enough. I have added deadlock reproducer test, which can help to track this issue. regards J. 2011-05-20 Jiri Vanek * tests/jnlp_tests: directory for reproducers * tests/jnlp_tests/advanced: reproducers which must care about deploying and compiling thmselves * tests/jnlp_tests/simple: reproducers compiled, jared and deployed automatically * tests/jnlp_tests/simple/name/srcs|testcases|resources/: sourcefiles, resources and testaces for simple reproducers * tests/jnlp_tests/simple/deadlocktest: test for tracing not-killable javaws * tests/jnlp_tests/simple/simpletest1: tutorial test * tests/jnlp_tests/simple/simpletest2: tutorial test with exception * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java: tests for server basic functionality * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java: implementation of server to produce jnlps and resources. Implementation of helpers to run javaws process. Makefile.am: new variables pointing to structure above; (junit-jnlp-dist-dirs.txt): prepare destination directory structure (stamps/netx-dist-tests-prepare-reproducers.stamp):compile tescascases of simple reproducers (netx-dist-tests-source-files.txt): lookup for server and helping classes (stamps/netx-dist-tests-compile.stamp): compile server and helping classes (stamps/netx-dist-tests-compile-testcases.stamp): compile, jar and deploy all simple testcases and their resources (run-netx-dist-tests): after make install run junit testsuite upon reproducers on virtual server (clean-netx-tests): added dependence on clean-netx-dist-tests (clean-netx-dist-tests): deleting of reproducers -------------- next part -------------- A non-text attachment was scrubbed... Name: j-reproducers_engine-new.patch Type: text/x-patch Size: 47669 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110520/34802049/j-reproducers_engine-new.patch From mjw at icedtea.classpath.org Fri May 20 03:50:30 2011 From: mjw at icedtea.classpath.org (mjw at icedtea.classpath.org) Date: Fri, 20 May 2011 10:50:30 +0000 Subject: /hg/buildbot: Add more --disable-system-lcms to IcedTea7 master.... Message-ID: changeset c02bdc56dc6e in /hg/buildbot details: http://icedtea.classpath.org/hg/buildbot?cmd=changeset;node=c02bdc56dc6e author: Mark Wielaard date: Fri May 20 12:50:08 2011 +0200 Add more --disable-system-lcms to IcedTea7 master.cfg configurations. Also add a f3an7 BuildFactory variant for icedtea7-natty-armv7l- quick. diffstat: icedtea/master.cfg | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diffs (61 lines): diff -r d3a4c323b594 -r c02bdc56dc6e icedtea/master.cfg --- a/icedtea/master.cfg Thu May 05 11:25:39 2011 +0200 +++ b/icedtea/master.cfg Fri May 20 12:50:08 2011 +0200 @@ -380,6 +380,28 @@ description="check-langtools", workdir="build", timeout=2400)) +f3an7 = factory.BuildFactory() +f3an7.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3an7.addStep(ShellCommand(command=["./autogen.sh"], + workdir="src", + description="autogen")) +f3an7.addStep(ShellCommand(command=["rm", "-rf", "build"], + workdir=".", + description="clean build dir")) +f3an7.addStep(Configure(command=["../src/configure", + "--disable-bootstrap", + "--with-parallel-jobs=2", + "--disable-docs", + "--disable-system-lcms"], + workdir="build")) +f3an7.addStep(Compile(workdir="build")) +f3an7.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) +f3an7.addStep(JTRegCheck(command=["make", "check-langtools"], + description="check-langtools", + workdir="build", timeout=2400)) + f3anc = factory.BuildFactory() f3anc.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) f3anc.addStep(ShellCommand(command=["./autogen.sh"], @@ -550,7 +572,8 @@ f3a5.addStep(Configure(command=["../src/configure", "--disable-bootstrap", "--with-parallel-jobs=1", - "--disable-docs"], + "--disable-docs", + "--disable-system-lcms"], workdir="build")) f3a5.addStep(Compile(workdir="build")) f3a5.addStep(JTRegCheck(command=["make", "check-hotspot"], @@ -723,7 +746,7 @@ icedtea7_builder_quick_arm_natty = { 'name': "icedtea7-natty-armv7l-quick", 'slavenames': ["natty-armv7l"], 'builddir': "icedtea7-natty-armv7l-quick", - 'factory': f3an } + 'factory': f3an7 } f4 = factory.BuildFactory() f4.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) @@ -740,7 +763,8 @@ "--enable-nss", "--with-additional-vms=shark", "--with-parallel-jobs=4", - "--with-llvm-config=llvm-config-2.7"], + "--with-llvm-config=llvm-config-2.7", + "--disable-system-lcms"], workdir="build")) f4.addStep(Compile(workdir="build")) f4.addStep(JTRegCheck(command=["make", "check-hotspot"], From dlila at icedtea.classpath.org Fri May 20 05:55:52 2011 From: dlila at icedtea.classpath.org (dlila at icedtea.classpath.org) Date: Fri, 20 May 2011 12:55:52 +0000 Subject: /hg/icedtea6: No focus to disabled components. Message-ID: changeset 0224254fcf75 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0224254fcf75 author: Denis Lila date: Fri May 20 08:55:31 2011 -0400 No focus to disabled components. diffstat: ChangeLog | 7 + Makefile.am | 1 + NEWS | 1 + patches/openjdk/4685768-focus.patch | 390 ++++++++++++++++++++++++++++++++++++ 4 files changed, 399 insertions(+), 0 deletions(-) diffs (438 lines): diff -r cb5177de9f0b -r 0224254fcf75 ChangeLog --- a/ChangeLog Thu May 19 12:39:01 2011 +0200 +++ b/ChangeLog Fri May 20 08:55:31 2011 -0400 @@ -1,3 +1,10 @@ +2011-05-19 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/4685768-focus.patchpatch: The restore focus + procedure now skips disabled components. + 2011-05-19 Pavel Tisnovsky * patches/jtreg-6929067-fix.patch: Test enhancement - diff -r cb5177de9f0b -r 0224254fcf75 Makefile.am --- a/Makefile.am Thu May 19 12:39:01 2011 +0200 +++ b/Makefile.am Fri May 20 08:55:31 2011 -0400 @@ -200,6 +200,7 @@ patches/openjdk/6637796-set_bounds.patch \ patches/openjdk/6607660-treelock.patch \ patches/openjdk/6607170-request_focus.patch \ + patches/openjdk/4685768-focus.patch \ patches/openjdk/6616323-component_array.patch \ patches/openjdk/6682046-shape_calculation.patch \ patches/openjdk/6797195-hw_lw_mixing.patch \ diff -r cb5177de9f0b -r 0224254fcf75 NEWS --- a/NEWS Thu May 19 12:39:01 2011 +0200 +++ b/NEWS Fri May 20 08:55:31 2011 -0400 @@ -29,6 +29,7 @@ - S7042040: Remove disk space sanity check - S7043054: REGRESSION - wrong userBounds in Paint.createContext() - S7043963, RH698295: Window manager workaround in AWT was not applied to mutter. Now it is. + - S4685768: Focus set to disabled component, can't Tab/Shift-Tab * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - G356743: Support libpng 1.5. diff -r cb5177de9f0b -r 0224254fcf75 patches/openjdk/4685768-focus.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/4685768-focus.patch Fri May 20 08:55:31 2011 -0400 @@ -0,0 +1,398 @@ +# HG changeset patch +# User ant +# Date 1213695448 -14400 +# Node ID a9b5b5d105a8e613fe8ebacba01fa010ff087d3e +# Parent 58a2ba2767bef1b7ca6d994d94c0812216b4f5ad +4685768: A11y issue - Focus set to disabled component, can't Tab/Shift-Tab +Summary: The restore-focus procedure should skip disabled components. +Reviewed-by: art, dcherepanov + +diff -r 58a2ba2767be -r a9b5b5d105a8 src/share/classes/java/awt/Component.java +--- openjdk.orig/jdk/src/share/classes/java/awt/Component.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/src/share/classes/java/awt/Component.java Tue Jun 17 13:37:28 2008 +0400 +@@ -7488,9 +7488,7 @@ + Container rootAncestor = getTraversalRoot(); + Component comp = this; + while (rootAncestor != null && +- !(rootAncestor.isShowing() && +- rootAncestor.isFocusable() && +- rootAncestor.isEnabled())) ++ !(rootAncestor.isShowing() && rootAncestor.canBeFocusOwner())) + { + comp = rootAncestor; + rootAncestor = comp.getFocusCycleRootAncestor(); +@@ -7539,9 +7537,7 @@ + Container rootAncestor = getTraversalRoot(); + Component comp = this; + while (rootAncestor != null && +- !(rootAncestor.isShowing() && +- rootAncestor.isFocusable() && +- rootAncestor.isEnabled())) ++ !(rootAncestor.isShowing() && rootAncestor.canBeFocusOwner())) + { + comp = rootAncestor; + rootAncestor = comp.getFocusCycleRootAncestor(); +@@ -8518,6 +8514,14 @@ + setComponentOrientation(orientation); + } + ++ final boolean canBeFocusOwner() { ++ // It is enabled, visible, focusable. ++ if (isEnabled() && isDisplayable() && isVisible() && isFocusable()) { ++ return true; ++ } ++ return false; ++ } ++ + /** + * Checks that this component meets the prerequesites to be focus owner: + * - it is enabled, visible, focusable +@@ -8527,9 +8531,9 @@ + * this component as focus owner + * @since 1.5 + */ +- final boolean canBeFocusOwner() { ++ final boolean canBeFocusOwnerRecursively() { + // - it is enabled, visible, focusable +- if (!(isEnabled() && isDisplayable() && isVisible() && isFocusable())) { ++ if (!canBeFocusOwner()) { + return false; + } + +diff -r 58a2ba2767be -r a9b5b5d105a8 src/share/classes/java/awt/Container.java +--- openjdk.orig/jdk/src/share/classes/java/awt/Container.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/src/share/classes/java/awt/Container.java Tue Jun 17 13:37:28 2008 +0400 +@@ -860,11 +860,11 @@ + + // If component is focus owner or parent container of focus owner check that after reparenting + // focus owner moved out if new container prohibit this kind of focus owner. +- if (comp.isFocusOwner() && !comp.canBeFocusOwner()) { ++ if (comp.isFocusOwner() && !comp.canBeFocusOwnerRecursively()) { + comp.transferFocus(); + } else if (comp instanceof Container) { + Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner(); +- if (focusOwner != null && isParentOf(focusOwner) && !focusOwner.canBeFocusOwner()) { ++ if (focusOwner != null && isParentOf(focusOwner) && !focusOwner.canBeFocusOwnerRecursively()) { + focusOwner.transferFocus(); + } + } +diff -r 58a2ba2767be -r a9b5b5d105a8 src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java +--- openjdk.orig/jdk/src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java Tue Jun 17 13:37:28 2008 +0400 +@@ -556,8 +556,7 @@ + * enabled, and focusable; false otherwise + */ + protected boolean accept(Component aComponent) { +- if (!(aComponent.isVisible() && aComponent.isDisplayable() && +- aComponent.isFocusable() && aComponent.isEnabled())) { ++ if (!aComponent.canBeFocusOwner()) { + return false; + } + +diff -r 58a2ba2767be -r a9b5b5d105a8 src/share/classes/java/awt/DefaultKeyboardFocusManager.java +--- openjdk.orig/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java Tue Jun 17 13:37:28 2008 +0400 +@@ -154,7 +154,7 @@ + private boolean doRestoreFocus(Component toFocus, Component vetoedComponent, + boolean clearOnFailure) + { +- if (toFocus != vetoedComponent && toFocus.isShowing() && toFocus.isFocusable() && ++ if (toFocus != vetoedComponent && toFocus.isShowing() && toFocus.canBeFocusOwner() && + toFocus.requestFocus(false, CausedFocusEvent.Cause.ROLLBACK)) + { + return true; +@@ -500,8 +500,11 @@ + } + } + +- if (!(newFocusOwner.isFocusable() && newFocusOwner.isEnabled() +- && newFocusOwner.isShowing())) ++ if (!(newFocusOwner.isFocusable() && newFocusOwner.isShowing() && ++ // Refuse focus on a disabled component if the focus event ++ // isn't of UNKNOWN reason (i.e. not a result of a direct request ++ // but traversal, activation or system generated). ++ (newFocusOwner.isEnabled() || cause.equals(CausedFocusEvent.Cause.UNKNOWN)))) + { + // we should not accept focus on such component, so reject it. + dequeueKeyEvents(-1, newFocusOwner); +@@ -742,8 +745,7 @@ + public boolean dispatchKeyEvent(KeyEvent e) { + Component focusOwner = (((AWTEvent)e).isPosted) ? getFocusOwner() : e.getComponent(); + +- if (focusOwner != null && focusOwner.isShowing() && +- focusOwner.isFocusable() && focusOwner.isEnabled()) { ++ if (focusOwner != null && focusOwner.isShowing() && focusOwner.canBeFocusOwner()) { + if (!e.isConsumed()) { + Component comp = e.getComponent(); + if (comp != null && comp.isEnabled()) { +diff -r 58a2ba2767be -r a9b5b5d105a8 src/share/classes/java/awt/Window.java +--- openjdk.orig/jdk/src/share/classes/java/awt/Window.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/src/share/classes/java/awt/Window.java Tue Jun 17 13:37:28 2008 +0400 +@@ -3145,9 +3145,7 @@ + Component previousComp = temporaryLostComponent; + // Check that "component" is an acceptable focus owner and don't store it otherwise + // - or later we will have problems with opposite while handling WINDOW_GAINED_FOCUS +- if (component == null +- || (component.isDisplayable() && component.isVisible() && component.isEnabled() && component.isFocusable())) +- { ++ if (component == null || component.canBeFocusOwner()) { + temporaryLostComponent = component; + } else { + temporaryLostComponent = null; +diff -r 58a2ba2767be -r a9b5b5d105a8 test/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java Tue Jun 17 13:37:28 2008 +0400 +@@ -0,0 +1,109 @@ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code 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 ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/* ++ @test ++ @bug 4685768 ++ @summary Tests that auto-transfering focus doesn't stuck on a disabled component. ++ @author Anton Tarasov: area=awt.focus ++ @library ../../regtesthelpers ++ @build Util ++ @run main NoAutotransferToDisabledCompTest ++*/ ++ ++import java.awt.Robot; ++import javax.swing.*; ++import java.awt.*; ++import java.awt.event.*; ++import java.applet.Applet; ++import test.java.awt.regtesthelpers.Util; ++ ++public class NoAutotransferToDisabledCompTest extends Applet { ++ Robot robot; ++ JFrame frame = new JFrame("Frame"); ++ JButton b0 = new JButton("b0"); ++ JButton b1 = new JButton("b1"); ++ JButton b2 = new JButton("b2"); ++ ++ public static void main(String[] args) { ++ NoAutotransferToDisabledCompTest app = new NoAutotransferToDisabledCompTest(); ++ app.init(); ++ app.start(); ++ } ++ ++ public void init() { ++ robot = Util.createRobot(); ++ frame.add(b0); ++ frame.add(b1); ++ frame.add(b2); ++ frame.setLayout(new FlowLayout()); ++ frame.pack(); ++ ++ b1.addActionListener(new ActionListener() { ++ public void actionPerformed(ActionEvent e) { ++ b1.setEnabled(false); ++ b2.setEnabled(false); ++ } ++ }); ++ } ++ ++ public void start() { ++ Util.showWindowWait(frame); ++ ++ // Request focus on b1. ++ if (!Util.focusComponent(b1, 2000)) { ++ throw new TestErrorException("couldn't focus " + b1); ++ } ++ ++ // Activate b1. ++ robot.keyPress(KeyEvent.VK_SPACE); ++ robot.delay(50); ++ robot.keyRelease(KeyEvent.VK_SPACE); ++ Util.waitForIdle(robot); ++ ++ // Check that focus has been transfered to b0. ++ if (!b0.hasFocus()) { ++ throw new TestFailedException("focus wasn't auto-transfered properly!"); ++ } ++ System.out.println("Test passed."); ++ } ++} ++ ++/** ++ * Thrown when the behavior being verified is found wrong. ++ */ ++class TestFailedException extends RuntimeException { ++ TestFailedException(String msg) { ++ super("Test failed: " + msg); ++ } ++} ++ ++/** ++ * Thrown when an error not related to the behavior being verified is encountered. ++ */ ++class TestErrorException extends RuntimeException { ++ TestErrorException(String msg) { ++ super("Unexpected error: " + msg); ++ } ++} ++ +diff -r 58a2ba2767be -r a9b5b5d105a8 test/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java Tue Jun 17 13:37:28 2008 +0400 +@@ -0,0 +1,97 @@ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code 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 ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/* ++ @test ++ @bug 4685768 ++ @summary Tests that it's possible to manually request focus on a disabled component. ++ @author Anton Tarasov: area=awt.focus ++ @library ../../regtesthelpers ++ @build Util ++ @run main RequestFocusToDisabledCompTest ++*/ ++ ++import java.awt.Robot; ++import javax.swing.*; ++import java.awt.*; ++import java.awt.event.*; ++import java.applet.Applet; ++import test.java.awt.regtesthelpers.Util; ++ ++public class RequestFocusToDisabledCompTest extends Applet { ++ Robot robot; ++ JFrame frame = new JFrame("Frame"); ++ JButton b0 = new JButton("b0"); ++ JButton b1 = new JButton("b1"); ++ ++ public static void main(String[] args) { ++ RequestFocusToDisabledCompTest app = new RequestFocusToDisabledCompTest(); ++ app.init(); ++ app.start(); ++ } ++ ++ public void init() { ++ robot = Util.createRobot(); ++ frame.add(b0); ++ frame.add(b1); ++ frame.setLayout(new FlowLayout()); ++ frame.pack(); ++ ++ b1.setEnabled(false); ++ } ++ ++ public void start() { ++ Util.showWindowWait(frame); ++ ++ if (!b0.hasFocus()) { ++ // Request focus on b0. ++ if (!Util.focusComponent(b0, 2000)) { ++ throw new TestErrorException("couldn't focus " + b0); ++ } ++ } ++ ++ // Try to request focus on b1. ++ if (!Util.focusComponent(b1, 2000)) { ++ throw new TestFailedException("focus wasn't requested on disabled " + b1); ++ } ++ System.out.println("Test passed."); ++ } ++} ++ ++/** ++ * Thrown when the behavior being verified is found wrong. ++ */ ++class TestFailedException extends RuntimeException { ++ TestFailedException(String msg) { ++ super("Test failed: " + msg); ++ } ++} ++ ++/** ++ * Thrown when an error not related to the behavior being verified is encountered. ++ */ ++class TestErrorException extends RuntimeException { ++ TestErrorException(String msg) { ++ super("Unexpected error: " + msg); ++ } ++} +diff -r 58a2ba2767be -r a9b5b5d105a8 test/java/awt/regtesthelpers/Util.java +--- openjdk.orig/jdk/test/java/awt/regtesthelpers/Util.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/test/java/awt/regtesthelpers/Util.java Tue Jun 17 13:37:28 2008 +0400 +@@ -124,6 +124,14 @@ + } + + /** ++ * Makes the window visible and waits until it's shown. ++ */ ++ public static void showWindowWait(Window win) { ++ win.setVisible(true); ++ waitTillShown(win); ++ } ++ ++ /** + * Moves mouse pointer in the center of given {@code comp} component + * using {@code robot} parameter. + */ +@@ -574,4 +582,22 @@ + public static boolean trackActionPerformed(Button button, Runnable action, int time, boolean printEvent) { + return trackEvent(ActionEvent.ACTION_PERFORMED, button, action, time, printEvent); + } ++ ++ /* ++ * Requests focus on the component provided and waits for the result. ++ * @return true if the component has been focused, false otherwise. ++ */ ++ public static boolean focusComponent(Component comp, int time) { ++ return focusComponent(comp, time, false); ++ } ++ public static boolean focusComponent(final Component comp, int time, boolean printEvent) { ++ return trackFocusGained(comp, ++ new Runnable() { ++ public void run() { ++ comp.requestFocus(); ++ } ++ }, ++ time, printEvent); ++ ++ } + } +exporting patch: + From dlila at icedtea.classpath.org Fri May 20 05:57:07 2011 From: dlila at icedtea.classpath.org (dlila at icedtea.classpath.org) Date: Fri, 20 May 2011 12:57:07 +0000 Subject: /hg/release/icedtea6-1.10: No focus to disabled components. Message-ID: changeset d7b761a77f0d in /hg/release/icedtea6-1.10 details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=d7b761a77f0d author: Denis Lila date: Fri May 20 08:56:33 2011 -0400 No focus to disabled components. diffstat: ChangeLog | 7 + Makefile.am | 1 + NEWS | 1 + patches/openjdk/4685768-focus.patch | 390 ++++++++++++++++++++++++++++++++++++ 4 files changed, 399 insertions(+), 0 deletions(-) diffs (438 lines): diff -r 711c59eac969 -r d7b761a77f0d ChangeLog --- a/ChangeLog Wed May 18 09:06:00 2011 -0400 +++ b/ChangeLog Fri May 20 08:56:33 2011 -0400 @@ -1,3 +1,10 @@ +2011-05-19 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/4685768-focus.patchpatch: The restore focus + procedure now skips disabled components. + 2011-05-17 Denis Lila * Makefile.am: Apply patch. diff -r 711c59eac969 -r d7b761a77f0d Makefile.am --- a/Makefile.am Wed May 18 09:06:00 2011 -0400 +++ b/Makefile.am Fri May 20 08:56:33 2011 -0400 @@ -200,6 +200,7 @@ patches/openjdk/6637796-set_bounds.patch \ patches/openjdk/6607660-treelock.patch \ patches/openjdk/6607170-request_focus.patch \ + patches/openjdk/4685768-focus.patch \ patches/openjdk/6616323-component_array.patch \ patches/openjdk/6682046-shape_calculation.patch \ patches/openjdk/6797195-hw_lw_mixing.patch \ diff -r 711c59eac969 -r d7b761a77f0d NEWS --- a/NEWS Wed May 18 09:06:00 2011 -0400 +++ b/NEWS Fri May 20 08:56:33 2011 -0400 @@ -25,6 +25,7 @@ - Add missing privileged block around access to the sun.awt.nativedebug property. - S7032388, PR682: Make HotSpot work on machines without cmov instruction again - S7031385, PR680: Incorrect register allocation in orderAccess_linux_x86.inline.hpp + - S4685768: Focus set to disabled component, can't Tab/Shift-Tab * Fixes - G356743: Support libpng 1.5. * CACAO diff -r 711c59eac969 -r d7b761a77f0d patches/openjdk/4685768-focus.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/4685768-focus.patch Fri May 20 08:56:33 2011 -0400 @@ -0,0 +1,398 @@ +# HG changeset patch +# User ant +# Date 1213695448 -14400 +# Node ID a9b5b5d105a8e613fe8ebacba01fa010ff087d3e +# Parent 58a2ba2767bef1b7ca6d994d94c0812216b4f5ad +4685768: A11y issue - Focus set to disabled component, can't Tab/Shift-Tab +Summary: The restore-focus procedure should skip disabled components. +Reviewed-by: art, dcherepanov + +diff -r 58a2ba2767be -r a9b5b5d105a8 src/share/classes/java/awt/Component.java +--- openjdk.orig/jdk/src/share/classes/java/awt/Component.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/src/share/classes/java/awt/Component.java Tue Jun 17 13:37:28 2008 +0400 +@@ -7488,9 +7488,7 @@ + Container rootAncestor = getTraversalRoot(); + Component comp = this; + while (rootAncestor != null && +- !(rootAncestor.isShowing() && +- rootAncestor.isFocusable() && +- rootAncestor.isEnabled())) ++ !(rootAncestor.isShowing() && rootAncestor.canBeFocusOwner())) + { + comp = rootAncestor; + rootAncestor = comp.getFocusCycleRootAncestor(); +@@ -7539,9 +7537,7 @@ + Container rootAncestor = getTraversalRoot(); + Component comp = this; + while (rootAncestor != null && +- !(rootAncestor.isShowing() && +- rootAncestor.isFocusable() && +- rootAncestor.isEnabled())) ++ !(rootAncestor.isShowing() && rootAncestor.canBeFocusOwner())) + { + comp = rootAncestor; + rootAncestor = comp.getFocusCycleRootAncestor(); +@@ -8518,6 +8514,14 @@ + setComponentOrientation(orientation); + } + ++ final boolean canBeFocusOwner() { ++ // It is enabled, visible, focusable. ++ if (isEnabled() && isDisplayable() && isVisible() && isFocusable()) { ++ return true; ++ } ++ return false; ++ } ++ + /** + * Checks that this component meets the prerequesites to be focus owner: + * - it is enabled, visible, focusable +@@ -8527,9 +8531,9 @@ + * this component as focus owner + * @since 1.5 + */ +- final boolean canBeFocusOwner() { ++ final boolean canBeFocusOwnerRecursively() { + // - it is enabled, visible, focusable +- if (!(isEnabled() && isDisplayable() && isVisible() && isFocusable())) { ++ if (!canBeFocusOwner()) { + return false; + } + +diff -r 58a2ba2767be -r a9b5b5d105a8 src/share/classes/java/awt/Container.java +--- openjdk.orig/jdk/src/share/classes/java/awt/Container.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/src/share/classes/java/awt/Container.java Tue Jun 17 13:37:28 2008 +0400 +@@ -860,11 +860,11 @@ + + // If component is focus owner or parent container of focus owner check that after reparenting + // focus owner moved out if new container prohibit this kind of focus owner. +- if (comp.isFocusOwner() && !comp.canBeFocusOwner()) { ++ if (comp.isFocusOwner() && !comp.canBeFocusOwnerRecursively()) { + comp.transferFocus(); + } else if (comp instanceof Container) { + Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner(); +- if (focusOwner != null && isParentOf(focusOwner) && !focusOwner.canBeFocusOwner()) { ++ if (focusOwner != null && isParentOf(focusOwner) && !focusOwner.canBeFocusOwnerRecursively()) { + focusOwner.transferFocus(); + } + } +diff -r 58a2ba2767be -r a9b5b5d105a8 src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java +--- openjdk.orig/jdk/src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java Tue Jun 17 13:37:28 2008 +0400 +@@ -556,8 +556,7 @@ + * enabled, and focusable; false otherwise + */ + protected boolean accept(Component aComponent) { +- if (!(aComponent.isVisible() && aComponent.isDisplayable() && +- aComponent.isFocusable() && aComponent.isEnabled())) { ++ if (!aComponent.canBeFocusOwner()) { + return false; + } + +diff -r 58a2ba2767be -r a9b5b5d105a8 src/share/classes/java/awt/DefaultKeyboardFocusManager.java +--- openjdk.orig/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/src/share/classes/java/awt/DefaultKeyboardFocusManager.java Tue Jun 17 13:37:28 2008 +0400 +@@ -154,7 +154,7 @@ + private boolean doRestoreFocus(Component toFocus, Component vetoedComponent, + boolean clearOnFailure) + { +- if (toFocus != vetoedComponent && toFocus.isShowing() && toFocus.isFocusable() && ++ if (toFocus != vetoedComponent && toFocus.isShowing() && toFocus.canBeFocusOwner() && + toFocus.requestFocus(false, CausedFocusEvent.Cause.ROLLBACK)) + { + return true; +@@ -500,8 +500,11 @@ + } + } + +- if (!(newFocusOwner.isFocusable() && newFocusOwner.isEnabled() +- && newFocusOwner.isShowing())) ++ if (!(newFocusOwner.isFocusable() && newFocusOwner.isShowing() && ++ // Refuse focus on a disabled component if the focus event ++ // isn't of UNKNOWN reason (i.e. not a result of a direct request ++ // but traversal, activation or system generated). ++ (newFocusOwner.isEnabled() || cause.equals(CausedFocusEvent.Cause.UNKNOWN)))) + { + // we should not accept focus on such component, so reject it. + dequeueKeyEvents(-1, newFocusOwner); +@@ -742,8 +745,7 @@ + public boolean dispatchKeyEvent(KeyEvent e) { + Component focusOwner = (((AWTEvent)e).isPosted) ? getFocusOwner() : e.getComponent(); + +- if (focusOwner != null && focusOwner.isShowing() && +- focusOwner.isFocusable() && focusOwner.isEnabled()) { ++ if (focusOwner != null && focusOwner.isShowing() && focusOwner.canBeFocusOwner()) { + if (!e.isConsumed()) { + Component comp = e.getComponent(); + if (comp != null && comp.isEnabled()) { +diff -r 58a2ba2767be -r a9b5b5d105a8 src/share/classes/java/awt/Window.java +--- openjdk.orig/jdk/src/share/classes/java/awt/Window.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/src/share/classes/java/awt/Window.java Tue Jun 17 13:37:28 2008 +0400 +@@ -3145,9 +3145,7 @@ + Component previousComp = temporaryLostComponent; + // Check that "component" is an acceptable focus owner and don't store it otherwise + // - or later we will have problems with opposite while handling WINDOW_GAINED_FOCUS +- if (component == null +- || (component.isDisplayable() && component.isVisible() && component.isEnabled() && component.isFocusable())) +- { ++ if (component == null || component.canBeFocusOwner()) { + temporaryLostComponent = component; + } else { + temporaryLostComponent = null; +diff -r 58a2ba2767be -r a9b5b5d105a8 test/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java Tue Jun 17 13:37:28 2008 +0400 +@@ -0,0 +1,109 @@ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code 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 ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/* ++ @test ++ @bug 4685768 ++ @summary Tests that auto-transfering focus doesn't stuck on a disabled component. ++ @author Anton Tarasov: area=awt.focus ++ @library ../../regtesthelpers ++ @build Util ++ @run main NoAutotransferToDisabledCompTest ++*/ ++ ++import java.awt.Robot; ++import javax.swing.*; ++import java.awt.*; ++import java.awt.event.*; ++import java.applet.Applet; ++import test.java.awt.regtesthelpers.Util; ++ ++public class NoAutotransferToDisabledCompTest extends Applet { ++ Robot robot; ++ JFrame frame = new JFrame("Frame"); ++ JButton b0 = new JButton("b0"); ++ JButton b1 = new JButton("b1"); ++ JButton b2 = new JButton("b2"); ++ ++ public static void main(String[] args) { ++ NoAutotransferToDisabledCompTest app = new NoAutotransferToDisabledCompTest(); ++ app.init(); ++ app.start(); ++ } ++ ++ public void init() { ++ robot = Util.createRobot(); ++ frame.add(b0); ++ frame.add(b1); ++ frame.add(b2); ++ frame.setLayout(new FlowLayout()); ++ frame.pack(); ++ ++ b1.addActionListener(new ActionListener() { ++ public void actionPerformed(ActionEvent e) { ++ b1.setEnabled(false); ++ b2.setEnabled(false); ++ } ++ }); ++ } ++ ++ public void start() { ++ Util.showWindowWait(frame); ++ ++ // Request focus on b1. ++ if (!Util.focusComponent(b1, 2000)) { ++ throw new TestErrorException("couldn't focus " + b1); ++ } ++ ++ // Activate b1. ++ robot.keyPress(KeyEvent.VK_SPACE); ++ robot.delay(50); ++ robot.keyRelease(KeyEvent.VK_SPACE); ++ Util.waitForIdle(robot); ++ ++ // Check that focus has been transfered to b0. ++ if (!b0.hasFocus()) { ++ throw new TestFailedException("focus wasn't auto-transfered properly!"); ++ } ++ System.out.println("Test passed."); ++ } ++} ++ ++/** ++ * Thrown when the behavior being verified is found wrong. ++ */ ++class TestFailedException extends RuntimeException { ++ TestFailedException(String msg) { ++ super("Test failed: " + msg); ++ } ++} ++ ++/** ++ * Thrown when an error not related to the behavior being verified is encountered. ++ */ ++class TestErrorException extends RuntimeException { ++ TestErrorException(String msg) { ++ super("Unexpected error: " + msg); ++ } ++} ++ +diff -r 58a2ba2767be -r a9b5b5d105a8 test/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java Tue Jun 17 13:37:28 2008 +0400 +@@ -0,0 +1,97 @@ ++/* ++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code 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 ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++ * CA 95054 USA or visit www.sun.com if you need additional information or ++ * have any questions. ++ */ ++ ++/* ++ @test ++ @bug 4685768 ++ @summary Tests that it's possible to manually request focus on a disabled component. ++ @author Anton Tarasov: area=awt.focus ++ @library ../../regtesthelpers ++ @build Util ++ @run main RequestFocusToDisabledCompTest ++*/ ++ ++import java.awt.Robot; ++import javax.swing.*; ++import java.awt.*; ++import java.awt.event.*; ++import java.applet.Applet; ++import test.java.awt.regtesthelpers.Util; ++ ++public class RequestFocusToDisabledCompTest extends Applet { ++ Robot robot; ++ JFrame frame = new JFrame("Frame"); ++ JButton b0 = new JButton("b0"); ++ JButton b1 = new JButton("b1"); ++ ++ public static void main(String[] args) { ++ RequestFocusToDisabledCompTest app = new RequestFocusToDisabledCompTest(); ++ app.init(); ++ app.start(); ++ } ++ ++ public void init() { ++ robot = Util.createRobot(); ++ frame.add(b0); ++ frame.add(b1); ++ frame.setLayout(new FlowLayout()); ++ frame.pack(); ++ ++ b1.setEnabled(false); ++ } ++ ++ public void start() { ++ Util.showWindowWait(frame); ++ ++ if (!b0.hasFocus()) { ++ // Request focus on b0. ++ if (!Util.focusComponent(b0, 2000)) { ++ throw new TestErrorException("couldn't focus " + b0); ++ } ++ } ++ ++ // Try to request focus on b1. ++ if (!Util.focusComponent(b1, 2000)) { ++ throw new TestFailedException("focus wasn't requested on disabled " + b1); ++ } ++ System.out.println("Test passed."); ++ } ++} ++ ++/** ++ * Thrown when the behavior being verified is found wrong. ++ */ ++class TestFailedException extends RuntimeException { ++ TestFailedException(String msg) { ++ super("Test failed: " + msg); ++ } ++} ++ ++/** ++ * Thrown when an error not related to the behavior being verified is encountered. ++ */ ++class TestErrorException extends RuntimeException { ++ TestErrorException(String msg) { ++ super("Unexpected error: " + msg); ++ } ++} +diff -r 58a2ba2767be -r a9b5b5d105a8 test/java/awt/regtesthelpers/Util.java +--- openjdk.orig/jdk/test/java/awt/regtesthelpers/Util.java Wed Jun 11 01:31:42 2008 -0700 ++++ openjdk/jdk/test/java/awt/regtesthelpers/Util.java Tue Jun 17 13:37:28 2008 +0400 +@@ -124,6 +124,14 @@ + } + + /** ++ * Makes the window visible and waits until it's shown. ++ */ ++ public static void showWindowWait(Window win) { ++ win.setVisible(true); ++ waitTillShown(win); ++ } ++ ++ /** + * Moves mouse pointer in the center of given {@code comp} component + * using {@code robot} parameter. + */ +@@ -574,4 +582,22 @@ + public static boolean trackActionPerformed(Button button, Runnable action, int time, boolean printEvent) { + return trackEvent(ActionEvent.ACTION_PERFORMED, button, action, time, printEvent); + } ++ ++ /* ++ * Requests focus on the component provided and waits for the result. ++ * @return true if the component has been focused, false otherwise. ++ */ ++ public static boolean focusComponent(Component comp, int time) { ++ return focusComponent(comp, time, false); ++ } ++ public static boolean focusComponent(final Component comp, int time, boolean printEvent) { ++ return trackFocusGained(comp, ++ new Runnable() { ++ public void run() { ++ comp.requestFocus(); ++ } ++ }, ++ time, printEvent); ++ ++ } + } +exporting patch: + From ahughes at redhat.com Fri May 20 06:28:26 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 20 May 2011 14:28:26 +0100 Subject: Questionable regression test LocaleEnhanceTest in IcedTea7 In-Reply-To: <4DD62B54.1030109@redhat.com> References: <4DD270F9.6000305@redhat.com> <20110517140907.GZ31710@rivendell.middle-earth.co.uk> <4DD28BDA.8070207@redhat.com> <20110519184041.GM31710@rivendell.middle-earth.co.uk> <4DD62B54.1030109@redhat.com> Message-ID: <20110520132826.GE29959@rivendell.middle-earth.co.uk> On 10:50 Fri 20 May , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > > There is a standard Oracle GPLv2+Classpath exception license above it > > so I'm not sure what's going on here. We need someone from Oracle to > > clarify this. > > Hi Andrew, > thank you for your clarification. > > > > > In the meantime, doesn't jtreg have an 'ignore' facility so we can > > set the dependent test as to be ignored with an appropriate reason? > > Then we can just turn it back on if this class is allowed back in. > > I've added this test to a exclude list with an explanation why this test > is "blacklisted". hg diff with the proposed change for IcedTea7 is > stored in an attachment and here is ChangeLog entry: > > 2011-05-20 Pavel Tisnovsky > > * test/jtreg/excludelist.jdk.jtx: > Added LocaleEnhanceTest to a JTreg exclude list, > because the test base class can not be used > in IcedTea due to questionable licence. > > Do you think it is ok to push this change to IcedTea7? > > Thank you in advance, > Pavel Yes, this looks fine. Thanks. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Fri May 20 07:00:43 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 20 May 2011 15:00:43 +0100 Subject: Mutter awt fix. In-Reply-To: <4DD282F1.60909@redhat.com> References: <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <4DD137BB.7070409@redhat.com> <20110517004158.GW31710@rivendell.middle-earth.co.uk> <4DD24264.3030109@redhat.com> <20110517140408.GX31710@rivendell.middle-earth.co.uk> <4DD282F1.60909@redhat.com> Message-ID: <20110520140043.GJ29959@rivendell.middle-earth.co.uk> On 15:15 Tue 17 May , Andrew Haley wrote: > On 05/17/2011 03:04 PM, Dr Andrew John Hughes wrote: > > On 10:39 Tue 17 May , Andrew Haley wrote: > >> On 17/05/11 01:41, Dr Andrew John Hughes wrote: > >>> On 16:42 Mon 16 May , Pavel Tisnovsky wrote: > >>>> > >>>> AFAIK you still did not received the rights to push this change to > >>>> OpenJDK right (because the repos is in frozen state)? Or do you have bug > >>>> ID for this fix at least? > >>>> > >>> > >>> Denis' patch was reviewed and accepted. It hasn't been pushed because > >>> Oracle seem to have decided to make up some new rules, limiting pushes > >>> to the repositories without any prior notice. > >> > >> This is presumably the OpenJDK 7 schedule, which was posted some time ago. > >> Only higher-priority bug fixes are allowed. > >> > >> http://openjdk.java.net/projects/jdk7/ > > > > And what it doesn't say is how 'higher-priority bug fixes' are > > determined. We've only ever been submitting bug fixes for the most > > part, so I would have assumed that we could go on doing so for some > > time. However, the reality seems to be that we now can't submit > > anything for the next three months to OpenJDK7, but Oracle can. > > I don't see how that follows. > It's just an observation, based on current activity. Oracle are still committing stuff, yet our patches are being refused. > > I wouldn't be happy releasing IcedTea7 to our users with known > > issues, so we will continue making the changes we need, but locally. > > That depends on the severity of the bug, surely. Sometimes you have > to make the judgement call that something will not be fixed because it > would potentially invalidate the test cycle and might break something > else. This is all perfectly normal: there has to be a freeze window. > I don't have a problem with a freeze; we have them with IcedTea. But this only seems to be a freeze on external contributions, and not one that has been discussed, but imposed. > Andrew. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ahughes at redhat.com Fri May 20 07:01:48 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 20 May 2011 15:01:48 +0100 Subject: Reviewer needed - fix for hotspot regression test Test6929067 in IcedTea7 In-Reply-To: <4DD14647.8050406@redhat.com> References: <4DD14647.8050406@redhat.com> Message-ID: <20110520140148.GK29959@rivendell.middle-earth.co.uk> On 17:44 Mon 16 May , Pavel Tisnovsky wrote: > Hi all, > > I'd like to synchronize (and fix at the same moment :-) regression test > Test6929067 in IcedTea7. The changes are the same as I've made in IcedTea6. > > hg diff for IcedTea7-forest is stored in attachment (i.e. its not > regular patch as it is in IcedTea6 case) > > Can anybody please review that change? > > Thank you in advance, > Pavel Fine. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From asu at redhat.com Fri May 20 07:07:54 2011 From: asu at redhat.com (Andrew Su) Date: Fri, 20 May 2011 10:07:54 -0400 (EDT) Subject: [RFC][Icedtea-Web]: Fix for bug 726 In-Reply-To: <64327440.196063.1305900249670.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <1567875295.196174.1305900474225.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Hello, This patch fixes an issue with recently used not existing in ~/.icedtea/cache since on jvm shutdown we try to store an updated cache order even though we don't have this file. This needs to be put in both HEAD and 1.1 of icedtea-web. ChangeLog: 2011-05-20 Andrew Su * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: (CacheLRUWrapper): New constructor to create file. (lock): Removed creation of file here. Ok to push? Cheers, Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: b726fix.patch Type: text/x-patch Size: 1440 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110520/fba2c3ce/b726fix.patch From aph at redhat.com Fri May 20 07:11:33 2011 From: aph at redhat.com (Andrew Haley) Date: Fri, 20 May 2011 15:11:33 +0100 Subject: Mutter awt fix. In-Reply-To: <20110520140043.GJ29959@rivendell.middle-earth.co.uk> References: <798463808.221214.1305555025392.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com> <4DD137BB.7070409@redhat.com> <20110517004158.GW31710@rivendell.middle-earth.co.uk> <4DD24264.3030109@redhat.com> <20110517140408.GX31710@rivendell.middle-earth.co.uk> <4DD282F1.60909@redhat.com> <20110520140043.GJ29959@rivendell.middle-earth.co.uk> Message-ID: <4DD67695.5040400@redhat.com> On 05/20/2011 03:00 PM, Dr Andrew John Hughes wrote: > On 15:15 Tue 17 May , Andrew Haley wrote: >> On 05/17/2011 03:04 PM, Dr Andrew John Hughes wrote: >>> On 10:39 Tue 17 May , Andrew Haley wrote: >>>> On 17/05/11 01:41, Dr Andrew John Hughes wrote: >>>>> On 16:42 Mon 16 May , Pavel Tisnovsky wrote: >>>>>> >>>>>> AFAIK you still did not received the rights to push this change to >>>>>> OpenJDK right (because the repos is in frozen state)? Or do you have bug >>>>>> ID for this fix at least? >>>>>> >>>>> >>>>> Denis' patch was reviewed and accepted. It hasn't been pushed because >>>>> Oracle seem to have decided to make up some new rules, limiting pushes >>>>> to the repositories without any prior notice. >>>> >>>> This is presumably the OpenJDK 7 schedule, which was posted some time ago. >>>> Only higher-priority bug fixes are allowed. >>>> >>>> http://openjdk.java.net/projects/jdk7/ >>> >>> And what it doesn't say is how 'higher-priority bug fixes' are >>> determined. We've only ever been submitting bug fixes for the most >>> part, so I would have assumed that we could go on doing so for some >>> time. However, the reality seems to be that we now can't submit >>> anything for the next three months to OpenJDK7, but Oracle can. >> >> I don't see how that follows. > > It's just an observation, based on current activity. Oracle are still > committing stuff, yet our patches are being refused. There seems to be a lack of transparency, certainly. I'm trying to find out exactly what is going on. >>> I wouldn't be happy releasing IcedTea7 to our users with known >>> issues, so we will continue making the changes we need, but locally. >> >> That depends on the severity of the bug, surely. Sometimes you have >> to make the judgement call that something will not be fixed because it >> would potentially invalidate the test cycle and might break something >> else. This is all perfectly normal: there has to be a freeze window. > > I don't have a problem with a freeze; we have them with IcedTea. But > this only seems to be a freeze on external contributions, and not one > that has been discussed, but imposed. I don't think that it is a freeze on external contributions only. AFAIAA, the freeze only allows show-stopping bugs to be fixed. With regard to the schedule, it was announced a long time ago, and from what I remember the comments were along the lines of "bring it on." I think the real situation is probably better than it appears. Andrew. From ahughes at redhat.com Fri May 20 08:20:44 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 20 May 2011 16:20:44 +0100 Subject: Reviewer needed: fix for regression test test/com/sun/org/apache/xml/internal/ws/server/Test.java In-Reply-To: <4DD6346D.9030903@redhat.com> References: <4DD6346D.9030903@redhat.com> Message-ID: <20110520152044.GM29959@rivendell.middle-earth.co.uk> On 11:29 Fri 20 May , Pavel Tisnovsky wrote: > Hi all, > > I'd like to push fix for patch using to create regression test > /test/com/sun/org/apache/xml/internal/ws/server/Test.java to IcedTea7. > > The existing patch "patches/security/6592792.patch" creates only one > part of this test, but it does not contain shell script used to run the > test itself. hg diff containing fixed patch is stored in an attachment. > > Here's ChangeLog entry: > > 2011-05-20 Pavel Tisnovsky > > * patches/security/6592792.patch: > Added missing script used to start this regression test. > > > Can anybody review it please? > > Thank you in advance, > Pavel I think you attached the wrong patch. I'm not sure how viable that patch even is, but it's hard to find anyone to ask about old security patches. > # HG changeset patch > # User ptisnovs > # Date 1305881214 -7200 > # Node ID e7c2a6393dac8ccab64e834e0befdd859026cea0 > # Parent 1af45d3c1f92c24aa74ad62efa229bef60617869 > Added LocaleEnhanceTest to regression test exclude list. > > diff -r 1af45d3c1f92 -r e7c2a6393dac test/jtreg/excludelist.jdk.jtx > --- a/test/jtreg/excludelist.jdk.jtx Fri May 20 03:23:45 2011 +0100 > +++ b/test/jtreg/excludelist.jdk.jtx Fri May 20 10:46:54 2011 +0200 > @@ -197,3 +197,9 @@ > java/awt/FontClass/CreateFont/fileaccess/FontFile.java > java/awt/FontClass/CreateFont/DeleteFont.sh > java/awt/FontClass/CreateFont/bigfont.html > + > +# This test cannot be compiled because it's base class > +# LocaleTestFmwk is deleted during the "liberation" phase > +# of build process (this class has questionable licence). > +java/util/Locale/LocaleEnhanceTest.java > + -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From ptisnovs at redhat.com Fri May 20 09:04:17 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 20 May 2011 18:04:17 +0200 Subject: Reviewer needed: fix for regression test test/com/sun/org/apache/xml/internal/ws/server/Test.java In-Reply-To: <20110520152044.GM29959@rivendell.middle-earth.co.uk> References: <4DD6346D.9030903@redhat.com> <20110520152044.GM29959@rivendell.middle-earth.co.uk> Message-ID: <4DD69101.5090407@redhat.com> Dr Andrew John Hughes wrote: > On 11:29 Fri 20 May , Pavel Tisnovsky wrote: >> Hi all, >> >> I'd like to push fix for patch using to create regression test >> /test/com/sun/org/apache/xml/internal/ws/server/Test.java to IcedTea7. >> >> The existing patch "patches/security/6592792.patch" creates only one >> part of this test, but it does not contain shell script used to run the >> test itself. hg diff containing fixed patch is stored in an attachment. >> >> Here's ChangeLog entry: >> >> 2011-05-20 Pavel Tisnovsky >> >> * patches/security/6592792.patch: >> Added missing script used to start this regression test. >> >> >> Can anybody review it please? >> >> Thank you in advance, >> Pavel > > I think you attached the wrong patch. Hmm you are right, but anyway I realized that there are two patches named 6592792.patch. The first one is stored in patches/security/6592792.patch and is really applied (according to Makefile) and the second one is stored in patches/6592792.patch and is not applied. I'd rather to copy part of the second patch (only test script) to the first one and then IMHO the second patch could be erase. Any idea? Cheers, Pavel > > I'm not sure how viable that patch even is, but it's hard to find anyone > to ask about old security patches. > From bugzilla-daemon at icedtea.classpath.org Fri May 20 15:05:40 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 20 May 2011 22:05:40 +0000 Subject: [Bug 677] Dialogs are not modal even when set to APPLICATION_MODAL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=677 Denis Lila changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dlila at redhat.com --- Comment #2 from Denis Lila 2011-05-20 22:05:39 --- This is a regression in icedtea6. It was introduced by revision 6a5e37e3180b: Add 6985453 patch which was missing from first Oracle bundle. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Sat May 21 18:42:38 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 22 May 2011 01:42:38 +0000 Subject: [Bug 728] New: GTKLookAndFeel does not honor gtk-alternative-button-order Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=728 Summary: GTKLookAndFeel does not honor gtk-alternative-button- order Product: IcedTea Version: unspecified Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: kevin.kofler at chello.at The com.sun.java.swing.plaf.gtk.GTKLookAndFeel unconditionally sets the OptionPane.isYesLast component property to true. It should check GTK's gtk-alternative-button-order property before doing that. OptionPane.isYesLast should be the opposite of gtk-alternative-button-order, i.e.: * if gtk-alternative-button-order is 0 (the default), OptionPane.isYesLast should be true, * if gtk-alternative-button-order is 1 (as set e.g. by kdebase-workspace in KDE Plasma sessions), OptionPane.isYesLast should be false. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Sat May 21 19:09:42 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 22 May 2011 02:09:42 +0000 Subject: [Bug 729] New: GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=729 Summary: GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops Product: IcedTea Version: unspecified Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: kevin.kofler at chello.at Depends on: 728 javax.swing.UIManager.getSystemLookAndFeel() returns the Metal look&feel on non-GNOME desktops. However, of the other modern desktops: * Xfce and LXDE are GTK+-based, so the system look&feel on those desktops should definitely be the GTK+ look&feel! * KDE Plasma provides the Oxygen-GTK theme which makes the GTK+ look&feel (and other GTK+ applications) integrate well into KDE Plasma. (However, bug #728 needs to be addressed! Otherwise, the button order will be wrong for KDE Plasma.) So this is the closest you'll get to the native KDE look&feel in the absence of a Qt look&feel implementation, and IMHO it fits the definition of "system look&feel". I tested the GTKLookAndFeel with oxygen-gtk and it basically works, only tabs get rendered badly (which should probably be the subject of another bug report, but I need to figure out if it's Swing's or Oxygen-GTK's fault). So I suggest to drop the check for GNOME in the implementation of getSystemLookAndFeel. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Sat May 21 19:09:42 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 22 May 2011 02:09:42 +0000 Subject: [Bug 728] GTKLookAndFeel does not honor gtk-alternative-button-order In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=728 Kevin Kofler changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |729 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Sat May 21 19:47:30 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 22 May 2011 02:47:30 +0000 Subject: [Bug 729] GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=729 --- Comment #1 from Kevin Kofler 2011-05-22 02:47:30 --- FYI, I filed these against Oxygen-GTK for the tab rendering glitches: https://bugs.kde.org/show_bug.cgi?id=273828 https://bugs.kde.org/show_bug.cgi?id=273829 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ptisnovs at icedtea.classpath.org Mon May 23 02:26:13 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 23 May 2011 09:26:13 +0000 Subject: /hg/icedtea: Added LocaleEnhanceTest to a JTreg exclude list. Message-ID: changeset 654b84d3de8c in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=654b84d3de8c author: ptisnovs date: Mon May 23 11:30:50 2011 +0200 Added LocaleEnhanceTest to a JTreg exclude list. diffstat: ChangeLog | 7 +++++++ test/jtreg/excludelist.jdk.jtx | 6 ++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diffs (27 lines): diff -r 1af45d3c1f92 -r 654b84d3de8c ChangeLog --- a/ChangeLog Fri May 20 03:23:45 2011 +0100 +++ b/ChangeLog Mon May 23 11:30:50 2011 +0200 @@ -1,3 +1,10 @@ +2011-05-23 Pavel Tisnovsky + + * test/jtreg/excludelist.jdk.jtx: + Added LocaleEnhanceTest to a JTreg exclude list, + because the test base class can not be used + in IcedTea due to questionable licence. + 2011-05-20 Andrew John Hughes * acinclude.m4: diff -r 1af45d3c1f92 -r 654b84d3de8c test/jtreg/excludelist.jdk.jtx --- a/test/jtreg/excludelist.jdk.jtx Fri May 20 03:23:45 2011 +0100 +++ b/test/jtreg/excludelist.jdk.jtx Mon May 23 11:30:50 2011 +0200 @@ -197,3 +197,9 @@ java/awt/FontClass/CreateFont/fileaccess/FontFile.java java/awt/FontClass/CreateFont/DeleteFont.sh java/awt/FontClass/CreateFont/bigfont.html + +# This test cannot be compiled because it's base class +# LocaleTestFmwk is deleted during the "liberation" phase +# of build process (this class has questionable licence). +java/util/Locale/LocaleEnhanceTest.java + From ptisnovs at redhat.com Mon May 23 05:55:50 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 23 May 2011 14:55:50 +0200 Subject: IcedTea7 build failure Message-ID: <4DDA5956.4090404@redhat.com> IcedTea7 build failure: Platform: x86_64 OS: RHEL 5 Configure options: --disable-bootstrap --with-parallel-jobs=4 --disable-system-lcms JVM installed: java version "1.6.0_20" OpenJDK Runtime Environment (IcedTea6 1.9.7) (rhel-1.22.1.9.7.el5-x86_64) OpenJDK 64-Bit Server VM (build 19.0-b09, mixed mode) Config: config.log.gz (attachment) Output: icedtea7-build-2011-05-23.log.gz (attachment) -------------- next part -------------- A non-text attachment was scrubbed... Name: config.log.gz Type: application/x-gzip Size: 10659 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110523/8a487772/config.log.gz -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea7-build-2011-05-23.log.gz Type: application/x-gzip Size: 33361 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110523/8a487772/icedtea7-build-2011-05-23.log.gz From andrew at icedtea.classpath.org Mon May 23 07:53:02 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 23 May 2011 14:53:02 +0000 Subject: /hg/icedtea: 3 new changesets Message-ID: changeset 68119ec8f861 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=68119ec8f861 author: Andrew John Hughes date: Mon May 23 14:08:37 2011 +0100 Revert to copying not linking the HotSpot directory. 2011-05-22 Andrew John Hughes * Makefile.am: (replace-hotspot): Revert to copying not linking; breaks the build in strange ways. changeset c644df7984ad in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c644df7984ad author: Andrew John Hughes date: Mon May 23 15:48:03 2011 +0100 Make sure IT_LOCATE_NSS macro is called and include --enable-nss logic it depends on. 2011-05-23 Andrew John Hughes * acinclude.m4: (IT_LOCATE_NSS): Add --enable-nss logic. * configure.ac: Move --enable-nss logic to IT_LOCATE_NSS macro. Call IT_LOCATE_NSS macro. changeset 3024025d7759 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3024025d7759 author: Andrew John Hughes date: Mon May 23 15:52:47 2011 +0100 Merge diffstat: ChangeLog | 21 +++++++++++++++++++++ Makefile.am | 5 +++-- acinclude.m4 | 13 +++++++++++++ configure.ac | 14 +------------- test/jtreg/excludelist.jdk.jtx | 6 ++++++ 5 files changed, 44 insertions(+), 15 deletions(-) diffs (110 lines): diff -r 1af45d3c1f92 -r 3024025d7759 ChangeLog --- a/ChangeLog Fri May 20 03:23:45 2011 +0100 +++ b/ChangeLog Mon May 23 15:52:47 2011 +0100 @@ -1,3 +1,24 @@ +2011-05-23 Andrew John Hughes + + * acinclude.m4: + (IT_LOCATE_NSS): Add --enable-nss logic. + * configure.ac: + Move --enable-nss logic to IT_LOCATE_NSS macro. + Call IT_LOCATE_NSS macro. + +2011-05-23 Pavel Tisnovsky + + * test/jtreg/excludelist.jdk.jtx: + Added LocaleEnhanceTest to a JTreg exclude list, + because the test base class can not be used + in IcedTea due to questionable licence. + +2011-05-22 Andrew John Hughes + + * Makefile.am: + (replace-hotspot): Revert to copying not + linking; breaks the build in strange ways. + 2011-05-20 Andrew John Hughes * acinclude.m4: diff -r 1af45d3c1f92 -r 3024025d7759 Makefile.am --- a/Makefile.am Fri May 20 03:23:45 2011 +0100 +++ b/Makefile.am Mon May 23 15:52:47 2011 +0100 @@ -1244,8 +1244,9 @@ fi ; \ if ! test -d openjdk/hotspot ; \ then \ - ln -s $(abs_top_builddir)/hotspot-$(HS_CHANGESET) \ - openjdk/hotspot ; \ + mv hotspot-$(HS_CHANGESET) openjdk/hotspot ; \ + else \ + rm -rf hotspot-$(HS_CHANGESET) ; \ fi ; \ fi ; \ fi diff -r 1af45d3c1f92 -r 3024025d7759 acinclude.m4 --- a/acinclude.m4 Fri May 20 03:23:45 2011 +0100 +++ b/acinclude.m4 Mon May 23 15:52:47 2011 +0100 @@ -1686,6 +1686,18 @@ AC_DEFUN_ONCE([IT_LOCATE_NSS], [ AC_REQUIRE([IT_OBTAIN_DEFAULT_LIBDIR]) +AC_MSG_CHECKING([whether to enable the NSS-based security provider]) +AC_ARG_ENABLE([nss], + [AS_HELP_STRING([--enable-nss], + [Enable inclusion of NSS security provider])], + [ENABLE_NSS="${enableval}"], [ENABLE_NSS='no']) +AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes]) +if test "x${ENABLE_NSS}" = "xyes" +then + AC_MSG_RESULT([enabled by default (edit java.security to disable)]) +else + AC_MSG_RESULT([disabled by default (edit java.security to enable)]) +fi PKG_CHECK_MODULES(NSS, nss, [NSS_FOUND=yes], [NSS_FOUND=no]) if test "x${NSS_FOUND}" = xno then @@ -1702,6 +1714,7 @@ AC_SUBST(NSS_LIBDIR) AC_CONFIG_FILES([nss.cfg]) ]) + AC_DEFUN([IT_DIAMOND_CHECK],[ AC_CACHE_CHECK([if javac lacks support for the diamond operator], it_cv_diamond, [ CLASS=Test.java diff -r 1af45d3c1f92 -r 3024025d7759 configure.ac --- a/configure.ac Fri May 20 03:23:45 2011 +0100 +++ b/configure.ac Mon May 23 15:52:47 2011 +0100 @@ -83,19 +83,7 @@ AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes]) AC_MSG_RESULT(${ENABLE_SYSTEMTAP}) -AC_MSG_CHECKING([whether to include the NSS-based security provider]) -AC_ARG_ENABLE([nss], - [AS_HELP_STRING([--enable-nss], - [Enable inclusion of NSS security provider])], - [ENABLE_NSS="${enableval}"], [ENABLE_NSS='no']) -AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes]) -if test "x${ENABLE_NSS}" = "xyes" -then - AC_MSG_RESULT([enabled by default (edit java.security to disable)]) -else - AC_MSG_RESULT([disabled by default (edit java.security to enable)]) -fi - +IT_LOCATE_NSS IT_GET_PKGVERSION IT_GET_LSB_DATA diff -r 1af45d3c1f92 -r 3024025d7759 test/jtreg/excludelist.jdk.jtx --- a/test/jtreg/excludelist.jdk.jtx Fri May 20 03:23:45 2011 +0100 +++ b/test/jtreg/excludelist.jdk.jtx Mon May 23 15:52:47 2011 +0100 @@ -197,3 +197,9 @@ java/awt/FontClass/CreateFont/fileaccess/FontFile.java java/awt/FontClass/CreateFont/DeleteFont.sh java/awt/FontClass/CreateFont/bigfont.html + +# This test cannot be compiled because it's base class +# LocaleTestFmwk is deleted during the "liberation" phase +# of build process (this class has questionable licence). +java/util/Locale/LocaleEnhanceTest.java + From bugzilla-daemon at icedtea.classpath.org Mon May 23 17:50:10 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 24 May 2011 00:50:10 +0000 Subject: [Bug 728] GTKLookAndFeel does not honor gtk-alternative-button-order In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=728 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org AssignedTo|unassigned at icedtea.classpath|gnu_andrew at member.fsf.org |.org | --- Comment #1 from Andrew John Hughes 2011-05-24 00:50:10 --- I'll look into this. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Mon May 23 17:50:31 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 24 May 2011 00:50:31 +0000 Subject: [Bug 729] GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=729 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org AssignedTo|unassigned at icedtea.classpath|gnu_andrew at member.fsf.org |.org | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From avg at icyb.net.ua Tue May 24 01:57:51 2011 From: avg at icyb.net.ua (Andriy Gapon) Date: Tue, 24 May 2011 11:57:51 +0300 Subject: firefox 4: problem with NPN_GetURL target=_self In-Reply-To: <4DD2255D.5090704@icyb.net.ua> References: <4DADADC8.7010404@icyb.net.ua> <4DADCF06.8080803@smedbergs.us> <4DADD105.30103@icyb.net.ua> <20110421153134.GC7494@redhat.com> <4DD026DD.8010205@icyb.net.ua> <20110516180328.GH29490@redhat.com> <4DD2255D.5090704@icyb.net.ua> Message-ID: <4DDB730F.1050802@icyb.net.ua> on 17/05/2011 10:35 Andriy Gapon said the following: > on 16/05/2011 21:03 Deepak Bhole said the following: >> Can you please try again with the patch here applied? >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/014200.html >> >> That patch adds full recursive call support for showDocument() calls, >> rather than relying on FF to not make such calls. It should therefore >> always work. Please let me know if there are any problems. > > Unfortunately it still doesn't help. > In my simple test http://people.freebsd.org/~avg/java_test/ I see "Attempting to > go to: http://www.google.ca" printed if I press the button, but the page never > changes. > > Please let me know if I should provide any additional debugging info. Besides, it seems that the patch breaks the plugin in other browsers... -- Andriy Gapon From bugzilla-daemon at icedtea.classpath.org Tue May 24 04:24:23 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 24 May 2011 11:24:23 +0000 Subject: [Bug 730] New: Calling URL with Firefox 4 / Chrome Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=730 Summary: Calling URL with Firefox 4 / Chrome Product: IcedTea Version: 6-1.8.7 Platform: 32-bit OS/Version: Linux Status: NEW Severity: critical Priority: P5 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mm at michaelamerz.com java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8.7) (fedora-50.1.8.7.fc13-i386) OpenJDK Server VM (build 14.0-b16, mixed mode) Java Source: [..] AppletContext a = jApplet.getAppletContext(); URL u = new URL(webSite); UtilsImpl.debugOut("Try to call [" + webSite + "]"); a.showDocument(u, "_self"); [..] With Firefox 3 (Works OK)------------------------------------- ITNPP Thread# -1216317728: PIPE: plugin read: instance 1 status Applet loaded. ITNPP Thread# -1216317728: plugin_in_pipe_callback: setting status Applet loaded. ITNPP Thread# -1216317728: plugin_in_pipe_callback return ITNPP Thread# -1216317728: plugin_in_pipe_callback ITNPP Thread# -1216317728: PIPE: plugin read: instance 1 url https://dfilex/%3faction=jt&msg=OK _self ITNPP Thread# -1216317728: GOT URL: https://dfilex/%3faction=jt&msg=OK -- ITNPP Thread# -1216317728: SENDING URL: https://dfilex/?action=jt&msg=OK ITNPP Thread# -1216317728: plugin_in_pipe_callback: opening URL https://dfilex/?action=jt&msg=OK ITNPP Thread# -1216317728: plugin_in_pipe_callback: URL target _self ITNPP Thread# -1216317728: plugin_in_pipe_callback return ITNPP Thread# -1216317728: plugin_in_pipe_callback ITNPP Thread# -1216317728: PIPE: plugin read: instance 1 status Applet initialized. ITNPP Thread# -1216317728: plugin_in_pipe_callback: setting status Applet initialized. ITNPP Thread# -1216317728: plugin_in_pipe_callback return ITNPP Thread# -1216317728: plugin_in_pipe_callback ITNPP Thread# -1216317728: PIPE: plugin read: instance 1 status Applet started. ITNPP Thread# -1216317728: plugin_in_pipe_callback: setting status Applet started. ITNPP Thread# -1216317728: plugin_in_pipe_callback return ITNPP Thread# -1216317728: plugin_in_pipe_callback ITNPP Thread# -1216317728: PIPE: plugin read: instance 1 reference 0 initialized ITNPP Thread# -1216317728: Trying to lock 0xa9990100... ITNPP Thread# -1216317728: Message instance 1 reference 0 initialized received on bus. Notifying subscribers. ITNPP Thread# -1216317728: Notifying subscriber 0xa9998e40 of instance 1 reference 0 initialized ITNPP Thread# -1216317728: PluginRequestProcessor processing instance 1 reference 0 initialized ITNPP Thread# -1216317728: PluginRequestProcessor::newMessageOnBus: { instance, 1, reference, 0, initialized } ITNPP Thread# -1216317728: Warning: No consumer found for message instance 1 reference 0 initialized ITNPP Thread# -1216317728: 0xa9990100 unlocked... ITNPP Thread# -1216317728: plugin_in_pipe_callback return ITNPP Thread# -1216317728: ITNP_Destroy 0xa9a2430c ITNPP Thread# -1216317728: plugin_data_destroy ITNPP Thread# -1216317728: plugin_data_destroy return ITNPP Thread# -1216317728: Returning id 0 for instance 0xa9a2430c ITNPP Thread# -1216317728: Invalidating instance 0xa9a2430c ITNPP Thread# -1216317728: ITNP_Destroy return ITNPP Thread# -1216317728: plugin_in_pipe_callback ITNPP Thread# -1216317728: PIPE: plugin read: instance 1 status Applet stopped. ITNPP Thread# -1216317728: Instance 1 is not active. Refusing to consume message "instance 1 status Applet stopped." ITNPP Thread# -1216317728: plugin_in_pipe_callback return ITNPP Thread# -1216317728: plugin_in_pipe_callback ITNPP Thread# -1216317728: PIPE: plugin read: instance 1 status Applet destroyed. ITNPP Thread# -1216317728: Instance 1 is not active. Refusing to consume message "instance 1 status Applet destroyed." ITNPP Thread# -1216317728: plugin_in_pipe_callback return ITNPP Thread# -1216317728: plugin_in_pipe_callback ITNPP Thread# -1216317728: PIPE: plugin read: instance 1 status Applet disposed. ITNPP Thread# -1216317728: Instance 1 is not active. Refusing to consume message "instance 1 status Applet disposed." ITNPP Thread# -1216317728: plugin_in_pipe_callback return With Firefox 4 (Hang / Doesn't work) ---------------------------------- ITNPP Thread# -1217562512: PIPE: plugin read: instance 1 status Applet loaded. ITNPP Thread# -1217562512: plugin_in_pipe_callback: setting status Applet loaded. ITNPP Thread# -1217562512: plugin_in_pipe_callback return ITNPP Thread# -1217562512: plugin_in_pipe_callback ITNPP Thread# -1217562512: PIPE: plugin read: instance 1 reference 0 initialized ITNPP Thread# -1217562512: Trying to lock 0xa0e5a280... ITNPP Thread# -1217562512: Message instance 1 reference 0 initialized received on bus. Notifying subscribers. ITNPP Thread# -1217562512: Notifying subscriber 0xa0e2b830 of instance 1 reference 0 initialized ITNPP Thread# -1217562512: PluginRequestProcessor processing instance 1 reference 0 initialized ITNPP Thread# -1217562512: PluginRequestProcessor::newMessageOnBus: { instance, 1, reference, 0, initialized } ITNPP Thread# -1217562512: Warning: No consumer found for message instance 1 reference 0 initialized ITNPP Thread# -1217562512: 0xa0e5a280 unlocked... ITNPP Thread# -1217562512: plugin_in_pipe_callback return ITNPP Thread# -1217562512: plugin_in_pipe_callback ITNPP Thread# -1217562512: PIPE: plugin read: instance 1 url https://dfilex/%3faction=jt&msg=OK _self ITNPP Thread# -1217562512: GOT URL: https://dfilex/%3faction=jt&msg=OK -- ITNPP Thread# -1217562512: SENDING URL: https://dfilex/?action=jt&msg=OK ITNPP Thread# -1217562512: plugin_in_pipe_callback: opening URL https://dfilex/?action=jt&msg=OK ITNPP Thread# -1217562512: plugin_in_pipe_callback: URL target _self ITNPP Thread# -1217562512: ITNP_GetValue ITNPP Thread# -1217562512: JavaRequestProcessor constructor ITNPP Thread# -1217562512: Returning id 1 for instance 0xa0e5a468 ITNPP Thread# -1217562512: Subscribing 0xbfb2f688 to bus 0xa0e5a280 ITNPP Thread# -1217562512: Trying to lock 0xa0e5a340... ITNPP Thread# -1217562512: Message instance 1 reference 1 GetJavaObject received on bus. Notifying subscribers. ITNPP Thread# -1217562512: Notifying subscriber 0xa3583b98 of instance 1 reference 1 GetJavaObject ITNPP Thread# -1217562512: plugin_send_message_to_appletviewer ITNPP Thread# -1217562512: PIPE: plugin wrote: instance 1 reference 1 GetJavaObject ITNPP Thread# -1217562512: plugin_send_message_to_appletviewer return ITNPP Thread# -1217562512: 0xa0e5a340 unlocked... ITNPP Thread# -1217562512: Error: Timed out when waiting for response to instance 1 reference 1 GetJavaObject ITNPP Thread# -1217562512: Un-subscribing 0xbfb2f688 from bus 0xa0e5a280 Error: Unable to fetch applet instance id from Java side. ITNPP Thread# -1217562512: JavaRequestProcessor::~JavaRequestProcessor ITNPP Thread# -1217562512: ITNP_GetValue return ITNPP Thread# -1217562512: plugin_in_pipe_callback return ITNPP Thread# -1217562512: plugin_in_pipe_callback ITNPP Thread# -1217562512: PIPE: plugin read: instance 1 status Applet initialized. ITNPP Thread# -1217562512: plugin_in_pipe_callback: setting status Applet initialized. ITNPP Thread# -1217562512: plugin_in_pipe_callback return ITNPP Thread# -1217562512: plugin_in_pipe_callback ITNPP Thread# -1217562512: PIPE: plugin read: context 0 reference 1 GetJavaObject 51 ITNPP Thread# -1217562512: Trying to lock 0xa0e5a280... ITNPP Thread# -1217562512: Message context 0 reference 1 GetJavaObject 51 received on bus. Notifying subscribers. ITNPP Thread# -1217562512: Notifying subscriber 0xa0e2b830 of context 0 reference 1 GetJavaObject 51 ITNPP Thread# -1217562512: PluginRequestProcessor processing context 0 reference 1 GetJavaObject 51 ITNPP Thread# -1217562512: PluginRequestProcessor::newMessageOnBus: { context, 0, reference, 1, GetJavaObject, 51 } ITNPP Thread# -1217562512: Warning: No consumer found for message context 0 reference 1 GetJavaObject 51 ITNPP Thread# -1217562512: 0xa0e5a280 unlocked... ITNPP Thread# -1217562512: plugin_in_pipe_callback return ITNPP Thread# -1217562512: plugin_in_pipe_callback ITNPP Thread# -1217562512: PIPE: plugin read: instance 1 status Applet started. ITNPP Thread# -1217562512: plugin_in_pipe_callback: setting status Applet started. ITNPP Thread# -1217562512: plugin_in_pipe_callback return ITNPP Thread# -1217562512: ITNP_Destroy 0xa0e5a468 ITNPP Thread# -1217562512: plugin_data_destroy ITNPP Thread# -1217562512: plugin_data_destroy return ITNPP Thread# -1217562512: Returning id 0 for instance 0xa0e5a468 ITNPP Thread# -1217562512: Invalidating instance 0xa0e5a468 ITNPP Thread# -1217562512: ITNP_Destroy return ITNPP Thread# -1217562512: plugin_in_pipe_callback ITNPP Thread# -1217562512: PIPE: plugin read: instance 1 status Applet stopped. ITNPP Thread# -1217562512: Instance 1 is not active. Refusing to consume message "instance 1 status Applet stopped." ITNPP Thread# -1217562512: plugin_in_pipe_callback return ITNPP Thread# -1217562512: plugin_in_pipe_callback ITNPP Thread# -1217562512: PIPE: plugin read: instance 1 status Applet destroyed. ITNPP Thread# -1217562512: Instance 1 is not active. Refusing to consume message "instance 1 status Applet destroyed." ITNPP Thread# -1217562512: plugin_in_pipe_callback return ITNPP Thread# -1217562512: plugin_in_pipe_callback ITNPP Thread# -1217562512: PIPE: plugin read: instance 1 status Applet disposed. ITNPP Thread# -1217562512: Instance 1 is not active. Refusing to consume message "instance 1 status Applet disposed." ITNPP Thread# -1217562512: plugin_in_pipe_callback return -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 24 04:30:15 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 24 May 2011 11:30:15 +0000 Subject: [Bug 730] Calling URL with Firefox 4 / Chrome In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=730 Michaela Merz changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mm at michaelamerz.com --- Comment #1 from Michaela Merz 2011-05-24 11:30:15 --- Expected: Browser will go to submitted URL. Experienced: Browser remains on old URL. The following link may be used to reproduce the error: http://download.oracle.com/javase/tutorial/deployment/applet/browser.html -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ptisnovs at redhat.com Tue May 24 05:00:43 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 24 May 2011 14:00:43 +0200 Subject: Reviewer needed - synchronization and fixing of regression test test/java/lang/annotation/package-info.java with OpenJDK7 Message-ID: <4DDB9DEB.6070300@redhat.com> Hi, I'd like to synchronize and at the same time fix regression test test/java/lang/annotation/package-info.java with OpenJDK7. hg diff generated against IcedTea7-forest is stored in an attachment. ChangeLog entry to IcedTea7 repo: 2011-05-24 Pavel Tisnovsky * Makefile.am: (HOTSPOT_CHANGESET): Synchronize regression test test/java/lang/annotation/package-info.java with OpenJDK7 Can anybody please review this simple change? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110524/da667eee/hg_diff.ksh From ptisnovs at redhat.com Tue May 24 06:18:24 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 24 May 2011 15:18:24 +0200 Subject: Reviewer needed: synchronization of two regression tests test/java/lang/invoke/6991596/Test6991596.java and test/java/lang/invoke/6991596/Test6991596.java between IcedTea7-forest and OpenJDK7 Message-ID: <4DDBB020.3040604@redhat.com> Hi all, I'd like to synchronize two regression tests test/java/lang/invoke/6991596/Test6991596.java and test/java/lang/invoke/6991596/Test6991596.java between IcedTea7-forest and OpenJDK7. hg diff generated against IcedTea7-forest is stored in an attachment. Here is ChangeLog entry for IcedTea7: 2011-05-24 Pavel Tisnovsky * Makefile.am: (HOTSPOT_CHANGESET): Synchronize regression tests test/java/lang/invoke/6991596/Test6991596.java and test/java/lang/invoke/6991596/Test6991596.java with OpenJDK7 (HOTSPOT_SHA256SUM): Likewise Can anybody please review this change? Thank you in advance, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110524/bb5b9fd9/hg_diff.ksh From bugzilla-daemon at icedtea.classpath.org Tue May 24 06:16:40 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 24 May 2011 13:16:40 +0000 Subject: [Bug 730] Calling URL with Firefox 4 / Chrome In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=730 --- Comment #2 from Michaela Merz 2011-05-24 13:16:40 --- Simple Source to verify error: ============================================================ import java.applet.Applet; import java.awt.Button; import java.awt.Graphics; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; import java.net.URL; public class Test extends Applet implements ActionListener { Button googleButton; public void changePage(String url) { System.err.println("Attempting to go to: " + url); try { getAppletContext().showDocument(new URL(url), "_self"); } catch (Exception e) { e.printStackTrace(); } } public void init() { googleButton = new Button("google.ca"); googleButton.addActionListener(this); add(googleButton); } public void actionPerformed(ActionEvent evt) { if (evt.getSource() == googleButton) { changePage("http://www.google.ca"); } } } -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ptisnovs at redhat.com Tue May 24 08:08:17 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 24 May 2011 17:08:17 +0200 Subject: Reviewer needed: fix for regression test test/java/lang/invoke/InvokeDynamicPrintArgs.java in IcedTea7-forest Message-ID: <4DDBC9E1.6060004@redhat.com> Hi all, Can anybody please review fix for regression test test/java/lang/invoke/InvokeDynamicPrintArgs.java for IcedTea7-forest? Original text contains imports from JUnit framework and also @Test tag which is not needed for regression tests (it in fact prevents the compilation). hg diff generated against recent IcedTea7-forest is stored in an attachment. ChangeLog entry: 2011-05-24 Pavel Tisnovsky * Makefile.am: (HOTSPOT_CHANGESET): Remove dependency of JUnit from regression test test/java/lang/invoke/InvokeDynamicPrintArgs.java (HOTSPOT_SHA256SUM): Likewise Thank you in advance for reviewing, Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hg_diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110524/702846ec/hg_diff.ksh From drazzib at drazzib.com Tue May 24 08:23:54 2011 From: drazzib at drazzib.com (Damien Raude-Morvan) Date: Tue, 24 May 2011 17:23:54 +0200 Subject: IcedTea7 build failure In-Reply-To: <4DDA5956.4090404@redhat.com> References: <4DDA5956.4090404@redhat.com> Message-ID: <6b3957408a524a2bb3d0c62b7fa5a145@drazzib.com> Hi Pavel, On Mon, 23 May 2011 14:55:50 +0200, Pavel Tisnovsky wrote: > IcedTea7 build failure: [...] > Configure options: > --disable-bootstrap --with-parallel-jobs=4 --disable-system-lcms [...] This build failures was reproduced on builder.classpath.org (see build #27 [1]). This seems to be fixed in lastest #28 build [2] ! [1] http://builder.classpath.org/icedtea/buildbot/builders/icedtea7-squeeze-x86_64-full/builds/27/steps/compile/logs/stdio [2] http://builder.classpath.org/icedtea/buildbot/builders/icedtea7-squeeze-x86_64-full/builds/28 Regards, -- Damien From bugzilla-daemon at icedtea.classpath.org Tue May 24 08:32:54 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 24 May 2011 15:32:54 +0000 Subject: [Bug 677] Dialogs are not modal even when set to APPLICATION_MODAL In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=677 --- Comment #3 from Denis Lila 2011-05-24 15:32:54 --- Seems like I was wrong. The regression was introduced in 105c8fc5c1de: S6633275: Need to support shaped/translucent windows -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ChrisPhi at LGonQn.Org Tue May 24 09:23:00 2011 From: ChrisPhi at LGonQn.Org (Chris Phillips) Date: Tue, 24 May 2011 12:23:00 -0400 Subject: distro-pkg-dev Digest, Vol 48, Issue 87 : Reviewer needed: synchronization of two regression tests In-Reply-To: References: Message-ID: <4DDBDB64.5020005@LGonQn.Org> Hi Pavel Looks good. Chris On 24/05/11 09:16 AM, distro-pkg-dev-request at openjdk.java.net wrote: > Message: 7 > Date: Tue, 24 May 2011 15:18:24 +0200 > From: Pavel Tisnovsky > Subject: Reviewer needed: synchronization of two regression tests > test/java/lang/invoke/6991596/Test6991596.java and > test/java/lang/invoke/6991596/Test6991596.java between IcedTea7-forest > and OpenJDK7 > To: IcedTea > Message-ID:<4DDBB020.3040604 at redhat.com> > Content-Type: text/plain; charset="iso-8859-1" > > Hi all, > > I'd like to synchronize two regression tests > test/java/lang/invoke/6991596/Test6991596.java and > test/java/lang/invoke/6991596/Test6991596.java between IcedTea7-forest > and OpenJDK7. > > hg diff generated against IcedTea7-forest is stored in an attachment. > > Here is ChangeLog entry for IcedTea7: > > 2011-05-24 Pavel Tisnovsky > > * Makefile.am: > (HOTSPOT_CHANGESET): Synchronize regression tests > test/java/lang/invoke/6991596/Test6991596.java > and > test/java/lang/invoke/6991596/Test6991596.java > with OpenJDK7 > (HOTSPOT_SHA256SUM): Likewise > > Can anybody please review this change? > > Thank you in advance, > Pavel From ahughes at redhat.com Tue May 24 14:50:34 2011 From: ahughes at redhat.com (Andrew John Hughes) Date: Tue, 24 May 2011 22:50:34 +0100 Subject: Reviewer needed: fix for regression test test/java/lang/invoke/InvokeDynamicPrintArgs.java in IcedTea7-forest In-Reply-To: <4DDBC9E1.6060004@redhat.com> References: <4DDBC9E1.6060004@redhat.com> Message-ID: <20110524215034.GA2642@shelob.middle-earth.co.uk> On Tue, May 24, 2011 at 05:08:17PM +0200, Pavel Tisnovsky wrote: > Hi all, > > Can anybody please review fix for regression test > test/java/lang/invoke/InvokeDynamicPrintArgs.java > for IcedTea7-forest? Original text contains imports from JUnit framework > and also @Test tag which is not needed for regression tests (it in fact > prevents the compilation). > > hg diff generated against recent IcedTea7-forest is stored in an attachment. > > ChangeLog entry: > > 2011-05-24 Pavel Tisnovsky > > * Makefile.am: > (HOTSPOT_CHANGESET): Remove dependency of JUnit > from regression test > test/java/lang/invoke/InvokeDynamicPrintArgs.java > (HOTSPOT_SHA256SUM): Likewise > > Thank you in advance for reviewing, > Pavel If these patches are in OpenJDK7 already, then we'll get them when we bump to a newer release after the 1.14 release tomorrow. I don't think we need to be backporting test fixes just for 1.14, so please just wait until these changes appear naturally. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Tue May 24 22:41:51 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 05:41:51 +0000 Subject: [Bug 707] You can open windows with JAVA but you can't close them In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=707 --- Comment #1 from Maximiliano Casta??n Araneda 2011-05-25 05:41:50 --- you can close the windows from the same JAVA APP in the menu EXIT, but can't close from the X in the Xorg Window, this doesn't happen with Windows JAVA -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ptisnovs at redhat.com Wed May 25 00:55:06 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 25 May 2011 09:55:06 +0200 Subject: Reviewer needed: fix for regression test test/java/lang/invoke/InvokeDynamicPrintArgs.java in IcedTea7-forest In-Reply-To: <20110524215034.GA2642@shelob.middle-earth.co.uk> References: <4DDBC9E1.6060004@redhat.com> <20110524215034.GA2642@shelob.middle-earth.co.uk> Message-ID: <4DDCB5DA.7040109@redhat.com> Andrew John Hughes wrote: > On Tue, May 24, 2011 at 05:08:17PM +0200, Pavel Tisnovsky wrote: >> Hi all, >> >> Can anybody please review fix for regression test >> test/java/lang/invoke/InvokeDynamicPrintArgs.java >> for IcedTea7-forest? Original text contains imports from JUnit framework >> and also @Test tag which is not needed for regression tests (it in fact >> prevents the compilation). >> >> hg diff generated against recent IcedTea7-forest is stored in an attachment. >> >> ChangeLog entry: >> >> 2011-05-24 Pavel Tisnovsky >> >> * Makefile.am: >> (HOTSPOT_CHANGESET): Remove dependency of JUnit >> from regression test >> test/java/lang/invoke/InvokeDynamicPrintArgs.java >> (HOTSPOT_SHA256SUM): Likewise >> >> Thank you in advance for reviewing, >> Pavel > > If these patches are in OpenJDK7 already, then we'll get them when we bump to > a newer release after the 1.14 release tomorrow. I don't think we need to be > backporting test fixes just for 1.14, so please just wait until these changes > appear naturally. Hi Andrew, other patches I sent yesterday are really in OpenJDK7, but specifically this fix was made by me, which means its not part of OpenJDK nor IcedTea. I suppose someone probably just forgot to delete a JUnit specific code from this test and it caused problems. Cheers, Pavel From andrew at icedtea.classpath.org Wed May 25 05:19:59 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 25 May 2011 12:19:59 +0000 Subject: /hg/icedtea: 13 new changesets Message-ID: changeset eff72c004141 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=eff72c004141 author: Andrew John Hughes date: Wed May 25 01:37:57 2011 +0100 PR103: Usage of native2ascii during bootstrap. 2011-02-22 Andrew John Hughes PR103: Usage of native2ascii during bootstrap. * Makefile.am: (bootstrap-directory-ecj): Symlink native2ascii. * NEWS: Updated. * acinclude.m4: (IT_FIND_NATIVE2ASCII): Added. * configure.ac: Call IT_FIND_NATIVE2ASCII. changeset c12aafe2de1b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c12aafe2de1b author: Andrew John Hughes date: Tue Feb 22 12:52:39 2011 +0000 PR497: Mercurial revision detection not very reliable 2011-02-22 Andrew John Hughes PR497: Mercurial revision detection not very reliable * acinclude.m4: (IT_OBTAIN_HG_REVISIONS): Use hg id rather than hg tip. changeset 97063b48abc0 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=97063b48abc0 author: Andrew John Hughes date: Wed May 25 01:42:05 2011 +0100 Replace WITH_CACAO with more accurate ENABLE_CACAO. 2011-02-22 Andrew John Hughes Use more accurate ENABLE_CACAO rather than WITH_CACAO. * Makefile.am: Replace WITH_CACAO throughout. * acinclude.m4: Likewise. changeset de13896b4712 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=de13896b4712 author: Andrew John Hughes date: Wed May 25 01:48:54 2011 +0100 Update INSTALL documentation for latest changes. 2011-02-23 Andrew John Hughes * INSTALL: Update with native2ascii option and JamVM. Mention --without-hotspot-build in HotSpot documentation. changeset 36c3bb7acd7c in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=36c3bb7acd7c author: Andrew John Hughes date: Wed Feb 23 17:05:16 2011 +0000 Cleanup the IT_CHECK_WITH_JAMVM_SRC_ZIP macro and document it in INSTALL. 2011-02-23 Andrew John Hughes * INSTALL: Mention --with-alt-jamvm-src-zip. * acinclude.m4: (IT_CHECK_WITH_JAMVM_SRC_ZIP): Use a single AM_CONDITIONAL. Check that the specified value is a valid file using test. changeset 1320911bda96 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1320911bda96 author: Andrew John Hughes date: Wed May 25 01:51:14 2011 +0100 Fix references to output directory in INSTALL. 2011-05-25 Andrew John Hughes * INSTALL: Fix references to openjdk/build/- to reference openjdk.build. changeset 027cc10ea7bf in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=027cc10ea7bf author: Andrew John Hughes date: Wed May 25 01:58:11 2011 +0100 Make JDK binary macros more idiot-proof. 2011-02-23 Andrew John Hughes * acinclude.m4: Make java, javah, rmic and jar macros more idiot-proof like the new native2ascii macro. (IT_FIND_JAVA): Improve output, check file exists and is executable and look for alternatives on the path if not. (IT_FIND_JAVAH): Likewise. (IT_FIND_JAR): Likewise. (IT_FIND_RMIC): Likewise. (IT_FIND_NATIVE2ASCII): Invert executable test for clarify. changeset 475fabfc836b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=475fabfc836b author: Andrew John Hughes date: Wed May 25 02:08:09 2011 +0100 Check existence of source zips during configure. 2011-05-25 Andrew John Hughes * acinclude.m4: (IT_WITH_CORBA_SRC_ZIP): Check zip exists and is a regular file. Use a single AM_CONDITIONAL. (IT_WITH_JAXP_SRC_ZIP): Likewise. (IT_WITH_JAXWS_SRC_ZIP): Likewise. (IT_WITH_JDK_SRC_ZIP): Likewise. (IT_WITH_LANGTOOLS_SRC_ZIP): Likewise. 2011-02-23 Andrew John Hughes * acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Check zip exists and is a regular file. Use a single AM_CONDITIONAL. (IT_WITH_OPENJDK_SRC_ZIP): Likewise. (IT_WITH_HOTSPOT_SRC_ZIP): Likewise. (IT_WITH_JAXP_DROP_ZIP): Likewise. (IT_WITH_JAF_DROP_ZIP): Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise. changeset 742ab4a6e279 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=742ab4a6e279 author: Andrew John Hughes date: Wed May 25 02:11:47 2011 +0100 Treat --without-x-src-zip as equivalent to not specifying the option. 2011-05-25 Andrew John Hughes * acinclude.m4: (IT_WITH_CORBA_SRC_ZIP): Treat --without option as equivalent to unspecified. (IT_WITH_JAXP_SRC_ZIP): Likewise. (IT_WITH_JAXWS_SRC_ZIP): Likewise. (IT_WITH_JDK_SRC_ZIP): Likewise. (IT_WITH_LANGTOOLS_DROP_ZIP): Likewise. 2011-02-23 Andrew John Hughes * acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Treat --without option as equivalent to unspecified. (IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise. (IT_WITH_OPENJDK_SRC_ZIP): Likewise. (IT_WITH_HOTSPOT_SRC_ZIP): Likewise. (IT_WITH_JAXP_DROP_ZIP): Likewise. (IT_WITH_JAF_DROP_ZIP): Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise. changeset 8d2c6f90feb9 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c6f90feb9 author: Andrew John Hughes date: Wed May 25 02:15:27 2011 +0100 Remove superfluous use of CHECK in macro naming. 2011-02-23 Andrew John Hughes * acinclude.m4: (IT_ENABLE_JAMVM): Renamed from IT_CHECK_ENABLE_JAMVM. (IT_WITH_JAMVM_SRC_ZIP): Renamed form IT_CHECK_WITH_JAMVM_SRC_ZIP. (IT_ENABLE_CACAO): Renamed from IT_CHECK_ENABLE_CACAO. (IT_WITH_CACAO_HOME): Renamed form IT_CHECK_WITH_CACAO_HOME. (IT_WITH_CACAO_SRC_ZIP): Renamed form IT_CHECK_WITH_CACAO_SRC_ZIP. (IT_WITH_CACAO_SRC_DIR): Renamed form IT_CHECK_WITH_CACAO_SRC_DIR. (IT_WITH_GCJ): Renamed from IT_CHECK_WITH_GCJ. (IT_WITH_HOTSPOT_BUILD): Renamed from IT_CHECK_WITH_HOTSPOT_BUILD. (IT_WITH_HG_REVISION): Renamed from IT_CHECK_WITH_HG_REVISION. (IT_WITH_TZDATA_DIR): Renamed from IT_CHECK_WITH_TZDATA_DIR. changeset 5b68b587ad17 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5b68b587ad17 author: Andrew John Hughes date: Wed May 25 02:17:57 2011 +0100 Invert AM_CONDITIONAL test in --with-x-src-zip to get correct behaviour. 2011-05-25 Andrew John Hughes * acinclude.m4: (IT_WITH_CORBA_SRC_ZIP): Invert AM_CONDITIONAL test to get correct behaviour. (IT_WITH_JAXP_SRC_ZIP): Likewise. (IT_WITH_JAXWS_SRC_ZIP): Likewise. (IT_WITH_JDK_SRC_ZIP): Likewise. (IT_WITH_LANGTOOLS_DROP_ZIP): Likewise. 2011-02-23 Andrew John Hughes * acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Invert AM_CONDITIONAL test to get correct behaviour. (IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise. (IT_WITH_OPENJDK_SRC_ZIP): Likewise. (IT_WITH_HOTSPOT_SRC_ZIP): Likewise. (IT_WITH_JAXP_DROP_ZIP): Likewise. (IT_WITH_JAF_DROP_ZIP): Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise. changeset ee016b0bca71 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ee016b0bca71 author: Andrew John Hughes date: Wed May 25 02:20:29 2011 +0100 Add the missing $. 2011-05-25 Andrew John Hughes * acinclude.m4: (IT_WITH_CORBA_SRC_ZIP): Add missing $. (IT_WITH_JAXP_SRC_ZIP): Likewise. (IT_WITH_JAXWS_SRC_ZIP): Likewise. (IT_WITH_JDK_SRC_ZIP): Likewise. (IT_WITH_LANGTOOLS_DROP_ZIP): Likewise. 2011-02-23 Andrew John Hughes * acinclude.m4: (IT_CHECK_WITH_CACAO_SRC_ZIP): Add missing $. (IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise. (IT_WITH_OPENJDK_SRC_ZIP): Likewise. (IT_WITH_HOTSPOT_SRC_ZIP): Likewise. (IT_WITH_JAXP_DROP_ZIP): Likewise. (IT_WITH_JAF_DROP_ZIP): Likewise. (IT_WITH_JAXWS_DROP_ZIP): Likewise. changeset 3331b5399731 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3331b5399731 author: Andrew John Hughes date: Wed May 25 13:19:52 2011 +0100 Add missing 'fi'. 2011-05-25 Andrew John Hughes * acinclude.m4: (IT_FIND_JAVAH): Add 'fi' missed in merge. diffstat: ChangeLog | 164 +++++++++++++++++++++++++++++++++ INSTALL | 18 +++- Makefile.am | 15 +- NEWS | 1 + acinclude.m4 | 293 ++++++++++++++++++++++++++++++++++++++++------------------ configure.ac | 19 ++- 6 files changed, 400 insertions(+), 110 deletions(-) diffs (truncated from 970 to 500 lines): diff -r 3024025d7759 -r 3331b5399731 ChangeLog --- a/ChangeLog Mon May 23 15:52:47 2011 +0100 +++ b/ChangeLog Wed May 25 13:19:52 2011 +0100 @@ -1,3 +1,167 @@ +2011-05-25 Andrew John Hughes + + * acinclude.m4: + (IT_FIND_JAVAH): Add 'fi' missed in merge. + +2011-05-25 Andrew John Hughes + + * acinclude.m4: + (IT_WITH_CORBA_SRC_ZIP): Add missing $. + (IT_WITH_JAXP_SRC_ZIP): Likewise. + (IT_WITH_JAXWS_SRC_ZIP): Likewise. + (IT_WITH_JDK_SRC_ZIP): Likewise. + (IT_WITH_LANGTOOLS_DROP_ZIP): Likewise. + +2011-02-23 Andrew John Hughes + + * acinclude.m4: + (IT_CHECK_WITH_CACAO_SRC_ZIP): Add missing $. + (IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise. + (IT_WITH_OPENJDK_SRC_ZIP): Likewise. + (IT_WITH_HOTSPOT_SRC_ZIP): Likewise. + (IT_WITH_JAXP_DROP_ZIP): Likewise. + (IT_WITH_JAF_DROP_ZIP): Likewise. + (IT_WITH_JAXWS_DROP_ZIP): Likewise. + +2011-05-25 Andrew John Hughes + + * acinclude.m4: + (IT_WITH_CORBA_SRC_ZIP): Invert + AM_CONDITIONAL test to get correct behaviour. + (IT_WITH_JAXP_SRC_ZIP): Likewise. + (IT_WITH_JAXWS_SRC_ZIP): Likewise. + (IT_WITH_JDK_SRC_ZIP): Likewise. + (IT_WITH_LANGTOOLS_DROP_ZIP): Likewise. + +2011-02-23 Andrew John Hughes + + * acinclude.m4: + (IT_CHECK_WITH_CACAO_SRC_ZIP): Invert + AM_CONDITIONAL test to get correct behaviour. + (IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise. + (IT_WITH_OPENJDK_SRC_ZIP): Likewise. + (IT_WITH_HOTSPOT_SRC_ZIP): Likewise. + (IT_WITH_JAXP_DROP_ZIP): Likewise. + (IT_WITH_JAF_DROP_ZIP): Likewise. + (IT_WITH_JAXWS_DROP_ZIP): Likewise. + +2011-02-23 Andrew John Hughes + + * acinclude.m4: + (IT_ENABLE_JAMVM): Renamed from IT_CHECK_ENABLE_JAMVM. + (IT_WITH_JAMVM_SRC_ZIP): Renamed form IT_CHECK_WITH_JAMVM_SRC_ZIP. + (IT_ENABLE_CACAO): Renamed from IT_CHECK_ENABLE_CACAO. + (IT_WITH_CACAO_HOME): Renamed form IT_CHECK_WITH_CACAO_HOME. + (IT_WITH_CACAO_SRC_ZIP): Renamed form IT_CHECK_WITH_CACAO_SRC_ZIP. + (IT_WITH_CACAO_SRC_DIR): Renamed form IT_CHECK_WITH_CACAO_SRC_DIR. + (IT_WITH_GCJ): Renamed from IT_CHECK_WITH_GCJ. + (IT_WITH_HOTSPOT_BUILD): Renamed from IT_CHECK_WITH_HOTSPOT_BUILD. + (IT_WITH_HG_REVISION): Renamed from IT_CHECK_WITH_HG_REVISION. + (IT_WITH_TZDATA_DIR): Renamed from IT_CHECK_WITH_TZDATA_DIR. + +2011-05-25 Andrew John Hughes + + * acinclude.m4: + (IT_WITH_CORBA_SRC_ZIP): Treat + --without option as equivalent to unspecified. + (IT_WITH_JAXP_SRC_ZIP): Likewise. + (IT_WITH_JAXWS_SRC_ZIP): Likewise. + (IT_WITH_JDK_SRC_ZIP): Likewise. + (IT_WITH_LANGTOOLS_DROP_ZIP): Likewise. + +2011-02-23 Andrew John Hughes + + * acinclude.m4: + (IT_CHECK_WITH_CACAO_SRC_ZIP): Treat + --without option as equivalent to unspecified. + (IT_CHECK_WITH_JAMVM_SRC_ZIP): Likewise. + (IT_WITH_OPENJDK_SRC_ZIP): Likewise. + (IT_WITH_HOTSPOT_SRC_ZIP): Likewise. + (IT_WITH_JAXP_DROP_ZIP): Likewise. + (IT_WITH_JAF_DROP_ZIP): Likewise. + (IT_WITH_JAXWS_DROP_ZIP): Likewise. + +2011-05-25 Andrew John Hughes + + * acinclude.m4: + (IT_WITH_CORBA_SRC_ZIP): Check zip exists + and is a regular file. Use a single AM_CONDITIONAL. + (IT_WITH_JAXP_SRC_ZIP): Likewise. + (IT_WITH_JAXWS_SRC_ZIP): Likewise. + (IT_WITH_JDK_SRC_ZIP): Likewise. + (IT_WITH_LANGTOOLS_SRC_ZIP): Likewise. + +2011-02-23 Andrew John Hughes + + * acinclude.m4: + (IT_CHECK_WITH_CACAO_SRC_ZIP): Check zip exists + and is a regular file. Use a single AM_CONDITIONAL. + (IT_WITH_OPENJDK_SRC_ZIP): Likewise. + (IT_WITH_HOTSPOT_SRC_ZIP): Likewise. + (IT_WITH_JAXP_DROP_ZIP): Likewise. + (IT_WITH_JAF_DROP_ZIP): Likewise. + (IT_WITH_JAXWS_DROP_ZIP): Likewise. + +2011-02-23 Andrew John Hughes + + * acinclude.m4: + Make java, javah, rmic and jar macros more + idiot-proof like the new native2ascii macro. + (IT_FIND_JAVA): Improve output, check file + exists and is executable and look for alternatives + on the path if not. + (IT_FIND_JAVAH): Likewise. + (IT_FIND_JAR): Likewise. + (IT_FIND_RMIC): Likewise. + (IT_FIND_NATIVE2ASCII): Invert executable test + for clarify. + +2011-05-25 Andrew John Hughes + + * INSTALL: + Fix references to openjdk/build/- + to reference openjdk.build. + +2011-02-23 Andrew John Hughes + + * INSTALL: Mention --with-alt-jamvm-src-zip. + * acinclude.m4: + (IT_CHECK_WITH_JAMVM_SRC_ZIP): Use a single + AM_CONDITIONAL. Check that the specified value + is a valid file using test. + +2011-02-23 Andrew John Hughes + + * INSTALL: + Update with native2ascii option and JamVM. + Mention --without-hotspot-build in HotSpot + documentation. + +2011-02-22 Andrew John Hughes + + Use more accurate ENABLE_CACAO rather + than WITH_CACAO. + * Makefile.am: + Replace WITH_CACAO throughout. + * acinclude.m4: Likewise. + +2011-02-22 Andrew John Hughes + + PR497: Mercurial revision detection not very reliable + * acinclude.m4: + (IT_OBTAIN_HG_REVISIONS): Use hg id rather + than hg tip. + +2011-02-22 Andrew John Hughes + + PR103: Usage of native2ascii during bootstrap. + * Makefile.am: + (bootstrap-directory-ecj): Symlink native2ascii. + * NEWS: Updated. + * acinclude.m4: + (IT_FIND_NATIVE2ASCII): Added. + * configure.ac: Call IT_FIND_NATIVE2ASCII. + 2011-05-23 Andrew John Hughes * acinclude.m4: diff -r 3024025d7759 -r 3331b5399731 INSTALL --- a/INSTALL Mon May 23 15:52:47 2011 +0100 +++ b/INSTALL Wed May 25 13:19:52 2011 +0100 @@ -113,6 +113,9 @@ is checked for gjavah and javah. * --with-rmic: Specify the location of a 'rmic' binary. By default, the path is checked for grmic and rmic. +* --with-native2ascii: Specify the location of a 'native2ascii' binary. By default, + ${SYSTEM_JDK_DIR}/bin/native2ascii is used. If this is absent, then the path + is checked for native2ascii and gnative2ascii. * --with-ecj-jar: Specify the location of an ecj JAR file. By default, the following paths are checked: - /usr/share/java/eclipse-ecj.jar @@ -149,6 +152,7 @@ and building one. * --with-cacao-src-zip: Specify the location of a CACAO tarball to avoid downloading. * --with-cacao-src-dir: Specify the location of a CACAO source tree to avoid downloading. +* --with-jamvm-src-zip: Specify the location of a JamVM tarball to avoid downloading. * --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option. * --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi. * --with-netbeans: Specify the location of NetBeans for VisualVM, defaulting to the netbeans on the path. @@ -171,6 +175,7 @@ * --enable-systemtap: Include support for tracing using systemtap. * --enable-nss: Enable the NSS security provider. * --enable-cacao: Replace HotSpot with the CACAO VM. +* --enable-jamvm: Replace HotSpot with JamVM. * --enable-shark: Build the Shark LLVM-based JIT. * --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms. * --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK. @@ -218,7 +223,7 @@ or later if you want Java method tracing). The tapset needs to know the final install location of the JDK, so the --with-abs-install-dir should also be used to specify this. If not set, it defaults to the -in-tree location of openjdk/build/-/j2sdk-image and requires +in-tree location of openjdk.build/j2sdk-image and requires manual changes to tapset/hotspot.stp to work from elsewhere. For example, if you plan to install the resulting build in /usr/lib/jvm/java-1.6.0-openjdk, then you should specify @@ -245,11 +250,20 @@ more platforms than HotSpot, including ppc, ppc64, arm and mips. When --enable-cacao is specified, CACAO will be downloaded and built, followed by the JDK portion of OpenJDK resulting in a CACAO+OpenJDK -image in openjdk/build/-/j2sdk-image. The --with-cacao-home +image in openjdk.build/j2sdk-image. The --with-cacao-home option can be used to specify the use of an existing CACAO install instead, and --with-cacao-src-zip/dir options exist to allow the use of a pre-downloaded zip or source tree respectively. +JamVM +===== + +IcedTea6 can use JamVM as the virtual machine, as opposed to HotSpot. +When --enable-jamvm is specified, JamVM will be downloaded and built, +followed by the JDK portion of OpenJDK resulting in a JamVM+OpenJDK +image in openjdk.build/j2sdk-image. The --with-jamvm-src-zip option +exists to allow the use of a pre-downloaded zip. + Zero & Shark ============ diff -r 3024025d7759 -r 3331b5399731 Makefile.am --- a/Makefile.am Mon May 23 15:52:47 2011 +0100 +++ b/Makefile.am Wed May 25 13:19:52 2011 +0100 @@ -176,7 +176,7 @@ PREFER_SOURCE = -Xprefer:source endif -if WITH_CACAO +if ENABLE_CACAO ICEDTEA_BUILD_TARGET = jdk_only ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only else @@ -304,7 +304,7 @@ patches/cacao/memory.patch endif -if WITH_CACAO +if ENABLE_CACAO ICEDTEA_PATCHES += \ patches/cacao/ignore-tests.patch endif @@ -480,7 +480,7 @@ VERBOSE="$(VERBOSE)" \ STATIC_CXX="false" -if WITH_CACAO +if ENABLE_CACAO ICEDTEA_ENV += \ ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)" endif @@ -1480,7 +1480,7 @@ mv openjdk/jdk/make/common/shared/Defs.gmk Defs.gmk.bak cat Defs.gmk.bak > openjdk/jdk/make/common/shared/Defs.gmk icedtea_version="$(PACKAGE_VERSION)$(ICEDTEA_REV)" ; \ - if test "x$(WITH_CACAO)" = "xyes" || \ + if test "x$(ENABLE_CACAO)" = "xyes" || \ test "x$(ENABLE_JAMVM)" = "xyes"; then \ echo "JDK_DERIVATIVE_NAME=$${icedtea_version}" \ >>openjdk/jdk/make/common/shared/Defs.gmk ; \ @@ -1678,6 +1678,7 @@ ln -sf $(JAVAH) $(STAGE1_BOOT_DIR)/bin/javah ln -sf $(RMIC) $(STAGE1_BOOT_DIR)/bin/rmic ln -sf $(JAR) $(STAGE1_BOOT_DIR)/bin/jar + ln -sf $(NATIVE2ASCII) $(STAGE1_BOOT_DIR)/bin/native2ascii ln -sf ../../../javac $(STAGE1_BOOT_DIR)/bin/javac ln -sf ../../../javap $(STAGE1_BOOT_DIR)/bin/javap mkdir -p $(STAGE1_BOOT_DIR)/lib/endorsed && \ @@ -1795,7 +1796,7 @@ if SHARK_BUILD printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif -if WITH_CACAO +if ENABLE_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif if ENABLE_SYSTEMTAP @@ -1860,7 +1861,7 @@ if SHARK_BUILD printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif -if WITH_CACAO +if ENABLE_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif if ENABLE_SYSTEMTAP @@ -2365,7 +2366,7 @@ check-jdk: stamps/jtreg.stamp mkdir -p test/jdk/JTwork test/jdk/JTreport -if WITH_CACAO +if ENABLE_CACAO CACAO_EXCLUDE="-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.cacao.jtx" endif if test "x$${DISPLAY}" = "x"; then XVFB_RUN="@XVFB_RUN_CMD@"; fi; \ diff -r 3024025d7759 -r 3331b5399731 NEWS --- a/NEWS Mon May 23 15:52:47 2011 +0100 +++ b/NEWS Wed May 25 13:19:52 2011 +0100 @@ -12,6 +12,7 @@ - PR616, PR99: Don't statically link libstdc++ - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. - PR714: Forwardport replace-hotspot support from IcedTea6. + - PR103: Usage of native2ascii during bootstrap * JamVM - Ignore all unknown options. - Handle overflow in getPhysicalMemory(). diff -r 3024025d7759 -r 3331b5399731 acinclude.m4 --- a/acinclude.m4 Mon May 23 15:52:47 2011 +0100 +++ b/acinclude.m4 Wed May 25 13:19:52 2011 +0100 @@ -209,28 +209,41 @@ AC_DEFUN([IT_FIND_JAVA], [ - AC_MSG_CHECKING(for java) + JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java + AC_MSG_CHECKING([if a java binary was specified]) AC_ARG_WITH([java], [AS_HELP_STRING([--with-java[[=PATH]]],specify location of a 1.5 Java VM)], [ - JAVA="${withval}" + if test "x${withval}" = "xyes"; then + JAVA=no + else + JAVA="${withval}" + fi ], [ - JAVA=${SYSTEM_JDK_DIR}/bin/java + JAVA=no ]) - if ! test -f "${JAVA}"; then - AC_PATH_PROG(JAVA, "${JAVA}") + AC_MSG_RESULT(${JAVA}) + if test "x${JAVA}" = "xno"; then + JAVA=${JAVA_DEFAULT} fi - if test -z "${JAVA}"; then - AC_PATH_PROG(JAVA, "gij") + AC_MSG_CHECKING([if $JAVA is a valid executable]) + if test -x "${JAVA}"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + JAVA="" + AC_PATH_PROG(JAVA, "java") + if test -z "${JAVA}"; then + AC_PATH_PROG(JAVA, "gij") + fi + if test -z "${JAVA}"; then + AC_PATH_PROG(JAVA, "cacao") + fi + if test -z "${JAVA}"; then + AC_MSG_ERROR("A 1.5-compatible Java VM is required.") + fi fi - if test -z "${JAVA}"; then - AC_PATH_PROG(JAVA, "java") - fi - if test -z "${JAVA}"; then - AC_MSG_ERROR("A 1.5-compatible Java VM is required.") - fi - AC_MSG_RESULT(${JAVA}) AC_SUBST(JAVA) ]) @@ -367,15 +380,19 @@ if test "x${JAVAH}" == "xno"; then JAVAH=${JAVAH_DEFAULT} fi - AC_PATH_PROG(JAVAH, "${JAVAH}") - if test -z "${JAVAH}"; then + AC_MSG_CHECKING([if $JAVAH is a valid executable]) + if test -x "${JAVAH}"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + JAVAH="" AC_PATH_PROG(JAVAH, "javah") - fi - if test -z "${JAVAH}"; then - AC_PATH_PROG(JAVAH, "gjavah") - fi - if test -z "${JAVAH}"; then - AC_MSG_ERROR("A Java header generator was not found.") + if test -z "${JAVAH}"; then + AC_PATH_PROG(JAVAH, "gjavah") + fi + if test -z "${JAVAH}"; then + AC_MSG_ERROR("A Java header generator was not found.") + fi fi AC_SUBST(JAVAH) ]) @@ -400,15 +417,19 @@ if test "x${JAR}" == "xno"; then JAR=${JAR_DEFAULT} fi - AC_PATH_PROG(JAR, "${JAR}") - if test -z "${JAR}"; then + AC_MSG_CHECKING([if $JAR is a valid executable]) + if test -x "${JAR}"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + JAR="" AC_PATH_PROG(JAR, "jar") - fi - if test -z "${JAR}"; then - AC_PATH_PROG(JAR, "gjar") - fi - if test -z "${JAR}"; then - AC_MSG_ERROR("No Java archive tool was found.") + if test -z "${JAR}"; then + AC_PATH_PROG(JAR, "gjar") + fi + if test -z "${JAR}"; then + AC_MSG_ERROR("No Java archive tool was found.") + fi fi AC_MSG_CHECKING([whether jar supports @ argument]) touch _config.txt @@ -466,19 +487,60 @@ if test "x${RMIC}" = "xno"; then RMIC=${RMIC_DEFAULT} fi - AC_PATH_PROG(RMIC, "${RMIC}") - if test -z "${RMIC}"; then + AC_MSG_CHECKING([if $RMIC is a valid executable]) + if test -x "${RMIC}"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + RMIC="" AC_PATH_PROG(RMIC, "rmic") - fi - if test -z "${RMIC}"; then - AC_PATH_PROG(RMIC, "grmic") - fi - if test -z "${RMIC}"; then - AC_MSG_ERROR("An RMI compiler was not found.") + if test -z "${RMIC}"; then + AC_PATH_PROG(RMIC, "grmic") + fi + if test -z "${RMIC}"; then + AC_MSG_ERROR("An RMI compiler was not found.") + fi fi AC_SUBST(RMIC) ]) +AC_DEFUN([IT_FIND_NATIVE2ASCII], +[ + NATIVE2ASCII_DEFAULT=${SYSTEM_JDK_DIR}/bin/native2ascii + AC_MSG_CHECKING([if a native2ascii binary was specified]) + AC_ARG_WITH([native2ascii], + [AS_HELP_STRING(--with-native2ascii,specify location of the native2ascii converter)], + [ + if test "x${withval}" = "xyes"; then + NATIVE2ASCII=no + else + NATIVE2ASCII="${withval}" + fi + ], + [ + NATIVE2ASCII=no + ]) + AC_MSG_RESULT(${NATIVE2ASCII}) + if test "x${NATIVE2ASCII}" = "xno"; then + NATIVE2ASCII=${NATIVE2ASCII_DEFAULT} + fi + AC_MSG_CHECKING([if $NATIVE2ASCII is a valid executable]) + if test -x "${NATIVE2ASCII}"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + NATIVE2ASCII="" + AC_PATH_PROG(NATIVE2ASCII, "native2ascii") + if test -z "${NATIVE2ASCII}"; then + AC_PATH_PROG(NATIVE2ASCII, "gnative2ascii") + fi + if test -z "${NATIVE2ASCII}"; then + AC_MSG_ERROR("A native2ascii converter was not found.") + fi + fi + AC_SUBST([NATIVE2ASCII]) +]) + AC_DEFUN([IT_WITH_OPENJDK_SRC_ZIP], [ AC_MSG_CHECKING([for an OpenJDK source zip]) From andrew at icedtea.classpath.org Wed May 25 09:34:09 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 25 May 2011 16:34:09 +0000 Subject: /hg/icedtea: Fix make distcheck, broken by recent imported patch... Message-ID: changeset 43c6c4a00875 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=43c6c4a00875 author: Andrew John Hughes date: Wed May 25 17:33:49 2011 +0100 Fix make distcheck, broken by recent imported patches from IcedTea6. 2011-05-25 Andrew John Hughes Fix make distcheck. * Makefile.am: (EXTRA_DIST): Remove hotspot/default/*.patch. Add jamvm/*.patch. (clean-extract-hotspot): Remove remnants of the attempt to symlink the HotSpot directory. (clean-add-jamvm): Check jvm.cfg exists and use full path. (clean-add-jamvm-debug): Likewise for debug mode. diffstat: ChangeLog | 12 ++++++++++++ Makefile.am | 15 ++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diffs (68 lines): diff -r 3331b5399731 -r 43c6c4a00875 ChangeLog --- a/ChangeLog Wed May 25 13:19:52 2011 +0100 +++ b/ChangeLog Wed May 25 17:33:49 2011 +0100 @@ -1,3 +1,15 @@ +2011-05-25 Andrew John Hughes + + Fix make distcheck. + * Makefile.am: + (EXTRA_DIST): Remove hotspot/default/*.patch. + Add jamvm/*.patch. + (clean-extract-hotspot): Remove remnants of + the attempt to symlink the HotSpot directory. + (clean-add-jamvm): Check jvm.cfg exists + and use full path. + (clean-add-jamvm-debug): Likewise for debug mode. + 2011-05-25 Andrew John Hughes * acinclude.m4: diff -r 3331b5399731 -r 43c6c4a00875 Makefile.am --- a/Makefile.am Wed May 25 13:19:52 2011 +0100 +++ b/Makefile.am Wed May 25 17:33:49 2011 +0100 @@ -694,10 +694,10 @@ $(top_srcdir)/pulseaudio/COPYING EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \ - $(top_srcdir)/patches/hotspot/default/*.patch \ $(top_srcdir)/patches/boot/*.patch \ $(top_srcdir)/patches/cacao/*.patch \ $(top_srcdir)/patches/debian/*.patch \ + $(top_srcdir)/patches/jamvm/*.patch \ $(top_srcdir)/patches/security/*.patch \ tools-copy contrib overlays \ javaws.png javaws.desktop \ @@ -1253,10 +1253,7 @@ touch stamps/extract-hotspot.stamp clean-extract-hotspot: - if test -L openjdk/hotspot ; then \ - rm -f openjdk/hotspot - fi - rm -rf hotspot-$(HS_CHANGESET) + rm -rf openjdk/hotspot rm -f stamps/extract-hotspot.stamp stamps/sanitise-openjdk.stamp: stamps/extract-openjdk.stamp \ @@ -2122,7 +2119,9 @@ clean-add-jamvm: rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm - sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg + if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \ + sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ + fi rm -f stamps/add-jamvm.stamp stamps/add-jamvm-debug.stamp: stamps/icedtea-debug.stamp stamps/jamvm.stamp @@ -2138,7 +2137,9 @@ clean-add-jamvm-debug: rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm - sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg + if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \ + sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ + fi rm -f stamps/add-jamvm-debug.stamp # CACAO From asu at redhat.com Wed May 25 11:21:22 2011 From: asu at redhat.com (Andrew Su) Date: Wed, 25 May 2011 14:21:22 -0400 (EDT) Subject: [RFC][Icedtea-Web]: Fix for bug 726 In-Reply-To: <1567875295.196174.1305900474225.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <578425685.293831.1306347682276.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> ping ----- Original Message ----- > From: "Andrew Su" > To: "distro-pkg-dev" > Sent: Friday, May 20, 2011 10:07:54 AM > Subject: [RFC][Icedtea-Web]: Fix for bug 726 > Hello, > > This patch fixes an issue with recently used not existing in > ~/.icedtea/cache since on jvm shutdown we try to store an updated > cache order even though we don't have this file. > > This needs to be put in both HEAD and 1.1 of icedtea-web. > > ChangeLog: > > 2011-05-20 Andrew Su > > * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: > (CacheLRUWrapper): New constructor to create file. > (lock): Removed creation of file here. > > Ok to push? > > Cheers, > Andrew From omajid at redhat.com Wed May 25 11:42:41 2011 From: omajid at redhat.com (Omair Majid) Date: Wed, 25 May 2011 14:42:41 -0400 Subject: [RFC][Icedtea-Web]: Fix for bug 726 In-Reply-To: <1567875295.196174.1305900474225.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <1567875295.196174.1305900474225.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <4DDD4DA1.3080702@redhat.com> On 05/20/2011 10:07 AM, Andrew Su wrote: > Hello, > > This patch fixes an issue with recently used not existing in > ~/.icedtea/cache since on jvm shutdown we try to store an updated > cache order even though we don't have this file. > > This needs to be put in both HEAD and 1.1 of icedtea-web. > > ChangeLog: > > 2011-05-20 Andrew Su > > * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: > (CacheLRUWrapper): New constructor to create file. (lock): Removed > creation of file here. > > Ok to push? > Looks fine to me. Okay for HEAD and 1.1 Cheers, Omair From asu at icedtea.classpath.org Wed May 25 11:48:32 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Wed, 25 May 2011 18:48:32 +0000 Subject: /hg/icedtea-web: Fix PR726. Create recently_used on startup. Message-ID: changeset d878cc072253 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d878cc072253 author: Andrew Su date: Wed May 25 14:50:42 2011 -0400 Fix PR726. Create recently_used on startup. diffstat: ChangeLog | 6 ++++++ netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diffs (49 lines): diff -r f1615c79971d -r d878cc072253 ChangeLog --- a/ChangeLog Tue May 17 16:43:45 2011 +0200 +++ b/ChangeLog Wed May 25 14:50:42 2011 -0400 @@ -1,3 +1,9 @@ +2011-05-20 Andrew Su + + * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: + (CacheLRUWrapper): New constructor to create file. + (lock): Removed creation of file here. + 2011-05-17 Jiri Vanek * tests/junit-runner/JunitLikeXmlOutputListener: This listener exports diff -r f1615c79971d -r d878cc072253 netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java --- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Tue May 17 16:43:45 2011 +0200 +++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Wed May 25 14:50:42 2011 -0400 @@ -78,6 +78,18 @@ private PropertiesFile cacheOrder = new PropertiesFile( new File(cacheDir + File.separator + "recently_used")); + private CacheLRUWrapper(){ + File f = cacheOrder.getStoreFile(); + if (!f.exists()) { + try { + FileUtils.createParentDir(f); + FileUtils.createRestrictedFile(f, true); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + /** * Returns an instance of the policy. * @@ -181,12 +193,7 @@ */ public synchronized void lock() { try { - File f = cacheOrder.getStoreFile(); - if (!f.exists()) { - FileUtils.createParentDir(f); - FileUtils.createRestrictedFile(f, true); - } - fl = FileUtils.getFileLock(f.getPath(), false, true); + fl = FileUtils.getFileLock(cacheOrder.getStoreFile().getPath(), false, true); } catch (OverlappingFileLockException e) { // if overlap we just increase the count. } catch (Exception e) { // We didn't get a lock.. e.printStackTrace(); From asu at icedtea.classpath.org Wed May 25 11:51:38 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Wed, 25 May 2011 18:51:38 +0000 Subject: /hg/release/icedtea-web-1.1: Fix PR726. Create recently_used on ... Message-ID: changeset 06e542ca50c3 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=06e542ca50c3 author: Andrew Su date: Wed May 25 14:52:30 2011 -0400 Fix PR726. Create recently_used on startup. diffstat: ChangeLog | 6 ++++++ netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diffs (49 lines): diff -r 85cf7fb25642 -r 06e542ca50c3 ChangeLog --- a/ChangeLog Tue May 10 11:59:47 2011 -0400 +++ b/ChangeLog Wed May 25 14:52:30 2011 -0400 @@ -1,3 +1,9 @@ +2011-05-20 Andrew Su + + * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: + (CacheLRUWrapper): New constructor to create file. + (lock): Removed creation of file here. + 2011-05-10 Andrew Su * netx/net/sourceforge/jnlp/controlpanel/CachePane.java: diff -r 85cf7fb25642 -r 06e542ca50c3 netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java --- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Tue May 10 11:59:47 2011 -0400 +++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Wed May 25 14:52:30 2011 -0400 @@ -78,6 +78,18 @@ private PropertiesFile cacheOrder = new PropertiesFile( new File(cacheDir + File.separator + "recently_used")); + private CacheLRUWrapper(){ + File f = cacheOrder.getStoreFile(); + if (!f.exists()) { + try { + FileUtils.createParentDir(f); + FileUtils.createRestrictedFile(f, true); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + /** * Returns an instance of the policy. * @@ -181,12 +193,7 @@ */ public synchronized void lock() { try { - File f = cacheOrder.getStoreFile(); - if (!f.exists()) { - FileUtils.createParentDir(f); - FileUtils.createRestrictedFile(f, true); - } - fl = FileUtils.getFileLock(f.getPath(), false, true); + fl = FileUtils.getFileLock(cacheOrder.getStoreFile().getPath(), false, true); } catch (OverlappingFileLockException e) { // if overlap we just increase the count. } catch (Exception e) { // We didn't get a lock.. e.printStackTrace(); From asu at redhat.com Wed May 25 11:52:33 2011 From: asu at redhat.com (Andrew Su) Date: Wed, 25 May 2011 14:52:33 -0400 (EDT) Subject: [RFC][Icedtea-Web]: Fix for bug 726 In-Reply-To: <4DDD4DA1.3080702@redhat.com> Message-ID: <1196357028.294566.1306349553604.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > From: "Omair Majid" > To: "Andrew Su" > Cc: "distro-pkg-dev" > Sent: Wednesday, May 25, 2011 2:42:41 PM > Subject: Re: [RFC][Icedtea-Web]: Fix for bug 726 > On 05/20/2011 10:07 AM, Andrew Su wrote: > > Hello, > > > > This patch fixes an issue with recently used not existing in > > ~/.icedtea/cache since on jvm shutdown we try to store an updated > > cache order even though we don't have this file. > > > > This needs to be put in both HEAD and 1.1 of icedtea-web. > > > > ChangeLog: > > > > 2011-05-20 Andrew Su > > > > * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: > > (CacheLRUWrapper): New constructor to create file. (lock): Removed > > creation of file here. > > > > Ok to push? > > > > Looks fine to me. Okay for HEAD and 1.1 Pushed. Thanks! Cheers, Andrew From bugzilla-daemon at icedtea.classpath.org Wed May 25 11:54:53 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 18:54:53 +0000 Subject: [Bug 715] Port updated macros from IcedTea6 to 7 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=715 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #1 from Andrew John Hughes 2011-05-25 18:54:52 --- Done. http://icedtea.classpath.org/hg/icedtea/rev/027cc10ea7bf http://icedtea.classpath.org/hg/icedtea/rev/475fabfc836b http://icedtea.classpath.org/hg/icedtea/rev/742ab4a6e279 http://icedtea.classpath.org/hg/icedtea/rev/5b68b587ad17 http://icedtea.classpath.org/hg/icedtea/rev/ee016b0bca71 http://icedtea.classpath.org/hg/icedtea/rev/3331b5399731 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 11:54:53 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 18:54:53 +0000 Subject: [Bug 695] [TRACKER] IcedTea7 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 Bug 695 depends on bug 715, which changed state. Bug 715 Summary: Port updated macros from IcedTea6 to 7 http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=715 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at redhat.com Wed May 25 11:55:51 2011 From: omajid at redhat.com (Omair Majid) Date: Wed, 25 May 2011 14:55:51 -0400 Subject: [RFC][Icedtea-Web]: Fix for bug 726 In-Reply-To: <1196357028.294566.1306349553604.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <1196357028.294566.1306349553604.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <4DDD50B7.1040502@redhat.com> On 05/25/2011 02:52 PM, Andrew Su wrote: > > > ----- Original Message ----- >> From: "Omair Majid" >> To: "Andrew Su" >> Cc: "distro-pkg-dev" >> Sent: Wednesday, May 25, 2011 2:42:41 PM >> Subject: Re: [RFC][Icedtea-Web]: Fix for bug 726 >> On 05/20/2011 10:07 AM, Andrew Su wrote: >>> Hello, >>> >>> This patch fixes an issue with recently used not existing in >>> ~/.icedtea/cache since on jvm shutdown we try to store an updated >>> cache order even though we don't have this file. >>> >>> This needs to be put in both HEAD and 1.1 of icedtea-web. >>> >>> ChangeLog: >>> >>> 2011-05-20 Andrew Su >>> >>> * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: >>> (CacheLRUWrapper): New constructor to create file. (lock): Removed >>> creation of file here. >>> >>> Ok to push? >>> >> >> Looks fine to me. Okay for HEAD and 1.1 > > Pushed. Thanks! > No problem. It would have been nice to include a NEWS entry though. Also, please add links to your changeset(s) in the bug report [1] and close it as fixed. Thanks, Omair [1] http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=726 From bugzilla-daemon at icedtea.classpath.org Wed May 25 11:58:24 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 18:58:24 +0000 Subject: [Bug 726] Exception after closing javaws -about window In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=726 Andrew Su changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #1 from Andrew Su 2011-05-25 18:58:24 --- I have applied patch to HEAD and 1.1. http://icedtea.classpath.org/hg/icedtea-web/rev/d878cc072253 http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/06e542ca50c3 Closing as fixed. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From asu at redhat.com Wed May 25 12:07:00 2011 From: asu at redhat.com (Andrew Su) Date: Wed, 25 May 2011 15:07:00 -0400 (EDT) Subject: [RFC][Icedtea-Web]: Fix for bug 726 In-Reply-To: <4DDD50B7.1040502@redhat.com> Message-ID: <549129773.294933.1306350420154.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > From: "Omair Majid" > To: "Andrew Su" > Cc: "distro-pkg-dev" > Sent: Wednesday, May 25, 2011 2:55:51 PM > Subject: Re: [RFC][Icedtea-Web]: Fix for bug 726 > On 05/25/2011 02:52 PM, Andrew Su wrote: > > > > > > ----- Original Message ----- > >> From: "Omair Majid" > >> To: "Andrew Su" > >> Cc: "distro-pkg-dev" > >> Sent: Wednesday, May 25, 2011 2:42:41 PM > >> Subject: Re: [RFC][Icedtea-Web]: Fix for bug 726 > >> On 05/20/2011 10:07 AM, Andrew Su wrote: > >>> Hello, > >>> > >>> This patch fixes an issue with recently used not existing in > >>> ~/.icedtea/cache since on jvm shutdown we try to store an updated > >>> cache order even though we don't have this file. > >>> > >>> This needs to be put in both HEAD and 1.1 of icedtea-web. > >>> > >>> ChangeLog: > >>> > >>> 2011-05-20 Andrew Su > >>> > >>> * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: > >>> (CacheLRUWrapper): New constructor to create file. (lock): Removed > >>> creation of file here. > >>> > >>> Ok to push? > >>> > >> > >> Looks fine to me. Okay for HEAD and 1.1 > > > > Pushed. Thanks! > > > > No problem. It would have been nice to include a NEWS entry though. > Also, please add links to your changeset(s) in the bug report [1] and > close it as fixed. Done, and here is update to news. Regards, Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: newsupdate.patch Type: text/x-patch Size: 981 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110525/d5378a7a/newsupdate.patch From omajid at redhat.com Wed May 25 12:09:32 2011 From: omajid at redhat.com (Omair Majid) Date: Wed, 25 May 2011 15:09:32 -0400 Subject: [RFC][Icedtea-Web]: Fix for bug 726 In-Reply-To: <549129773.294933.1306350420154.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <549129773.294933.1306350420154.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <4DDD53EC.2020308@redhat.com> On 05/25/2011 03:07 PM, Andrew Su wrote: > > Done, and here is update to news. > Looks good. Thanks for doing this. Cheers, Omair From asu at icedtea.classpath.org Wed May 25 12:10:31 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Wed, 25 May 2011 19:10:31 +0000 Subject: /hg/icedtea-web: Update NEWS. Message-ID: changeset a92a625ced46 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a92a625ced46 author: Andrew Su date: Wed May 25 15:12:18 2011 -0400 Update NEWS. diffstat: ChangeLog | 4 ++++ NEWS | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diffs (22 lines): diff -r d878cc072253 -r a92a625ced46 ChangeLog --- a/ChangeLog Wed May 25 14:50:42 2011 -0400 +++ b/ChangeLog Wed May 25 15:12:18 2011 -0400 @@ -1,3 +1,7 @@ +2011-05-20 Andrew Su + + * NEWS: Update. + 2011-05-20 Andrew Su * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: diff -r d878cc072253 -r a92a625ced46 NEWS --- a/NEWS Wed May 25 14:50:42 2011 -0400 +++ b/NEWS Wed May 25 15:12:18 2011 -0400 @@ -26,6 +26,7 @@ - The user's default browser (determined from xdg-open or $BROWSER) is used - RH669942: javaws fails to download version/packed files (missing support for jnlp.packEnabled and jnlp.versionEnabled) - PR658: now jnlp.packEnabled works with applets. + - PR726: closing javaws -about no longer throws exceptions. * Plugin - PR475, RH604061: Allow applets from the same page to use the same classloader - PR612: NetDania application ends on java.security.AccessControlException: access denied (java.util.PropertyPermission browser read) From asu at icedtea.classpath.org Wed May 25 12:11:29 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Wed, 25 May 2011 19:11:29 +0000 Subject: /hg/release/icedtea-web-1.1: Update NEWS. Message-ID: changeset d74fed364c47 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=d74fed364c47 author: Andrew Su date: Wed May 25 15:13:19 2011 -0400 Update NEWS. diffstat: ChangeLog | 4 ++++ NEWS | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diffs (22 lines): diff -r 06e542ca50c3 -r d74fed364c47 ChangeLog --- a/ChangeLog Wed May 25 14:52:30 2011 -0400 +++ b/ChangeLog Wed May 25 15:13:19 2011 -0400 @@ -1,3 +1,7 @@ +2011-05-20 Andrew Su + + * NEWS: Update. + 2011-05-20 Andrew Su * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: diff -r 06e542ca50c3 -r d74fed364c47 NEWS --- a/NEWS Wed May 25 14:52:30 2011 -0400 +++ b/NEWS Wed May 25 15:13:19 2011 -0400 @@ -26,6 +26,7 @@ - The user's default browser (determined from xdg-open or $BROWSER) is used - RH669942: javaws fails to download version/packed files (missing support for jnlp.packEnabled and jnlp.versionEnabled) - PR658: now jnlp.packEnabled works with applets. + - PR726: closing javaws -about no longer throws exceptions. * Plugin - PR475, RH604061: Allow applets from the same page to use the same classloader - PR612: NetDania application ends on java.security.AccessControlException: access denied (java.util.PropertyPermission browser read) From bugzilla-daemon at icedtea.classpath.org Wed May 25 13:20:24 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 20:20:24 +0000 Subject: [Bug 731] New: [TRACKER] IcedTea-Web 1.1 Release Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=731 Summary: [TRACKER] IcedTea-Web 1.1 Release Product: IcedTea-Web Version: hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: General AssignedTo: unassigned at icedtea.classpath.org ReportedBy: omajid at redhat.com CC: unassigned at icedtea.classpath.org Metabug for IcedTea-Web 1.1 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 13:21:24 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 20:21:24 +0000 Subject: [Bug 727] Transient failures when running JNLP applications In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=727 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |731 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 13:21:24 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 20:21:24 +0000 Subject: [Bug 731] [TRACKER] IcedTea-Web 1.1 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=731 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |727 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 13:21:46 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 20:21:46 +0000 Subject: [Bug 724] Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=724 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |731 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 13:21:46 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 20:21:46 +0000 Subject: [Bug 731] [TRACKER] IcedTea-Web 1.1 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=731 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |724 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 13:22:14 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 20:22:14 +0000 Subject: [Bug 723] AccessControlException while downloading resource In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=723 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |731 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 13:22:14 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 20:22:14 +0000 Subject: [Bug 731] [TRACKER] IcedTea-Web 1.1 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=731 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |723 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 13:37:53 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 20:37:53 +0000 Subject: [Bug 730] Calling URL with Firefox 4 / Chrome In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=730 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |omajid at redhat.com --- Comment #3 from Omair Majid 2011-05-25 20:37:52 --- IcedTea6 1.8 is quite old and we dont fix many bugs in it any more. IcedTea-Web is where most of the plugin development takes place. Have you tested this with a recent IcedTea-Web? That said, there is a ongoing discussion on the mailing list about problems with Firefox 4. I am not sure how relevant that is: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-April/013706.html -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From dbhole at redhat.com Wed May 25 14:27:20 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Wed, 25 May 2011 17:27:20 -0400 Subject: firefox 4: problem with NPN_GetURL target=_self In-Reply-To: <4DDB730F.1050802@icyb.net.ua> References: <4DADADC8.7010404@icyb.net.ua> <4DADCF06.8080803@smedbergs.us> <4DADD105.30103@icyb.net.ua> <20110421153134.GC7494@redhat.com> <4DD026DD.8010205@icyb.net.ua> <20110516180328.GH29490@redhat.com> <4DD2255D.5090704@icyb.net.ua> <4DDB730F.1050802@icyb.net.ua> Message-ID: <20110525212720.GB2259@redhat.com> * Andriy Gapon [2011-05-24 04:58]: > on 17/05/2011 10:35 Andriy Gapon said the following: > > on 16/05/2011 21:03 Deepak Bhole said the following: > >> Can you please try again with the patch here applied? > >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/014200.html > >> > >> That patch adds full recursive call support for showDocument() calls, > >> rather than relying on FF to not make such calls. It should therefore > >> always work. Please let me know if there are any problems. > > > > Unfortunately it still doesn't help. > > In my simple test http://people.freebsd.org/~avg/java_test/ I see "Attempting to > > go to: http://www.google.ca" printed if I press the button, but the page never > > changes. > > > > Please let me know if I should provide any additional debugging info. > > Besides, it seems that the patch breaks the plugin in other browsers... > Hi, Just got back from vacation... Did you try applying the patch to a clean copy and building? Also, what sort of breakage are you seeing? I tested it with FF4 and chromium (just tried it again to be sure) and am seeing no problems. Cheers, Deepak > -- > Andriy Gapon > _______________________________________________ > dev-tech-plugins mailing list > dev-tech-plugins at lists.mozilla.org > https://lists.mozilla.org/listinfo/dev-tech-plugins From andrew at icedtea.classpath.org Wed May 25 14:56:04 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 25 May 2011 21:56:04 +0000 Subject: /hg/icedtea: Use xsltproc for bootstrap xslt processing not Xerc... Message-ID: changeset 8b248f7009b8 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8b248f7009b8 author: Andrew John Hughes date: Wed May 25 21:25:40 2011 +0100 Use xsltproc for bootstrap xslt processing not Xerces/Xalan. 2011-05-25 Andrew John Hughes * Makefile.am: (ENDORSED_DIR): Removed. (ICEDTEA_BOOT_PATCHES): Add xsltproc.patch (ICEDTEA_ENV_BOOT): Set XSLT. Don't set ICEDTEA_ENDORSED_DIR or ENDORSED. (bootstrap-directory- stage1): Don't link xalan2, xerces2 or xalan2 serialiser. * acinclude.m4: (IT_FIND_XALAN2_JAR): Removed. (IT_FIND_XALAN2_SERIALIZER_JAR): Likewise. (IT_FIND_XERCES2_JAR): Likewise. * configure.ac: Replace calls to IT_FIND_XALAN2_JAR, IT_FIND_XALAN2_SERIALIZER_JAR and IT_FIND_XERCES2_JAR with call to IT_FIND_TOOL for xsltproc. * patches/boot/xsltproc.patch: Patch jvmti.make in HotSpot to use xsltproc instead of Java's XSLT when bootstrapping. * patches/headers.patch: Remove addition of $(ENDORSED) to jvmti.make. diffstat: ChangeLog | 26 ++++++++++++ Makefile.am | 14 +---- acinclude.m4 | 95 --------------------------------------------- configure.ac | 4 +- patches/boot/xsltproc.patch | 53 +++++++++++++++++++++++++ patches/headers.patch | 12 ----- 6 files changed, 84 insertions(+), 120 deletions(-) diffs (282 lines): diff -r 43c6c4a00875 -r 8b248f7009b8 ChangeLog --- a/ChangeLog Wed May 25 17:33:49 2011 +0100 +++ b/ChangeLog Wed May 25 21:25:40 2011 +0100 @@ -1,3 +1,29 @@ +2011-05-25 Andrew John Hughes + + * Makefile.am: + (ENDORSED_DIR): Removed. + (ICEDTEA_BOOT_PATCHES): Add xsltproc.patch + (ICEDTEA_ENV_BOOT): Set XSLT. Don't + set ICEDTEA_ENDORSED_DIR or ENDORSED. + (bootstrap-directory-stage1): Don't link + xalan2, xerces2 or xalan2 serialiser. + * acinclude.m4: + (IT_FIND_XALAN2_JAR): Removed. + (IT_FIND_XALAN2_SERIALIZER_JAR): Likewise. + (IT_FIND_XERCES2_JAR): Likewise. + * configure.ac: + Replace calls to IT_FIND_XALAN2_JAR, + IT_FIND_XALAN2_SERIALIZER_JAR and + IT_FIND_XERCES2_JAR with call to + IT_FIND_TOOL for xsltproc. + * patches/boot/xsltproc.patch: + Patch jvmti.make in HotSpot to use + xsltproc instead of Java's XSLT + when bootstrapping. + * patches/headers.patch: + Remove addition of $(ENDORSED) to + jvmti.make. + 2011-05-25 Andrew John Hughes Fix make distcheck. diff -r 43c6c4a00875 -r 8b248f7009b8 Makefile.am --- a/Makefile.am Wed May 25 17:33:49 2011 +0100 +++ b/Makefile.am Wed May 25 21:25:40 2011 +0100 @@ -65,7 +65,6 @@ BOOT_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-boot BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0 RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar -ENDORSED_DIR = $(BOOT_DIR)/lib/endorsed CLS_DIR_BOOT = $(BOOT_BUILD_OUTPUT_DIR)/classes SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) @@ -373,7 +372,8 @@ patches/boot/hotspot-jdk-dependency.patch \ patches/boot/ecj-multicatch.patch \ patches/boot/ecj-trywithresources.patch \ - patches/boot/ecj-autoboxing.patch + patches/boot/ecj-autoboxing.patch \ + patches/boot/xsltproc.patch if CP39408_JAVAH ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch @@ -444,8 +444,6 @@ ALT_BOOTDIR="$(BOOT_DIR)" \ BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \ ICEDTEA_RT="$(RUNTIME)" \ - ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \ - ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \ CLASSPATH="" \ LD_LIBRARY_PATH="" \ ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \ @@ -534,7 +532,8 @@ JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \ DISABLE_NIMBUS="true" \ NO_DOCS="true" \ - ALT_OUTPUTDIR="$(BOOT_BUILD_OUTPUT_DIR)" + ALT_OUTPUTDIR="$(BOOT_BUILD_OUTPUT_DIR)" \ + XSLT="$(XSLTPROC)" # Source files @@ -1678,11 +1677,6 @@ ln -sf $(NATIVE2ASCII) $(STAGE1_BOOT_DIR)/bin/native2ascii ln -sf ../../../javac $(STAGE1_BOOT_DIR)/bin/javac ln -sf ../../../javap $(STAGE1_BOOT_DIR)/bin/javap - mkdir -p $(STAGE1_BOOT_DIR)/lib/endorsed && \ - ln -sf $(XALAN2_JAR) $(STAGE1_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \ - ln -sf $(XALAN2_SERIALIZER_JAR) \ - $(STAGE1_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \ - ln -sf $(XERCES2_JAR) $(STAGE1_BOOT_DIR)/lib/endorsed/xerces-j2.jar mkdir -p $(STAGE1_BOOT_DIR)/lib/modules mkdir -p $(STAGE1_BOOT_DIR)/jre/lib && \ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ diff -r 43c6c4a00875 -r 8b248f7009b8 acinclude.m4 --- a/acinclude.m4 Wed May 25 17:33:49 2011 +0100 +++ b/acinclude.m4 Wed May 25 21:25:40 2011 +0100 @@ -579,101 +579,6 @@ AC_SUBST(ALT_JAR_CMD) ]) -AC_DEFUN([IT_FIND_XALAN2_JAR], -[ - AC_MSG_CHECKING([for a xalan2 jar]) - AC_ARG_WITH([xalan2-jar], - [AS_HELP_STRING([--with-xalan2-jar[[=PATH]]],specify location of the xalan2 jar)], - [ - if test -f "${withval}" ; then - XALAN2_JAR="${withval}" - fi - ], - [ - XALAN2_JAR= - ]) - if test -z "${XALAN2_JAR}"; then - if test -e "/usr/share/java/xalan-j2.jar"; then - XALAN2_JAR=/usr/share/java/xalan-j2.jar - elif test -e "/usr/share/java/xalan2.jar"; then - XALAN2_JAR=/usr/share/java/xalan2.jar - elif test -e "/usr/share/xalan/lib/xalan.jar"; then - XALAN2_JAR=/usr/share/xalan/lib/xalan.jar - else - AC_MSG_RESULT(no) - fi - fi - if test -z "${XALAN2_JAR}"; then - AC_MSG_ERROR("A xalan2 jar was not found.") - fi - AC_MSG_RESULT(${XALAN2_JAR}) - AC_SUBST(XALAN2_JAR) -]) - -AC_DEFUN([IT_FIND_XALAN2_SERIALIZER_JAR], -[ - AC_MSG_CHECKING([for a xalan2 serializer jar]) - AC_ARG_WITH([xalan2-serializer-jar], - [AS_HELP_STRING([--with-xalan2-serializer-jar[[=PATH]]],specify location of the xalan2-serializer jar)], - [ - if test -f "${withval}" ; then - XALAN2_SERIALIZER_JAR="${withval}" - fi - ], - [ - XALAN2_SERIALIZER_JAR= - ]) - if test -z "${XALAN2_SERIALIZER_JAR}"; then - if test -e "/usr/share/java/xalan-j2-serializer.jar"; then - XALAN2_SERIALIZER_JAR=/usr/share/java/xalan-j2-serializer.jar - elif test -e "/usr/share/xalan-serializer/lib/serializer.jar"; then - XALAN2_SERIALIZER_JAR=/usr/share/xalan-serializer/lib/serializer.jar - elif test -e "/usr/share/java/serializer.jar"; then - XALAN2_SERIALIZER_JAR=/usr/share/java/serializer.jar - else - AC_MSG_RESULT(no) - fi - fi - if test -z "${XALAN2_SERIALIZER_JAR}"; then - AC_MSG_ERROR("A xalan2-serializer jar was not found.") - fi - AC_MSG_RESULT(${XALAN2_SERIALIZER_JAR}) - AC_SUBST(XALAN2_SERIALIZER_JAR) -]) - -AC_DEFUN([IT_FIND_XERCES2_JAR], -[ - AC_MSG_CHECKING([for a xerces2 jar]) - AC_ARG_WITH([xerces2-jar], - [AS_HELP_STRING([--with-xerces2-jar[[=PATH]]],specify location of the xerces2 jar)], - [ - if test -f "${withval}" ; then - XERCES2_JAR="${withval}" - fi - ], - [ - XERCES2_JAR= - ]) - if test -z "${XERCES2_JAR}"; then - if test -e "/usr/share/java/xerces-j2.jar"; then - XERCES2_JAR=/usr/share/java/xerces-j2.jar - elif test -e "/usr/share/java/xerces2.jar"; then - XERCES2_JAR=/usr/share/java/xerces2.jar - elif test -e "/usr/share/xerces-2/lib/xercesImpl.jar"; then - XERCES2_JAR=/usr/share/xerces-2/lib/xercesImpl.jar - elif test -e "/usr/share/java/xercesImpl.jar"; then - XERCES2_JAR=/usr/share/java/xercesImpl.jar - else - AC_MSG_RESULT(no) - fi - fi - if test -z "${XERCES2_JAR}"; then - AC_MSG_ERROR("A xerces2 jar was not found.") - fi - AC_MSG_RESULT(${XERCES2_JAR}) - AC_SUBST(XERCES2_JAR) -]) - AC_DEFUN([IT_FIND_RHINO_JAR], [ AC_MSG_CHECKING([whether to include Javascript support via Rhino]) diff -r 43c6c4a00875 -r 8b248f7009b8 configure.ac --- a/configure.ac Wed May 25 17:33:49 2011 +0100 +++ b/configure.ac Wed May 25 21:25:40 2011 +0100 @@ -103,9 +103,7 @@ IT_FIND_NATIVE2ASCII if test "x$enable_bootstrap" = "xyes"; then IT_FIND_ECJ_JAR - IT_FIND_XALAN2_JAR - IT_FIND_XALAN2_SERIALIZER_JAR - IT_FIND_XERCES2_JAR + IT_FIND_TOOL([XSLTPROC], [xsltproc]) fi AC_CONFIG_FILES([javac], [chmod +x javac]) AC_CONFIG_FILES([javap], [chmod +x javap]) diff -r 43c6c4a00875 -r 8b248f7009b8 patches/boot/xsltproc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/xsltproc.patch Wed May 25 21:25:40 2011 +0100 @@ -0,0 +1,54 @@ +diff -r 591c7dc0b2ee make/linux/makefiles/jvmti.make +--- openjdk-boot/hotspot/make/linux/makefiles/jvmti.make Thu May 19 13:27:44 2011 +0200 ++++ openjdk-boot/hotspot/make/linux/makefiles/jvmti.make Wed May 25 20:01:25 2011 +0100 +@@ -58,8 +58,6 @@ + + JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%) + +-XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen +- + .PHONY: all jvmtidocs clean cleanall + + # ######################################################################### +@@ -76,34 +74,34 @@ + + $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti ++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnter.cpp --stringparam interface jvmti $(JvmtiSrcDir)/jvmtiEnter.xsl $(JvmtiSrcDir)/jvmti.xml + + $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl + @echo Generating $@ +- $(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp ++ $(XSLT) -o $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml + + $(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace ++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnterTrace.cpp --stringparam interface jvmti --stringparam trace Trace $(JvmtiSrcDir)/jvmtiEnter.xsl $(JvmtiSrcDir)/jvmti.xml + + $(JvmtiOutDir)/jvmtiEnvRecommended.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiEnvFillClass) + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnv.xsl -OUT $(JvmtiOutDir)/jvmtiEnvStub.cpp ++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnvStub.cpp $(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmti.xml + $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiEnvFill $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiOutDir)/jvmtiEnvStub.cpp $(JvmtiOutDir)/jvmtiEnvRecommended.cpp + + $(JvmtiOutDir)/jvmtiEnv.hpp: $(both) $(JvmtiSrcDir)/jvmtiHpp.xsl + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiHpp.xsl -OUT $(JvmtiOutDir)/jvmtiEnv.hpp ++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnv.hpp $(JvmtiSrcDir)/jvmtiHpp.xsl $(JvmtiSrcDir)/jvmti.xml + + $(JvmtiOutDir)/jvmti.h: $(both) $(JvmtiSrcDir)/jvmtiH.xsl + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiH.xsl -OUT $(JvmtiOutDir)/jvmti.h ++ $(XSLT) -o $(JvmtiOutDir)/jvmti.h $(JvmtiSrcDir)/jvmtiH.xsl $(JvmtiSrcDir)/jvmti.xml + + jvmtidocs: $(JvmtiOutDir)/jvmti.html + + $(JvmtiOutDir)/jvmti.html: $(both) $(JvmtiSrcDir)/jvmti.xsl + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmti.xsl -OUT $(JvmtiOutDir)/jvmti.html ++ $(XSLT) -o $(JvmtiOutDir)/jvmti.html $(JvmtiSrcDir)/jvmti.xsl $(JvmtiSrcDir)/jvmti.xml + + # ######################################################################### + diff -r 43c6c4a00875 -r 8b248f7009b8 patches/headers.patch --- a/patches/headers.patch Wed May 25 17:33:49 2011 +0100 +++ b/patches/headers.patch Wed May 25 21:25:40 2011 +0100 @@ -37,16 +37,3 @@ endif endif FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH) -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jvmti.make openjdk/hotspot/make/linux/makefiles/jvmti.make ---- openjdk.orig/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:51:14.000000000 +0100 -+++ openjdk/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:54:13.000000000 +0100 -@@ -59,7 +59,7 @@ - - JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%) - --XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen -+XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) $(ENDORSED) -classpath $(JvmtiOutDir) jvmtiGen - - .PHONY: all jvmtidocs clean cleanall - - From bugzilla-daemon at icedtea.classpath.org Wed May 25 15:07:05 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 22:07:05 +0000 Subject: [Bug 732] New: Use xsltproc for bootstrap xslt in place of Xerces/Xalan Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=732 Summary: Use xsltproc for bootstrap xslt in place of Xerces/Xalan Product: IcedTea Version: unspecified Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea7 AssignedTo: gnu_andrew at member.fsf.org ReportedBy: gnu_andrew at member.fsf.org CC: unassigned at icedtea.classpath.org Blocks: 695,712 Using libxslt's xsltproc simplifies the dependencies required for bootstrapping IcedTea, allowing the removal of Xerces/Xalan detection Xerces/Xalan are even more problematic with newer versions which bring in additional xml-commons dependencies. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 15:07:05 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 22:07:05 +0000 Subject: [Bug 695] [TRACKER] IcedTea7 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |732 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 15:07:05 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 22:07:05 +0000 Subject: [Bug 712] [TRACKER] IcedTea7 2.0 release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on| |732 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 15:07:49 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 22:07:49 +0000 Subject: [Bug 732] Use xsltproc for bootstrap xslt in place of Xerces/Xalan In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=732 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #1 from Andrew John Hughes 2011-05-25 22:07:48 --- In IcedTea7. Just needs backporting to IcedTea6. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 15:09:16 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 22:09:16 +0000 Subject: [Bug 732] Use xsltproc for bootstrap xslt in place of Xerces/Xalan In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=732 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks|712 |705 --- Comment #2 from Andrew John Hughes 2011-05-25 22:09:16 --- Should be blocking IcedTea6 1.11 not IcedTea 2.0. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Wed May 25 15:09:17 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 25 May 2011 22:09:17 +0000 Subject: [Bug 712] [TRACKER] IcedTea7 2.0 release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=712 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Depends on|732 | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From andrew at icedtea.classpath.org Wed May 25 15:24:00 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 25 May 2011 22:24:00 +0000 Subject: /hg/icedtea: Update NEWS and bump to 1.14. Message-ID: changeset 1b47f8cc8c75 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1b47f8cc8c75 author: Andrew John Hughes date: Wed May 25 23:23:56 2011 +0100 Update NEWS and bump to 1.14. 2011-05-25 Andrew John Hughes * NEWS: Updated with changes since 1.13 and added URL key from IcedTea6. * configure.ac: Bump to 1.14 proper. diffstat: ChangeLog | 7 +++++++ NEWS | 15 ++++++++++++++- configure.ac | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) diffs (57 lines): diff -r 8b248f7009b8 -r 1b47f8cc8c75 ChangeLog --- a/ChangeLog Wed May 25 21:25:40 2011 +0100 +++ b/ChangeLog Wed May 25 23:23:56 2011 +0100 @@ -1,3 +1,10 @@ +2011-05-25 Andrew John Hughes + + * NEWS: + Updated with changes since 1.13 + and added URL key from IcedTea6. + * configure.ac: Bump to 1.14 proper. + 2011-05-25 Andrew John Hughes * Makefile.am: diff -r 8b248f7009b8 -r 1b47f8cc8c75 NEWS --- a/NEWS Wed May 25 21:25:40 2011 +0100 +++ b/NEWS Wed May 25 23:23:56 2011 +0100 @@ -1,9 +1,19 @@ +Key: + +SX - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=X +PRX - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=X +RHX - https://bugzilla.redhat.com/show_bug.cgi?id=X +DX - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X +GX - http://bugs.gentoo.org/show_bug.cgi?id=X CAX - http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=X -New in release 1.14 (XXXX-XX-XX) +CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY + +New in release 1.14 (2011-05-25): * NetX and the plugin moved to the IcedTea-Web project with a separate release cycle. +* Builds using system LCMS by default. * Added out-of-the-box JamVM support using --enable-jamvm * Allow building of JamVM beside the default VM by using --with-additional-vms=jamvm * Allow the location of the JamVM source zip to be specified using --with-jamvm-src-zip @@ -13,6 +23,9 @@ - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. - PR714: Forwardport replace-hotspot support from IcedTea6. - PR103: Usage of native2ascii during bootstrap + - PR543: zero fails to build on icedtea7 trunk 20100907 + - PR715: Port updated macros from IcedTea6 to 7 + - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan * JamVM - Ignore all unknown options. - Handle overflow in getPhysicalMemory(). diff -r 8b248f7009b8 -r 1b47f8cc8c75 configure.ac --- a/configure.ac Wed May 25 21:25:40 2011 +0100 +++ b/configure.ac Wed May 25 23:23:56 2011 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [1.14-pre], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [1.14], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From andrew at icedtea.classpath.org Wed May 25 15:24:19 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 25 May 2011 22:24:19 +0000 Subject: /hg/icedtea: Added tag icedtea-1.14 for changeset 1b47f8cc8c75 Message-ID: changeset 1508b893efed in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1508b893efed author: Andrew John Hughes date: Wed May 25 23:24:11 2011 +0100 Added tag icedtea-1.14 for changeset 1b47f8cc8c75 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 1b47f8cc8c75 -r 1508b893efed .hgtags --- a/.hgtags Wed May 25 23:23:56 2011 +0100 +++ b/.hgtags Wed May 25 23:24:11 2011 +0100 @@ -29,3 +29,4 @@ 81a1e18fede27d94540b67a42798419aaf59f5b9 icedtea-1.12 d96a0228b79286eea28af85707fd8ccc42cbed84 icedtea-1.12 13b9a6c006730355f1441c69649775e7cebd8aa0 icedtea-1.13 +1b47f8cc8c754841c63dfcddc41a11f1b012bddd icedtea-1.14 From ahughes at redhat.com Wed May 25 16:03:36 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 26 May 2011 00:03:36 +0100 Subject: IcedTea7 1.14 Released! Message-ID: <20110525230335.GG11507@rivendell.middle-earth.co.uk> We are pleased to announce a new major release of IcedTea7, 1.14! This will be the final preview release. The next release of IcedTea7 will be based on the first release of OpenJDK7 and we propose to start versioning of such releases from 2.0, allowing the IcedTea6/7 differentation to be dropped if required. The IcedTea project provides a harness to build the source code from OpenJDK7 using Free Software build tools and against system libraries, together with a number of local extensions such as a PulseAudio sound provider. What?s New? ?????? * Updated to OpenJDK7 b136. * NetX and the plugin moved to the IcedTea-Web project with a separate release cycle. * Builds using system LCMS by default. * Added out-of-the-box JamVM support using --enable-jamvm * Allow building of JamVM beside the default VM by using --with-additional-vms=jamvm * Allow the location of the JamVM source zip to be specified using --with-jamvm-src-zip * JamVM builds can bootstrap and are self-hosting. * Bug fixes - PR616, PR99: Don't statically link libstdc++ - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize. - PR714: Forwardport replace-hotspot support from IcedTea6. - PR103: Usage of native2ascii during bootstrap - PR543: zero fails to build on icedtea7 trunk 20100907 - PR715: Port updated macros from IcedTea6 to 7 - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan * JamVM - Ignore all unknown options. - Handle overflow in getPhysicalMemory(). - Base default min and max heap size on physical memory. - Fix reflective array access. - Handle O_DELETE in JVM_Open. - Minor performance improvement on ARM. - First set of changes to support JamVM/OpenJDK on MacOS X. - Minor memory leak (missing free). - Handle integer overflow on i386/amd64. - On ARM, force interpreter to be built in ARM mode. - MIPS: 64-bit and interpreter inlining by default. - Trivial implementation of stubs for MIPS. * CACAO - Threadlist & threadobject improvements. - Ignore all unknown options, but report them. - Fixes build for newer gcc (at least 4.4) on PPC64, breaks older gcc. - CA123: LD_LIBRARY_PATH and java.library.path. - CA143: don't hang with invalid locale. - CA144: aligned patchers on x86_64. - CA148: support for LCMP bytecode. - CA152: Calling Policy.setPolicy with a new Policy object has no effect on the DefaultSecurityManager. - CA156: uncaughtExceptionHandler doesn't work with OpenJDK 6 b21. - CA157: ARM SMP Assertion thinlock failed. * Zero/Shark - Match Shark in icedtea6, makes OSR work by removing vestigal check. - LLVM 2.7 non-product fixes. - Correct suffix for the llvm.atomic.cmp.swap intrinsic. The tarball can be downloaded from: * http://icedtea.classpath.org/download/source/icedtea-1.14.tar.gz sha256sum: 4df2c20d4379468436c60779cba89209ad25f884588f8b638647ad210a6ae9a8 The following people helped with this release: Gary Benson, Deepak Bhole, Andrew John Hughes, Matthias Klose, Denis Lila, Omair Majid, Damien Raude-Morvan, Xerxes R?nby, Pavel Tisnovsky, Mark Wielaard We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea-1.14.tar.gz $ cd icedtea-1.14 Full build requirements and instructions are in INSTALL: $ ./configure [--enable-zero --enable-pulse-java --enable-systemtap ...] $ make -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From bugzilla-daemon at icedtea.classpath.org Wed May 25 17:20:10 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 00:20:10 +0000 Subject: [Bug 733] New: A fatal error has been detected by the Java Runtime Environment Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=733 Summary: A fatal error has been detected by the Java Runtime Environment Product: IcedTea Version: 6-1.9.7 Platform: 32-bit OS/Version: Linux Status: NEW Severity: major Priority: P5 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: ion.cojoc at gmail.com # # A fatal error has been detected by the Java Runtime Environment: # # SIGBUS (0x7) at pc=0xb6af3d72, pid=10597, tid=2458057584 # # JRE version: 6.0_20-b20 # Java VM: OpenJDK Client VM (19.0-b09 mixed mode linux-x86 ) # Derivative: IcedTea6 1.9.7 # Distribution: Dummy Product (i586), package suse-1.2.1-i386 # Problematic frame: # C [libzip.so+0x3d72] # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # --------------- T H R E A D --------------- Current thread (0x92c47000): JavaThread "Messenger" [_thread_in_native, id=10629, stack(0x927df000,0x92830000)] siginfo:si_signo=SIGBUS: si_errno=0, si_code=2 (BUS_ADRERR), si_addr=0x92dc18b7 Registers: EAX=0x08292e80, EBX=0xb6af7ff4, ECX=0xb76b4380, EDX=0x08205aa0 ESP=0x9282d660, EBP=0x9282d6a8, ESI=0x92dc189a, EDI=0x08205aa8 EIP=0xb6af3d72, CR2=0x92dc18b7, EFLAGS=0x00010286 Register to memory mapping: EAX=0x08292e80 0x08292e80 is pointing to unknown location EBX=0xb6af7ff4 0xb6af7ff4: in /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libzip.so at 0xb6af0000 ECX=0xb76b4380 0xb76b4380: in /lib/libc.so.6 at 0xb754a000 EDX=0x08205aa0 0x08205aa0 is pointing to unknown location ESP=0x9282d660 0x9282d660 is pointing into the stack for thread: 0x92c47000 "Messenger" prio=10 tid=0x92c47000 nid=0x2985 runnable [0x9282d000] java.lang.Thread.State: RUNNABLE EBP=0x9282d6a8 0x9282d6a8 is pointing into the stack for thread: 0x92c47000 "Messenger" prio=10 tid=0x92c47000 nid=0x2985 runnable [0x9282d000] java.lang.Thread.State: RUNNABLE ESI=0x92dc189a 0x92dc189a is pointing to unknown location EDI=0x08205aa8 0x08205aa8 is pointing to unknown location Top of Stack: (sp=0x9282d660) 0x9282d660: 00000030 08292e80 9282d6a8 b6e10dfd 0x9282d670: 0828aab8 b7108ff4 934038e0 b6ddb6fd 0x9282d680: 9282d6cc 08205aa8 08292e80 b6af4d30 0x9282d690: 0828aab8 00000022 b6af3d2d b6af7ff4 0x9282d6a0: 082a09fc 08292e80 9282d6e8 b6af5308 0x9282d6b0: 00000000 9282d73e 92c47000 00000000 0x9282d6c0: 9282d6dc b4af2f87 08144798 979ff7b1 0x9282d6d0: 93de1da0 9282d6d4 92c47000 b6af7ff4 Instructions: (pc=0xb6af3d72) 0xb6af3d62: 00 00 00 00 8b 45 e0 8b 76 04 2b 70 1c 03 70 10 0xb6af3d72: 0f b6 56 1d 0f b6 46 1c c1 e2 08 09 c2 89 55 e4 Stack: [0x927df000,0x92830000], sp=0x9282d660, free space=313k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [libzip.so+0x3d72] C [libzip.so+0x5308] ZIP_GetEntry+0xb8 C [libzip.so+0x3468] Java_java_util_zip_ZipFile_getEntry+0xe8 j java.util.zip.ZipFile.getEntry(JLjava/lang/String;Z)J+0 j java.util.zip.ZipFile.getEntry(Ljava/lang/String;)Ljava/util/zip/ZipEntry;+31 j java.util.jar.JarFile.getEntry(Ljava/lang/String;)Ljava/util/zip/ZipEntry;+2 j java.util.jar.JarFile.getJarEntry(Ljava/lang/String;)Ljava/util/jar/JarEntry;+2 j sun.misc.URLClassPath$JarLoader.getResource(Ljava/lang/String;Z)Lsun/misc/Resource;+48 j sun.misc.URLClassPath.getResource(Ljava/lang/String;Z)Lsun/misc/Resource;+53 j java.net.URLClassLoader$1.run()Ljava/lang/Object;+26 v ~StubRoutines::call_stub V [libjvm.so+0x219b4e] Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j java.util.zip.ZipFile.getEntry(JLjava/lang/String;Z)J+0 j java.util.zip.ZipFile.getEntry(Ljava/lang/String;)Ljava/util/zip/ZipEntry;+31 j java.util.jar.JarFile.getEntry(Ljava/lang/String;)Ljava/util/zip/ZipEntry;+2 j java.util.jar.JarFile.getJarEntry(Ljava/lang/String;)Ljava/util/jar/JarEntry;+2 j sun.misc.URLClassPath$JarLoader.getResource(Ljava/lang/String;Z)Lsun/misc/Resource;+48 j sun.misc.URLClassPath.getResource(Ljava/lang/String;Z)Lsun/misc/Resource;+53 j java.net.URLClassLoader$1.run()Ljava/lang/Object;+26 v ~StubRoutines::call_stub j java.security.AccessController.doPrivileged(Ljava/security/PrivilegedExceptionAction;Ljava/security/AccessControlContext;)Ljava/lang/Object;+0 j java.net.URLClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class;+13 j net.sourceforge.jnlp.runtime.JNLPClassLoader.findClass(Ljava/lang/String;)Ljava/lang/Class;+23 j net.sourceforge.jnlp.runtime.JNLPClassLoader.loadClassExt(Ljava/lang/String;)Ljava/lang/Class;+6 j net.sourceforge.jnlp.runtime.JNLPClassLoader.loadClass(Ljava/lang/String;)Ljava/lang/Class;+36 v ~StubRoutines::call_stub j org.beepcore.beep.transport.tcp.TCPSession.(Ljava/net/Socket;Lorg/beepcore/beep/core/ProfileRegistry;ILorg/beepcore/beep/core/SessionCredential;Lorg/beepcore/beep/core/SessionCredential;Lorg/beepcore/beep/core/SessionTuningProperties;)V+13 j org.beepcore.beep.transport.tcp.TCPSession.createInitiator(Ljava/net/Socket;Lorg/beepcore/beep/core/ProfileRegistry;)Lorg/beepcore/beep/transport/tcp/TCPSession;+16 j org.beepcore.beep.transport.tcp.TCPSessionCreator.initiate(Ljava/net/InetAddress;ILorg/beepcore/beep/core/ProfileRegistry;)Lorg/beepcore/beep/transport/tcp/TCPSession;+10 j org.beepcore.beep.transport.tcp.TCPSessionCreator.initiate(Ljava/lang/String;ILorg/beepcore/beep/core/ProfileRegistry;)Lorg/beepcore/beep/transport/tcp/TCPSession;+6 j com.webct.platform.tools.wio.applet.WIOChannelCreator.startConnection()Z+32 j com.webct.platform.tools.wio.common.Messenger.init()V+628 j sun.applet.AppletPanel.run()V+205 j java.lang.Thread.run()V+11 v ~StubRoutines::call_stub --------------- P R O C E S S --------------- Java Threads: ( => current thread ) 0x082d8000 JavaThread "Thread-24" [_thread_in_native, id=10666, stack(0x92371000,0x923c2000)] 0x082d7400 JavaThread "Thread-23" [_thread_in_native, id=10665, stack(0x9269b000,0x926ec000)] 0x0820a000 JavaThread "Thread-22" [_thread_in_native, id=10664, stack(0x9264a000,0x9269b000)] 0x08208000 JavaThread "Thread-21" [_thread_in_native, id=10663, stack(0x925f9000,0x9264a000)] 0x081d4c00 JavaThread "Thread-20" [_thread_in_native, id=10662, stack(0x92dc6000,0x92e17000)] 0x081d4400 JavaThread "Applet" [_thread_blocked, id=10661, stack(0x925a8000,0x925f9000)] 0x0820b400 JavaThread "Thread-19" [_thread_blocked, id=10660, stack(0x926ec000,0x9273d000)] 0x92c20000 JavaThread "Thread-18" [_thread_blocked, id=10659, stack(0x9273d000,0x9278e000)] 0x08295800 JavaThread "WIOServerStatusThread" [_thread_blocked, id=10657, stack(0x9278e000,0x927df000)] 0x08291800 JavaThread "Keep-Alive-Timer" daemon [_thread_blocked, id=10656, stack(0x92464000,0x924b5000)] 0x92c48800 JavaThread "Keep-Alive-SocketCleaner" daemon [_thread_in_native, id=10646, stack(0x92413000,0x92464000)] 0x0827bc00 JavaThread "Thread-16" [_thread_blocked, id=10645, stack(0x923c2000,0x92413000)] 0x08280000 JavaThread "Thread-15" [_thread_blocked, id=10644, stack(0x924b5000,0x92506000)] 0x08258400 JavaThread "Thread-14" [_thread_blocked, id=10638, stack(0x92506000,0x92557000)] 0x08257000 JavaThread "Thread-13" [_thread_blocked, id=10637, stack(0x92557000,0x925a8000)] =>0x92c47000 JavaThread "Messenger" [_thread_in_native, id=10629, stack(0x927df000,0x92830000)] 0x92c45800 JavaThread "AWT-EventQueue-0" [_thread_blocked, id=10628, stack(0x92830000,0x92881000)] 0x93408c00 JavaThread "AWT-Shutdown" [_thread_blocked, id=10627, stack(0x92881000,0x928d2000)] 0x081be000 JavaThread "Thread-5" [_thread_blocked, id=10626, stack(0x928d2000,0x92923000)] 0x08057c00 JavaThread "Thread-4" [_thread_blocked, id=10625, stack(0x92923000,0x92974000)] 0x92c1c400 JavaThread "DestroyJavaVM" [_thread_blocked, id=10600, stack(0xb6b3b000,0xb6b8c000)] 0x92c14000 JavaThread "Thread-3" [_thread_in_native, id=10624, stack(0x92974000,0x929c5000)] 0x934a7000 JavaThread "Thread-2" [_thread_in_Java, id=10622, stack(0x92e17000,0x92e68000)] 0x93490c00 JavaThread "AWT-XAWT" daemon [_thread_in_native, id=10616, stack(0x92f36000,0x92f87000)] 0x9343fc00 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=10615, stack(0x930d8000,0x93129000)] 0x080c6c00 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=10612, stack(0x93651000,0x936a2000)] 0x080c5000 JavaThread "CompilerThread0" daemon [_thread_blocked, id=10610, stack(0x936a2000,0x93723000)] 0x080c3800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=10607, stack(0x93723000,0x93774000)] 0x080b3400 JavaThread "Finalizer" daemon [_thread_blocked, id=10605, stack(0x937ba000,0x9380b000)] 0x080ae800 JavaThread "Reference Handler" daemon [_thread_blocked, id=10603, stack(0x9380b000,0x9385c000)] Other Threads: 0x080aa800 VMThread [stack: 0x9385c000,0x938dd000] [id=10602] 0x080cac00 WatcherThread [stack: 0x935d0000,0x93651000] [id=10614] VM state:not at safepoint (normal execution) VM Mutex/Monitor currently owned by a thread: None Heap def new generation total 4480K, used 2314K [0x93c70000, 0x94140000, 0x9d670000) eden space 4032K, 48% used [0x93c70000, 0x93e596d8, 0x94060000) from space 448K, 79% used [0x940d0000, 0x941294c0, 0x94140000) to space 448K, 0% used [0x94060000, 0x94060000, 0x940d0000) tenured generation total 9856K, used 6374K [0x9d670000, 0x9e010000, 0xb0a70000) the space 9856K, 64% used [0x9d670000, 0x9dca98d8, 0x9dca9a00, 0x9e010000) compacting perm gen total 13824K, used 13789K [0xb0a70000, 0xb17f0000, 0xb4a70000) the space 13824K, 99% used [0xb0a70000, 0xb17e7600, 0xb17e7600, 0xb17f0000) No shared spaces configured. Dynamic libraries: 08048000-08051000 r-xp 00000000 08:06 415852 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/bin/java 08051000-08052000 r--p 00008000 08:06 415852 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/bin/java 08052000-08053000 rw-p 00009000 08:06 415852 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/bin/java 08053000-082f0000 rw-p 00000000 00:00 0 [heap] 922d5000-922d8000 ---p 00000000 00:00 0 922d8000-92326000 rw-p 00000000 00:00 0 92326000-92371000 r--p 00000000 08:06 264657 /var/cache/libx11/compose/l4_024_313cb605_00280cc0 92371000-92374000 ---p 00000000 00:00 0 92374000-923c2000 rw-p 00000000 00:00 0 923c2000-923c5000 ---p 00000000 00:00 0 923c5000-92413000 rw-p 00000000 00:00 0 92413000-92416000 ---p 00000000 00:00 0 92416000-92464000 rw-p 00000000 00:00 0 92464000-92467000 ---p 00000000 00:00 0 92467000-924b5000 rw-p 00000000 00:00 0 924b5000-924b8000 ---p 00000000 00:00 0 924b8000-92506000 rw-p 00000000 00:00 0 92506000-92509000 ---p 00000000 00:00 0 92509000-92557000 rw-p 00000000 00:00 0 92557000-9255a000 ---p 00000000 00:00 0 9255a000-925a8000 rw-p 00000000 00:00 0 925a8000-925ab000 ---p 00000000 00:00 0 925ab000-925f9000 rw-p 00000000 00:00 0 925f9000-925fc000 ---p 00000000 00:00 0 925fc000-9264a000 rw-p 00000000 00:00 0 9264a000-9264d000 ---p 00000000 00:00 0 9264d000-9269b000 rw-p 00000000 00:00 0 9269b000-9269e000 ---p 00000000 00:00 0 9269e000-926ec000 rw-p 00000000 00:00 0 926ec000-926ef000 ---p 00000000 00:00 0 926ef000-9273d000 rw-p 00000000 00:00 0 9273d000-92740000 ---p 00000000 00:00 0 92740000-9278e000 rw-p 00000000 00:00 0 9278e000-92791000 ---p 00000000 00:00 0 92791000-927df000 rw-p 00000000 00:00 0 927df000-927e2000 ---p 00000000 00:00 0 927e2000-92830000 rw-p 00000000 00:00 0 92830000-92833000 ---p 00000000 00:00 0 92833000-92881000 rw-p 00000000 00:00 0 92881000-92884000 ---p 00000000 00:00 0 92884000-928d2000 rw-p 00000000 00:00 0 928d2000-928d5000 ---p 00000000 00:00 0 928d5000-92923000 rw-p 00000000 00:00 0 92923000-92926000 ---p 00000000 00:00 0 92926000-92974000 rw-p 00000000 00:00 0 92974000-92977000 ---p 00000000 00:00 0 92977000-929c5000 rw-p 00000000 00:00 0 929c5000-92a18000 r-xp 00000000 08:06 392169 /lib/libfreebl3.so 92a18000-92a19000 ---p 00053000 08:06 392169 /lib/libfreebl3.so 92a19000-92a1a000 r--p 00053000 08:06 392169 /lib/libfreebl3.so 92a1a000-92a1b000 rw-p 00054000 08:06 392169 /lib/libfreebl3.so 92a1b000-92a1f000 rw-p 00000000 00:00 0 92a1f000-92ab7000 r-xp 00000000 08:06 137451 /usr/lib/libsqlite3.so.0.8.6 92ab7000-92ab8000 r--p 00098000 08:06 137451 /usr/lib/libsqlite3.so.0.8.6 92ab8000-92ab9000 rw-p 00099000 08:06 137451 /usr/lib/libsqlite3.so.0.8.6 92ab9000-92aba000 rw-p 00000000 00:00 0 92aba000-92bfb000 r-xp 00000000 08:06 139661 /usr/lib/libnss3.so 92bfb000-92bfe000 r--p 00140000 08:06 139661 /usr/lib/libnss3.so 92bfe000-92c00000 rw-p 00143000 08:06 139661 /usr/lib/libnss3.so 92c00000-92c59000 rw-p 00000000 00:00 0 92c59000-92d00000 ---p 00000000 00:00 0 92d10000-92d50000 r-xp 00000000 08:06 139506 /usr/lib/libsoftokn3.so 92d50000-92d51000 r--p 00040000 08:06 139506 /usr/lib/libsoftokn3.so 92d51000-92d52000 rw-p 00041000 08:06 139506 /usr/lib/libsoftokn3.so 92d52000-92d8c000 r-xp 00000000 08:06 137640 /usr/lib/libnspr4.so 92d8c000-92d8d000 r--p 00039000 08:06 137640 /usr/lib/libnspr4.so 92d8d000-92d8e000 rw-p 0003a000 08:06 137640 /usr/lib/libnspr4.so 92d8e000-92d90000 rw-p 00000000 00:00 0 92d90000-92d93000 r-xp 00000000 08:06 137642 /usr/lib/libplds4.so 92d93000-92d94000 r--p 00002000 08:06 137642 /usr/lib/libplds4.so 92d94000-92d95000 rw-p 00003000 08:06 137642 /usr/lib/libplds4.so 92d95000-92dac000 r-xp 00000000 08:06 139662 /usr/lib/libnssutil3.so 92dac000-92dad000 ---p 00017000 08:06 139662 /usr/lib/libnssutil3.so 92dad000-92db0000 r--p 00017000 08:06 139662 /usr/lib/libnssutil3.so 92db0000-92db1000 rw-p 0001a000 08:06 139662 /usr/lib/libnssutil3.so 92db1000-92db2000 r--s 00005000 08:07 263000 /home/gaby/.icedteaplugin/cache/https/mycourses.mcgill.ca/webct/jar/wioAppletResources_en.jar 92db2000-92db3000 r--s 00009000 08:07 262999 /home/gaby/.icedteaplugin/cache/https/mycourses.mcgill.ca/webct/jar/wioAppletResources_ja.jar 92db3000-92db8000 r--s 0002e000 08:07 262995 /home/gaby/.icedteaplugin/cache/https/mycourses.mcgill.ca/webct/jar/crimson.jar 92db8000-92dc6000 r--s 000d8000 08:07 262994 /home/gaby/.icedteaplugin/cache/https/mycourses.mcgill.ca/webct/jar/wio_applet.jar 92dc6000-92dc9000 ---p 00000000 00:00 0 92dc9000-92e17000 rw-p 00000000 00:00 0 92e17000-92e1a000 ---p 00000000 00:00 0 92e1a000-92e68000 rw-p 00000000 00:00 0 92e68000-92e6f000 r--s 00000000 08:06 292387 /var/cache/fontconfig/77e41c5059666d75f92e318d4be8c21e-le32d4.cache-3 92e6f000-92e91000 r--s 00000000 08:06 290292 /var/cache/fontconfig/8d4af663993b81a124ee82e610bb31f9-le32d4.cache-3 92e91000-92eb1000 r--s 00000000 08:06 292388 /var/cache/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-le32d4.cache-3 92eb1000-92ef2000 r--s 00000000 08:06 290284 /var/cache/fontconfig/df311e82a1a24c41a75c2c930223552e-le32d4.cache-3 92ef2000-92f33000 r--s 00000000 08:06 290285 /var/cache/fontconfig/17090aa38d5c6f09fb8c5c354938f1d7-le32d4.cache-3 92f33000-92f34000 r--s 00005000 08:07 262998 /home/gaby/.icedteaplugin/cache/https/mycourses.mcgill.ca/webct/jar/wioAppletResources_fr.jar 92f34000-92f35000 r--s 00005000 08:07 262997 /home/gaby/.icedteaplugin/cache/https/mycourses.mcgill.ca/webct/jar/wioAppletResources_fi_FI.jar 92f35000-92f36000 r--s 00005000 08:07 262993 /home/gaby/.icedteaplugin/cache/https/mycourses.mcgill.ca/webct/jar/wioAppletResources_es.jar 92f36000-92f39000 ---p 00000000 00:00 0 92f39000-92f87000 rw-p 00000000 00:00 0 92f87000-92f91000 r-xp 00000000 08:06 159994 /usr/lib/libXcursor.so.1.0.2 92f91000-92f92000 r--p 00009000 08:06 159994 /usr/lib/libXcursor.so.1.0.2 92f92000-92f93000 rw-p 0000a000 08:06 159994 /usr/lib/libXcursor.so.1.0.2 92f93000-92f97000 r-xp 00000000 08:06 137641 /usr/lib/libplc4.so 92f97000-92f98000 r--p 00003000 08:06 137641 /usr/lib/libplc4.so 92f98000-92f99000 rw-p 00004000 08:06 137641 /usr/lib/libplc4.so 92f99000-92fa6000 r-xp 00000000 08:06 415928 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libj2pkcs11.so 92fa6000-92fa7000 r--p 0000c000 08:06 415928 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libj2pkcs11.so 92fa7000-92fa8000 rw-p 0000d000 08:06 415928 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libj2pkcs11.so 92fa8000-92faf000 r--s 00000000 08:06 292387 /var/cache/fontconfig/77e41c5059666d75f92e318d4be8c21e-le32d4.cache-3 92faf000-92fd1000 r--s 00000000 08:06 290292 /var/cache/fontconfig/8d4af663993b81a124ee82e610bb31f9-le32d4.cache-3 92fd1000-92ff1000 r--s 00000000 08:06 292388 /var/cache/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-le32d4.cache-3 92ff1000-93032000 r--s 00000000 08:06 290284 /var/cache/fontconfig/df311e82a1a24c41a75c2c930223552e-le32d4.cache-3 93032000-93037000 r--s 00000000 08:06 290287 /var/cache/fontconfig/d62e99ef547d1d24cdb1bd22ec1a2976-le32d4.cache-3 93037000-93078000 r--s 00000000 08:06 290285 /var/cache/fontconfig/17090aa38d5c6f09fb8c5c354938f1d7-le32d4.cache-3 93078000-93079000 r--s 00004000 08:07 262992 /home/gaby/.icedteaplugin/cache/https/mycourses.mcgill.ca/webct/jar/wioAppletResources_en_GB.jar 93079000-9307a000 r--s 00005000 08:07 262996 /home/gaby/.icedteaplugin/cache/https/mycourses.mcgill.ca/webct/jar/wioAppletResources_de.jar 9307a000-9307d000 r--s 00038000 08:06 415887 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/ext/sunpkcs11.jar 9307d000-93081000 r-xp 00000000 08:06 152039 /usr/lib/libXfixes.so.3.1.0 93081000-93082000 r--p 00003000 08:06 152039 /usr/lib/libXfixes.so.3.1.0 93082000-93083000 rw-p 00004000 08:06 152039 /usr/lib/libXfixes.so.3.1.0 93083000-93089000 r--s 000fc000 08:06 415989 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/resources.jar 93089000-930c2000 rw-p 00000000 00:00 0 930c2000-930d6000 r-xp 00000000 08:06 415941 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libnet.so 930d6000-930d7000 r--p 00013000 08:06 415941 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libnet.so 930d7000-930d8000 rw-p 00014000 08:06 415941 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libnet.so 930d8000-930db000 ---p 00000000 00:00 0 930db000-93129000 rw-p 00000000 00:00 0 93129000-93145000 r-xp 00000000 08:06 409555 /lib/libgcc_s.so.1 93145000-93146000 r--p 0001b000 08:06 409555 /lib/libgcc_s.so.1 93146000-93147000 rw-p 0001c000 08:06 409555 /lib/libgcc_s.so.1 93147000-931ca000 r-xp 00000000 08:06 139401 /usr/lib/libfreetype.so.6.6.2 931ca000-931ce000 r--p 00082000 08:06 139401 /usr/lib/libfreetype.so.6.6.2 931ce000-931cf000 rw-p 00086000 08:06 139401 /usr/lib/libfreetype.so.6.6.2 931cf000-931d1000 r--s 00013000 08:06 415972 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/jce.jar 931d1000-931d4000 r--s 00031000 08:06 415886 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/ext/sunjce_provider.jar 931d4000-931e2000 r-xp 00000000 08:06 415942 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libnio.so 931e2000-931e3000 r--p 0000d000 08:06 415942 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libnio.so 931e3000-931e4000 rw-p 0000e000 08:06 415942 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libnio.so 931e4000-9322a000 r-xp 00000000 08:06 415923 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libfontmanager.so 9322a000-9322c000 r--p 00045000 08:06 415923 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libfontmanager.so 9322c000-9322d000 rw-p 00047000 08:06 415923 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libfontmanager.so 9322d000-93232000 rw-p 00000000 00:00 0 93232000-93250000 r-xp 00000000 08:06 139477 /usr/lib/libxcb.so.1.1.0 93250000-93251000 r--p 0001e000 08:06 139477 /usr/lib/libxcb.so.1.1.0 93251000-93252000 rw-p 0001f000 08:06 139477 /usr/lib/libxcb.so.1.1.0 93252000-93260000 r-xp 00000000 08:06 153211 /usr/lib/libXi.so.6.1.0 93260000-93261000 r--p 0000d000 08:06 153211 /usr/lib/libXi.so.6.1.0 93261000-93262000 rw-p 0000e000 08:06 153211 /usr/lib/libXi.so.6.1.0 93262000-93267000 r-xp 00000000 08:06 160014 /usr/lib/libXtst.so.6.1.0 93267000-93268000 r--p 00004000 08:06 160014 /usr/lib/libXtst.so.6.1.0 93268000-93269000 rw-p 00005000 08:06 160014 /usr/lib/libXtst.so.6.1.0 93269000-933a2000 r-xp 00000000 08:06 150872 /usr/lib/libX11.so.6.3.0 933a2000-933a3000 r--p 00139000 08:06 150872 /usr/lib/libX11.so.6.3.0 933a3000-933a6000 rw-p 0013a000 08:06 150872 /usr/lib/libX11.so.6.3.0 933a6000-933b6000 r-xp 00000000 08:06 152041 /usr/lib/libXext.so.6.4.0 933b6000-933b7000 r--p 00010000 08:06 152041 /usr/lib/libXext.so.6.4.0 933b7000-933b8000 rw-p 00011000 08:06 152041 /usr/lib/libXext.so.6.4.0 933b8000-933fc000 r-xp 00000000 08:06 415958 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/xawt/libmawt.so 933fc000-933fd000 r--p 00044000 08:06 415958 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/xawt/libmawt.so 933fd000-933ff000 rw-p 00045000 08:06 415958 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/xawt/libmawt.so 933ff000-93400000 rw-p 00000000 00:00 0 93400000-934fe000 rw-p 00000000 00:00 0 934fe000-93500000 ---p 00000000 00:00 0 93500000-93501000 r--p 00000000 00:00 0 93501000-9350a000 r-xp 00000000 08:06 152307 /usr/lib/libXrender.so.1.3.0 9350a000-9350b000 r--p 00008000 08:06 152307 /usr/lib/libXrender.so.1.3.0 9350b000-9350c000 rw-p 00009000 08:06 152307 /usr/lib/libXrender.so.1.3.0 9350c000-93510000 r--s 0007c000 08:06 415974 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/jsse.jar 93510000-93515000 r--s 00000000 08:06 290287 /var/cache/fontconfig/d62e99ef547d1d24cdb1bd22ec1a2976-le32d4.cache-3 93515000-93518000 r--s 0000f000 08:06 415885 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/ext/pulse-java.jar 93518000-93521000 r--s 00065000 08:06 415882 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/ext/gnome-java-bridge.jar 93521000-935a4000 r-xp 00000000 08:06 415921 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libawt.so 935a4000-935a5000 r--p 00082000 08:06 415921 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libawt.so 935a5000-935ac000 rw-p 00083000 08:06 415921 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libawt.so 935ac000-935d0000 rw-p 00000000 00:00 0 935d0000-935d1000 ---p 00000000 00:00 0 935d1000-93651000 rw-p 00000000 00:00 0 93651000-93654000 ---p 00000000 00:00 0 93654000-936a2000 rw-p 00000000 00:00 0 936a2000-936a5000 ---p 00000000 00:00 0 936a5000-93723000 rw-p 00000000 00:00 0 93723000-93726000 ---p 00000000 00:00 0 93726000-93774000 rw-p 00000000 00:00 0 93774000-9377b000 r--s 00000000 08:06 148533 /usr/lib/gconv/gconv-modules.cache 9377b000-937ba000 r--p 00000000 08:06 528798 /usr/lib/locale/en_US.utf8/LC_CTYPE 937ba000-937bd000 ---p 00000000 00:00 0 937bd000-9380b000 rw-p 00000000 00:00 0 9380b000-9380e000 ---p 00000000 00:00 0 9380e000-9385c000 rw-p 00000000 00:00 0 9385c000-9385d000 ---p 00000000 00:00 0 9385d000-938dd000 rw-p 00000000 00:00 0 938dd000-938e2000 r--s 00044000 08:06 415985 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/netx.jar 938e2000-93915000 rw-p 00000000 00:00 0 93915000-93aac000 r--s 03992000 08:06 415991 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/rt.jar 93aac000-93ab3000 rw-p 00000000 00:00 0 93ab3000-93acd000 rw-p 00000000 00:00 0 93acd000-93ad2000 rw-p 00000000 00:00 0 93ad2000-93b68000 rw-p 00000000 00:00 0 93b68000-93b6b000 rw-p 00000000 00:00 0 93b6b000-93bb5000 rw-p 00000000 00:00 0 93bb5000-93bba000 rw-p 00000000 00:00 0 93bba000-93c4f000 rw-p 00000000 00:00 0 93c4f000-93c56000 rw-p 00000000 00:00 0 93c56000-93c6f000 rw-p 00000000 00:00 0 93c6f000-94140000 rw-p 00000000 00:00 0 94140000-9d670000 rw-p 00000000 00:00 0 9d670000-9e010000 rw-p 00000000 00:00 0 9e010000-b0a70000 rw-p 00000000 00:00 0 b0a70000-b17f0000 rw-p 00000000 00:00 0 b17f0000-b4a70000 rw-p 00000000 00:00 0 b4a70000-b4a77000 rw-p 00000000 00:00 0 b4a77000-b4af0000 rw-p 00000000 00:00 0 b4af0000-b4c78000 rwxp 00000000 00:00 0 b4c78000-b6af0000 rw-p 00000000 00:00 0 b6af0000-b6af7000 r-xp 00000000 08:06 415950 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libzip.so b6af7000-b6af8000 r--p 00006000 08:06 415950 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libzip.so b6af8000-b6af9000 rw-p 00007000 08:06 415950 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libzip.so b6af9000-b6b01000 rw-s 00000000 08:06 6164 /tmp/hsperfdata_gaby/10597 b6b01000-b6b08000 r-xp 00000000 08:06 415952 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/native_threads/libhpi.so b6b08000-b6b09000 r--p 00006000 08:06 415952 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/native_threads/libhpi.so b6b09000-b6b0a000 rw-p 00007000 08:06 415952 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/native_threads/libhpi.so b6b0a000-b6b2e000 r-xp 00000000 08:06 415930 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libjava.so b6b2e000-b6b2f000 r--p 00023000 08:06 415930 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libjava.so b6b2f000-b6b31000 rw-p 00024000 08:06 415930 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libjava.so b6b31000-b6b39000 r-xp 00000000 08:06 391739 /lib/librt-2.11.3.so b6b39000-b6b3a000 r--p 00007000 08:06 391739 /lib/librt-2.11.3.so b6b3a000-b6b3b000 rw-p 00008000 08:06 391739 /lib/librt-2.11.3.so b6b3b000-b6b3e000 ---p 00000000 00:00 0 b6b3e000-b6b8c000 rw-p 00000000 00:00 0 b6b8c000-b6bb4000 r-xp 00000000 08:06 391717 /lib/libm-2.11.3.so b6bb4000-b6bb5000 r--p 00027000 08:06 391717 /lib/libm-2.11.3.so b6bb5000-b6bb6000 rw-p 00028000 08:06 391717 /lib/libm-2.11.3.so b6bb6000-b70f2000 r-xp 00000000 08:06 415914 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/client/libjvm.so b70f2000-b7109000 r--p 0053c000 08:06 415914 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/client/libjvm.so b7109000-b7116000 rw-p 00553000 08:06 415914 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/client/libjvm.so b7116000-b7533000 rw-p 00000000 00:00 0 b7533000-b7548000 r-xp 00000000 08:06 392255 /lib/libz.so.1.2.5 b7548000-b7549000 r--p 00014000 08:06 392255 /lib/libz.so.1.2.5 b7549000-b754a000 rw-p 00015000 08:06 392255 /lib/libz.so.1.2.5 b754a000-b76b0000 r-xp 00000000 08:06 391709 /lib/libc-2.11.3.so b76b0000-b76b1000 ---p 00166000 08:06 391709 /lib/libc-2.11.3.so b76b1000-b76b3000 r--p 00166000 08:06 391709 /lib/libc-2.11.3.so b76b3000-b76b4000 rw-p 00168000 08:06 391709 /lib/libc-2.11.3.so b76b4000-b76b7000 rw-p 00000000 00:00 0 b76b7000-b76ba000 r-xp 00000000 08:06 391715 /lib/libdl-2.11.3.so b76ba000-b76bb000 r--p 00002000 08:06 391715 /lib/libdl-2.11.3.so b76bb000-b76bc000 rw-p 00003000 08:06 391715 /lib/libdl-2.11.3.so b76bc000-b76bd000 rw-p 00000000 00:00 0 b76bd000-b76c0000 r-xp 00000000 08:06 415918 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/jli/libjli.so b76c0000-b76c1000 r--p 00003000 08:06 415918 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/jli/libjli.so b76c1000-b76c2000 rw-p 00004000 08:06 415918 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/jli/libjli.so b76c2000-b76d9000 r-xp 00000000 08:06 391735 /lib/libpthread-2.11.3.so b76d9000-b76da000 r--p 00016000 08:06 391735 /lib/libpthread-2.11.3.so b76da000-b76db000 rw-p 00017000 08:06 391735 /lib/libpthread-2.11.3.so b76db000-b76dd000 rw-p 00000000 00:00 0 b76dd000-b76df000 r-xp 00000000 08:06 137636 /usr/lib/libXau.so.6.0.0 b76df000-b76e0000 r--p 00001000 08:06 137636 /usr/lib/libXau.so.6.0.0 b76e0000-b76e1000 rw-p 00002000 08:06 137636 /usr/lib/libXau.so.6.0.0 b76e1000-b76e3000 r--s 0001d000 08:06 415986 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/plugin.jar b76e3000-b76e4000 rw-p 00000000 00:00 0 b76e4000-b76e5000 r--p 00000000 00:00 0 b76e5000-b76f0000 r-xp 00000000 08:06 415949 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libverify.so b76f0000-b76f1000 r--p 0000b000 08:06 415949 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libverify.so b76f1000-b76f2000 rw-p 0000c000 08:06 415949 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/libverify.so b76f2000-b76f3000 rw-p 00000000 00:00 0 b76f3000-b7712000 r-xp 00000000 08:06 391702 /lib/ld-2.11.3.so b7712000-b7713000 r--p 0001e000 08:06 391702 /lib/ld-2.11.3.so b7713000-b7714000 rw-p 0001f000 08:06 391702 /lib/ld-2.11.3.so bf943000-bf964000 rw-p 00000000 00:00 0 [stack] f57fe000-f57ff000 r-xp 00000000 00:00 0 [vdso] VM Arguments: java_command: sun.applet.PluginMain /tmp/icedteaplugin-gaby/10425-icedteanp-plugin-to-appletviewer /tmp/icedteaplugin-gaby/10425-icedteanp-appletviewer-to-plugin Launcher Type: SUN_STANDARD Environment Variables: JAVA_HOME=/usr/lib/jvm/jre JRE_HOME=/usr/lib/jvm/jre PATH=/home/gaby/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib/jvm/jre/bin USERNAME=gaby LD_LIBRARY_PATH=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386/client:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/lib/i386:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0/jre/../lib/i386 SHELL=/bin/bash DISPLAY=:0.0 HOSTTYPE=i386 OSTYPE=linux MACHTYPE=i686-suse-linux Signal Handlers: SIGSEGV: [libjvm.so+0x3fcac0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGBUS: [libjvm.so+0x3fcac0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGFPE: [libjvm.so+0x312a80], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGPIPE: SIG_IGN, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGXFSZ: [libjvm.so+0x312a80], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGILL: [libjvm.so+0x312a80], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGUSR2: [libjvm.so+0x312920], sa_mask[0]=0x00000000, sa_flags=0x10000004 SIGHUP: [libjvm.so+0x3157d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGINT: [libjvm.so+0x3157d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGTERM: [libjvm.so+0x3157d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGQUIT: [libjvm.so+0x3157d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 --------------- S Y S T E M --------------- OS:openSUSE 11.4 (i586) VERSION = 11.4 CODENAME = Celadon uname:Linux 2.6.37.6-0.5-xen #1 SMP 2011-04-25 21:48:33 +0200 i686 libc:glibc 2.11.3 NPTL 2.11.3 rlimit: STACK 8192k, CORE 0k, NPROC 7044, NOFILE 8192, AS 1792480k load average:0.45 0.16 0.09 /proc/meminfo: MemTotal: 945456 kB MemFree: 61520 kB Buffers: 26224 kB Cached: 528324 kB SwapCached: 1628 kB Active: 360212 kB Inactive: 434968 kB Active(anon): 171068 kB Inactive(anon): 212444 kB Active(file): 189144 kB Inactive(file): 222524 kB Unevictable: 16 kB Mlocked: 16 kB HighTotal: 226104 kB HighFree: 488 kB LowTotal: 719352 kB LowFree: 61032 kB SwapTotal: 1259516 kB SwapFree: 1242508 kB Dirty: 672 kB Writeback: 0 kB AnonPages: 239408 kB Mapped: 96864 kB Shmem: 142928 kB Slab: 34348 kB SReclaimable: 19036 kB SUnreclaim: 15312 kB KernelStack: 2672 kB PageTables: 0 kB NFS_Unstable: 0 kB Bounce: 0 kB WritebackTmp: 0 kB CommitLimit: 1732244 kB Committed_AS: 1488312 kB VmallocTotal: 122880 kB VmallocUsed: 19520 kB VmallocChunk: 86968 kB HardwareCorrupted: 0 kB DirectMap4k: 700920 kB DirectMap2M: 0 kB CPU:total 2 (1 cores per cpu, 2 threads per core) family 15 model 4 stepping 1, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ht Memory: 4k page, physical 945456k(61520k free), swap 1259516k(1242508k free) vm_info: OpenJDK Client VM (19.0-b09) for linux-x86 JRE (1.6.0_20-b20), built on Feb 27 2011 13:03:14 by "abuild" with gcc 4.5.1 20101208 [gcc-4_5-branch revision 167585] time: Mon May 23 17:06:54 2011 elapsed time: 11 seconds -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:30:09 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:30:09 +0000 Subject: [Bug 681] Fail on start netbeans-6.8 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=681 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|blocker |normal -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:45:13 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:45:13 +0000 Subject: [Bug 730] Calling URL with Firefox 4 / Chrome In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=730 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|critical |normal Platform|32-bit |x86 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:46:08 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:46:08 +0000 Subject: [Bug 523] Crash when running mkgmap In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=523 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|critical |normal -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:46:22 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:46:22 +0000 Subject: [Bug 598] Tomcat crashes on tomcat stop In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=598 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|critical |normal Platform|64-bit |x86_64 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:46:59 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:46:59 +0000 Subject: [Bug 598] Tomcat crashes on tomcat stop In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=598 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #1 from Andrew John Hughes 2011-05-26 07:46:59 --- The 1.7 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:47:58 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:47:58 +0000 Subject: [Bug 601] JRE failure with CollabNetSubversionEdge-1.3.0_linux-x86.tar.gz In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=601 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #6 from Andrew John Hughes 2011-05-26 07:47:58 --- The 1.7 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:48:57 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:48:57 +0000 Subject: [Bug 603] How to but icedtea? Already added a bug report, but no answer. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=603 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|major |normal Platform|32-bit |x86 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:49:22 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:49:22 +0000 Subject: [Bug 702] Crash when generating openstreetmap maps using mkgmap In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=702 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|critical |normal -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:50:16 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:50:16 +0000 Subject: [Bug 720] Error: caught unhandled signal 11, tomcat6, arm, debian linux, In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=720 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|critical |normal Component|IcedTea6 |Zero -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:52:45 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:52:45 +0000 Subject: [Bug 276] SIGSEGV in 64 bit JDK 1.6 when using JNI, and both library and Java app are threaded In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=276 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #5 from Andrew John Hughes 2011-05-26 07:52:45 --- The 1.2 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:53:08 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:53:08 +0000 Subject: [Bug 293] JVM fatal error in VM code (HS 14) after NetworkManager disable / reenable cycle In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=293 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #14 from Andrew John Hughes 2011-05-26 07:53:07 --- The 1.4 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:53:35 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:53:35 +0000 Subject: [Bug 305] eclipse crashes if I try to configure PyDev plugin In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=305 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #9 from Andrew John Hughes 2011-05-26 07:53:35 --- The 1.2 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:53:57 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:53:57 +0000 Subject: [Bug 308] run scilab 5.1 demos at openSUSE11.1 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=308 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #4 from Andrew John Hughes 2011-05-26 07:53:57 --- The 1.4 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:54:25 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:54:25 +0000 Subject: [Bug 316] unexpected error In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=316 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #4 from Andrew John Hughes 2011-05-26 07:54:25 --- The 1.2 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:56:02 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:56:02 +0000 Subject: [Bug 365] IntelliJ IDEA crashes due to SIGSEGV in libjvm.so+0x4760e6 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=365 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #12 from Andrew John Hughes 2011-05-26 07:56:01 --- The 1.4 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:56:20 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:56:20 +0000 Subject: [Bug 396] SIGSEGV (0xb) around pango_layout_new+0x2a In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=396 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #2 from Andrew John Hughes 2011-05-26 07:56:20 --- The 1.2 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:56:51 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:56:51 +0000 Subject: [Bug 408] SIGSEGV: JavaThread "Java2D Disposer" crashes JVM In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=408 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #5 from Andrew John Hughes 2011-05-26 07:56:50 --- The 1.2 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:57:09 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:57:09 +0000 Subject: [Bug 409] similar error observed here In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=409 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #8 from Andrew John Hughes 2011-05-26 07:57:09 --- The 1.2 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:57:37 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:57:37 +0000 Subject: [Bug 418] JVM Crash (SIGSEGV) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=418 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #3 from Andrew John Hughes 2011-05-26 07:57:37 --- The 1.2 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:58:07 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:58:07 +0000 Subject: [Bug 423] Iced tea openjdk1.6 and jdk1.7 crashes in remote x server (cygwin) environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=423 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #4 from Andrew John Hughes 2011-05-26 07:58:06 --- The 1.6 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:58:49 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:58:49 +0000 Subject: [Bug 424] Error: guarantee(get_thread_slow() == thread,"must be the same thread, slowly") In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=424 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #1 from Andrew John Hughes 2011-05-26 07:58:48 --- The 1.6 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 00:59:20 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 07:59:20 +0000 Subject: [Bug 435] unable to compile icedtea-6.1.7: interpreter segfault in java.lang.Thread. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=435 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #13 from Andrew John Hughes 2011-05-26 07:59:19 --- The 1.7 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:00:02 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:00:02 +0000 Subject: [Bug 437] YaCy crashed with SIGSEGV In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=437 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #16 from Andrew John Hughes 2011-05-26 08:00:02 --- The 1.7 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:00:21 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:00:21 +0000 Subject: [Bug 447] Java VM: OpenJDK 64-Bit Server VM (1.6.0_0-b11 mixed mode linux-amd64) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=447 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #4 from Andrew John Hughes 2011-05-26 08:00:21 --- The 1.2 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:00:59 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:00:59 +0000 Subject: [Bug 448] cacao fails to load icedtea plugin because ManagementFactory is broken on cacao VM In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=448 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #2 from Andrew John Hughes 2011-05-26 08:00:58 --- The 1.7 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:01:39 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:01:39 +0000 Subject: [Bug 452] SIGSEGV while running jna test cases in ld-linux In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=452 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #4 from Andrew John Hughes 2011-05-26 08:01:39 --- The 1.7 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:02:01 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:02:01 +0000 Subject: [Bug 468] Eclipse Galileo CDT crashes for SIGSEGV after saving a c++ file on CentOS 5.4 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=468 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #2 from Andrew John Hughes 2011-05-26 08:02:00 --- The 1.2 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:04:08 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:04:08 +0000 Subject: [Bug 733] A fatal error has been detected by the Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=733 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|major |normal Platform|32-bit |x86 --- Comment #1 from Andrew John Hughes 2011-05-26 08:04:08 --- Do you have a reproducer for this? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:04:49 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:04:49 +0000 Subject: [Bug 531] install thinkingrock 3.1.2 start get erroe and crash In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=531 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|major |normal --- Comment #2 from Andrew John Hughes 2011-05-26 08:04:49 --- What version of IcedTea is this? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:05:11 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:05:11 +0000 Subject: [Bug 533] compilation of icedtea-6-1.8.1 fails on test_gamma In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=533 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|major |normal -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:05:37 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:05:37 +0000 Subject: [Bug 471] debugging using eclipse In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=471 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #3 from Andrew John Hughes 2011-05-26 08:05:37 --- The 1.6 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:06:31 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:06:31 +0000 Subject: [Bug 478] Fatal error when running tests in Eclipse In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=478 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|REOPENED |RESOLVED Resolution| |WONTFIX --- Comment #5 from Andrew John Hughes 2011-05-26 08:06:31 --- The 1.7 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:08:00 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:08:00 +0000 Subject: [Bug 499] Eclipse crash due to error in Java Runtime Environment In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=499 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Platform|32-bit |x86 Resolution| |WONTFIX Version|6-1.0 |6-1.7.3 --- Comment #3 from Andrew John Hughes 2011-05-26 08:07:59 --- The 1.7 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:08:28 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:08:28 +0000 Subject: [Bug 501] OpenJDK SIGSEGV [libjvm.so+0x1c1937] In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=501 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #4 from Andrew John Hughes 2011-05-26 08:08:28 --- The 1.2 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:09:17 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:09:17 +0000 Subject: [Bug 524] OpenOffice crash In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=524 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |INVALID --- Comment #4 from Andrew John Hughes 2011-05-26 08:09:17 --- Closing as invalid. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:09:41 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:09:41 +0000 Subject: [Bug 624] JVM crashes with Tomcat In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=624 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|major |normal Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #4 from Andrew John Hughes 2011-05-26 08:09:41 --- The 1.7 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:10:42 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:10:42 +0000 Subject: [Bug 655] SIGBUS MappedByteBuffer.load In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=655 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Severity|major |normal -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:11:02 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:11:02 +0000 Subject: [Bug 679] YUICompressor crashes with SIGSEGV (0xb) in frame libjvm.so+0x33224c In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=679 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #8 from Andrew John Hughes 2011-05-26 08:11:02 --- The 1.7 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:11:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:11:18 +0000 Subject: [Bug 683] jdk crash In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=683 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gnu_andrew at member.fsf.org Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #2 from Andrew John Hughes 2011-05-26 08:11:18 --- The 1.7 series is no longer supported. Please upgrade to a newer release and reopen this bug if the problem persists with a newer version. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Thu May 26 01:12:00 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 08:12:00 +0000 Subject: [Bug 695] [TRACKER] IcedTea7 1.14 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=695 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution| |FIXED --- Comment #1 from Andrew John Hughes 2011-05-26 08:12:00 --- Released: http://blog.fuseyism.com/index.php/2011/05/25/icedtea7-114-released/ -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From xerxes at zafena.se Thu May 26 05:17:53 2011 From: xerxes at zafena.se (Xerxes =?ISO-8859-1?Q?R=E5nby?=) Date: Thu, 26 May 2011 14:17:53 +0200 Subject: icedtea-1.14 JamVM + OpenJDK 7 -version patch Message-ID: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> Hi! Today i tested to build JamVM + OpenJDK 7 using the newly released icedtea-1.14 http://icedtea.classpath.org/download/source/icedtea-1.14.tar.gz that contains all JamVM build scripts from icedtea6. After some patching the JamVM + OpenJDK 7 combination builds and now passes java -version and java -help icedtea-1.14/openjdk.build/j2sdk-image/bin/java -version java version "1.7.0_136-icedtea" IcedTea7 Runtime Environment (1.14) (Ubuntu build 1.7.0_136-icedtea-b136) JamVM (build 1.6.0-devel, inline-threaded interpreter with stack-caching) * jamvm-oj7.patch : OpenJDK7 complained that JVM_FindClassFromBootLoader not found inside the jamvm libjvm.so, a new JVM API in OpenJDK 7, the attached patch fix by implementing it using jamvm's internal findSystemClass0 method. * icedtea-1.14-jamvm.patch : I had to do some tweaks to the icedtea-1.14 Makefile.am all contained in the icedtea-1.14-jamvm.patch because of a silly issue the jamvm sources did not get extracted before patching. This patch also makes it possible to rerun the stamps/jamvm.stamp by adding -f to ln so that it can replace the symlink if its allready there. OpenJDK 7 have added a check if the "unused by jamvm" libjsig.so actually are a valid .so file, so instead of simply touching it i simply created a link to the built libjvm.so created by stamps/jamvm.stamp. I configured my icedtea-1.14 build using ./configure --enable-jamvm --disable-system-lcms --disable-bootstrap Cheers Xerxes -------------- next part -------------- A non-text attachment was scrubbed... Name: jamvm-oj7.patch Type: text/x-patch Size: 676 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110526/1c1e9b8f/jamvm-oj7.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea-1.14-jamvm.patch Type: text/x-patch Size: 1620 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110526/1c1e9b8f/icedtea-1.14-jamvm.patch From ptisnovs at redhat.com Thu May 26 07:50:09 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 26 May 2011 16:50:09 +0200 Subject: Reviewer needed - synchronization and fixing of regression test test/java/lang/annotation/package-info.java with OpenJDK7 In-Reply-To: <4DDB9DEB.6070300@redhat.com> References: <4DDB9DEB.6070300@redhat.com> Message-ID: <4DDE68A1.8050508@redhat.com> Pavel Tisnovsky wrote: > Hi, > I'd like to synchronize and at the same time fix regression test > test/java/lang/annotation/package-info.java with OpenJDK7. hg diff > generated against IcedTea7-forest is stored in an attachment. > > ChangeLog entry to IcedTea7 repo: > > 2011-05-24 Pavel Tisnovsky > > * Makefile.am: > (HOTSPOT_CHANGESET): Synchronize regression test > test/java/lang/annotation/package-info.java > with OpenJDK7 > > Can anybody please review this simple change? > > Thank you in advance, > Pavel > Hi all, this fix is ATM not included in IcedTea7-1.14 nor IcedTea7-forest. Do you think it's worth to push this change to IcedTea7-forest? Cheers, Pavel From ptisnovs at redhat.com Thu May 26 07:51:36 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 26 May 2011 16:51:36 +0200 Subject: Reviewer needed: synchronization of two regression tests test/java/lang/invoke/6991596/Test6991596.java and test/java/lang/invoke/6991596/Test6991596.java between IcedTea7-forest and OpenJDK7 In-Reply-To: <4DDBB020.3040604@redhat.com> References: <4DDBB020.3040604@redhat.com> Message-ID: <4DDE68F8.3000709@redhat.com> Pavel Tisnovsky wrote: > Hi all, > > I'd like to synchronize two regression tests > test/java/lang/invoke/6991596/Test6991596.java and > test/java/lang/invoke/6991596/Test6991596.java between IcedTea7-forest > and OpenJDK7. > > hg diff generated against IcedTea7-forest is stored in an attachment. > > Here is ChangeLog entry for IcedTea7: > > 2011-05-24 Pavel Tisnovsky > > * Makefile.am: > (HOTSPOT_CHANGESET): Synchronize regression tests > test/java/lang/invoke/6991596/Test6991596.java > and > test/java/lang/invoke/6991596/Test6991596.java > with OpenJDK7 > (HOTSPOT_SHA256SUM): Likewise > > Can anybody please review this change? > > Thank you in advance, > Pavel > Hi all, these fix are ATM not included in IcedTea7-1.14 nor IcedTea7-forest. Do you think it's worth to push these changes to IcedTea7-forest? Cheers, Pavel From bugzilla-daemon at icedtea.classpath.org Thu May 26 08:58:09 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 May 2011 15:58:09 +0000 Subject: [Bug 730] Calling URL with Firefox 4 / Chrome In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=730 --- Comment #4 from Michaela Merz 2011-05-26 15:58:09 --- (In reply to comment #3) > IcedTea6 1.8 is quite old and we dont fix many bugs in it any more. IcedTea-Web > is where most of the plugin development takes place. Have you tested this with > a recent IcedTea-Web? > > That said, there is a ongoing discussion on the mailing list about problems > with Firefox 4. I am not sure how relevant that is: > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-April/013706.html > Hi there and thanks for your answer. I understand that IcedTea6 1.8 is not the new kid on the blog. However - a lot of people are not in the habit of updating their OS every other month. A lot of FC13s and 14s are still out there and I haven't been able to find any new icedtea version(s). Thanks. Michaela -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From avg at icyb.net.ua Thu May 26 12:21:53 2011 From: avg at icyb.net.ua (Andriy Gapon) Date: Thu, 26 May 2011 22:21:53 +0300 Subject: firefox 4: problem with NPN_GetURL target=_self In-Reply-To: <20110525212720.GB2259@redhat.com> References: <4DADADC8.7010404@icyb.net.ua> <4DADCF06.8080803@smedbergs.us> <4DADD105.30103@icyb.net.ua> <20110421153134.GC7494@redhat.com> <4DD026DD.8010205@icyb.net.ua> <20110516180328.GH29490@redhat.com> <4DD2255D.5090704@icyb.net.ua> <4DDB730F.1050802@icyb.net.ua> <20110525212720.GB2259@redhat.com> Message-ID: <4DDEA851.5070107@icyb.net.ua> on 26/05/2011 00:27 Deepak Bhole said the following: > * Andriy Gapon [2011-05-24 04:58]: >> on 17/05/2011 10:35 Andriy Gapon said the following: >>> on 16/05/2011 21:03 Deepak Bhole said the following: >>>> Can you please try again with the patch here applied? >>>> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/014200.html >>>> >>>> That patch adds full recursive call support for showDocument() calls, >>>> rather than relying on FF to not make such calls. It should therefore >>>> always work. Please let me know if there are any problems. >>> >>> Unfortunately it still doesn't help. >>> In my simple test http://people.freebsd.org/~avg/java_test/ I see "Attempting to >>> go to: http://www.google.ca" printed if I press the button, but the page never >>> changes. >>> >>> Please let me know if I should provide any additional debugging info. >> >> Besides, it seems that the patch breaks the plugin in other browsers... >> > > Hi, > > Just got back from vacation... > > Did you try applying the patch to a clean copy and building? Yes. > Also, what sort of breakage are you seeing? I tested it with FF4 and > chromium (just tried it again to be sure) and am seeing no problems. In my test (see above) the page doesn't change on pressing the button, not even after timeout, and now not even in chromium. Without the patch, chromium works, only firefox4 has the issue. I ran `env ICEDTEAPLUGIN_DEBUG=1 chrome` and this is what is printed after pressing the button: ITNPP Thread# 64249856: plugin_in_pipe_callback ITNPP Thread# 64249856: PIPE: plugin read: instance 1 url http://www.google.ca _self ITNPP Thread# 64249856: Trying to lock 0x3d53e70... ITNPP Thread# 64249856: Message instance 1 url http://www.google.ca _self received on bus. Notifying subscribers. ITNPP Thread# 64249856: Notifying subscriber 0x3dff9e0 of instance 1 url http://www.google.ca _self ITNPP Thread# 64249856: PluginRequestProcessor processing instance 1 url http://www.google.ca _self ITNPP Thread# 64249856: PluginRequestProcessor::newMessageOnBus: { instance, 1, url, http://www.google.ca, _self } ITNPP Thread# 64249856: Warning: No consumer found for message instance 1 url http://www.google.ca _self ITNPP Thread# 64249856: 0x3d53e70 unlocked... ITNPP Thread# 64249856: plugin_in_pipe_callback return I do not preclude that this could be something specific to my environment: FreeBSD + OpenJDK Runtime Environment (build 1.6.0-b22). -- Andriy Gapon From dbhole at redhat.com Thu May 26 12:33:10 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Thu, 26 May 2011 15:33:10 -0400 Subject: firefox 4: problem with NPN_GetURL target=_self In-Reply-To: <4DDEA851.5070107@icyb.net.ua> References: <4DADADC8.7010404@icyb.net.ua> <4DADCF06.8080803@smedbergs.us> <4DADD105.30103@icyb.net.ua> <20110421153134.GC7494@redhat.com> <4DD026DD.8010205@icyb.net.ua> <20110516180328.GH29490@redhat.com> <4DD2255D.5090704@icyb.net.ua> <4DDB730F.1050802@icyb.net.ua> <20110525212720.GB2259@redhat.com> <4DDEA851.5070107@icyb.net.ua> Message-ID: <20110526193310.GB29726@redhat.com> * Andriy Gapon [2011-05-26 15:22]: > on 26/05/2011 00:27 Deepak Bhole said the following: > > * Andriy Gapon [2011-05-24 04:58]: > >> on 17/05/2011 10:35 Andriy Gapon said the following: > >>> on 16/05/2011 21:03 Deepak Bhole said the following: > >>>> Can you please try again with the patch here applied? > >>>> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/014200.html > >>>> > >>>> That patch adds full recursive call support for showDocument() calls, > >>>> rather than relying on FF to not make such calls. It should therefore > >>>> always work. Please let me know if there are any problems. > >>> > >>> Unfortunately it still doesn't help. > >>> In my simple test http://people.freebsd.org/~avg/java_test/ I see "Attempting to > >>> go to: http://www.google.ca" printed if I press the button, but the page never > >>> changes. > >>> > >>> Please let me know if I should provide any additional debugging info. > >> > >> Besides, it seems that the patch breaks the plugin in other browsers... > >> > > > > Hi, > > > > Just got back from vacation... > > > > Did you try applying the patch to a clean copy and building? > > Yes. > > > Also, what sort of breakage are you seeing? I tested it with FF4 and > > chromium (just tried it again to be sure) and am seeing no problems. > > In my test (see above) the page doesn't change on pressing the button, not even > after timeout, and now not even in chromium. > Without the patch, chromium works, only firefox4 has the issue. > > > I ran `env ICEDTEAPLUGIN_DEBUG=1 chrome` and this is what is printed after > pressing the button: > > ITNPP Thread# 64249856: plugin_in_pipe_callback > ITNPP Thread# 64249856: PIPE: plugin read: instance 1 url http://www.google.ca > _self > ITNPP Thread# 64249856: Trying to lock 0x3d53e70... > ITNPP Thread# 64249856: Message instance 1 url http://www.google.ca _self > received on bus. Notifying subscribers. > ITNPP Thread# 64249856: Notifying subscriber 0x3dff9e0 of instance 1 url > http://www.google.ca _self > ITNPP Thread# 64249856: PluginRequestProcessor processing instance 1 url > http://www.google.ca _self > ITNPP Thread# 64249856: PluginRequestProcessor::newMessageOnBus: { instance, 1, > url, http://www.google.ca, _self } > ITNPP Thread# 64249856: Warning: No consumer found for message instance 1 url > http://www.google.ca _self > ITNPP Thread# 64249856: 0x3d53e70 unlocked... > ITNPP Thread# 64249856: plugin_in_pipe_callback return > Hi, This looks like the plugin installation is borked. The "instance X url ..." should not be sent by anything after the patch is applied. Does your JAVA_HOME have a jre/lib/netx.jar and jre/lib/plugin.jar? If so, they should be moved out of the way. Cheers, Deepak > I do not preclude that this could be something specific to my environment: > FreeBSD + OpenJDK Runtime Environment (build 1.6.0-b22). > > -- > Andriy Gapon > _______________________________________________ > dev-tech-plugins mailing list > dev-tech-plugins at lists.mozilla.org > https://lists.mozilla.org/listinfo/dev-tech-plugins From avg at icyb.net.ua Thu May 26 12:44:19 2011 From: avg at icyb.net.ua (Andriy Gapon) Date: Thu, 26 May 2011 22:44:19 +0300 Subject: firefox 4: problem with NPN_GetURL target=_self In-Reply-To: <20110526193310.GB29726@redhat.com> References: <4DADADC8.7010404@icyb.net.ua> <4DADCF06.8080803@smedbergs.us> <4DADD105.30103@icyb.net.ua> <20110421153134.GC7494@redhat.com> <4DD026DD.8010205@icyb.net.ua> <20110516180328.GH29490@redhat.com> <4DD2255D.5090704@icyb.net.ua> <4DDB730F.1050802@icyb.net.ua> <20110525212720.GB2259@redhat.com> <4DDEA851.5070107@icyb.net.ua> <20110526193310.GB29726@redhat.com> Message-ID: <4DDEAD93.8080404@icyb.net.ua> on 26/05/2011 22:33 Deepak Bhole said the following: > This looks like the plugin installation is borked. The "instance X url > ..." should not be sent by anything after the patch is applied. > > Does your JAVA_HOME have a jre/lib/netx.jar and jre/lib/plugin.jar? If > so, they should be moved out of the way. Yes, that did it! Thanks a lot! Those files were installed by our openjdk port (which includes an earlier version of the icedtea plugin in it) and I haven't realized that I had to remove them for the new files (which were installed at at a different place) to take effect. Thank you again for all the help. -- Andriy Gapon From dbhole at redhat.com Thu May 26 12:47:15 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Thu, 26 May 2011 15:47:15 -0400 Subject: firefox 4: problem with NPN_GetURL target=_self In-Reply-To: <4DDEAD93.8080404@icyb.net.ua> References: <4DADD105.30103@icyb.net.ua> <20110421153134.GC7494@redhat.com> <4DD026DD.8010205@icyb.net.ua> <20110516180328.GH29490@redhat.com> <4DD2255D.5090704@icyb.net.ua> <4DDB730F.1050802@icyb.net.ua> <20110525212720.GB2259@redhat.com> <4DDEA851.5070107@icyb.net.ua> <20110526193310.GB29726@redhat.com> <4DDEAD93.8080404@icyb.net.ua> Message-ID: <20110526194714.GC29726@redhat.com> * Andriy Gapon [2011-05-26 15:44]: > on 26/05/2011 22:33 Deepak Bhole said the following: > > This looks like the plugin installation is borked. The "instance X url > > ..." should not be sent by anything after the patch is applied. > > > > Does your JAVA_HOME have a jre/lib/netx.jar and jre/lib/plugin.jar? If > > so, they should be moved out of the way. > > Yes, that did it! Thanks a lot! > Those files were installed by our openjdk port (which includes an earlier > version of the icedtea plugin in it) and I haven't realized that I had to remove > them for the new files (which were installed at at a different place) to take > effect. > > Thank you again for all the help. > Nice! Thank you for trying it out! :) I will push the patch in after approval and it will be in the 1.1 release which should happen soon. Cheers, Deepak > -- > Andriy Gapon From doko at ubuntu.com Thu May 26 15:03:38 2011 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 27 May 2011 00:03:38 +0200 Subject: icedtea-1.14 JamVM + OpenJDK 7 -version patch In-Reply-To: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> References: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> Message-ID: <4DDECE3A.10502@ubuntu.com> On 05/26/2011 02:17 PM, Xerxes R?nby wrote: > Hi! > > Today i tested to build JamVM + OpenJDK 7 using the newly released > icedtea-1.14 [...] looks fine to me. did you run the jtreg tests? for openjdk-6/jamvm I get reasonable results for the hotspot and tools tests, but the jdk tests hang in the sun/nio tests. Matthias From asu at redhat.com Thu May 26 15:04:57 2011 From: asu at redhat.com (Andrew Su) Date: Thu, 26 May 2011 18:04:57 -0400 (EDT) Subject: [RFC][Icedtea-Web]: PR727 Fix deleting of incorrect file when cleaning cache. In-Reply-To: <430827072.328869.1306447482742.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <83945459.328877.1306447497877.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Hello, This patch fixes PR727 [1]. What was happening before was that when we say we want to keep a file, but it exists again in the list of recently used files, it will add it to remove. I however could not replicate this when using a debugger, everything would work as it should. Through letting it tell me during runtime with some print statements I was able to see where it was happening. Ok for HEAD and 1.1? Cheers, Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: pr727fix.patch Type: text/x-patch Size: 2267 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110526/ff616b91/pr727fix.patch From asu at redhat.com Thu May 26 15:15:32 2011 From: asu at redhat.com (Andrew Su) Date: Thu, 26 May 2011 18:15:32 -0400 (EDT) Subject: [RFC][Icedtea-Web]: PR727 Fix deleting of incorrect file when cleaning cache. In-Reply-To: <83945459.328877.1306447497877.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <1409724493.328990.1306448132395.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Oops forgot the changelog 2011-05-26 Andrew Su * NEWS: Update. * netx/net/sourceforge/jnlp/cache/CacheUtil.java: (cleanCache): Split conditional for delete. ----- Original Message ----- > From: "Andrew Su" > To: distro-pkg-dev at openjdk.java.net > Sent: Thursday, May 26, 2011 6:04:57 PM > Subject: [RFC][Icedtea-Web]: PR727 Fix deleting of incorrect file when cleaning cache. > Hello, > > This patch fixes PR727 [1]. > > What was happening before was that when we say we want to keep a file, > but it exists again in the list of recently used files, it will add it > to remove. > > I however could not replicate this when using a debugger, everything > would work as it should. Through letting it tell me during runtime > with some print statements I was able to see where it was happening. > > Ok for HEAD and 1.1? > > Cheers, > Andrew From omajid at redhat.com Thu May 26 15:48:07 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 26 May 2011 18:48:07 -0400 Subject: [RFC][Icedtea-Web]: PR727 Fix deleting of incorrect file when cleaning cache. In-Reply-To: <83945459.328877.1306447497877.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <83945459.328877.1306447497877.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <4DDED8A7.7090609@redhat.com> On 05/26/2011 06:04 PM, Andrew Su wrote: > Hello, > > This patch fixes PR727 [1]. > > What was happening before was that when we say we want to keep a > file, but it exists again in the list of recently used files, it will > add it to remove. > Hm... why does one entry appear multiple times? Shouldn't we be addressing that instead? I am a little confused by the current code. The current logic is if (delete || keep.contains(...)) { ... } Which I find a little strange (we are treating stuff to delete and stuff to keep equally?). Your patch certainly makes it look a little more sane. I see that you are adding a NEWS entry with a different description than on the bug. Would you mind updating the bug report itself? Thanks, Omair From chphilli at redhat.com Tue May 24 12:21:54 2011 From: chphilli at redhat.com (Chris Phillips) Date: Tue, 24 May 2011 15:21:54 -0400 Subject: distro-pkg-dev Digest, Vol 48, Issue 88:Reviewer needed: fix for regression test InvokeDynamicPrintArgs.java In-Reply-To: References: Message-ID: <4DDC0552.2010706@redhat.com> Hi Pavel This change looks ok, but the test InvokeDynamicPrintArgs.java was disabled in jdk7 recently. (I'll see if I can find the changeset). I think the test is out of sync with the current JSR 292 implementation now using Ricochet frames. Chris PS Changeset: Changeset: bd8c10d1db87 Author: mduigou Date: 2011-05-09 09:13 -0700 URL:http://hg.openjdk.java.net/jdk7/deploy/jdk/rev/bd8c10d1db87 7043104: disable test java/lang/invoke/InvokeDynamicPrintArgs.java Reviewed-by: alanb On 24/05/11 03:00 PM, distro-pkg-dev-request at openjdk.java.net wrote: > Date: Tue, 24 May 2011 17:08:17 +0200 > From: Pavel Tisnovsky > Subject: Reviewer needed: fix for regression test > test/java/lang/invoke/InvokeDynamicPrintArgs.java in IcedTea7-forest > To: IcedTea > Message-ID:<4DDBC9E1.6060004 at redhat.com> > Content-Type: text/plain; charset="iso-8859-1" > > Hi all, > > Can anybody please review fix for regression test > test/java/lang/invoke/InvokeDynamicPrintArgs.java > for IcedTea7-forest? Original text contains imports from JUnit framework > and also @Test tag which is not needed for regression tests (it in fact > prevents the compilation). > > hg diff generated against recent IcedTea7-forest is stored in an attachment. > > ChangeLog entry: > > 2011-05-24 Pavel Tisnovsky > > * Makefile.am: > (HOTSPOT_CHANGESET): Remove dependency of JUnit > from regression test > test/java/lang/invoke/InvokeDynamicPrintArgs.java > (HOTSPOT_SHA256SUM): Likewise > > Thank you in advance for reviewing, > Pavel > -------------- next part -------------- -- ** --/ Woda: "Java: write once, debug anywhere" Hong Zhang http://thehenrys.ca | Chris Phillips @ T O RedHat OpenJDK JVM Engineer, | |mailto:ChPhilli at RedHat.Com (416)483-3768 | |http://LGonQn.Org/www/Chris.Phillips cell: (416)505-3610 | "EPIC stands for Expects Perfectly Intuitive Compilers" P. Bannon http://www.hazmatmodine.com NOTICE: This email message is for the sole use of the intended recipient(s) and may contain confidential and privileged information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. "blah blah blah - Ginger!"/ Red Hat -- -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110524/7aa06a84/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: RedHat.gif Type: image/gif Size: 1185 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110524/7aa06a84/RedHat.gif From bugzilla-daemon at icedtea.classpath.org Fri May 27 01:32:19 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 08:32:19 +0000 Subject: [Bug 734] New: Recording from pulse-java.jar has huge latency and loses samples Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=734 Summary: Recording from pulse-java.jar has huge latency and loses samples Product: IcedTea Version: unspecified Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: PulseAudio AssignedTo: unassigned at icedtea.classpath.org ReportedBy: damjan.jov at gmail.com My application operates by calling available() on the TargetDataLine and sleeping until the predicted time when 60 ms of audio will be available, then calling read() with 60ms of samples if available() reports there is enough samples, otherwise continuing to sleep. The following code: AudioFormat pcm8kMonoFormat = new AudioFormat( AudioFormat.Encoding.PCM_SIGNED, 8000, 16, 1, 2, 8000, true); TargetDataLine microphone = AudioSystem.getTargetDataLine(pcm8kMonoFormat); microphone.open(pcm8kMonoFormat, 2*8*60*4); microphone.start(); while (true) { int bytesAvailable = microphone.available(); int samplesAvailable = bytesAvailable / 2; if (samplesAvailable >= 8*60) { byte[] pcmBytes = new byte[2*8*60]; int totalBytesRead = 0; while (totalBytesRead < pcmBytes.length) { totalBytesRead += microphone.read(pcmBytes, totalBytesRead, pcmBytes.length - totalBytesRead); } send(pcmBytes); selector.selectNow(); } else { long nanosAvailable = samplesAvailable * 1000L * 1000L / 8L; long remainingNanos = 60 * 1000L * 1000L - nanosAvailable; long remainingMillis = remainingNanos / (1000*1000); Thread.sleep(remainingMillis);//selector.select(remainingMillis); } } gives me this extremely jittery, bursty latency between audio reads, and doesn't provide enough samples per time period for the sampling rate (about 80% of the samples are lost): 9.52 ms 4.23 ms 3.20 ms 3.43 ms 1999.47 ms 5.74 ms 4.42 ms 2.67 ms 1961.60 ms By comparison, the "default [default]" mixer on OpenJDK works perfectly, giving me 60 ms of samples every 60 ms. Since both the "default [default]" and PulseAudio mixers go through the same PulseAudio server, it can't be PulseAudio itself doing something wrong, it must be pulse-java.jar. The most likely explanation is that your available() is reporting the wrong value. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From xerxes at zafena.se Fri May 27 03:35:38 2011 From: xerxes at zafena.se (Xerxes =?ISO-8859-1?Q?R=E5nby?=) Date: Fri, 27 May 2011 12:35:38 +0200 Subject: icedtea-1.14 JamVM + OpenJDK 7 -version patch In-Reply-To: <4DDECE3A.10502@ubuntu.com> References: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> <4DDECE3A.10502@ubuntu.com> Message-ID: <1306492538.21823.16.camel@xranby-ESPRIMO-P7935> fre 2011-05-27 klockan 00:03 +0200 skrev Matthias Klose: > On 05/26/2011 02:17 PM, Xerxes R?nby wrote: > > Hi! > > > > Today i tested to build JamVM + OpenJDK 7 using the newly released > > icedtea-1.14 > [...] > > looks fine to me. did you run the jtreg tests? for openjdk-6/jamvm I get > reasonable results for the hotspot and tools tests, but the jdk tests hang in > the sun/nio tests. > > Matthias I am not able to run the jtreg tests, what I currently observe are a unsatisfied link error. xranby at xranby-ESPRIMO-P7935:~/test $ ../icedtea-1.14/openjdk.build/j2sdk-image/bin/java Linpack java.lang.UnsatisfiedLinkError: registerNatives at sun.misc.Perf.registerNatives(Native Method) at sun.misc.Perf.(Perf.java:536) at sun.misc.Perf$GetPerfAction.run(Perf.java:97) at sun.misc.Perf$GetPerfAction.run(Perf.java:89) at java.security.AccessController.doPrivileged(Native Method) at sun.misc.PerfCounter.(PerfCounter.java:51) at java.net.URLClassLoader.defineClass(URLClassLoader.java:448) at java.net.URLClassLoader.access$100(URLClassLoader.java:71) at java.net.URLClassLoader$1.run(URLClassLoader.java:361) at java.net.URLClassLoader$1.run(URLClassLoader.java:355) at java.security.AccessController.doPrivileged(Native Method) at java.net.URLClassLoader.findClass(URLClassLoader.java:354) at java.lang.ClassLoader.loadClass(ClassLoader.java:423) at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:308) at java.lang.ClassLoader.loadClass(ClassLoader.java:356) at sun.launcher.LauncherHelper.checkAndLoadMain(LauncherHelper.java:472) The URLClassLoader uses sun.misc.Perf to register startup time. I start to think this are a bug in OpenJDK 7 that the sun.misc.Perf constructor expects to be able to use the native registerNatives method in libhprof.so without explicilty making sure that this library have already been loaded. The libhprof.so are part of the Hotspot JVMTI implementation so it are no surprise that JamVM currently dont not load it. Rob can you tell if registerNative are supposed to be part of the public JNI interface between OpenJDK7 classes and the JVM? Xerxes From xerxes at zafena.se Fri May 27 03:48:09 2011 From: xerxes at zafena.se (Xerxes =?ISO-8859-1?Q?R=E5nby?=) Date: Fri, 27 May 2011 12:48:09 +0200 Subject: icedtea-1.14 JamVM + OpenJDK 7 -version patch In-Reply-To: <1306492538.21823.16.camel@xranby-ESPRIMO-P7935> References: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> <4DDECE3A.10502@ubuntu.com> <1306492538.21823.16.camel@xranby-ESPRIMO-P7935> Message-ID: <1306493289.21823.21.camel@xranby-ESPRIMO-P7935> > What I currently observe are a > unsatisfied link error. > > xranby at xranby-ESPRIMO-P7935:~/test > $ ../icedtea-1.14/openjdk.build/j2sdk-image/bin/java Linpack > java.lang.UnsatisfiedLinkError: registerNatives > at sun.misc.Perf.registerNatives(Native Method) > at sun.misc.Perf.(Perf.java:536) ... > at sun.misc.PerfCounter.(PerfCounter.java:51) > at java.net.URLClassLoader.defineClass(URLClassLoader.java:448) > > The URLClassLoader uses sun.misc.Perf to register startup time. > > I start to think this are a bug in OpenJDK 7 that the sun.misc.Perf > constructor expects to be able to use the native registerNatives method > in libhprof.so without explicilty making sure that this library have > already been loaded. > > The libhprof.so are part of the Hotspot JVMTI implementation so it are > no surprise that JamVM currently dont not load it. > > Rob can you tell if registerNative are supposed to be part of the public > JNI interface between OpenJDK7 classes and the JVM? For clarification,the native method in libhprof.so void registerNative(void) called by the sun.misc.Perf constructor are not the same "RegisterNatives" as the JNI interface RegisterNatives http://download.oracle.com/javase/6/docs/technotes/guides/jni/spec/functions.html#wp17734 Xerxes From ptisnovs at redhat.com Fri May 27 04:30:25 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 27 May 2011 13:30:25 +0200 Subject: Reviewer needed - fix for regression test jdk/test/tools/jar/ChangeDir.java in IcedTea7 Message-ID: <4DDF8B51.20305@redhat.com> Hi all, can anybody please review fix in regression test jdk/test/tools/jar/ChangeDir.java? This fix ensures that this test deletes all garbage generated in temporary directory (usually /tmp). diff generated against IcedTea7-forest/jdk is stored in an attachment. ChangeLog entry for IcedTea7: 2011-05-27 Pavel Tisnovsky * Makefile.am: (HOTSPOT_CHANGESET): Update regression test jdk/test/tools/jar/ChangeDir.java (HOTSPOT_SHA256SUM): Likewise Cheers, Pavel -------------- next part -------------- A non-text attachment was scrubbed... Name: ChangeDir.patch Type: text/x-patch Size: 1179 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110527/da32a3d0/ChangeDir.patch From ptisnovs at redhat.com Fri May 27 04:43:08 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 27 May 2011 13:43:08 +0200 Subject: Reviewer needed - fix in regression test utility class Utils.java which leaves many temporary files in /tmp Message-ID: <4DDF8E4C.5090104@redhat.com> Hi all, here's another patch for IcedTea7-forest/jdk. Class jdk/test/tools/pack200/Utils.java does not delete temporary files created in /tmp directory, it could be fixed by patch stored in an attachment. It's difficult to trace other tests behaviour when temporary directory is full of garbage. Can anybody please review it? ChangeLog entry for IcedTea7: 2011-05-27 Pavel Tisnovsky * Makefile.am: (HOTSPOT_CHANGESET): Update regression test jdk/test/tools/pack200/Utils.java (HOTSPOT_SHA256SUM): Likewise Cheers, Pavel -------------- next part -------------- A non-text attachment was scrubbed... Name: Utils.patch Type: text/x-patch Size: 300 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110527/3bb26f3c/Utils.patch From xerxes at zafena.se Fri May 27 04:55:20 2011 From: xerxes at zafena.se (Xerxes =?ISO-8859-1?Q?R=E5nby?=) Date: Fri, 27 May 2011 13:55:20 +0200 Subject: icedtea-1.14 JamVM + OpenJDK 7 -version patch In-Reply-To: <1306493289.21823.21.camel@xranby-ESPRIMO-P7935> References: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> <4DDECE3A.10502@ubuntu.com> <1306492538.21823.16.camel@xranby-ESPRIMO-P7935> <1306493289.21823.21.camel@xranby-ESPRIMO-P7935> Message-ID: <1306497320.21823.31.camel@xranby-ESPRIMO-P7935> fre 2011-05-27 klockan 12:48 +0200 skrev Xerxes R?nby: > > What I currently observe are a > > unsatisfied link error. > > > > xranby at xranby-ESPRIMO-P7935:~/test > > $ ../icedtea-1.14/openjdk.build/j2sdk-image/bin/java Linpack > > java.lang.UnsatisfiedLinkError: registerNatives > > at sun.misc.Perf.registerNatives(Native Method) > > at sun.misc.Perf.(Perf.java:536) > ... > > at sun.misc.PerfCounter.(PerfCounter.java:51) > > at java.net.URLClassLoader.defineClass(URLClassLoader.java:448) > > > > The URLClassLoader uses sun.misc.Perf to register startup time. > > > > I start to think this are a bug in OpenJDK 7 that the sun.misc.Perf > > constructor expects to be able to use the native registerNatives method > > in libhprof.so without explicilty making sure that this library have > > already been loaded. > > > > The libhprof.so are part of the Hotspot JVMTI implementation so it are > > no surprise that JamVM currently dont not load it. The attached patch fix this UnsatisfiedLinkError by simply removing the use of sun.misc from the OpenJDK 7 ClassLoader and URLClassLoader. This makes it possible to use the OpenJDK 7 classes in combination with other JVM's than Hotspot. I think this are a valid fix since the hooks added using sun.misc.Perf to monitor ClassLoader bootup time are not part of the public ClassLoader API. These hooks do not exist in OpenJDK 6 and I can not find any refernce to validate their existance in OpenJDK 7. I think they are leftovers from some old ClassLoader speed regression investigation and should be considered as debug code. If someone like this debug code and have a suggestion how to properly re-engineer sun.misc to support other JVM's than Hotspot im all ear. > > > For clarification,the native method in libhprof.so void > registerNative(void) called by the sun.misc.Perf constructor are not the > same "RegisterNatives" as the JNI interface RegisterNatives > http://download.oracle.com/javase/6/docs/technotes/guides/jni/spec/functions.html#wp17734 > > > Xerxes -------------- next part -------------- A non-text attachment was scrubbed... Name: java.lang.ClassLoader.remove-use-of-sun.misc.patch Type: text/x-patch Size: 1945 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110527/b444a80b/java.lang.ClassLoader.remove-use-of-sun.misc.patch From andrew at icedtea.classpath.org Fri May 27 05:30:49 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 27 May 2011 12:30:49 +0000 Subject: /hg/icedtea: Prepare for 2.0. Message-ID: changeset 6cf9b58ff9bc in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6cf9b58ff9bc author: Andrew John Hughes date: Fri May 27 13:30:39 2011 +0100 Prepare for 2.0. 2011-05-27 Andrew John Hughes * NEWS: Add 2.0. * configure.ac: Bump to 2.0pre. diffstat: ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 3 files changed, 8 insertions(+), 1 deletions(-) diffs (33 lines): diff -r 1508b893efed -r 6cf9b58ff9bc ChangeLog --- a/ChangeLog Wed May 25 23:24:11 2011 +0100 +++ b/ChangeLog Fri May 27 13:30:39 2011 +0100 @@ -1,3 +1,8 @@ +2011-05-27 Andrew John Hughes + + * NEWS: Add 2.0. + * configure.ac: Bump to 2.0pre. + 2011-05-25 Andrew John Hughes * NEWS: diff -r 1508b893efed -r 6cf9b58ff9bc NEWS --- a/NEWS Wed May 25 23:24:11 2011 +0100 +++ b/NEWS Fri May 27 13:30:39 2011 +0100 @@ -9,6 +9,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 2.0 (2011-XX-XX): + New in release 1.14 (2011-05-25): * NetX and the plugin moved to the IcedTea-Web project with a separate diff -r 1508b893efed -r 6cf9b58ff9bc configure.ac --- a/configure.ac Wed May 25 23:24:11 2011 +0100 +++ b/configure.ac Fri May 27 13:30:39 2011 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [1.14], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.0pre], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From ptisnovs at redhat.com Fri May 27 05:55:12 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 27 May 2011 14:55:12 +0200 Subject: Reviewer needed - fix for regression test jdk/test/tools/jar/ChangeDir.java in IcedTea7 In-Reply-To: <4DDF8B51.20305@redhat.com> References: <4DDF8B51.20305@redhat.com> Message-ID: <4DDF9F30.2010406@redhat.com> Sorry for typo should be %s/HOTSPOT_/JDK_ for ChangeLog entry ;-) Pavel Tisnovsky wrote: > Hi all, > > can anybody please review fix in regression test > jdk/test/tools/jar/ChangeDir.java? This fix ensures that this test > deletes all garbage generated in temporary directory (usually /tmp). > > diff generated against IcedTea7-forest/jdk is stored in an attachment. > > ChangeLog entry for IcedTea7: > > 2011-05-27 Pavel Tisnovsky > > * Makefile.am: > (HOTSPOT_CHANGESET): Update regression test > jdk/test/tools/jar/ChangeDir.java > (HOTSPOT_SHA256SUM): Likewise > > Cheers, > Pavel > From ptisnovs at redhat.com Fri May 27 05:55:49 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 27 May 2011 14:55:49 +0200 Subject: Reviewer needed - fix in regression test utility class Utils.java which leaves many temporary files in /tmp In-Reply-To: <4DDF8E4C.5090104@redhat.com> References: <4DDF8E4C.5090104@redhat.com> Message-ID: <4DDF9F55.70502@redhat.com> Sorry for typo should be %s/HOTSPOT_/JDK_ for ChangeLog entry ;-) Pavel Tisnovsky wrote: > Hi all, > > here's another patch for IcedTea7-forest/jdk. Class > jdk/test/tools/pack200/Utils.java does not delete temporary files > created in /tmp directory, it could be fixed by patch stored in an > attachment. It's difficult to trace other tests behaviour when temporary > directory is full of garbage. > > Can anybody please review it? > > ChangeLog entry for IcedTea7: > > 2011-05-27 Pavel Tisnovsky > > * Makefile.am: > (HOTSPOT_CHANGESET): Update regression test > jdk/test/tools/pack200/Utils.java > (HOTSPOT_SHA256SUM): Likewise > > > Cheers, > Pavel > From rob.lougher at gmail.com Fri May 27 05:56:36 2011 From: rob.lougher at gmail.com (Robert Lougher) Date: Fri, 27 May 2011 13:56:36 +0100 Subject: icedtea-1.14 JamVM + OpenJDK 7 -version patch In-Reply-To: <1306493289.21823.21.camel@xranby-ESPRIMO-P7935> References: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> <4DDECE3A.10502@ubuntu.com> <1306492538.21823.16.camel@xranby-ESPRIMO-P7935> <1306493289.21823.21.camel@xranby-ESPRIMO-P7935> Message-ID: Hi, On 27 May 2011 11:48, Xerxes R?nby wrote: > >> What I currently observe are a >> unsatisfied link error. >> >> xranby at xranby-ESPRIMO-P7935:~/test >> $ ../icedtea-1.14/openjdk.build/j2sdk-image/bin/java Linpack >> java.lang.UnsatisfiedLinkError: registerNatives >> ? ? ? at sun.misc.Perf.registerNatives(Native Method) >> ? ? ? at sun.misc.Perf.(Perf.java:536) > ... >> ? ? ? at sun.misc.PerfCounter.(PerfCounter.java:51) >> ? ? ? at java.net.URLClassLoader.defineClass(URLClassLoader.java:448) >> >> The URLClassLoader uses sun.misc.Perf to register startup time. >> >> I start to think this are a bug in OpenJDK 7 that the sun.misc.Perf >> constructor expects to be able to use the native registerNatives method >> in libhprof.so without explicilty making sure that this library have >> already been loaded. >> >> The libhprof.so are part of the Hotspot JVMTI implementation so it are >> no surprise that JamVM currently dont not load it. >> >> Rob can you tell if registerNative are supposed to be part of the public >> JNI interface between OpenJDK7 classes and the JVM? > No. It's an idiom used within OpenJDK to bind the C functions that implement the native part of the class to the native methods. Some classes use it to bind a JVM_xxx interface function directly to a native method. It's also used for sun.misc.Unsafe support. The important question is where are the native methods... In the case of most of the classes, they're in libjava.so, which the VM must load itself. Sun.misc.Unsafe support was implemented directly in JamVM. >From the looks of it, these functions are in a JNI library, which should be preloaded. But without looking into it, I can't tell when and how the VM is expected to load it. It doesn't, however, look to be a difficult problem. Rob. > > For clarification,the native method in libhprof.so void > registerNative(void) called by the sun.misc.Perf constructor are not the > same "RegisterNatives" as the JNI interface RegisterNatives > http://download.oracle.com/javase/6/docs/technotes/guides/jni/spec/functions.html#wp17734 > > > Xerxes > > From ahughes at redhat.com Fri May 27 06:01:00 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 27 May 2011 14:01:00 +0100 Subject: icedtea-1.14 JamVM + OpenJDK 7 -version patch In-Reply-To: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> References: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> Message-ID: <20110527130059.GC31868@rivendell.middle-earth.co.uk> On 14:17 Thu 26 May , Xerxes R?nby wrote: > Hi! > > Today i tested to build JamVM + OpenJDK 7 using the newly released > icedtea-1.14 > http://icedtea.classpath.org/download/source/icedtea-1.14.tar.gz > that contains all JamVM build scripts from icedtea6. > > > After some patching the JamVM + OpenJDK 7 combination builds and now > passes java -version and java -help > > icedtea-1.14/openjdk.build/j2sdk-image/bin/java -version > java version "1.7.0_136-icedtea" > IcedTea7 Runtime Environment (1.14) (Ubuntu build > 1.7.0_136-icedtea-b136) > JamVM (build 1.6.0-devel, inline-threaded interpreter with > stack-caching) > > > > * jamvm-oj7.patch : > OpenJDK7 complained that JVM_FindClassFromBootLoader not found inside > the jamvm libjvm.so, a new JVM API in OpenJDK 7, the attached patch fix > by implementing it using jamvm's internal findSystemClass0 method. > Are you planning to add this to the repo? > > * icedtea-1.14-jamvm.patch : > I had to do some tweaks to the icedtea-1.14 Makefile.am all contained in > the icedtea-1.14-jamvm.patch because of a silly issue the jamvm sources > did not get extracted before patching. > This patch also makes it possible to rerun the stamps/jamvm.stamp by > adding -f to ln so that it can replace the symlink if its allready > there. Comments on this below. > OpenJDK 7 have added a check if the "unused by jamvm" libjsig.so > actually are a valid .so file, so instead of simply touching it i simply > created a link to the built libjvm.so created by stamps/jamvm.stamp. > > > I configured my icedtea-1.14 build using > ./configure --enable-jamvm --disable-system-lcms --disable-bootstrap > Wow, I'm surprised how few people have lcms2. > Cheers > Xerxes > Index: icedtea-1.14/jamvm/jamvm/src/classlib/openjdk/jvm.c > =================================================================== > --- icedtea-1.14.orig/jamvm/jamvm/src/classlib/openjdk/jvm.c 2011-05-26 12:47:39.703360774 +0200 > +++ icedtea-1.14/jamvm/jamvm/src/classlib/openjdk/jvm.c 2011-05-26 13:50:36.038086620 +0200 > @@ -492,6 +492,15 @@ > } > > > +/* JVM_FindClassFromBootLoader */ > + > +jclass JVM_FindClassFromBootLoader(JNIEnv* env, const char *name) { > + TRACE("JVM_FindClassFromBootLoader(env=%p, s=%s)", env, name); > + > + return findSystemClass0((char*)name); > +} > + > + > /* JVM_FindClassFromClassLoader */ > > jclass JVM_FindClassFromClassLoader(JNIEnv *env, const char *name, > Index: icedtea-1.14/Makefile.am > =================================================================== > --- icedtea-1.14.orig/Makefile.am 2011-05-26 11:18:03.468701462 +0200 > +++ icedtea-1.14/Makefile.am 2011-05-26 12:18:33.610702371 +0200 > @@ -1343,7 +1343,7 @@ > rm -rf $(abs_top_builddir)/generated.build > rm -f stamps/generated.stamp > > -stamps/patch-fsg.stamp: stamps/sanitise-openjdk.stamp > +stamps/patch-fsg.stamp: stamps/extract.stamp stamps/sanitise-openjdk.stamp I'm puzzled why you need this. sanitise-openjdk requires extract. > mkdir -p stamps ; \ > rm -f stamps/patch-fsg.stamp.tmp ; \ > touch stamps/patch-fsg.stamp.tmp ; \ > @@ -1394,7 +1394,7 @@ > rm -f stamps/patch-fsg.stamp ; \ > fi > > -stamps/patch.stamp: stamps/patch-fsg.stamp > +stamps/patch.stamp: stamps/extract.stamp stamps/patch-fsg.stamp And likewise, patch-fsg requires extract. > mkdir -p stamps ; \ > rm -f stamps/patch.stamp.tmp ; \ > touch stamps/patch.stamp.tmp ; \ > @@ -2087,9 +2087,9 @@ > $(MAKE) install > mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server > cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server > - ln -s server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client > + ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client > touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt > - touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so > + ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so > endif > mkdir -p stamps > touch stamps/jamvm.stamp This is a straight backport from 6, so you may need to make changes there too. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From rob.lougher at gmail.com Fri May 27 06:03:44 2011 From: rob.lougher at gmail.com (Robert Lougher) Date: Fri, 27 May 2011 14:03:44 +0100 Subject: icedtea-1.14 JamVM + OpenJDK 7 -version patch In-Reply-To: <1306497320.21823.31.camel@xranby-ESPRIMO-P7935> References: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> <4DDECE3A.10502@ubuntu.com> <1306492538.21823.16.camel@xranby-ESPRIMO-P7935> <1306493289.21823.21.camel@xranby-ESPRIMO-P7935> <1306497320.21823.31.camel@xranby-ESPRIMO-P7935> Message-ID: Hi, On 27 May 2011 12:55, Xerxes R?nby wrote: > fre 2011-05-27 klockan 12:48 +0200 skrev Xerxes R?nby: >> > What I currently observe are a >> > unsatisfied link error. >> > >> > xranby at xranby-ESPRIMO-P7935:~/test >> > $ ../icedtea-1.14/openjdk.build/j2sdk-image/bin/java Linpack >> > java.lang.UnsatisfiedLinkError: registerNatives >> > ? ? at sun.misc.Perf.registerNatives(Native Method) >> > ? ? at sun.misc.Perf.(Perf.java:536) >> ... >> > ? ? at sun.misc.PerfCounter.(PerfCounter.java:51) >> > ? ? at java.net.URLClassLoader.defineClass(URLClassLoader.java:448) >> > >> > The URLClassLoader uses sun.misc.Perf to register startup time. >> > >> > I start to think this are a bug in OpenJDK 7 that the sun.misc.Perf >> > constructor expects to be able to use the native registerNatives method >> > in libhprof.so without explicilty making sure that this library have >> > already been loaded. >> > >> > The libhprof.so are part of the Hotspot JVMTI implementation so it are >> > no surprise that JamVM currently dont not load it. > > The attached patch fix this UnsatisfiedLinkError by simply removing the > use of sun.misc from the OpenJDK 7 ClassLoader and URLClassLoader. This > makes it possible to use the OpenJDK 7 classes in combination with other > JVM's than Hotspot. > > I think this are a valid fix since the hooks added using sun.misc.Perf > to monitor ClassLoader bootup time are not part of the public > ClassLoader API. These hooks do not exist in OpenJDK 6 and I can not > find any refernce to validate their existance in OpenJDK 7. I think they > are leftovers from some old ClassLoader speed regression investigation > and should be considered as debug code. > > If someone like this debug code and have a suggestion how to properly > re-engineer sun.misc to support other JVM's than Hotspot im all ear. > I was in the middle of writing the previous email when I was dragged off to lunch. I think this is a valid fix. However, I would like to understand the mechanism which is enabling HotSpot to work. Of course, once the native functions can be found, there's no guarantee that they will work, as they may use other unimplemented features. Rob. >> >> >> For clarification,the native method in libhprof.so void >> registerNative(void) called by the sun.misc.Perf constructor are not the >> same "RegisterNatives" as the JNI interface RegisterNatives >> http://download.oracle.com/javase/6/docs/technotes/guides/jni/spec/functions.html#wp17734 >> >> >> Xerxes > > From ptisnovs at redhat.com Fri May 27 06:06:36 2011 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 27 May 2011 15:06:36 +0200 Subject: Reviewer needed - third regression test in IcedTea7 which leaves garbage in temporary directory Message-ID: <4DDFA1DC.6050107@redhat.com> Hi all, Fix for third regression test which leaves garbage in temporary directory is stored in an attachment. Could it be pushed to IcedTea7-forest/jdk please? ChangeLog entry for IcedTea7: 2011-05-27 Pavel Tisnovsky * Makefile.am: (JDK_CHANGESET): Update regression test jdk/test/sun/nio/ch/TempBuffer.java (JDK_SHA256SUM): Likewise Cheers, Pavel -------------- next part -------------- A non-text attachment was scrubbed... Name: TempBuffer.patch Type: text/x-patch Size: 1359 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110527/29b39efc/TempBuffer.patch From rob.lougher at gmail.com Fri May 27 06:08:37 2011 From: rob.lougher at gmail.com (Robert Lougher) Date: Fri, 27 May 2011 14:08:37 +0100 Subject: icedtea-1.14 JamVM + OpenJDK 7 -version patch In-Reply-To: <20110527130059.GC31868@rivendell.middle-earth.co.uk> References: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> <20110527130059.GC31868@rivendell.middle-earth.co.uk> Message-ID: Hi, On 27 May 2011 14:01, Dr Andrew John Hughes wrote: > On 14:17 Thu 26 May ? ? , Xerxes R?nby wrote: >> Hi! >> >> Today i tested to build JamVM + OpenJDK 7 using the newly released >> icedtea-1.14 >> http://icedtea.classpath.org/download/source/icedtea-1.14.tar.gz >> that contains all JamVM build scripts from icedtea6. >> >> >> After some patching the JamVM + OpenJDK 7 combination builds and now >> passes java -version and java -help >> >> icedtea-1.14/openjdk.build/j2sdk-image/bin/java -version >> java version "1.7.0_136-icedtea" >> IcedTea7 Runtime Environment (1.14) (Ubuntu build >> 1.7.0_136-icedtea-b136) >> JamVM (build 1.6.0-devel, inline-threaded interpreter with >> stack-caching) >> >> >> >> * jamvm-oj7.patch : >> OpenJDK7 complained that JVM_FindClassFromBootLoader not found inside >> the jamvm libjvm.so, a new JVM API in OpenJDK 7, the attached patch fix >> by implementing it using jamvm's internal findSystemClass0 method. >> > > Are you planning to add this to the repo? > >> I'll add it to JamVM's git repository (it's a trivial patch). I'm checking in some other fixes tonight so hopefully Xerxes can re-sync afterwards. Rob. > > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and IcedTea > http://www.gnu.org/software/classpath > http://icedtea.classpath.org > PGP Key: F5862A37 (https://keys.indymedia.org/) > Fingerprint = EA30 D855 D50F 90CD F54D ?0698 0713 C3ED F586 2A37 > From xerxes at zafena.se Fri May 27 06:48:21 2011 From: xerxes at zafena.se (Xerxes =?ISO-8859-1?Q?R=E5nby?=) Date: Fri, 27 May 2011 15:48:21 +0200 Subject: icedtea-1.14 JamVM + OpenJDK 7 -version patch In-Reply-To: <20110527130059.GC31868@rivendell.middle-earth.co.uk> References: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> <20110527130059.GC31868@rivendell.middle-earth.co.uk> Message-ID: <1306504101.21823.53.camel@xranby-ESPRIMO-P7935> fre 2011-05-27 klockan 14:01 +0100 skrev Dr Andrew John Hughes: > > * jamvm-oj7.patch : > > OpenJDK7 complained that JVM_FindClassFromBootLoader not found inside > > the jamvm libjvm.so, a new JVM API in OpenJDK 7, the attached patch fix > > by implementing it using jamvm's internal findSystemClass0 method. > > > > Are you planning to add this to the repo? I was expectig Rob to merge this upstream as he now allready have done :) Thanks Rob! And then be able to pull it into icedtea next time when i bump the jamvm revision. > > > > > * icedtea-1.14-jamvm.patch : > > I had to do some tweaks to the icedtea-1.14 Makefile.am all contained in > > the icedtea-1.14-jamvm.patch because of a silly issue the jamvm sources > > did not get extracted before patching. > > This patch also makes it possible to rerun the stamps/jamvm.stamp by > > adding -f to ln so that it can replace the symlink if its allready > > there. > > Comments on this below. > > > OpenJDK 7 have added a check if the "unused by jamvm" libjsig.so > > actually are a valid .so file, so instead of simply touching it i simply > > created a link to the built libjvm.so created by stamps/jamvm.stamp. > > > > > > I configured my icedtea-1.14 build using > > ./configure --enable-jamvm --disable-system-lcms --disable-bootstrap > > > > Wow, I'm surprised how few people have lcms2. I have to congratulate the Fedora project for its superior colormanagement support. For what I know Ubuntu will update to use the same colormanagement functionality as Fedora have implemented starting with the next 11.10 release. Many thanks to Till Kamppeter from the Linux Foundation for informing and unifying colormanagement fuctionality across the distributions. > > Index: icedtea-1.14/Makefile.am > > =================================================================== > > --- icedtea-1.14.orig/Makefile.am 2011-05-26 11:18:03.468701462 +0200 > > +++ icedtea-1.14/Makefile.am 2011-05-26 12:18:33.610702371 +0200 > > @@ -1343,7 +1343,7 @@ > > rm -rf $(abs_top_builddir)/generated.build > > rm -f stamps/generated.stamp > > > > -stamps/patch-fsg.stamp: stamps/sanitise-openjdk.stamp > > +stamps/patch-fsg.stamp: stamps/extract.stamp stamps/sanitise-openjdk.stamp > > I'm puzzled why you need this. sanitise-openjdk requires extract. The examination are: sanitise-openjdk only depend on extract-openjdk and extract-hotspot. The "master" stamps/extract.stamp never gets processed. The reason why icedtea6 happens to work are because extract.stamp hangs at the end of a long dependency chain, i guess it gets run almost by accident: stamps/patch-fsg.stamp: stamps/fonts.stamp stamps/fonts.stamp: stamps/generated.stamp stamps/generated.stamp: stamps/ports.stamp stamps/ports.stamp: stamps/replace-hotspot.stamp stamps/replace-hotspot.stamp: stamps/extract.stamp In icedtea 7 stamps/patch-fsg.stamp do not depend on stamps/fonts.stamp so this chain of depends used in icedtea6 never gets run. If you prefer i can change sanitise-openjdk to depend on stamps/extract.stamp it will fix this bug. > > mkdir -p stamps ; \ > > rm -f stamps/patch.stamp.tmp ; \ > > touch stamps/patch.stamp.tmp ; \ > > @@ -2087,9 +2087,9 @@ > > $(MAKE) install > > mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server > > cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server > > - ln -s server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client > > + ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client > > touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt > > - touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so > > + ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so > > endif > > mkdir -p stamps > > touch stamps/jamvm.stamp > > This is a straight backport from 6, so you may need to make changes there too. I will prepare a icedtea6 backport patch when this new patch are clear to go into icedtea 7. Cheers Xerxes From bugzilla-daemon at icedtea.classpath.org Fri May 27 07:17:48 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 14:17:48 +0000 Subject: [Bug 720] Error: caught unhandled signal 11, tomcat6, arm, debian linux, In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=720 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |xerxes at zafena.se Status|NEW |RESOLVED Component|Zero |Thumb2 JIT Resolution| |WONTFIX --- Comment #1 from Xerxes R?nby 2011-05-27 14:17:47 --- Hi Java VM: OpenJDK Zero VM (14.0-b16 mixed mode linux-arm ) Zero + "mixed mode" in the version string indicated that the Thumb2 jit and assembler loop optimizations are in use. The thumb2 assembler addon are made up of about 16000 lines of handwritten assembler that unfortunally are unmaintainable. We will not be able to fix this bug since it would require a full time job to keep the assembler addon in sync, resources that currently are not available. Due to this maintainability issue the assembler addon will not get used on arm when using the icedtea 1.9 release or later. You can workaround this bug by passing -XX:+PrintCommandLineFlags to the VM it will make the vm only use the Zero C++ implementation that are stable but slower. Other alternatives are to use cacao or jamvm instead of zero. I can recomend you to upgrade to the latest icedtea version 1.10.1. I have prepared binarys against debian squeeze armel that you can find here: http://openjdk.gudinna.com/squeeze-backports/armel/ Cheers Xerxes -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ahughes at redhat.com Fri May 27 07:28:48 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 27 May 2011 15:28:48 +0100 Subject: icedtea-1.14 JamVM + OpenJDK 7 -version patch In-Reply-To: <1306504101.21823.53.camel@xranby-ESPRIMO-P7935> References: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> <20110527130059.GC31868@rivendell.middle-earth.co.uk> <1306504101.21823.53.camel@xranby-ESPRIMO-P7935> Message-ID: <20110527142847.GA3664@rivendell.middle-earth.co.uk> On 15:48 Fri 27 May , Xerxes R?nby wrote: snip... > > > > > > -stamps/patch-fsg.stamp: stamps/sanitise-openjdk.stamp > > > +stamps/patch-fsg.stamp: stamps/extract.stamp stamps/sanitise-openjdk.stamp > > > > I'm puzzled why you need this. sanitise-openjdk requires extract. > > The examination are: > sanitise-openjdk only depend on extract-openjdk and extract-hotspot. > The "master" stamps/extract.stamp never gets processed. > Ok, I see it now. I think we just need: stamps/patch-fsg.stamp: stamps/extract.stamp sanitise-openjdk is included by extract, and patch depends on patch-fsg. > The reason why icedtea6 happens to work are because extract.stamp hangs > at the end of a long dependency chain, i guess it gets run almost by > accident: > stamps/patch-fsg.stamp: stamps/fonts.stamp > stamps/fonts.stamp: stamps/generated.stamp > stamps/generated.stamp: stamps/ports.stamp > stamps/ports.stamp: stamps/replace-hotspot.stamp > stamps/replace-hotspot.stamp: stamps/extract.stamp > Well, yeah, 6 is quite different. 7 is arguably cleaner, this just happened to slip throught the net. > In icedtea 7 stamps/patch-fsg.stamp do not depend on stamps/fonts.stamp > so this chain of depends used in icedtea6 never gets run. > We don't have fonts.stamp so that would probably be why... :-) I'm not sure if that's not just something that should go in the forest directly. > If you prefer i can change sanitise-openjdk to depend on > stamps/extract.stamp > it will fix this bug. No, the fix is to change patch-fsg as above. That would create a circular dependency as extract depends on sanitise-openjdk. Plus sanitise-openjdk should only depend on the openjdk tree. > > > > mkdir -p stamps ; \ > > > rm -f stamps/patch.stamp.tmp ; \ > > > touch stamps/patch.stamp.tmp ; \ > > > @@ -2087,9 +2087,9 @@ > > > $(MAKE) install > > > mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server > > > cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server > > > - ln -s server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client > > > + ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client > > > touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server/Xusage.txt > > > - touch $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so > > > + ln -sf client/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/libjsig.so > > > endif > > > mkdir -p stamps > > > touch stamps/jamvm.stamp > > > > This is a straight backport from 6, so you may need to make changes there too. > > I will prepare a icedtea6 backport patch when this new patch are clear > to go into icedtea 7. > It's probably just this fragment, and, if that fixes something in the jamvm build for you, it's fine by me. I haven't really run the jamvm build for a long time. > Cheers > Xerxes > Cheers, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From xranby at icedtea.classpath.org Fri May 27 08:19:41 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Fri, 27 May 2011 15:19:41 +0000 Subject: /hg/icedtea6: JamVM: Updated to 2011-04-28 revision, implemented... Message-ID: changeset fc898988b053 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fc898988b053 author: Xerxes R?nby date: Fri May 27 16:55:49 2011 +0200 JamVM: Updated to 2011-04-28 revision, implemented remaining OpenJDK Array reflection interface. 2011-05-27 Xerxes R?nby JamVM - Fix leak of native thread structure. - Consistent naming for classlib functions. - Add extra includes to get rid off compiler warning. - Rework OpenJDK storage of native thread structure. - Implement remaining OpenJDK Array reflection interface. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-04-28 revision. (JAMVM_SHA256SUM): Updated. diffstat: ChangeLog | 13 +++++++++++++ Makefile.am | 4 ++-- NEWS | 5 +++++ 3 files changed, 20 insertions(+), 2 deletions(-) diffs (49 lines): diff -r 0224254fcf75 -r fc898988b053 ChangeLog --- a/ChangeLog Fri May 20 08:55:31 2011 -0400 +++ b/ChangeLog Fri May 27 16:55:49 2011 +0200 @@ -1,3 +1,16 @@ +2011-05-27 Xerxes R??nby + + JamVM + - Fix leak of native thread structure. + - Consistent naming for classlib functions. + - Add extra includes to get rid off compiler warning. + - Rework OpenJDK storage of native thread structure. + - Implement remaining OpenJDK Array reflection interface. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-04-28 revision. + (JAMVM_SHA256SUM): Updated. + 2011-05-19 Denis Lila * Makefile.am: Apply patch. diff -r 0224254fcf75 -r fc898988b053 Makefile.am --- a/Makefile.am Fri May 20 08:55:31 2011 -0400 +++ b/Makefile.am Fri May 27 16:55:49 2011 +0200 @@ -11,8 +11,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = a95ca049d3bb257d730535a5d5ec3f73a943d0aa -JAMVM_SHA256SUM = 18bb5c97c03fb73f70b481440e3e11803448d327c024d4570a338b899693fefd +JAMVM_VERSION = 2e52a601883dda84c824b43363c02881def3e06d +JAMVM_SHA256SUM = b26bc67ddfb50c98761aa4939254470ec9a8f88e9a22628b858603099a784af8 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz diff -r 0224254fcf75 -r fc898988b053 NEWS --- a/NEWS Fri May 20 08:55:31 2011 -0400 +++ b/NEWS Fri May 27 16:55:49 2011 +0200 @@ -47,6 +47,11 @@ - CA156: uncaughtExceptionHandler doesn't work with OpenJDK 6 b21. - CA157: ARM SMP Assertion thinlock failed. * JamVM + - Fix leak of native thread structure. + - Consistent naming for classlib functions. + - Add extra includes to get rid off compiler warning. + - Rework OpenJDK storage of native thread structure. + - Implement remaining OpenJDK Array reflection interface. - Ignore all unknown options. - Handle overflow in getPhysicalMemory(). - Base default min and max heap size on physical memory. From xranby at icedtea.classpath.org Fri May 27 08:24:16 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Fri, 27 May 2011 15:24:16 +0000 Subject: /hg/icedtea: JamVM: Updated to 2011-04-28 revision, implemented ... Message-ID: changeset 31a4741ed890 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=31a4741ed890 author: Xerxes R?nby date: Fri May 27 17:00:15 2011 +0200 JamVM: Updated to 2011-04-28 revision, implemented remaining OpenJDK Array reflection interface. 2011-05-27 Xerxes R?nby JamVM - Fix leak of native thread structure. - Consistent naming for classlib functions. - Add extra includes to get rid off compiler warning. - Rework OpenJDK storage of native thread structure. - Implement remaining OpenJDK Array reflection interface. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-04-28 revision. (JAMVM_SHA256SUM): Updated diffstat: ChangeLog | 13 +++++++++++++ Makefile.am | 4 ++-- NEWS | 5 +++++ 3 files changed, 20 insertions(+), 2 deletions(-) diffs (49 lines): diff -r 6cf9b58ff9bc -r 31a4741ed890 ChangeLog --- a/ChangeLog Fri May 27 13:30:39 2011 +0100 +++ b/ChangeLog Fri May 27 17:00:15 2011 +0200 @@ -1,3 +1,16 @@ +2011-05-27 Xerxes R??nby + + JamVM + - Fix leak of native thread structure. + - Consistent naming for classlib functions. + - Add extra includes to get rid off compiler warning. + - Rework OpenJDK storage of native thread structure. + - Implement remaining OpenJDK Array reflection interface. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-04-28 revision. + (JAMVM_SHA256SUM): Updated. + 2011-05-27 Andrew John Hughes * NEWS: Add 2.0. diff -r 6cf9b58ff9bc -r 31a4741ed890 Makefile.am --- a/Makefile.am Fri May 27 13:30:39 2011 +0100 +++ b/Makefile.am Fri May 27 17:00:15 2011 +0200 @@ -24,8 +24,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 -JAMVM_VERSION = a95ca049d3bb257d730535a5d5ec3f73a943d0aa -JAMVM_SHA256SUM = 18bb5c97c03fb73f70b481440e3e11803448d327c024d4570a338b899693fefd +JAMVM_VERSION = 2e52a601883dda84c824b43363c02881def3e06d +JAMVM_SHA256SUM = b26bc67ddfb50c98761aa4939254470ec9a8f88e9a22628b858603099a784af8 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz diff -r 6cf9b58ff9bc -r 31a4741ed890 NEWS --- a/NEWS Fri May 27 13:30:39 2011 +0100 +++ b/NEWS Fri May 27 17:00:15 2011 +0200 @@ -29,6 +29,11 @@ - PR715: Port updated macros from IcedTea6 to 7 - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan * JamVM + - Fix leak of native thread structure. + - Consistent naming for classlib functions. + - Add extra includes to get rid off compiler warning. + - Rework OpenJDK storage of native thread structure. + - Implement remaining OpenJDK Array reflection interface. - Ignore all unknown options. - Handle overflow in getPhysicalMemory(). - Base default min and max heap size on physical memory. From omajid at redhat.com Fri May 27 08:26:00 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 27 May 2011 11:26:00 -0400 Subject: [icedtea-web] RFC: PR724: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest Message-ID: <4DDFC288.5070300@redhat.com> Hi, The attached patch fixes PR724. It just adds more checking to handle nulls gracefully. Okay to commit? ChangeLog: 2011-05-27 Omair Majid * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (getClasspathsFromManifest): Handle nulls or empty strings properly. Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea-web-null-ptr-classloader-01.patch Type: text/x-patch Size: 731 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110527/4e1addd1/icedtea-web-null-ptr-classloader-01.patch From dbhole at redhat.com Fri May 27 08:30:07 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 May 2011 11:30:07 -0400 Subject: [icedtea-web] RFC: PR724: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest In-Reply-To: <4DDFC288.5070300@redhat.com> References: <4DDFC288.5070300@redhat.com> Message-ID: <20110527153007.GC19676@redhat.com> * Omair Majid [2011-05-27 11:26]: > Hi, > > The attached patch fixes PR724. It just adds more checking to handle > nulls gracefully. Okay to commit? > > ChangeLog: > 2011-05-27 Omair Majid > > * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > (getClasspathsFromManifest): Handle nulls or empty strings properly. > > Cheers, > Omair Patch looks good to me. Okay for HEAD and branches (1.0 and 1.1). Thanks, Deepak > diff -r 85cf7fb25642 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue May 10 11:59:47 2011 -0400 > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Mon May 16 13:25:30 2011 -0400 > @@ -1375,6 +1375,9 @@ > if (mf != null) { > // extract the Class-Path entries from the manifest and split them > String classpath = mf.getMainAttributes().getValue("Class-Path"); > + if (classpath == null || classpath.trim().length() == 0) { > + return result; > + } > String[] paths = classpath.split(" +"); > for (String path : paths) { > if (path.trim().length() == 0) { From xerxes at zafena.se Fri May 27 08:30:43 2011 From: xerxes at zafena.se (Xerxes =?ISO-8859-1?Q?R=E5nby?=) Date: Fri, 27 May 2011 17:30:43 +0200 Subject: RFC: JamVM sync with upstream 2011-04-28 In-Reply-To: <20110519195324.GT31710@rivendell.middle-earth.co.uk> References: <4DC2A940.2010209@zafena.se> <4DD520FE.4050308@ubuntu.com> <20110519195324.GT31710@rivendell.middle-earth.co.uk> Message-ID: <1306510243.21823.58.camel@xranby-ESPRIMO-P7935> tor 2011-05-19 klockan 20:53 +0100 skrev Dr Andrew John Hughes: > On 15:54 Thu 19 May , Matthias Klose wrote: > > On 05/05/2011 03:42 PM, Xerxes R?nby wrote: > > > Hi the attached patch updates Icedtea6 to stay in sync with JamVM upstream. > > > http://git.berlios.de/cgi-bin/cgit.cgi/jamvm/commit/?id=2e52a601883dda84c824b43363c02881def3e06d > > > > > > I have made the ChangeLog more verbose to make it obvious which new JamVM improvements that have got included by this update. > > > > > > Ok to push? > > > > test built on i686, amd64 and armel. the segfault on i686 was tracked down to > > the use of GCC-4.6, and is unrelated to the update. > > > > looks ok. now that 7 has jamvm support, there too. > > > > Please wait until I push the other fixes to 7... only one of the forwardports is in so far. > Working on it now. Thanks for syncing icedtea with icedtea6! I have now pushed this change to: http://icedtea.classpath.org/hg/icedtea6/rev/fc898988b053 http://icedtea.classpath.org/hg/icedtea/rev/31a4741ed890 I wanted to get this in before I start to add more JamVM changes. Cheers Xerxes From xranby at icedtea.classpath.org Fri May 27 08:43:14 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Fri, 27 May 2011 15:43:14 +0000 Subject: /hg/icedtea: 2011-05-27 Xerxes R?nby Message-ID: changeset ccbd95318206 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ccbd95318206 author: Xerxes R?nby date: Fri May 27 17:19:22 2011 +0200 2011-05-27 Xerxes R?nby * NEWS: Fix previous commits news entry. diffstat: ChangeLog | 4 ++++ NEWS | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diffs (40 lines): diff -r 31a4741ed890 -r ccbd95318206 ChangeLog --- a/ChangeLog Fri May 27 17:00:15 2011 +0200 +++ b/ChangeLog Fri May 27 17:19:22 2011 +0200 @@ -1,3 +1,7 @@ +2011-05-27 Xerxes R??nby + + * NEWS: Fix previous commits news entry. + 2011-05-27 Xerxes R??nby JamVM diff -r 31a4741ed890 -r ccbd95318206 NEWS --- a/NEWS Fri May 27 17:00:15 2011 +0200 +++ b/NEWS Fri May 27 17:19:22 2011 +0200 @@ -11,6 +11,13 @@ New in release 2.0 (2011-XX-XX): +* JamVM + - Fix leak of native thread structure. + - Consistent naming for classlib functions. + - Add extra includes to get rid off compiler warning. + - Rework OpenJDK storage of native thread structure. + - Implement remaining OpenJDK Array reflection interface. + New in release 1.14 (2011-05-25): * NetX and the plugin moved to the IcedTea-Web project with a separate @@ -29,11 +36,6 @@ - PR715: Port updated macros from IcedTea6 to 7 - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan * JamVM - - Fix leak of native thread structure. - - Consistent naming for classlib functions. - - Add extra includes to get rid off compiler warning. - - Rework OpenJDK storage of native thread structure. - - Implement remaining OpenJDK Array reflection interface. - Ignore all unknown options. - Handle overflow in getPhysicalMemory(). - Base default min and max heap size on physical memory. From omajid at redhat.com Fri May 27 08:53:57 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 27 May 2011 11:53:57 -0400 Subject: [icedtea-web] RFC: Patch to allow recursive calls from NPN_GetURL In-Reply-To: <20110512204748.GA12268@redhat.com> References: <20110512204748.GA12268@redhat.com> Message-ID: <4DDFC915.3070904@redhat.com> On 05/12/2011 04:47 PM, Deepak Bhole wrote: > Hi, > > This patch addresses the issue brought up here: > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-April/013706.html > > Current plugin code does not expect NPN_getURL to make recursive calls > back to Java. Firefox 4 does just that, causing the browser to hang. > > Attached patch wires url load calls to be handled through the standard > Java -> JS call code, which can handle recursive calls. > > The scope of this patch is contained, and I think it should go into 1.1 > as well. > > Thoughts? > Looks good to me. Okay for HEAD and 1.1. Cheers, Omair From bugzilla-daemon at icedtea.classpath.org Fri May 27 08:57:48 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 15:57:48 +0000 Subject: [Bug 727] Cache may delete file even when it was suppose to be kept. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=727 Andrew Su changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Transient failures when |Cache may delete file even |running JNLP applications |when it was suppose to be | |kept. --- Comment #1 from Andrew Su 2011-05-27 15:57:48 --- This only happens when I run javaws without any option, but if I run javaws with the "-Xnofork" option it does not execute such odd behavior. That aside, the problem is with the conditional "keep.contains(file.getPath().substring(rStr.length()))" which made it remove the entry even if we said we wanted to keep it. I have proposed a patch [1] to move this condition to its own block, and only remove it from the list, if available. I'm updating the summary to reflect the cause. [1] http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-May/014446.html -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From asu at redhat.com Fri May 27 08:59:19 2011 From: asu at redhat.com (Andrew Su) Date: Fri, 27 May 2011 11:59:19 -0400 (EDT) Subject: [RFC][Icedtea-Web]: PR727 Fix deleting of incorrect file when cleaning cache. In-Reply-To: <4DDED8A7.7090609@redhat.com> Message-ID: <69388852.345995.1306511959900.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > From: "Omair Majid" > To: "Andrew Su" > Cc: distro-pkg-dev at openjdk.java.net > Sent: Thursday, May 26, 2011 6:48:07 PM > Subject: Re: [RFC][Icedtea-Web]: PR727 Fix deleting of incorrect file when cleaning cache. > On 05/26/2011 06:04 PM, Andrew Su wrote: > > Hello, > > > > This patch fixes PR727 [1]. > > > > What was happening before was that when we say we want to keep a > > file, but it exists again in the list of recently used files, it > > will > > add it to remove. > > > > Hm... why does one entry appear multiple times? Shouldn't we be > addressing that instead? This is very odd, since it shouldn't... but when I run javaws as follows, this doesn't happen. javaws -Xnofork http://www.sweethome3d.com/SweetHome3D.jnlp > > I am a little confused by the current code. The current logic is > if (delete || keep.contains(...)) { > ... > } > Which I find a little strange (we are treating stuff to delete and > stuff > to keep equally?). Your patch certainly makes it look a little more > sane. > > I see that you are adding a NEWS entry with a different description > than > on the bug. Would you mind updating the bug report itself? ok, updated. Is it ok for commit to head + 1.1 now? Cheers, Andrew From bugzilla-daemon at icedtea.classpath.org Fri May 27 09:15:05 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 16:15:05 +0000 Subject: [Bug 730] Calling URL with Firefox 4 / Chrome In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=730 --- Comment #5 from Omair Majid 2011-05-27 16:15:05 --- (In reply to comment #4) > Hi there and thanks for your answer. I understand that IcedTea6 1.8 is not the > new kid on the blog. However - a lot of people are not in the habit of updating > their OS every other month. A lot of FC13s and 14s are still out there and I > haven't been able to find any new icedtea version(s). > I understand your concerns; please allow me to explain the issues. Every time we do a new icedtea6 release (not icedtea-web release) we need to do extensive testing, including running the TCK (which is required for the icedtea6 packages to be called "Java"). This takes a huge amount of time and resources. Due to lack of manpower, it is not feasible for us to make new releases often. Because of this problem, the plugin/webstart were split off into the IcedTea-Web project. This will allow us to release more often. It will also allow us to keep updating older versions with bugfixes in a more timely manner. F15 includes this new IcedTea-Web. We are thinking about adding it to F14 as well after it gets a little bit more testing (it is brand new in some aspects and we certainly dont want to break something that was working previously). As for F13, it will be EOL'ed in a month, so I am not sure if there is enough time to add the icedtea-web packages there. The reason I ask you to test icedtea-web is because that's where most of these fixes are first added. If a problem is already fixed there, it is much easier for us to find the fix and backport it. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From omajid at redhat.com Fri May 27 09:19:42 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 27 May 2011 12:19:42 -0400 Subject: [RFC][Icedtea-Web]: PR727 Fix deleting of incorrect file when cleaning cache. In-Reply-To: <69388852.345995.1306511959900.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <69388852.345995.1306511959900.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <4DDFCF1E.2070709@redhat.com> On 05/27/2011 11:59 AM, Andrew Su wrote: >> >> Hm... why does one entry appear multiple times? Shouldn't we be >> addressing that instead? > > This is very odd, since it shouldn't... but when I run javaws as follows, this doesn't happen. > > javaws -Xnofork http://www.sweethome3d.com/SweetHome3D.jnlp > That's interesting. javaws exec()'s itself if it realizes it needs to run in another JVM (because of different VM arguments). This happens after the JNLP file is parsed (and added to the cache), but before (AFAIK) the application jars are downloaded. > Is it ok for commit to head + 1.1 now? > Yeah, the fix looks fine. Okay for both. I would appreciate it however, if you could look more into the problem to find out why it's happening in the first place. If there is a deeper problem, perhaps we should address that too. Cheers, Omair From asu at icedtea.classpath.org Fri May 27 09:30:58 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Fri, 27 May 2011 16:30:58 +0000 Subject: /hg/icedtea-web: Fix PR727: Split conditional to removed duplica... Message-ID: changeset 762fa13583b2 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=762fa13583b2 author: Andrew Su date: Fri May 27 12:32:52 2011 -0400 Fix PR727: Split conditional to removed duplicate entries in cache. diffstat: ChangeLog | 6 ++++++ NEWS | 1 + netx/net/sourceforge/jnlp/cache/CacheUtil.java | 10 ++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diffs (52 lines): diff -r a92a625ced46 -r 762fa13583b2 ChangeLog --- a/ChangeLog Wed May 25 15:12:18 2011 -0400 +++ b/ChangeLog Fri May 27 12:32:52 2011 -0400 @@ -1,3 +1,9 @@ +2011-05-26 Andrew Su + + * NEWS: Update. + * netx/net/sourceforge/jnlp/cache/CacheUtil.java: + (cleanCache): Split conditional for delete. + 2011-05-20 Andrew Su * NEWS: Update. diff -r a92a625ced46 -r 762fa13583b2 NEWS --- a/NEWS Wed May 25 15:12:18 2011 -0400 +++ b/NEWS Fri May 27 12:32:52 2011 -0400 @@ -27,6 +27,7 @@ - RH669942: javaws fails to download version/packed files (missing support for jnlp.packEnabled and jnlp.versionEnabled) - PR658: now jnlp.packEnabled works with applets. - PR726: closing javaws -about no longer throws exceptions. + - PR727: cache now properly removes files. * Plugin - PR475, RH604061: Allow applets from the same page to use the same classloader - PR612: NetDania application ends on java.security.AccessControlException: access denied (java.util.PropertyPermission browser read) diff -r a92a625ced46 -r 762fa13583b2 netx/net/sourceforge/jnlp/cache/CacheUtil.java --- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Wed May 25 15:12:18 2011 -0400 +++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Fri May 27 12:32:52 2011 -0400 @@ -567,6 +567,11 @@ rStr = cacheDir + rStr.substring(0, rStr.indexOf(File.separatorChar, 1)); long len = file.length(); + if (keep.contains(file.getPath().substring(rStr.length()))) { + lruHandler.removeEntry(key); + continue; + } + /* * we remove entries from our lru if any of the following condition is met. * Conditions: @@ -574,11 +579,8 @@ * - !file.isFile(): if someone tampered with the directory, file doesn't exist. * - maxSize >= 0 && curSize + len > maxSize: If a limit was set and the new size * on disk would exceed the maximum size. - * - keep.contains(...): We had already decided to keep an entry with the same - * url path. */ - if (delete || !file.isFile() || (maxSize >= 0 && curSize + len > maxSize) || - keep.contains(file.getPath().substring(rStr.length()))) { + if (delete || !file.isFile() || (maxSize >= 0 && curSize + len > maxSize)) { lruHandler.removeEntry(key); remove.add(rStr); } else { From xerxes at zafena.se Fri May 27 09:32:38 2011 From: xerxes at zafena.se (Xerxes =?ISO-8859-1?Q?R=E5nby?=) Date: Fri, 27 May 2011 18:32:38 +0200 Subject: icedtea-1.14 JamVM + OpenJDK 7 - oj7-remove-sun.misc.PerfCounter-debug-code.patch In-Reply-To: References: <1306412273.12735.18.camel@xranby-ESPRIMO-P7935> <4DDECE3A.10502@ubuntu.com> <1306492538.21823.16.camel@xranby-ESPRIMO-P7935> <1306493289.21823.21.camel@xranby-ESPRIMO-P7935> <1306497320.21823.31.camel@xranby-ESPRIMO-P7935> Message-ID: <1306513958.26201.29.camel@xranby-ESPRIMO-P7935> fre 2011-05-27 klockan 14:03 +0100 skrev Robert Lougher: > On 27 May 2011 12:55, Xerxes R?nby wrote: > > fre 2011-05-27 klockan 12:48 +0200 skrev Xerxes R?nby: > >> > What I currently observe are a > >> > unsatisfied link error. > >> > > >> > xranby at xranby-ESPRIMO-P7935:~/test > >> > $ ../icedtea-1.14/openjdk.build/j2sdk-image/bin/java Linpack > >> > java.lang.UnsatisfiedLinkError: registerNatives > >> > at sun.misc.Perf.registerNatives(Native Method) > >> > at sun.misc.Perf.(Perf.java:536) > >> ... > >> > at sun.misc.PerfCounter.(PerfCounter.java:51) > >> > at java.net.URLClassLoader.defineClass(URLClassLoader.java:448) > >> > > >> > The URLClassLoader uses sun.misc.Perf to register startup time. > >> > > >> > I start to think this are a bug in OpenJDK 7 that the sun.misc.Perf > >> > constructor expects to be able to use the native registerNatives method > >> > in libhprof.so without explicilty making sure that this library have > >> > already been loaded. > >> > > >> > The libhprof.so are part of the Hotspot JVMTI implementation so it are > >> > no surprise that JamVM currently dont not load it. > > > > The attached patch fix this UnsatisfiedLinkError by simply removing the > > use of sun.misc from the OpenJDK 7 ClassLoader and URLClassLoader. This > > makes it possible to use the OpenJDK 7 classes in combination with other > > JVM's than Hotspot. ... > > > > If someone like this debug code and have a suggestion how to properly > > re-engineer sun.misc to support other JVM's than Hotspot im all ear. > > > > I was in the middle of writing the previous email when I was dragged > off to lunch. I think this is a valid fix. However, I would like to > understand the mechanism which is enabling HotSpot to work. hard to tell the use of registerNatives in OpenJDK 7 sun.misc.Perf constructor are part of the initial "duke" commit http://hg.openjdk.java.net/jdk7/jdk7/jdk/annotate/c344779fab58/src/share/classes/sun/misc/Perf.java I have been able to track down the use of sun.misc.PerfCounter in the OpenJDK7 classes to this commit: http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/c7e469ae3edb http://bugs.sun.com/view_bug.do?bug_id=6878481 by following the bugreport chain its clear that this commit was added to find the root of the "On Windows System.nanoTime() may be 25x slower than System.currentTimeMillis()" bug http://bugs.sun.com/view_bug.do?bug_id=6440250 > Of > course, once the native functions can be found, there's no guarantee > that they will work, as they may use other unimplemented features. > > Rob. sun.misc.PerfCounter debug code have been fount to be used in four places of openjdk 7: ClassLoader, URLClassLoader, ZipFile and D3DGraphicsDevice With the attached oj7-remove-sun.misc.PerfCounter-debug-code.patch in place jamvm + oj7 now passes most of the hotspot jtreg test: hotspot results: passed: 101; failed: 6; error: 1 * BUGS: FAILED: compiler/7009231/Test7009231.java this looks like a genuine bug, it fails using openjdk 6 + jamvm as well while it pass using hotspot and cacao on i386. FAILED: runtime/6929067/Test6929067.sh fails because it try to open libjvm.so.0 instead of libjvm.so this are fault in the test itself or an icedtea bug. I can make this test pass by creating a symlink from libjvm.so.0 to libjvm.so FAILED: runtime/6819213/TestBootNativeLibraryPath.java looks to be a bootclasspath bug Error initialising natives: couldn't open libjava.so: use -verbose:jni for more information * Needs more investigation, possible bugs. Error: compiler/6901572/Test.java a speed timeout.. contains a lot of loops that do not finish in 120seconds. FAILED: runtime/6626217/Test6626217.sh I am not sure what this are supposed to do.. got a warning: [options] bootstrap class path not set in conjunction with -source 1.4 * Safe to ignore: FAILED: gc/6581734/Test6581734.java can be ignored, test looks for some specific debug info reported by -verbose:gc -XX:+UseConcMarkSweepGC FAILED: runtime/6981737/Test6981737.java execStatus=Failed. Execution failed: `main' threw exception: java.lang.RuntimeException: FAIL: Wrong value for java.vm.vendor property, "Robert Lougher", expected to be of form: "Oracle Corporation" When I try to run the langtools or jdk tests using JamVM + oj7 then I hit another UnsatisfiedLinkError for sun.misc.Unsafe.copyMemory. This method looks possible to implement by using the existing JamVM copyArray method that happens to take similar arguments. Exception in thread "main" java.lang.UnsatisfiedLinkError: copyMemory at sun.misc.Unsafe.copyMemory(Native Method) at sun.nio.fs.NativeBuffers.copyCStringToNativeBuffer(NativeBuffers.java:127) at sun.nio.fs.UnixNativeDispatcher.copyToNativeBuffer(UnixNativeDispatcher.java:50) ... Xerxes -------------- next part -------------- A non-text attachment was scrubbed... Name: oj7-remove-sun.misc.PerfCounter-debug-code.patch Type: text/x-patch Size: 3401 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110527/5094365d/oj7-remove-sun.misc.PerfCounter-debug-code.patch From asu at icedtea.classpath.org Fri May 27 09:33:50 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Fri, 27 May 2011 16:33:50 +0000 Subject: /hg/release/icedtea-web-1.1: Fix PR727: Split conditional to rem... Message-ID: changeset aea73e8365fe in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=aea73e8365fe author: Andrew Su date: Fri May 27 12:32:52 2011 -0400 Fix PR727: Split conditional to removed duplicate entries in cache. diffstat: ChangeLog | 6 ++++++ NEWS | 1 + netx/net/sourceforge/jnlp/cache/CacheUtil.java | 10 ++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diffs (52 lines): diff -r d74fed364c47 -r aea73e8365fe ChangeLog --- a/ChangeLog Wed May 25 15:13:19 2011 -0400 +++ b/ChangeLog Fri May 27 12:32:52 2011 -0400 @@ -1,3 +1,9 @@ +2011-05-26 Andrew Su + + * NEWS: Update. + * netx/net/sourceforge/jnlp/cache/CacheUtil.java: + (cleanCache): Split conditional for delete. + 2011-05-20 Andrew Su * NEWS: Update. diff -r d74fed364c47 -r aea73e8365fe NEWS --- a/NEWS Wed May 25 15:13:19 2011 -0400 +++ b/NEWS Fri May 27 12:32:52 2011 -0400 @@ -27,6 +27,7 @@ - RH669942: javaws fails to download version/packed files (missing support for jnlp.packEnabled and jnlp.versionEnabled) - PR658: now jnlp.packEnabled works with applets. - PR726: closing javaws -about no longer throws exceptions. + - PR727: cache now properly removes files. * Plugin - PR475, RH604061: Allow applets from the same page to use the same classloader - PR612: NetDania application ends on java.security.AccessControlException: access denied (java.util.PropertyPermission browser read) diff -r d74fed364c47 -r aea73e8365fe netx/net/sourceforge/jnlp/cache/CacheUtil.java --- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Wed May 25 15:13:19 2011 -0400 +++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Fri May 27 12:32:52 2011 -0400 @@ -567,6 +567,11 @@ rStr = cacheDir + rStr.substring(0, rStr.indexOf(File.separatorChar, 1)); long len = file.length(); + if (keep.contains(file.getPath().substring(rStr.length()))) { + lruHandler.removeEntry(key); + continue; + } + /* * we remove entries from our lru if any of the following condition is met. * Conditions: @@ -574,11 +579,8 @@ * - !file.isFile(): if someone tampered with the directory, file doesn't exist. * - maxSize >= 0 && curSize + len > maxSize: If a limit was set and the new size * on disk would exceed the maximum size. - * - keep.contains(...): We had already decided to keep an entry with the same - * url path. */ - if (delete || !file.isFile() || (maxSize >= 0 && curSize + len > maxSize) || - keep.contains(file.getPath().substring(rStr.length()))) { + if (delete || !file.isFile() || (maxSize >= 0 && curSize + len > maxSize)) { lruHandler.removeEntry(key); remove.add(rStr); } else { From bugzilla-daemon at icedtea.classpath.org Fri May 27 09:36:55 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 16:36:55 +0000 Subject: [Bug 731] [TRACKER] IcedTea-Web 1.1 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=731 Bug 731 depends on bug 727, which changed state. Bug 727 Summary: Cache may delete file even when it was suppose to be kept. http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=727 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri May 27 09:36:55 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 16:36:55 +0000 Subject: [Bug 727] Cache may delete file even when it was suppose to be kept. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=727 Andrew Su changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #2 from Andrew Su 2011-05-27 16:36:55 --- The fix has been applied to HEAD and 1.1. http://icedtea.classpath.org/hg/icedtea-web/rev/762fa13583b2 http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/aea73e8365fe Closing as fixed. Cheers, Andrew -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From omajid at icedtea.classpath.org Fri May 27 09:45:23 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Fri, 27 May 2011 16:45:23 +0000 Subject: /hg/icedtea-web: PR724: Possible NullPointerException in JNLPCla... Message-ID: changeset cce92a1211ae in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=cce92a1211ae author: Omair Majid date: Fri May 27 12:45:05 2011 -0400 PR724: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest 2011-05-27 Omair Majid * NEWS: Update. * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (getClassPathsFromManifest): Check for possible nulls and empty strings. diffstat: ChangeLog | 6 ++++++ NEWS | 1 + netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 3 +++ 3 files changed, 10 insertions(+), 0 deletions(-) diffs (37 lines): diff -r 762fa13583b2 -r cce92a1211ae ChangeLog --- a/ChangeLog Fri May 27 12:32:52 2011 -0400 +++ b/ChangeLog Fri May 27 12:45:05 2011 -0400 @@ -1,3 +1,9 @@ +2011-05-27 Omair Majid + + * NEWS: Update. + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (getClassPathsFromManifest): Check for possible nulls and empty strings. + 2011-05-26 Andrew Su * NEWS: Update. diff -r 762fa13583b2 -r cce92a1211ae NEWS --- a/NEWS Fri May 27 12:32:52 2011 -0400 +++ b/NEWS Fri May 27 12:45:05 2011 -0400 @@ -21,6 +21,7 @@ - PR497: Mercurial revision detection not very reliable - PR638: JNLPClassLoader.loadClass(String name) can return null - RH677772: NoSuchAlgorithmException using SSL/TLS in javaws + - PR724: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest * NetX - Use Firefox's proxy settings if possible - The user's default browser (determined from xdg-open or $BROWSER) is used diff -r 762fa13583b2 -r cce92a1211ae netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri May 27 12:32:52 2011 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri May 27 12:45:05 2011 -0400 @@ -1375,6 +1375,9 @@ if (mf != null) { // extract the Class-Path entries from the manifest and split them String classpath = mf.getMainAttributes().getValue("Class-Path"); + if (classpath == null || classpath.trim().length() == 0) { + return result; + } String[] paths = classpath.split(" +"); for (String path : paths) { if (path.trim().length() == 0) { From asu at redhat.com Fri May 27 09:51:39 2011 From: asu at redhat.com (Andrew Su) Date: Fri, 27 May 2011 12:51:39 -0400 (EDT) Subject: [RFC][Icedtea-Web]: PR727 Fix deleting of incorrect file when cleaning cache. In-Reply-To: <4DDFCF1E.2070709@redhat.com> Message-ID: <911177236.347363.1306515099423.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > From: "Omair Majid" > To: "Andrew Su" > Cc: distro-pkg-dev at openjdk.java.net > Sent: Friday, May 27, 2011 12:19:42 PM > Subject: Re: [RFC][Icedtea-Web]: PR727 Fix deleting of incorrect file when cleaning cache. > On 05/27/2011 11:59 AM, Andrew Su wrote: > >> > >> Hm... why does one entry appear multiple times? Shouldn't we be > >> addressing that instead? > > > > This is very odd, since it shouldn't... but when I run javaws as > > follows, this doesn't happen. > > > > javaws -Xnofork http://www.sweethome3d.com/SweetHome3D.jnlp > > > > That's interesting. javaws exec()'s itself if it realizes it needs to > run in another JVM (because of different VM arguments). This happens > after the JNLP file is parsed (and added to the cache), but before > (AFAIK) the application jars are downloaded. Hmm I see. Thanks for the info, hope it'll help. :) > > > Is it ok for commit to head + 1.1 now? > > > > Yeah, the fix looks fine. Okay for both. Thanks, I've pushed the change and added the link to rev on the report. > > I would appreciate it however, if you could look more into the problem > to find out why it's happening in the first place. If there is a > deeper > problem, perhaps we should address that too. Sure thing. Cheers, Andrew From omajid at icedtea.classpath.org Fri May 27 09:53:27 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Fri, 27 May 2011 16:53:27 +0000 Subject: /hg/release/icedtea-web-1.1: PR724: Possible NullPointerExceptio... Message-ID: changeset a962e87c78e8 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=a962e87c78e8 author: Omair Majid date: Fri May 27 12:53:15 2011 -0400 PR724: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest 2011-05-27 Omair Majid * NEWS: Update. * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (getClassPathsFromManifest): Check for possible nulls and empty strings. diffstat: ChangeLog | 6 ++++++ NEWS | 1 + netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 3 +++ 3 files changed, 10 insertions(+), 0 deletions(-) diffs (37 lines): diff -r aea73e8365fe -r a962e87c78e8 ChangeLog --- a/ChangeLog Fri May 27 12:32:52 2011 -0400 +++ b/ChangeLog Fri May 27 12:53:15 2011 -0400 @@ -1,3 +1,9 @@ +2011-05-27 Omair Majid + + * NEWS: Update. + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (getClassPathsFromManifest): Check for possible nulls and empty strings. + 2011-05-26 Andrew Su * NEWS: Update. diff -r aea73e8365fe -r a962e87c78e8 NEWS --- a/NEWS Fri May 27 12:32:52 2011 -0400 +++ b/NEWS Fri May 27 12:53:15 2011 -0400 @@ -21,6 +21,7 @@ - PR497: Mercurial revision detection not very reliable - PR638: JNLPClassLoader.loadClass(String name) can return null - RH677772: NoSuchAlgorithmException using SSL/TLS in javaws + - PR724: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest * NetX - Use Firefox's proxy settings if possible - The user's default browser (determined from xdg-open or $BROWSER) is used diff -r aea73e8365fe -r a962e87c78e8 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri May 27 12:32:52 2011 -0400 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri May 27 12:53:15 2011 -0400 @@ -1375,6 +1375,9 @@ if (mf != null) { // extract the Class-Path entries from the manifest and split them String classpath = mf.getMainAttributes().getValue("Class-Path"); + if (classpath == null || classpath.trim().length() == 0) { + return result; + } String[] paths = classpath.split(" +"); for (String path : paths) { if (path.trim().length() == 0) { From omajid at redhat.com Fri May 27 09:58:34 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 27 May 2011 12:58:34 -0400 Subject: [icedtea-web] RFC: PR724: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest In-Reply-To: <20110527153007.GC19676@redhat.com> References: <4DDFC288.5070300@redhat.com> <20110527153007.GC19676@redhat.com> Message-ID: <4DDFD83A.70402@redhat.com> On 05/27/2011 11:30 AM, Deepak Bhole wrote: > * Omair Majid [2011-05-27 11:26]: >> Hi, >> >> The attached patch fixes PR724. It just adds more checking to handle >> nulls gracefully. Okay to commit? >> >> ChangeLog: >> 2011-05-27 Omair Majid >> >> * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java >> (getClasspathsFromManifest): Handle nulls or empty strings properly. >> >> Cheers, >> Omair > > Patch looks good to me. Okay for HEAD and branches (1.0 and 1.1). > Thanks for the review. I have pushed it to HEAD and 1.1. 1.0 does not contain the getClasspathsFromManifest method (and thus suffers from the bug fixed by changeset 6abf7a788f4e [1]), so this patch is not required there. Cheers, Omair [1] http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6abf7a788f4e From bugzilla-daemon at icedtea.classpath.org Fri May 27 09:59:52 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 16:59:52 +0000 Subject: [Bug 724] Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=724 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #1 from Omair Majid 2011-05-27 16:59:52 --- Fixed in HEAD and 1.1: http://icedtea.classpath.org/hg/icedtea-web/rev/cce92a1211ae http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/a962e87c78e8 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri May 27 09:59:53 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 16:59:53 +0000 Subject: [Bug 731] [TRACKER] IcedTea-Web 1.1 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=731 Bug 731 depends on bug 724, which changed state. Bug 724 Summary: Possible NullPointerException in JNLPClassLoader.getClassPathsFromManifest http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=724 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri May 27 13:21:28 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 20:21:28 +0000 Subject: [Bug 722] javaws fails to run signed application if unsigned files are present under META-INF/ In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=722 --- Comment #2 from Omair Majid 2011-05-27 20:21:27 --- This fedora bug is also a result of us checking META-INF/INDEX.LIST for being signed: https://bugzilla.redhat.com/show_bug.cgi?id=675271 This was posted as another patch: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-February/012038.html -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at redhat.com Fri May 27 13:52:06 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 May 2011 16:52:06 -0400 Subject: [icedtea-web] RFC: Patch to fix bug #723 (permission error with some jnlp apps) Message-ID: <20110527205206.GA10929@redhat.com> Hi, Attached patch fixes error seen with the app at: http://download.oracle.com/javase/tutorial/ui/overview/demo.html Bug: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=723 ChangeLog: 2011-05-27 Deepak Bhole * netx/net/sourceforge/jnlp/cache/ResourceTracker.java (Downloader): Make class private. (Downloader::run): Call processResource via doPrivileged since resources may get added at run time from application code via JNLPClassLoader::addNewJar(). Okay for HEAD and 1.1? Cheers, Deepak -------------- next part -------------- diff -r a92a625ced46 netx/net/sourceforge/jnlp/cache/ResourceTracker.java --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Wed May 25 15:12:18 2011 -0400 +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 27 16:51:38 2011 -0400 @@ -28,6 +28,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; @@ -1078,7 +1080,7 @@ /** * This class downloads and initializes the queued resources. */ - class Downloader implements Runnable { + private class Downloader implements Runnable { Resource resource = null; public void run() { @@ -1100,7 +1102,19 @@ } try { - processResource(resource); + + // Resource processing involves writing to files + // (cache entry trackers, the files themselves, etc.) + // and it therefore needs to be privileged + + final Resource fResource = resource; + AccessController.doPrivileged(new PrivilegedAction() { + public Void run() { + processResource(fResource); + return null; + } + }); + } catch (Exception ex) { if (JNLPRuntime.isDebug()) ex.printStackTrace(); From omajid at redhat.com Fri May 27 14:15:29 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 27 May 2011 17:15:29 -0400 Subject: [icedtea-web] RFC: Patch to fix bug #723 (permission error with some jnlp apps) In-Reply-To: <20110527205206.GA10929@redhat.com> References: <20110527205206.GA10929@redhat.com> Message-ID: <4DE01471.6030502@redhat.com> On 05/27/2011 04:52 PM, Deepak Bhole wrote: > Hi, > > Attached patch fixes error seen with the app at: > http://download.oracle.com/javase/tutorial/ui/overview/demo.html > > Bug: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=723 > > ChangeLog: > 2011-05-27 Deepak Bhole > > * netx/net/sourceforge/jnlp/cache/ResourceTracker.java > (Downloader): Make class private. > (Downloader::run): Call processResource via doPrivileged since resources > may get added at run time from application code via > JNLPClassLoader::addNewJar(). > > Okay for HEAD and 1.1? > Looks good to me. Okay for both. Cheers, Omair From omajid at redhat.com Fri May 27 14:57:14 2011 From: omajid at redhat.com (Omair Majid) Date: Fri, 27 May 2011 17:57:14 -0400 Subject: [icedtea-web] RFC: PR725 Message-ID: <4DE01E3A.8060708@redhat.com> Hi, The attached patch fixes PR725. The original bug was that a user would be prompted every time when starting a JNLP application for creating a desktop entry. This patch fixes it. With this patch, the user is only prompted for creating a desktop entry the first time a jnlp application is run. Since we use desktop-file-install to install desktop entry files (which allows us to deal with a number of cases including renaming the ~/Desktop dir), we can not get a list of all desktop entry files currently present. The patch takes an alternative approach and maintains a list of all applications it has seen already; the user is only prompted to install a desktop entry for those applications that the user is running for the first time. I would like to add this to HEAD for now. Any thoughts or comments? ChangeLog: 2011-05-27 Omair Majid * netx/net/sourceforge/jnlp/config/Defaults.java: Add defaults for KEY_USER_DESKTOP_STORAGE_FILE. * netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java: Add KEY_USER_DESKTOP_STORAGE_FILE * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java (addMenuAndDesktopEntries): Only make a decision about creating the desktop file the first time a jnlp application is run. * netx/net/sourceforge/jnlp/util/DesktopEntryStorage.java: New file. * netx/net/sourceforge/jnlp/util/XDesktopEntry.java (hashCode): New method. (cacheIcon): Add effect of method to javadoc. Thanks, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea-web-do-not-prompt-repeatedly-for-creating-desktop-entries.patch Type: text/x-patch Size: 9920 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110527/2e381a9f/icedtea-web-do-not-prompt-repeatedly-for-creating-desktop-entries.patch From bugzilla-daemon at icedtea.classpath.org Fri May 27 14:58:29 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 21:58:29 +0000 Subject: [Bug 735] New: Firefox 4 sometimes freezes if the applet calls showDocument() Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=735 Summary: Firefox 4 sometimes freezes if the applet calls showDocument() Product: IcedTea-Web Version: unspecified Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: dbhole at redhat.com CC: unassigned at icedtea.classpath.org The plugin currently implements showDocument() via NPN_GetURL. In FF4, NPN_GetURL can make recursive callbacks to Java side to get the applet java object. This causes the browser to hang. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri May 27 14:58:50 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 21:58:50 +0000 Subject: [Bug 731] [TRACKER] IcedTea-Web 1.1 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=731 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Depends on| |735 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri May 27 14:58:50 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 21:58:50 +0000 Subject: [Bug 735] Firefox 4 sometimes freezes if the applet calls showDocument() In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=735 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |731 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From dbhole at icedtea.classpath.org Fri May 27 15:09:44 2011 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Fri, 27 May 2011 22:09:44 +0000 Subject: /hg/icedtea-web: 4 new changesets Message-ID: changeset 9cf54e1ace44 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9cf54e1ace44 author: Deepak Bhole date: Fri May 27 17:03:25 2011 -0400 Backed out 0256de6a4bf6 as it is prone to race conditions. changeset c73d453f811b in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c73d453f811b author: Deepak Bhole date: Fri May 27 17:27:55 2011 -0400 Call dispose() from swing thread when applet is closed. Do not stop applet threadgroup on exit. changeset 1d10dbc851d7 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=1d10dbc851d7 author: Deepak Bhole date: Fri May 27 18:00:02 2011 -0400 PR735: Firefox 4 sometimes freezes if the applet calls showDocument() changeset 7f0a8910a2a8 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7f0a8910a2a8 author: Deepak Bhole date: Fri May 27 18:01:27 2011 -0400 Fix PR723: AccessControlException while downloading resource diffstat: ChangeLog | 36 +++++++ NEWS | 1 + netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 18 +++- plugin/icedteanp/IcedTeaNPPlugin.cc | 21 +---- plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 74 +++++++++++++++- plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 4 + plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 20 +-- 7 files changed, 138 insertions(+), 36 deletions(-) diffs (308 lines): diff -r cce92a1211ae -r 7f0a8910a2a8 ChangeLog --- a/ChangeLog Fri May 27 12:45:05 2011 -0400 +++ b/ChangeLog Fri May 27 18:01:27 2011 -0400 @@ -1,3 +1,39 @@ +2011-05-27 Deepak Bhole + + PR723: AccessControlException while downloading resource + * netx/net/sourceforge/jnlp/cache/ResourceTracker.java + (Downloader): Make class private. + (Downloader::run): Call processResource via doPrivileged since + resources may get added at run time from application code via + JNLPClassLoader::addNewJar(). + +2011-05-27 Deepak Bhole + + PR735: Firefox 4 sometimes freezes if the applet calls showDocument() + * plugin/icedteanp/IcedTeaNPPlugin.cc (consume_message): Defer handling to + url load request to the queue processor. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc + (PluginRequestProcessor::newMessageOnBus): Handle new LoadURL command. + (PluginRequestProcessor::loadURL): New method. Loads the specified url in + the given target. + (queue_processor): Process the LoadURL command. + (_loadURL): New async callback function to handle LoadURL commands. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Add _loadURL and + loadURL method declerations. + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (showDocument): + Send the url load command in the standard "instance X reference Y + " format. + +2011-05-27 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (appletClose): Call dispose from the swing thread. Also, don't try to stop + the threadgroup. + +2011-05-27 Deepak Bhole + + * Backed out 0256de6a4bf6 + 2011-05-27 Omair Majid * NEWS: Update. diff -r cce92a1211ae -r 7f0a8910a2a8 NEWS --- a/NEWS Fri May 27 12:45:05 2011 -0400 +++ b/NEWS Fri May 27 18:01:27 2011 -0400 @@ -33,6 +33,7 @@ - PR475, RH604061: Allow applets from the same page to use the same classloader - PR612: NetDania application ends on java.security.AccessControlException: access denied (java.util.PropertyPermission browser read) - PR664: Sound doesn't play on runescape.com. + - PR735: Firefox 4 sometimes freezes if the applet calls showDocument() New in release 1.0 (2010-XX-XX): diff -r cce92a1211ae -r 7f0a8910a2a8 netx/net/sourceforge/jnlp/cache/ResourceTracker.java --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 27 12:45:05 2011 -0400 +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 27 18:01:27 2011 -0400 @@ -28,6 +28,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; @@ -1078,7 +1080,7 @@ /** * This class downloads and initializes the queued resources. */ - class Downloader implements Runnable { + private class Downloader implements Runnable { Resource resource = null; public void run() { @@ -1100,7 +1102,19 @@ } try { - processResource(resource); + + // Resource processing involves writing to files + // (cache entry trackers, the files themselves, etc.) + // and it therefore needs to be privileged + + final Resource fResource = resource; + AccessController.doPrivileged(new PrivilegedAction() { + public Void run() { + processResource(fResource); + return null; + } + }); + } catch (Exception ex) { if (JNLPRuntime.isDebug()) ex.printStackTrace(); diff -r cce92a1211ae -r 7f0a8910a2a8 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 27 12:45:05 2011 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 27 18:01:27 2011 -0400 @@ -1169,26 +1169,7 @@ data = (ITNPPluginData*) instance->pdata; } - if (g_str_has_prefix (parts[2], "url")) - { - // Open the URL in a new browser window. - gchar* decoded_url = (gchar*) calloc(strlen(parts[3]) + 1, sizeof(gchar)); - IcedTeaPluginUtilities::decodeURL(parts[3], &decoded_url); - - PLUGIN_DEBUG ("plugin_in_pipe_callback: opening URL %s\n", decoded_url); - PLUGIN_DEBUG ("plugin_in_pipe_callback: URL target %s\n", parts[4]); - - NPError np_error = - (*browser_functions.geturlnotify) (data->owner, decoded_url, parts[4], NULL); - - - if (np_error != NPERR_NO_ERROR) - PLUGIN_ERROR ("Failed to load URL."); - - g_free(decoded_url); - decoded_url = NULL; - } - else if (g_str_has_prefix (parts[2], "status")) + if (g_str_has_prefix (parts[2], "status")) { // clear the "instance X status" parts diff -r cce92a1211ae -r 7f0a8910a2a8 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri May 27 12:45:05 2011 -0400 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri May 27 18:01:27 2011 -0400 @@ -130,11 +130,12 @@ !command->find("GetSlot") || !command->find("SetSlot") || !command->find("Eval") || - !command->find("Finalize")) + !command->find("Finalize") || + !command->find("LoadURL")) { // Update queue synchronously - pthread_mutex_lock(&message_queue_mutex); + pthread_mutex_lock(&message_queue_mutex); message_queue->push_back(message_parts); pthread_mutex_unlock(&message_queue_mutex); @@ -714,6 +715,38 @@ plugin_to_java_bus->post(response.c_str()); } +/** + * Fetches the URL and loads it into the given target + * + * @param message_parts The request message. + */ +void +PluginRequestProcessor::loadURL(std::vector* message_parts) +{ + + int id = atoi(message_parts->at(1)->c_str()); + + AsyncCallThreadData thread_data = AsyncCallThreadData(); + thread_data.result_ready = false; + thread_data.parameters = std::vector(); + thread_data.result = std::string(); + + NPP instance; + get_instance_from_id(id, instance); + + // If instance is invalid, do not proceed further + if (!instance) + return; + + thread_data.parameters.push_back(instance); + thread_data.parameters.push_back(message_parts->at(5)); // push url + thread_data.parameters.push_back(message_parts->at(6)); // push target + + thread_data.result_ready = false; + browser_functions.pluginthreadasynccall(instance, &_loadURL, &thread_data); + while (!thread_data.result_ready) usleep(2000); // wait till ready +} + static void queue_cleanup(void* data) { @@ -794,6 +827,12 @@ pthread_mutex_lock(&syn_write_mutex); processor->finalize(message_parts); pthread_mutex_unlock(&syn_write_mutex); + } else if (command == "LoadURL") // For instance X url + { + // write methods are synchronized + pthread_mutex_lock(&syn_write_mutex); + processor->loadURL(message_parts); + pthread_mutex_unlock(&syn_write_mutex); } else { // Nothing matched @@ -1014,3 +1053,34 @@ PLUGIN_DEBUG("_getString returning\n"); } +void +_loadURL(void* data) { + + PLUGIN_DEBUG("_loadURL called\n"); + + NPP instance; + std::string* url; + std::string* target; + + std::vector parameters = ((AsyncCallThreadData*) data)->parameters; + + instance = (NPP) parameters.at(0); + url = (std::string*) parameters.at(1); + target = (std::string*) parameters.at(2); + + PLUGIN_DEBUG("Launching %s in %s\n", url->c_str(), target->c_str()); + + // Each decode can expand to 4 chars at the most + gchar* decoded_url = (gchar*) calloc(strlen(url->c_str())*4 + 1, sizeof(gchar)); + IcedTeaPluginUtilities::decodeURL(url->c_str(), &decoded_url); + + ((AsyncCallThreadData*) data)->call_successful = + (*browser_functions.geturl) (instance, decoded_url, target->c_str()); + + ((AsyncCallThreadData*) data)->result_ready = true; + + g_free(decoded_url); + decoded_url = NULL; + + PLUGIN_DEBUG("_loadURL returning %d\n", ((AsyncCallThreadData*) data)->call_successful); +} diff -r cce92a1211ae -r 7f0a8910a2a8 plugin/icedteanp/IcedTeaPluginRequestProcessor.h --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Fri May 27 12:45:05 2011 -0400 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Fri May 27 18:01:27 2011 -0400 @@ -83,6 +83,7 @@ void _call(void* data); void _eval(void* data); void _getString(void* data); +void _loadURL(void* data); void* queue_processor(void* data); @@ -138,6 +139,9 @@ /* Decrements reference count for given object */ void finalize(std::vector* message_parts); + + /* Loads a URL into the specified target */ + void loadURL(std::vector* message_parts); }; #endif // __ICEDTEAPLUGINREQUESTPROCESSOR_H__ diff -r cce92a1211ae -r 7f0a8910a2a8 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 27 12:45:05 2011 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 27 18:01:27 2011 -0400 @@ -928,8 +928,8 @@ */ public void showDocument(URL url, String target) { try { - // FIXME: change to postCallRequest - write("url " + UrlUtil.encode(url.toString(), "UTF-8") + " " + target); + Long reference = getRequestIdentifier(); + write("reference " + reference + " LoadURL " + UrlUtil.encode(url.toString(), "UTF-8") + " " + target); } catch (IOException exception) { // Deliberately ignore IOException. showDocument may be // called from threads other than the main thread after @@ -1621,13 +1621,10 @@ if (cl instanceof JNLPClassLoader.CodeBaseClassLoader) cl = ((JNLPClassLoader.CodeBaseClassLoader) cl).getParentJNLPClassLoader(); + ThreadGroup tg = ((JNLPClassLoader) cl).getApplication().getThreadGroup(); + appletShutdown(p); appletPanels.removeElement(p); - - /* TODO: Applets don't always shut down nicely. We - * need to find a proper way to forcibly closing all threads - * an applet starts during its lifetime - */ try { SwingUtilities.invokeAndWait(new Runnable() { @@ -1638,9 +1635,6 @@ } catch (Exception e) { // ignore, we are just disposing it } - // If there are no more applets running, exit the VM - // TODO: There is a possible race condition here as count - // can be 0 when an applet is in the initialization phase if (countApplets() == 0) { appletSystemExit(); } @@ -1651,10 +1645,12 @@ } /** - * This function should be called to halt the VM when all applets are destroyed. + * Exit the program. + * Exit from the program (if not stand alone) - do no clean-up */ private void appletSystemExit() { - System.exit(0); + // Do nothing. Exit is handled by another + // block of code, called when _all_ applets are gone } /** From dbhole at icedtea.classpath.org Fri May 27 15:09:59 2011 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Fri, 27 May 2011 22:09:59 +0000 Subject: /hg/release/icedtea-web-1.1: 4 new changesets Message-ID: changeset df4d263c8015 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=df4d263c8015 author: Deepak Bhole date: Fri May 27 17:03:25 2011 -0400 Backed out 0256de6a4bf6 as it is prone to race conditions. changeset a28b81cac144 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=a28b81cac144 author: Deepak Bhole date: Fri May 27 17:27:55 2011 -0400 Call dispose() from swing thread when applet is closed. Do not stop applet threadgroup on exit. changeset d9d787e8ce3e in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=d9d787e8ce3e author: Deepak Bhole date: Fri May 27 18:00:02 2011 -0400 PR735: Firefox 4 sometimes freezes if the applet calls showDocument() changeset 015b544f05d8 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=015b544f05d8 author: Deepak Bhole date: Fri May 27 18:01:27 2011 -0400 Fix PR723: AccessControlException while downloading resource diffstat: ChangeLog | 36 +++++++ NEWS | 1 + netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 18 +++- plugin/icedteanp/IcedTeaNPPlugin.cc | 21 +---- plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 74 +++++++++++++++- plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 4 + plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 20 +-- 7 files changed, 138 insertions(+), 36 deletions(-) diffs (308 lines): diff -r a962e87c78e8 -r 015b544f05d8 ChangeLog --- a/ChangeLog Fri May 27 12:53:15 2011 -0400 +++ b/ChangeLog Fri May 27 18:01:27 2011 -0400 @@ -1,3 +1,39 @@ +2011-05-27 Deepak Bhole + + PR723: AccessControlException while downloading resource + * netx/net/sourceforge/jnlp/cache/ResourceTracker.java + (Downloader): Make class private. + (Downloader::run): Call processResource via doPrivileged since + resources may get added at run time from application code via + JNLPClassLoader::addNewJar(). + +2011-05-27 Deepak Bhole + + PR735: Firefox 4 sometimes freezes if the applet calls showDocument() + * plugin/icedteanp/IcedTeaNPPlugin.cc (consume_message): Defer handling to + url load request to the queue processor. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc + (PluginRequestProcessor::newMessageOnBus): Handle new LoadURL command. + (PluginRequestProcessor::loadURL): New method. Loads the specified url in + the given target. + (queue_processor): Process the LoadURL command. + (_loadURL): New async callback function to handle LoadURL commands. + * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Add _loadURL and + loadURL method declerations. + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (showDocument): + Send the url load command in the standard "instance X reference Y + " format. + +2011-05-27 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (appletClose): Call dispose from the swing thread. Also, don't try to stop + the threadgroup. + +2011-05-27 Deepak Bhole + + * Backed out 0256de6a4bf6 + 2011-05-27 Omair Majid * NEWS: Update. diff -r a962e87c78e8 -r 015b544f05d8 NEWS --- a/NEWS Fri May 27 12:53:15 2011 -0400 +++ b/NEWS Fri May 27 18:01:27 2011 -0400 @@ -33,6 +33,7 @@ - PR475, RH604061: Allow applets from the same page to use the same classloader - PR612: NetDania application ends on java.security.AccessControlException: access denied (java.util.PropertyPermission browser read) - PR664: Sound doesn't play on runescape.com. + - PR735: Firefox 4 sometimes freezes if the applet calls showDocument() New in release 1.0 (2010-XX-XX): diff -r a962e87c78e8 -r 015b544f05d8 netx/net/sourceforge/jnlp/cache/ResourceTracker.java --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 27 12:53:15 2011 -0400 +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Fri May 27 18:01:27 2011 -0400 @@ -28,6 +28,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; @@ -1078,7 +1080,7 @@ /** * This class downloads and initializes the queued resources. */ - class Downloader implements Runnable { + private class Downloader implements Runnable { Resource resource = null; public void run() { @@ -1100,7 +1102,19 @@ } try { - processResource(resource); + + // Resource processing involves writing to files + // (cache entry trackers, the files themselves, etc.) + // and it therefore needs to be privileged + + final Resource fResource = resource; + AccessController.doPrivileged(new PrivilegedAction() { + public Void run() { + processResource(fResource); + return null; + } + }); + } catch (Exception ex) { if (JNLPRuntime.isDebug()) ex.printStackTrace(); diff -r a962e87c78e8 -r 015b544f05d8 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 27 12:53:15 2011 -0400 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri May 27 18:01:27 2011 -0400 @@ -1169,26 +1169,7 @@ data = (ITNPPluginData*) instance->pdata; } - if (g_str_has_prefix (parts[2], "url")) - { - // Open the URL in a new browser window. - gchar* decoded_url = (gchar*) calloc(strlen(parts[3]) + 1, sizeof(gchar)); - IcedTeaPluginUtilities::decodeURL(parts[3], &decoded_url); - - PLUGIN_DEBUG ("plugin_in_pipe_callback: opening URL %s\n", decoded_url); - PLUGIN_DEBUG ("plugin_in_pipe_callback: URL target %s\n", parts[4]); - - NPError np_error = - (*browser_functions.geturlnotify) (data->owner, decoded_url, parts[4], NULL); - - - if (np_error != NPERR_NO_ERROR) - PLUGIN_ERROR ("Failed to load URL."); - - g_free(decoded_url); - decoded_url = NULL; - } - else if (g_str_has_prefix (parts[2], "status")) + if (g_str_has_prefix (parts[2], "status")) { // clear the "instance X status" parts diff -r a962e87c78e8 -r 015b544f05d8 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri May 27 12:53:15 2011 -0400 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri May 27 18:01:27 2011 -0400 @@ -130,11 +130,12 @@ !command->find("GetSlot") || !command->find("SetSlot") || !command->find("Eval") || - !command->find("Finalize")) + !command->find("Finalize") || + !command->find("LoadURL")) { // Update queue synchronously - pthread_mutex_lock(&message_queue_mutex); + pthread_mutex_lock(&message_queue_mutex); message_queue->push_back(message_parts); pthread_mutex_unlock(&message_queue_mutex); @@ -714,6 +715,38 @@ plugin_to_java_bus->post(response.c_str()); } +/** + * Fetches the URL and loads it into the given target + * + * @param message_parts The request message. + */ +void +PluginRequestProcessor::loadURL(std::vector* message_parts) +{ + + int id = atoi(message_parts->at(1)->c_str()); + + AsyncCallThreadData thread_data = AsyncCallThreadData(); + thread_data.result_ready = false; + thread_data.parameters = std::vector(); + thread_data.result = std::string(); + + NPP instance; + get_instance_from_id(id, instance); + + // If instance is invalid, do not proceed further + if (!instance) + return; + + thread_data.parameters.push_back(instance); + thread_data.parameters.push_back(message_parts->at(5)); // push url + thread_data.parameters.push_back(message_parts->at(6)); // push target + + thread_data.result_ready = false; + browser_functions.pluginthreadasynccall(instance, &_loadURL, &thread_data); + while (!thread_data.result_ready) usleep(2000); // wait till ready +} + static void queue_cleanup(void* data) { @@ -794,6 +827,12 @@ pthread_mutex_lock(&syn_write_mutex); processor->finalize(message_parts); pthread_mutex_unlock(&syn_write_mutex); + } else if (command == "LoadURL") // For instance X url + { + // write methods are synchronized + pthread_mutex_lock(&syn_write_mutex); + processor->loadURL(message_parts); + pthread_mutex_unlock(&syn_write_mutex); } else { // Nothing matched @@ -1014,3 +1053,34 @@ PLUGIN_DEBUG("_getString returning\n"); } +void +_loadURL(void* data) { + + PLUGIN_DEBUG("_loadURL called\n"); + + NPP instance; + std::string* url; + std::string* target; + + std::vector parameters = ((AsyncCallThreadData*) data)->parameters; + + instance = (NPP) parameters.at(0); + url = (std::string*) parameters.at(1); + target = (std::string*) parameters.at(2); + + PLUGIN_DEBUG("Launching %s in %s\n", url->c_str(), target->c_str()); + + // Each decode can expand to 4 chars at the most + gchar* decoded_url = (gchar*) calloc(strlen(url->c_str())*4 + 1, sizeof(gchar)); + IcedTeaPluginUtilities::decodeURL(url->c_str(), &decoded_url); + + ((AsyncCallThreadData*) data)->call_successful = + (*browser_functions.geturl) (instance, decoded_url, target->c_str()); + + ((AsyncCallThreadData*) data)->result_ready = true; + + g_free(decoded_url); + decoded_url = NULL; + + PLUGIN_DEBUG("_loadURL returning %d\n", ((AsyncCallThreadData*) data)->call_successful); +} diff -r a962e87c78e8 -r 015b544f05d8 plugin/icedteanp/IcedTeaPluginRequestProcessor.h --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Fri May 27 12:53:15 2011 -0400 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Fri May 27 18:01:27 2011 -0400 @@ -83,6 +83,7 @@ void _call(void* data); void _eval(void* data); void _getString(void* data); +void _loadURL(void* data); void* queue_processor(void* data); @@ -138,6 +139,9 @@ /* Decrements reference count for given object */ void finalize(std::vector* message_parts); + + /* Loads a URL into the specified target */ + void loadURL(std::vector* message_parts); }; #endif // __ICEDTEAPLUGINREQUESTPROCESSOR_H__ diff -r a962e87c78e8 -r 015b544f05d8 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 27 12:53:15 2011 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri May 27 18:01:27 2011 -0400 @@ -912,8 +912,8 @@ */ public void showDocument(URL url, String target) { try { - // FIXME: change to postCallRequest - write("url " + UrlUtil.encode(url.toString(), "UTF-8") + " " + target); + Long reference = getRequestIdentifier(); + write("reference " + reference + " LoadURL " + UrlUtil.encode(url.toString(), "UTF-8") + " " + target); } catch (IOException exception) { // Deliberately ignore IOException. showDocument may be // called from threads other than the main thread after @@ -1605,13 +1605,10 @@ if (cl instanceof JNLPClassLoader.CodeBaseClassLoader) cl = ((JNLPClassLoader.CodeBaseClassLoader) cl).getParentJNLPClassLoader(); + ThreadGroup tg = ((JNLPClassLoader) cl).getApplication().getThreadGroup(); + appletShutdown(p); appletPanels.removeElement(p); - - /* TODO: Applets don't always shut down nicely. We - * need to find a proper way to forcibly closing all threads - * an applet starts during its lifetime - */ try { SwingUtilities.invokeAndWait(new Runnable() { @@ -1622,9 +1619,6 @@ } catch (Exception e) { // ignore, we are just disposing it } - // If there are no more applets running, exit the VM - // TODO: There is a possible race condition here as count - // can be 0 when an applet is in the initialization phase if (countApplets() == 0) { appletSystemExit(); } @@ -1635,10 +1629,12 @@ } /** - * This function should be called to halt the VM when all applets are destroyed. + * Exit the program. + * Exit from the program (if not stand alone) - do no clean-up */ private void appletSystemExit() { - System.exit(0); + // Do nothing. Exit is handled by another + // block of code, called when _all_ applets are gone } /** From bugzilla-daemon at icedtea.classpath.org Fri May 27 15:13:12 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 22:13:12 +0000 Subject: [Bug 735] Firefox 4 sometimes freezes if the applet calls showDocument() In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=735 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #1 from Deepak Bhole 2011-05-27 22:13:12 --- Fixed in repo: http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/d9d787e8ce3e -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri May 27 15:13:12 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 22:13:12 +0000 Subject: [Bug 731] [TRACKER] IcedTea-Web 1.1 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=731 Bug 731 depends on bug 735, which changed state. Bug 735 Summary: Firefox 4 sometimes freezes if the applet calls showDocument() http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=735 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Fri May 27 15:13:50 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 22:13:50 +0000 Subject: [Bug 723] AccessControlException while downloading resource In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=723 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Status|NEW |RESOLVED Resolution| |FIXED --- Comment #2 from Deepak Bhole 2011-05-27 22:13:49 --- Fixed in repo: http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/015b544f05d8 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Fri May 27 15:13:50 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 22:13:50 +0000 Subject: [Bug 731] [TRACKER] IcedTea-Web 1.1 Release In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=731 Bug 731 depends on bug 723, which changed state. Bug 723 Summary: AccessControlException while downloading resource http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=723 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From dbhole at redhat.com Fri May 27 15:14:28 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 May 2011 18:14:28 -0400 Subject: [icedtea-web] RFC: Patch to fix bug #723 (permission error with some jnlp apps) In-Reply-To: <4DE01471.6030502@redhat.com> References: <20110527205206.GA10929@redhat.com> <4DE01471.6030502@redhat.com> Message-ID: <20110527221428.GA14402@redhat.com> * Omair Majid [2011-05-27 17:15]: > On 05/27/2011 04:52 PM, Deepak Bhole wrote: > >Hi, > > > >Attached patch fixes error seen with the app at: > >http://download.oracle.com/javase/tutorial/ui/overview/demo.html > > > >Bug: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=723 > > > >ChangeLog: > >2011-05-27 Deepak Bhole > > > > * netx/net/sourceforge/jnlp/cache/ResourceTracker.java > > (Downloader): Make class private. > > (Downloader::run): Call processResource via doPrivileged since resources > > may get added at run time from application code via > > JNLPClassLoader::addNewJar(). > > > >Okay for HEAD and 1.1? > > > > Looks good to me. Okay for both. > Thanks! Pushed. Cheers, Deepak > Cheers, > Omair From dbhole at redhat.com Fri May 27 15:14:38 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 May 2011 18:14:38 -0400 Subject: [icedtea-web] RFC: Patch to allow recursive calls from NPN_GetURL In-Reply-To: <4DDFC915.3070904@redhat.com> References: <20110512204748.GA12268@redhat.com> <4DDFC915.3070904@redhat.com> Message-ID: <20110527221438.GB14402@redhat.com> * Omair Majid [2011-05-27 11:53]: > On 05/12/2011 04:47 PM, Deepak Bhole wrote: > >Hi, > > > >This patch addresses the issue brought up here: > >http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-April/013706.html > > > >Current plugin code does not expect NPN_getURL to make recursive calls > >back to Java. Firefox 4 does just that, causing the browser to hang. > > > >Attached patch wires url load calls to be handled through the standard > >Java -> JS call code, which can handle recursive calls. > > > >The scope of this patch is contained, and I think it should go into 1.1 > >as well. > > > >Thoughts? > > > > Looks good to me. Okay for HEAD and 1.1. > Thanks! Pushed. Cheers, Deepak > Cheers, > Omair From dbhole at redhat.com Fri May 27 15:24:26 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 May 2011 18:24:26 -0400 Subject: IcedTea-Web 1.1 release status In-Reply-To: <20110516184215.GI29490@redhat.com> References: <20110506215601.GC2485@redhat.com> <20110516184215.GI29490@redhat.com> Message-ID: <20110527222426.GC14402@redhat.com> * Deepak Bhole [2011-05-16 14:43]: > * Deepak Bhole [2011-05-06 18:05]: > > Hi, > > > > Over the past few days I have found some rather important issues in the > > plugin that I feel need to be fixed. Due to me being at the Red Hat > > Summit over most of this week I've only now been able to start looking > > into them. > > > > I think it would be best to push the release to some time next week. I > > will send another update on Monday/Tuesday on the status of the fixes. > > > > The issues that need addressing are: > > - NPN_getURL attempts recursive action and hangs (FF4 only) > > - FF randomly crashes due to calls from incorrect (non-main) threads to > > NP* functions ... the cause was unknown to me until early this week.. > > only now found a better reproducer > > > > I'd rather see us release a good product slightly late than a bad one > > early :) > > > > Hi, > > Despite my best efforts, I have been unable to work on 1.1 release due > to other more time sensitive items on my plate :( > > We found some regressions in 1.1 recently and I am going on vacation > until the 25th. Rather than hastily release 1.1 only to be followed by > 1.1.1, I think it would be best to wait till after I am back. > > Omair and others will be working on regressions fixes in the mean time. > Assuming everything is cleared, we will aim for a release on the 27th. > > Once again, I do apologize that 1.1 has been delayed this way -- it > was not for lack of trying :/ > ALMOST there :) All pending fixes are now in. We will do a quick test of all the items on Monday and if nothing else is found, I will tag and release IcedTea-Web 1.1 on Monday. Cheers, Deepak > Cheers, > Deepak From bugzilla-daemon at icedtea.classpath.org Fri May 27 15:59:31 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 May 2011 22:59:31 +0000 Subject: [Bug 411] Applet cannot load j2pkcs11 library In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=411 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WORKSFORME --- Comment #4 from Omair Majid 2011-05-27 22:59:30 --- (In reply to comment #3) > The demos at https://www.e-contract.be/eid-applet-beta/ work for me using > IcedTea-Web HEAD. > Closing as WORKSFORME since I cant reproduce this. Feel free to reopen if you are still running into this bug. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From doko at icedtea.classpath.org Sat May 28 03:33:11 2011 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Sat, 28 May 2011 10:33:11 +0000 Subject: /hg/icedtea: PR 704, fix build --with-additional-vms=zero Message-ID: changeset 1684b3450ecf in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1684b3450ecf author: doko at ubuntu.com date: Sat May 28 12:31:06 2011 +0200 PR 704, fix build --with-additional-vms=zero The add-zero targets were not updated when the rest of the build infrastructure was updated. Fix the target to build hotspot, and do not use the javac from the stage1 default build. 2011-05-28 Matthias Klose PR 704 * Makefile.am (ADD_ZERO_EXTRA_BUILD_ENV): Filter-out distribution specific jamvm patches. (ADD_ZERO_CONFIGURE_ARGS): Filter- out --with-javac. (stamps/add-zero.stamp, stamps/add-zero- debug.stamp): Update build target. diffstat: ChangeLog | 8 ++++++++ Makefile.am | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diffs (53 lines): diff -r ccbd95318206 -r 1684b3450ecf ChangeLog --- a/ChangeLog Fri May 27 17:19:22 2011 +0200 +++ b/ChangeLog Sat May 28 12:31:06 2011 +0200 @@ -1,3 +1,11 @@ +2011-05-28 Matthias Klose + + PR 704 + * Makefile.am (ADD_ZERO_EXTRA_BUILD_ENV): Filter-out distribution + specific jamvm patches. + (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with-javac. + (stamps/add-zero.stamp, stamps/add-zero-debug.stamp): Update build target. + 2011-05-27 Xerxes R??nby * NEWS: Fix previous commits news entry. diff -r ccbd95318206 -r 1684b3450ecf Makefile.am --- a/Makefile.am Fri May 27 17:19:22 2011 +0200 +++ b/Makefile.am Sat May 28 12:31:06 2011 +0200 @@ -2222,6 +2222,7 @@ --disable-docs \ $(filter-out '--with-jdk-home=% '--with-ecj=% \ '--with-java=% '--with-javah=% \ + '--with-javac=% '--with-javac=% \ '--with-rmic=% '--with-additional-vms=% \ '--disable-bootstrap% '--enable-bootstrap% , \ $(CONFIGURE_ARGS)) \ @@ -2234,7 +2235,7 @@ BUILD_JAXWS=false ALT_JAXWS_DIST=$(BUILD_OUTPUT_DIR)/jaxws/dist \ BUILD_CORBA=false ALT_CORBA_DIST=$(BUILD_OUTPUT_DIR)/corba/dist \ BUILD_JDK=false \ - DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))' + DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(if $(findstring jamvm,$(p)),,$(p))))' stamps/add-zero.stamp: stamps/icedtea.stamp mkdir -p stamps @@ -2246,7 +2247,7 @@ $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) $(ADD_ZERO_EXTRA_BUILD_ENV) \ - $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET) + $(ARCH_PREFIX) $(MAKE) -C zerovm ICEDTEA_BUILD_TARGET=hotspot icedtea-stage2 if ZERO_BUILD mkdir -p $(BUILD_JRE_ARCH_DIR)/shark @@ -2287,7 +2288,7 @@ $(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS) $(ADD_ZERO_EXTRA_BUILD_ENV) \ - $(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET) + $(ARCH_PREFIX) $(MAKE) -C zerovm ICEDTEA_DEBUG_BUILD_TARGET=hotspot icedtea-stage2 if ZERO_BUILD mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark From bugzilla-daemon at icedtea.classpath.org Sat May 28 03:35:17 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 28 May 2011 10:35:17 +0000 Subject: [Bug 704] Bootstrap of ZeroVM: zip I/O error: No such file or directory In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=704 Matthias Klose changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |doko at ubuntu.com Status|NEW |RESOLVED Resolution| |FIXED --- Comment #4 from Matthias Klose 2011-05-28 10:35:17 --- fixed on 7-hg -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From doko at icedtea.classpath.org Sat May 28 03:39:24 2011 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Sat, 28 May 2011 10:39:24 +0000 Subject: /hg/icedtea6: Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out ... Message-ID: changeset 0034f5cfd96a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0034f5cfd96a author: doko at ubuntu.com date: Sat May 28 12:37:23 2011 +0200 Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with-javac. duplicate the pattern to keep syntax highlighting happy. 2011-05-28 Matthias Klose * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with- javac. diffstat: ChangeLog | 4 ++++ Makefile.am | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diffs (22 lines): diff -r fc898988b053 -r 0034f5cfd96a ChangeLog --- a/ChangeLog Fri May 27 16:55:49 2011 +0200 +++ b/ChangeLog Sat May 28 12:37:23 2011 +0200 @@ -1,3 +1,7 @@ +2011-05-28 Matthias Klose + + * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with-javac. + 2011-05-27 Xerxes R??nby JamVM diff -r fc898988b053 -r 0034f5cfd96a Makefile.am --- a/Makefile.am Fri May 27 16:55:49 2011 +0200 +++ b/Makefile.am Sat May 28 12:37:23 2011 +0200 @@ -1952,6 +1952,7 @@ --disable-docs \ $(filter-out '--with-jdk-home=% '--with-ecj=% \ '--with-java=% '--with-javah=% \ + '--with-javac=% '--with-javac=% \ '--with-rmic=% '--with-additional-vms=% \ '--with-openjdk '--with-openjdk=% , \ $(CONFIGURE_ARGS)) \ From bugzilla-daemon at icedtea.classpath.org Sun May 29 02:33:09 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 29 May 2011 09:33:09 +0000 Subject: [Bug 608] zero fails to build on icedtea7 trunk 20101210 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=608 --- Comment #2 from Matthias Klose 2011-05-29 09:33:08 --- zero seems to build now on 7-hg on x86_64, powerpc and ARM, it fails on x86 with: g++-4.6 -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DIA32 -DZERO_LIBARCH=\"i386\" -DPRODUCT -I. -I/build/buildd/openjdk-7-7~b136-2.0~pre1/build/zerovm/openjdk/hotspot/src/share/vm/prims -I/build/buildd/openjdk-7-7~b136-2.0~pre1/build/zerovm/openjdk/hotspot/src/share/vm -I/build/buildd/openjdk-7-7~b136-2.0~pre1/build/zerovm/openjdk/hotspot/src/cpu/zero/vm -I/build/buildd/openjdk-7-7~b136-2.0~pre1/build/zerovm/openjdk/hotspot/src/os_cpu/linux_zero/vm -I/build/buildd/openjdk-7-7~b136-2.0~pre1/build/zerovm/openjdk/hotspot/src/os/linux/vm -I/build/buildd/openjdk-7-7~b136-2.0~pre1/build/zerovm/openjdk/hotspot/src/os/posix/vm -I../generated -DHOTSPOT_RELEASE_VERSION="\"21.0-b07\"" -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"buildd\"" -DHOTSPOT_LIB_ARCH=\"i386\" -DJRE_RELEASE_VERSION="\"1.7.0_136-b136\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea7 2.0pre\"" -DDEB_MULTIARCH="\"i386-linux-gnu\"" -DDISTRIBUTION_ID="\"Ubuntu oneiric (development branch), package 7~b136-2.0~pre1-1ubuntu1\"" -DTARGET_OS_FAMILY_linux -DTARGET_ARCH_zero -DTARGET_ARCH_MODEL_zero -DTARGET_OS_ARCH_linux_zero -DTARGET_OS_ARCH_MODEL_linux_zero -DTARGET_COMPILER_gcc -DSHARK -I/usr/lib/llvm-2.7/include -DNDEBUG -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DSHARK_LLVM_VERSION=27 -fpic -fno-rtti -fno-exceptions -D_REENTRANT -fcheck-new -fvisibility=hidden -m32 -pipe -g -O3 -fno-strict-aliasing -DVM_LITTLE_ENDIAN -Werror -Wpointer-arith -Wsign-compare -c -MMD -MP -MF ../generated/dependencies/vtableStubs.o.d -o vtableStubs.o /build/buildd/openjdk-7-7~b136-2.0~pre1/build/zerovm/openjdk/hotspot/src/share/vm/code/vtableStubs.cpp /build/buildd/openjdk-7-7~b136-2.0~pre1/build/zerovm/openjdk/hotspot/src/share/vm/runtime/vmStructs.cpp:2154:3: error: 'x86' is not a member of 'StubRoutines' make[8]: *** [vmStructs.o] Error 1 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Sun May 29 02:36:34 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 29 May 2011 09:36:34 +0000 Subject: [Bug 608] zero fails to build on icedtea7 trunk 20110529 on x86 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=608 Matthias Klose changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|zero fails to build on |zero fails to build on |icedtea7 trunk 20101210 |icedtea7 trunk 20110529 on | |x86 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Sun May 29 19:08:44 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 02:08:44 +0000 Subject: [Bug 736] New: Java processes continue to die were in operation. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=736 Summary: Java processes continue to die were in operation. Product: MIPS Port Version: unspecified Platform: 64-bit OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: general AssignedTo: unassigned at icedtea.classpath.org ReportedBy: eniac2 at naver.com 1. crontab to execute the java daemon. 2. Archive equipment and files from the daemon is working. 3. One moment, like the daemons die attachment. Please check for any reason die. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Sun May 29 19:10:01 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 02:10:01 +0000 Subject: [Bug 736] Java processes continue to die were in operation. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=736 --- Comment #1 from hyoungseouk No 2011-05-30 02:10:01 --- Created an attachment (id=537) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=537) pid err -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Mon May 30 05:51:53 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 12:51:53 +0000 Subject: [Bug 737] New: Passing Number and Array parameters to applet methods doesn't work Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=737 Summary: Passing Number and Array parameters to applet methods doesn't work Product: IcedTea-Web Version: unspecified Platform: 64-bit OS/Version: Linux Status: NEW Severity: major Priority: P5 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: trollixx at gmail.com CC: unassigned at icedtea.classpath.org Developing an applet using LiveConnect I got stuck with passing different parameters to my applet methods. The first bug is that passing simple number or Number object to method(int param) leads to 'Error calling method on NPObject', but passing String to the same method works fine. The second problem is broken arrays support. So, passing simple JavaScript array like [1, 2, 3] or new Array(1, 2, 3) to method(byte[] array) (byte type used for example, actually all other types I tried (String[], int[], Object[]) do not works correctly) leads to calling method with empty array (array.length=0). No such problems with Sun's plugin. Tested on Chromium 13 and Firefox 4 on Ubuntu 11.04 x86_64. Here's some tests which don't work with IcedTea plugin http://opensource.apple.com/source/WebCore/WebCore-955.66/manual-tests/liveconnect-applet-array-parameters.html -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon May 30 07:59:13 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 14:59:13 +0000 Subject: [Bug 738] New: JButton Label Truncated Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=738 Summary: JButton Label Truncated Product: IcedTea Version: 6-1.9.7 Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: dmondega at redhat.com Created an attachment (id=538) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=538) This is the reproducer Labels for JButton are truncated even though there is adequate free space to resize and fit. However, if the setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT) property is set, it works fine. Without that property or with this property setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT) the text gets truncated again. Attached is a reproducer. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Mon May 30 08:15:47 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 15:15:47 +0000 Subject: [Bug 739] New: javaws just hangs while downloading jars Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=739 Summary: javaws just hangs while downloading jars Product: IcedTea-Web Version: hg Platform: all URL: http://download.java.net/general/openjfx/demos/javafxpad .jnlp OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: General AssignedTo: unassigned at icedtea.classpath.org ReportedBy: omajid at redhat.com CC: unassigned at icedtea.classpath.org Sometimes, javaws hangs while downloading jars at when launching http://download.java.net/general/openjfx/demos/javafxpad.jnlp This does not happen all the time (from a few quick tries on my machine, maybe 25% of the time), but when it does, download.java.net/general/openjfx/demos/javafxrt.jar is stuck at 26%. Worse, if you kill javaws, the cache is somehow corrupted and trying to rerun the application fails with a Initializaiton Error (error trying to verify jars). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From asu at redhat.com Mon May 30 08:20:42 2011 From: asu at redhat.com (Andrew Su) Date: Mon, 30 May 2011 11:20:42 -0400 (EDT) Subject: [RFC][Icedtea-web]: Remove/hide invalid option in itweb-settings In-Reply-To: <235906036.370443.1306768396908.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <2054057646.370549.1306768842737.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Hello, This patch removes the option to set the option for showing applet lifetime exception from the debugging panel in itweb-settings. ChangeLog: 2011-05-30 Andrew Su * netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java: (properties): Removed property. (addComponents): Removed checkbox. I want to remove this option from HEAD and 1.1 as it is specified in: http://download.oracle.com/javase/6/docs/technotes/guides/deployment/deployment-guide/properties.html Cheers, Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: disable_option.patch Type: text/x-patch Size: 2037 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110530/09a514a5/disable_option.patch From bugzilla-daemon at icedtea.classpath.org Mon May 30 08:22:32 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 15:22:32 +0000 Subject: [Bug 734] Recording from pulse-java.jar has huge latency and loses samples In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=734 Denis Lila changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dlila at redhat.com --- Comment #1 from Denis Lila 2011-05-30 15:22:32 --- Hi Damjan. I was able to reproduce this. I am looking into it. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Mon May 30 08:23:29 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 15:23:29 +0000 Subject: [Bug 734] Recording from pulse-java.jar has huge latency and loses samples In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=734 Denis Lila changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|dlila at redhat.com |.org | --- Comment #2 from Denis Lila 2011-05-30 15:23:29 --- Assigning to myself. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Mon May 30 09:17:48 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 16:17:48 +0000 Subject: [Bug 740] New: JavaFx applications fail to start Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=740 Summary: JavaFx applications fail to start Product: IcedTea-Web Version: hg Platform: all URL: http://javafx.com/samples/BrickBreaker/index.html OS/Version: Linux Status: NEW Severity: normal Priority: P5 Component: NetX AssignedTo: omajid at redhat.com ReportedBy: omajid at redhat.com CC: unassigned at icedtea.classpath.org Various javafx applications fail to start with an exceptions along the lines of: Exception in thread "AWT-EventQueue-1" java.lang.NullPointerException at javax.swing.ImageIcon.(ImageIcon.java:155) at com.sun.javafx.eula.EulaDialog$2.(Unknown Source) at com.sun.javafx.eula.EulaDialog.getBackgroundPanel(Unknown Source) at com.sun.javafx.eula.EulaDialog.(Unknown Source) at com.sun.javafx.eula.EulaDialog$12.run(Unknown Source) at com.sun.javafx.eula.EulaDialog.askUserAcceptEULA(Unknown Source) at com.sun.javafx.eula.EulaImpl.askUserAcceptEULA(Unknown Source) at com.sun.javafx.eula.EulaImpl.show(Unknown Source) at com.sun.javafx.tk.swing.SwingToolkit$StartupRoutine.run(Unknown Source) at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:226) at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:647) at java.awt.EventQueue.access$000(EventQueue.java:96) at java.awt.EventQueue$1.run(EventQueue.java:608) at java.awt.EventQueue$1.run(EventQueue.java:606) at java.security.AccessController.doPrivileged(Native Method) at java.security.AccessControlContext$1.doIntersectionPrivilege(AccessControlContext.java:105) at java.awt.EventQueue.dispatchEvent(EventQueue.java:617) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:275) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:200) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:185) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:177) at java.awt.EventDispatchThread.run(EventDispatchThread.java:138) At least some of these applications were working previously. This is probably not a regression in icedtea-web, as older versions of javaws cant run these applications either. It looks like a change in javafx itself that icedtea-web cant handle. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From asu at redhat.com Mon May 30 09:25:15 2011 From: asu at redhat.com (Andrew Su) Date: Mon, 30 May 2011 12:25:15 -0400 (EDT) Subject: [RFC][Icedtea-web]: Fix downloading issue when closing javaws In-Reply-To: <1465481870.371198.1306772140656.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <28499253.371385.1306772715940.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Hello, This fix is to fix the problem where if you close javaws while it is downloading, it will refuse to redownload the file. ChangeLog: 2011-05-30 Andrew Su * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: (downloadResource): Check whether file to be downloaded is current. Okay to apply this to HEAD and 1.1? Cheers, Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: download_fix.patch Type: text/x-patch Size: 1814 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110530/03302349/download_fix.patch From omajid at redhat.com Mon May 30 09:29:14 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 30 May 2011 12:29:14 -0400 Subject: [icedtea-web] RFC: make splash screen a JDialog instead of a JFrame In-Reply-To: <4DD597A3.9050803@redhat.com> References: <4DD597A3.9050803@redhat.com> Message-ID: <4DE3C5DA.7040307@redhat.com> On 05/19/2011 06:20 PM, Omair Majid wrote: > Hi, > > The attached patch makes the splash screen a JDialog instead of a > JFrame. The patch makes the splash screen play nice with tiling window > managers. > > Okay to commit? Is this suitable for inclusion in 1.1? > > ChangeLog: > 2011-05-19 Omair Majid > > * netx/net/sourceforge/jnlp/JNLPSplashScreen.java: Subclass JDialog, > not JFrame. > Ping. Cheers, Omair From omajid at redhat.com Mon May 30 09:41:10 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 30 May 2011 12:41:10 -0400 Subject: [RFC][Icedtea-web]: Remove/hide invalid option in itweb-settings In-Reply-To: <2054057646.370549.1306768842737.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <2054057646.370549.1306768842737.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <4DE3C8A6.2080607@redhat.com> On 05/30/2011 11:20 AM, Andrew Su wrote: > Hello, > > This patch removes the option to set the option for showing applet > lifetime exception from the debugging panel in itweb-settings. > > I want to remove this option from HEAD and 1.1 Makes sense to me. Could you also remove the translation string from the messages.properties file? Thanks, Omair From asu at redhat.com Mon May 30 09:49:39 2011 From: asu at redhat.com (Andrew Su) Date: Mon, 30 May 2011 12:49:39 -0400 (EDT) Subject: [RFC][Icedtea-web]: Remove/hide invalid option in itweb-settings In-Reply-To: <4DE3C8A6.2080607@redhat.com> Message-ID: <1858504559.371630.1306774179693.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > From: "Omair Majid" > To: "Andrew Su" > Cc: distro-pkg-dev at openjdk.java.net > Sent: Monday, May 30, 2011 12:41:10 PM > Subject: Re: [RFC][Icedtea-web]: Remove/hide invalid option in itweb-settings > On 05/30/2011 11:20 AM, Andrew Su wrote: > > Hello, > > > > This patch removes the option to set the option for showing applet > > lifetime exception from the debugging panel in itweb-settings. > > > > I want to remove this option from HEAD and 1.1 > > Makes sense to me. Could you also remove the translation string from > the > messages.properties file? Updated. Cheers, Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: disable_option.patch Type: text/x-patch Size: 2540 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110530/30bc7e53/disable_option.patch From omajid at redhat.com Mon May 30 09:51:43 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 30 May 2011 12:51:43 -0400 Subject: [RFC][Icedtea-web]: Remove/hide invalid option in itweb-settings In-Reply-To: <1858504559.371630.1306774179693.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <1858504559.371630.1306774179693.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <4DE3CB1F.5000402@redhat.com> On 05/30/2011 12:49 PM, Andrew Su wrote: > > > ----- Original Message ----- >> From: "Omair Majid" >> To: "Andrew Su" >> Cc: distro-pkg-dev at openjdk.java.net >> Sent: Monday, May 30, 2011 12:41:10 PM >> Subject: Re: [RFC][Icedtea-web]: Remove/hide invalid option in itweb-settings >> On 05/30/2011 11:20 AM, Andrew Su wrote: >>> Hello, >>> >>> This patch removes the option to set the option for showing applet >>> lifetime exception from the debugging panel in itweb-settings. >>> >>> I want to remove this option from HEAD and 1.1 >> >> Makes sense to me. Could you also remove the translation string from >> the >> messages.properties file? > > Updated. > Looks good to me. Okay for HEAD and 1.1. Cheers, Omair From bugzilla-daemon at icedtea.classpath.org Mon May 30 10:09:00 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 17:09:00 +0000 Subject: [Bug 740] JavaFx applications fail to start In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=740 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |xerxes at zafena.se --- Comment #1 from Xerxes R?nby 2011-05-30 17:09:00 --- I noticed that the new javafx 2.0 beta do not support the javafx script syntax and .fx files that where the main thing of the old javafx 1.3. All existing javafx applications have to get ported to 2.0 since oracle are dropping support for all the existing .fx scripts. javafx porting guide: http://weblogs.java.net/blog/opinali/archive/2011/05/28/javafx-20-beta-first-impressions -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From asu at icedtea.classpath.org Mon May 30 10:14:06 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Mon, 30 May 2011 17:14:06 +0000 Subject: /hg/icedtea-web: Remove non-standard option from itweb-settings. Message-ID: changeset 36376d58c0ab in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=36376d58c0ab author: Andrew Su date: Mon May 30 13:15:50 2011 -0400 Remove non-standard option from itweb-settings. diffstat: ChangeLog | 8 ++++++++ netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java | 7 ++----- netx/net/sourceforge/jnlp/resources/Messages.properties | 1 - 3 files changed, 10 insertions(+), 6 deletions(-) diffs (62 lines): diff -r 7f0a8910a2a8 -r 36376d58c0ab ChangeLog --- a/ChangeLog Fri May 27 18:01:27 2011 -0400 +++ b/ChangeLog Mon May 30 13:15:50 2011 -0400 @@ -1,3 +1,11 @@ +2011-05-30 Andrew Su + + * netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java: + (properties): Removed property. + (addComponents): Removed checkbox. + * netx/net/sourceforge/jnlp/resources/Messages.properties: + Removed translation string for DPLifeCycleExceptions. + 2011-05-27 Deepak Bhole PR723: AccessControlException while downloading resource diff -r 7f0a8910a2a8 -r 36376d58c0ab netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java --- a/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Fri May 27 18:01:27 2011 -0400 +++ b/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Mon May 30 13:15:50 2011 -0400 @@ -46,7 +46,6 @@ /** List of properties used by this panel */ public static String[] properties = { "deployment.trace", // Debugging "deployment.log", // Debugging - "deployment.javapi.lifecycle.exception", // Debugging "deployment.console.startup.mode", // Java Console }; private DeploymentConfiguration config; @@ -74,8 +73,7 @@ JLabel debuggingDescription = new JLabel("" + Translator.R("CPDebuggingDescription") + "

"); JCheckBox[] debuggingOptions = { new JCheckBox(Translator.R("DPEnableTracing")), - new JCheckBox(Translator.R("DPEnableLogging")), - new JCheckBox(Translator.R("DPLifeCycleExceptions")) }; + new JCheckBox(Translator.R("DPEnableLogging")), }; ComboItem[] javaConsoleItems = { new ComboItem(Translator.R("DPDisable"), "DISABLE"), new ComboItem(Translator.R("DPHide"), "HIDE"), @@ -107,13 +105,12 @@ switch (i) { case 0: case 1: - case 2: debuggingOptions[i].setSelected(Boolean.parseBoolean(s)); debuggingOptions[i].setActionCommand(properties[i]); debuggingOptions[i].addItemListener(this); add(debuggingOptions[i], c); break; - case 3: + case 2: for (int j = 0; j < javaConsoleItems.length; j++) { consoleComboBox.addItem(javaConsoleItems[j]); if (config.getProperty("deployment.console.startup.mode").equals(javaConsoleItems[j].getValue())) diff -r 7f0a8910a2a8 -r 36376d58c0ab netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Fri May 27 18:01:27 2011 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Mon May 30 13:15:50 2011 -0400 @@ -334,7 +334,6 @@ # Control Panel - DebugginPanel DPEnableTracing=Enable tracing DPEnableLogging=Enable logging -DPLifeCycleExceptions=Show applet lifecycle exceptions DPDisable=Disable DPHide=Hide on startup DPShow=Show on startup From asu at icedtea.classpath.org Mon May 30 10:16:23 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Mon, 30 May 2011 17:16:23 +0000 Subject: /hg/release/icedtea-web-1.1: Remove non-standard option from itw... Message-ID: changeset de182e65a6e1 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=de182e65a6e1 author: Andrew Su date: Mon May 30 13:15:50 2011 -0400 Remove non-standard option from itweb-settings. diffstat: ChangeLog | 8 ++++++++ netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java | 7 ++----- netx/net/sourceforge/jnlp/resources/Messages.properties | 1 - 3 files changed, 10 insertions(+), 6 deletions(-) diffs (62 lines): diff -r 015b544f05d8 -r de182e65a6e1 ChangeLog --- a/ChangeLog Fri May 27 18:01:27 2011 -0400 +++ b/ChangeLog Mon May 30 13:15:50 2011 -0400 @@ -1,3 +1,11 @@ +2011-05-30 Andrew Su + + * netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java: + (properties): Removed property. + (addComponents): Removed checkbox. + * netx/net/sourceforge/jnlp/resources/Messages.properties: + Removed translation string for DPLifeCycleExceptions. + 2011-05-27 Deepak Bhole PR723: AccessControlException while downloading resource diff -r 015b544f05d8 -r de182e65a6e1 netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java --- a/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Fri May 27 18:01:27 2011 -0400 +++ b/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Mon May 30 13:15:50 2011 -0400 @@ -46,7 +46,6 @@ /** List of properties used by this panel */ public static String[] properties = { "deployment.trace", // Debugging "deployment.log", // Debugging - "deployment.javapi.lifecycle.exception", // Debugging "deployment.console.startup.mode", // Java Console }; private DeploymentConfiguration config; @@ -74,8 +73,7 @@ JLabel debuggingDescription = new JLabel("" + Translator.R("CPDebuggingDescription") + "

"); JCheckBox[] debuggingOptions = { new JCheckBox(Translator.R("DPEnableTracing")), - new JCheckBox(Translator.R("DPEnableLogging")), - new JCheckBox(Translator.R("DPLifeCycleExceptions")) }; + new JCheckBox(Translator.R("DPEnableLogging")), }; ComboItem[] javaConsoleItems = { new ComboItem(Translator.R("DPDisable"), "DISABLE"), new ComboItem(Translator.R("DPHide"), "HIDE"), @@ -107,13 +105,12 @@ switch (i) { case 0: case 1: - case 2: debuggingOptions[i].setSelected(Boolean.parseBoolean(s)); debuggingOptions[i].setActionCommand(properties[i]); debuggingOptions[i].addItemListener(this); add(debuggingOptions[i], c); break; - case 3: + case 2: for (int j = 0; j < javaConsoleItems.length; j++) { consoleComboBox.addItem(javaConsoleItems[j]); if (config.getProperty("deployment.console.startup.mode").equals(javaConsoleItems[j].getValue())) diff -r 015b544f05d8 -r de182e65a6e1 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Fri May 27 18:01:27 2011 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Mon May 30 13:15:50 2011 -0400 @@ -334,7 +334,6 @@ # Control Panel - DebugginPanel DPEnableTracing=Enable tracing DPEnableLogging=Enable logging -DPLifeCycleExceptions=Show applet lifecycle exceptions DPDisable=Disable DPHide=Hide on startup DPShow=Show on startup From bugzilla-daemon at icedtea.classpath.org Mon May 30 10:21:16 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 17:21:16 +0000 Subject: [Bug 740] JavaFx applications fail to start In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=740 --- Comment #2 from Xerxes R?nby 2011-05-30 17:21:15 --- I noticed that the hosts used to host the javafx 1.3 files are down http://dl.javafx.com/1.3 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From asu at redhat.com Mon May 30 10:23:16 2011 From: asu at redhat.com (Andrew Su) Date: Mon, 30 May 2011 13:23:16 -0400 (EDT) Subject: [RFC][Icedtea-web]: validate cache location in itweb-settings In-Reply-To: <2012346580.371901.1306776158815.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <97936982.371904.1306776196486.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Hello, This patch will add validation when the user sets the cache directory location. It is not necessary to apply this patch, since the user can just as easily remove permissions after setting it, or enable permission after selecting a path without permission. Comments? Regards, Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: validate_cache_location.patch Type: text/x-patch Size: 2307 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20110530/cac9794d/validate_cache_location.patch From omajid at redhat.com Mon May 30 10:30:05 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 30 May 2011 13:30:05 -0400 Subject: [RFC][Icedtea-web]: Fix downloading issue when closing javaws In-Reply-To: <28499253.371385.1306772715940.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <28499253.371385.1306772715940.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <4DE3D41D.7070406@redhat.com> On 05/30/2011 12:25 PM, Andrew Su wrote: > Hello, > > This fix is to fix the problem where if you close javaws while it is downloading, it will refuse to redownload the file. > > ChangeLog: > > 2011-05-30 Andrew Su > > * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: > (downloadResource): Check whether file to be downloaded > is current. > > Okay to apply this to HEAD and 1.1? > I was a little unclear on why the calls to CacheEntry.initialize() were needed. But after you explains on IRC how initializeResources() only calls CacheEntry.initialize() for the final location (which is different from the compressed file location), this makes a lot of sense. Okay for HEAD and 1.1. Cheers, Omair From asu at icedtea.classpath.org Mon May 30 10:48:49 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Mon, 30 May 2011 17:48:49 +0000 Subject: /hg/icedtea-web: Fix cache to allow redownload on next run when ... Message-ID: changeset 4393a8c5101a in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=4393a8c5101a author: Andrew Su date: Mon May 30 13:50:35 2011 -0400 Fix cache to allow redownload on next run when javaws is killed diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletions(-) diffs (40 lines): diff -r 36376d58c0ab -r 4393a8c5101a ChangeLog --- a/ChangeLog Mon May 30 13:15:50 2011 -0400 +++ b/ChangeLog Mon May 30 13:50:35 2011 -0400 @@ -1,3 +1,8 @@ +2011-05-30 Andrew Su + + * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: + (downloadResource): Check whether file to be downloaded is current. + 2011-05-30 Andrew Su * netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java: diff -r 36376d58c0ab -r 4393a8c5101a netx/net/sourceforge/jnlp/cache/ResourceTracker.java --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Mon May 30 13:15:50 2011 -0400 +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Mon May 30 13:50:35 2011 -0400 @@ -675,7 +675,7 @@ CacheEntry downloadEntry = new CacheEntry(downloadLocation, resource.downloadVersion); File finalFile = CacheUtil.getCacheFile(resource.location, resource.downloadVersion); // This is where extracted version will be, or downloaded file if not compressed. - if (!finalFile.exists()) { + if (!downloadEntry.isCurrent(con)) { // Make sure we don't re-download the file. however it will wait as if it was downloading. // (This is fine because file is not ready yet anyways) byte buf[] = new byte[1024]; @@ -700,6 +700,7 @@ * If the file was compressed, uncompress it. */ if (packgz) { + downloadEntry.initialize(con); GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil .getCacheFile(downloadLocation, resource.downloadVersion))); InputStream inputStream = new BufferedInputStream(gzInputStream); @@ -714,6 +715,7 @@ inputStream.close(); gzInputStream.close(); } else if (gzip) { + downloadEntry.initialize(con); GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil .getCacheFile(downloadLocation, resource.downloadVersion))); InputStream inputStream = new BufferedInputStream(gzInputStream); From asu at icedtea.classpath.org Mon May 30 10:49:35 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Mon, 30 May 2011 17:49:35 +0000 Subject: /hg/release/icedtea-web-1.1: Fix cache to allow redownload on ne... Message-ID: changeset 60b21220df55 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=60b21220df55 author: Andrew Su date: Mon May 30 13:50:35 2011 -0400 Fix cache to allow redownload on next run when javaws is killed diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletions(-) diffs (40 lines): diff -r de182e65a6e1 -r 60b21220df55 ChangeLog --- a/ChangeLog Mon May 30 13:15:50 2011 -0400 +++ b/ChangeLog Mon May 30 13:50:35 2011 -0400 @@ -1,3 +1,8 @@ +2011-05-30 Andrew Su + + * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: + (downloadResource): Check whether file to be downloaded is current. + 2011-05-30 Andrew Su * netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java: diff -r de182e65a6e1 -r 60b21220df55 netx/net/sourceforge/jnlp/cache/ResourceTracker.java --- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Mon May 30 13:15:50 2011 -0400 +++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Mon May 30 13:50:35 2011 -0400 @@ -675,7 +675,7 @@ CacheEntry downloadEntry = new CacheEntry(downloadLocation, resource.downloadVersion); File finalFile = CacheUtil.getCacheFile(resource.location, resource.downloadVersion); // This is where extracted version will be, or downloaded file if not compressed. - if (!finalFile.exists()) { + if (!downloadEntry.isCurrent(con)) { // Make sure we don't re-download the file. however it will wait as if it was downloading. // (This is fine because file is not ready yet anyways) byte buf[] = new byte[1024]; @@ -700,6 +700,7 @@ * If the file was compressed, uncompress it. */ if (packgz) { + downloadEntry.initialize(con); GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil .getCacheFile(downloadLocation, resource.downloadVersion))); InputStream inputStream = new BufferedInputStream(gzInputStream); @@ -714,6 +715,7 @@ inputStream.close(); gzInputStream.close(); } else if (gzip) { + downloadEntry.initialize(con); GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil .getCacheFile(downloadLocation, resource.downloadVersion))); InputStream inputStream = new BufferedInputStream(gzInputStream); From omajid at redhat.com Mon May 30 10:52:35 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 30 May 2011 13:52:35 -0400 Subject: [RFC][Icedtea-web]: validate cache location in itweb-settings In-Reply-To: <97936982.371904.1306776196486.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <97936982.371904.1306776196486.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <4DE3D963.6000708@redhat.com> Hi Andrew, On 05/30/2011 01:23 PM, Andrew Su wrote: > This patch will add validation when the user sets the cache directory > location. > > It is not necessary to apply this patch, since the user can just as > easily remove permissions after setting it, or enable permission > after selecting a path without permission. > > Comments? The patch looks fine to me. IMHO, it should be applied. It will help a novice user avoid selecting a wrong directory for caching (which would result in mysterious failures when running jnlp applications). An expert user, on the other hand, can use the command line interface of itweb-settings or his favourite text editor to change the settings in the deployment.properties without running into this check. Cheers, Omair From asu at redhat.com Mon May 30 10:54:51 2011 From: asu at redhat.com (Andrew Su) Date: Mon, 30 May 2011 13:54:51 -0400 (EDT) Subject: [RFC][Icedtea-web]: Fix downloading issue when closing javaws In-Reply-To: <4DE3D41D.7070406@redhat.com> Message-ID: <2062198498.372069.1306778091237.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > From: "Omair Majid" > To: distro-pkg-dev at openjdk.java.net > Sent: Monday, May 30, 2011 1:30:05 PM > Subject: Re: [RFC][Icedtea-web]: Fix downloading issue when closing javaws > On 05/30/2011 12:25 PM, Andrew Su wrote: > > Hello, > > > > This fix is to fix the problem where if you close javaws while it is > > downloading, it will refuse to redownload the file. > > > > ChangeLog: > > > > 2011-05-30 Andrew Su > > > > * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: > > (downloadResource): Check whether file to be downloaded > > is current. > > > > Okay to apply this to HEAD and 1.1? > > > > I was a little unclear on why the calls to CacheEntry.initialize() > were > needed. But after you explains on IRC how initializeResources() only > calls CacheEntry.initialize() for the final location (which is > different > from the compressed file location), this makes a lot of sense. > > Okay for HEAD and 1.1. Thanks for the reviews, pushed. http://icedtea.classpath.org/hg/icedtea-web/rev/4393a8c5101a http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/60b21220df55 Thanks, Andrew From asu at icedtea.classpath.org Mon May 30 11:04:34 2011 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Mon, 30 May 2011 18:04:34 +0000 Subject: /hg/icedtea-web: Check if cache directory is writable from itweb... Message-ID: changeset 03f8f75457dc in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=03f8f75457dc author: Andrew Su date: Mon May 30 14:03:23 2011 -0400 Check if cache directory is writable from itweb-settings diffstat: ChangeLog | 6 ++ netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java | 23 +++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diffs (62 lines): diff -r 4393a8c5101a -r 03f8f75457dc ChangeLog --- a/ChangeLog Mon May 30 13:50:35 2011 -0400 +++ b/ChangeLog Mon May 30 14:03:23 2011 -0400 @@ -1,3 +1,9 @@ +2011-05-30 Andrew Su + + * netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java: + (addComponent): Add check to see if specified cache directory is + writable. + 2011-05-30 Andrew Su * netx/net/sourceforge/jnlp/cache/ResourceTracker.java: diff -r 4393a8c5101a -r 03f8f75457dc netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java --- a/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java Mon May 30 13:50:35 2011 -0400 +++ b/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java Mon May 30 14:03:23 2011 -0400 @@ -26,6 +26,7 @@ import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.io.File; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -33,6 +34,7 @@ import javax.swing.JComponent; import javax.swing.JFileChooser; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JSlider; import javax.swing.JSpinner; @@ -109,10 +111,27 @@ public void actionPerformed(ActionEvent e) { JFileChooser fileChooser = new JFileChooser(); fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + fileChooser.setFileHidingEnabled(false); if (fileChooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) { + // Check if we have permission to write to that location. String result = fileChooser.getSelectedFile().getAbsolutePath(); - location.setText(result); - config.setProperty(properties[1], result); + File dirLocation = new File(result); + boolean canWrite = dirLocation.canWrite(); + while (!canWrite && dirLocation != null){ // File does not exist, or no permission. + + if (dirLocation.exists()) { + JOptionPane.showMessageDialog(null, "No permission to write to this location."); + return; + } + + dirLocation = dirLocation.getParentFile(); + canWrite = dirLocation.canWrite(); + } + + if (canWrite) { + location.setText(result); + config.setProperty(properties[1], result); + } } } }); From bugzilla-daemon at icedtea.classpath.org Mon May 30 11:12:04 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 18:12:04 +0000 Subject: [Bug 739] javaws just hangs while downloading jars In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=739 Andrew Su changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |asu at redhat.com --- Comment #1 from Andrew Su 2011-05-30 18:12:03 --- The second problem mentioned in the report (killing javaws corrupts jars) has been fixed in HEAD and 1.1 http://icedtea.classpath.org/hg/icedtea-web/rev/4393a8c5101a http://icedtea.classpath.org/hg/release/icedtea-web-1.1/rev/60b21220df55 As for the issue with hanging, I haven't been able to reproduce that. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. You are the assignee for the bug. From andrew at icedtea.classpath.org Mon May 30 11:21:55 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 30 May 2011 18:21:55 +0000 Subject: /hg/icedtea6: Fix build failure caused by hs20 only LLVM 2.9 fix. Message-ID: changeset e191909a7c6e in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e191909a7c6e author: Andrew John Hughes date: Mon May 30 19:21:44 2011 +0100 Fix build failure caused by hs20 only LLVM 2.9 fix. 2011-05-30 Andrew John Hughes * patches/openjdk/7036220-shark_llvm_29_headers.patch: Moved to... * Makefile.am: Only apply 7036220 to hs20. * patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch: ...here. diffstat: ChangeLog | 8 ++ Makefile.am | 4 +- patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch | 43 ++++++++++++++++ patches/openjdk/7036220-shark_llvm_29_headers.patch | 43 ---------------- 4 files changed, 53 insertions(+), 45 deletions(-) diffs (132 lines): diff -r 0034f5cfd96a -r e191909a7c6e ChangeLog --- a/ChangeLog Sat May 28 12:37:23 2011 +0200 +++ b/ChangeLog Mon May 30 19:21:44 2011 +0100 @@ -1,3 +1,11 @@ +2011-05-30 Andrew John Hughes + + * patches/openjdk/7036220-shark_llvm_29_headers.patch: + Moved to... + * Makefile.am: Only apply 7036220 to hs20. + * patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch: + ...here. + 2011-05-28 Matthias Klose * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with-javac. diff -r 0034f5cfd96a -r e191909a7c6e Makefile.am --- a/Makefile.am Sat May 28 12:37:23 2011 +0200 +++ b/Makefile.am Mon May 30 19:21:44 2011 +0100 @@ -333,7 +333,6 @@ patches/revert-6885123.patch \ patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ - patches/openjdk/7036220-shark_llvm_29_headers.patch \ patches/openjdk/6986968-crash_on_xim_restart.patch \ patches/openjdk/7036754-stroker-nan.patch \ patches/openjdk/pgram-pipe-regression.patch \ @@ -347,7 +346,8 @@ patches/pr639-broken_shark_build.patch \ patches/hotspot/$(HSBUILD)/powerpc-stacksize.patch \ patches/jtreg-remove-test-6987555.patch \ - patches/jtreg-remove-test-6991596.patch + patches/jtreg-remove-test-6991596.patch \ + patches/hotspot/$(HSBUILD)/7036220-shark_llvm_29_headers.patch else ICEDTEA_PATCHES += \ patches/hotspot/$(HSBUILD)/no-precompiled-headers.patch \ diff -r 0034f5cfd96a -r e191909a7c6e patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch Mon May 30 19:21:44 2011 +0100 @@ -0,0 +1,44 @@ +# HG changeset patch +# User twisti +# Date 1302771192 25200 +# Node ID 1fcd6e9c3965f4bf23f6a8f4fbb77fdf74de37a7 +# Parent 3a808be061ffc10da5647e50cc28252d70f21883 +7036220: Shark fails to find LLVM 2.9 System headers during build +Reviewed-by: gbenson, twisti +Contributed-by: Xerxes Ranby + +diff -r 3a808be061ff -r 1fcd6e9c3965 src/share/vm/shark/llvmHeaders.hpp +--- openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp Wed Apr 13 14:33:03 2011 -0700 ++++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp Thu Apr 14 01:53:12 2011 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright 2008, 2009, 2010 Red Hat, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * +@@ -46,7 +46,11 @@ + #include + #endif + #include ++#if SHARK_LLVM_VERSION >= 29 ++#include ++#else + #include ++#endif + #include + #include + #include +@@ -55,8 +59,12 @@ + #include + #include + #include ++#if SHARK_LLVM_VERSION >= 29 ++#include ++#else + #include + #endif ++#endif + + #include + diff -r 0034f5cfd96a -r e191909a7c6e patches/openjdk/7036220-shark_llvm_29_headers.patch --- a/patches/openjdk/7036220-shark_llvm_29_headers.patch Sat May 28 12:37:23 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -# HG changeset patch -# User twisti -# Date 1302771192 25200 -# Node ID 1fcd6e9c3965f4bf23f6a8f4fbb77fdf74de37a7 -# Parent 3a808be061ffc10da5647e50cc28252d70f21883 -7036220: Shark fails to find LLVM 2.9 System headers during build -Reviewed-by: gbenson, twisti -Contributed-by: Xerxes Ranby - -diff -r 3a808be061ff -r 1fcd6e9c3965 src/share/vm/shark/llvmHeaders.hpp ---- openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp Wed Apr 13 14:33:03 2011 -0700 -+++ openjdk/hotspot/src/share/vm/shark/llvmHeaders.hpp Thu Apr 14 01:53:12 2011 -0700 -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. - * Copyright 2008, 2009, 2010 Red Hat, Inc. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * -@@ -46,7 +46,11 @@ - #include - #endif - #include -+#if SHARK_LLVM_VERSION >= 29 -+#include -+#else - #include -+#endif - #include - #include - #include -@@ -55,8 +59,12 @@ - #include - #include - #include -+#if SHARK_LLVM_VERSION >= 29 -+#include -+#else - #include - #endif -+#endif - - #include - From bugzilla-daemon at icedtea.classpath.org Mon May 30 11:30:29 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 18:30:29 +0000 Subject: [Bug 738] JButton Label Truncated In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=738 Andrew Su changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |asu at redhat.com --- Comment #1 from Andrew Su 2011-05-30 18:30:29 --- The backport for the fix has been applied to icedtea6 HEAD and icedtea6-1.10. You will need to either wait for an update or build from one of those trees and install it. Cheers, Andrew -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Mon May 30 11:41:39 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 18:41:39 +0000 Subject: [Bug 738] JButton Label Truncated In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=738 Andrew Su changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #2 from Andrew Su 2011-05-30 18:41:39 --- err, sorry not applied; added to the list of patches: http://icedtea.classpath.org/hg/icedtea6/rev/c78edcdba40f http://icedtea.classpath.org/hg/release/icedtea6-1.10/rev/c78edcdba40f -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From ahughes at redhat.com Mon May 30 12:04:38 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 30 May 2011 20:04:38 +0100 Subject: /hg/icedtea6: PR689: Shark fails to find LLVM 2.9 System headers... In-Reply-To: References: Message-ID: <20110530190438.GB8921@rivendell.middle-earth.co.uk> On 14:17 Tue 12 Apr , xranby at icedtea.classpath.org wrote: > changeset 307d19e0cca0 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=307d19e0cca0 > author: Xerxes R?nby > date: Tue Apr 12 15:56:56 2011 +0200 > > PR689: Shark fails to find LLVM 2.9 System headers during build > > 2011-04-12 Xerxes R?nby > > PR689: Shark fails to find LLVM 2.9 System headers during > build > * Makefile.am: Add patch. > * patches/shark-llvm-2.9.patch: In LLVM 2.9 System headers are > moved to Support. > * NEWS: Updated. > > > diffstat: > > ChangeLog | 8 ++++++++ > Makefile.am | 3 ++- > NEWS | 2 ++ > patches/shark-llvm-2.9.patch | 28 ++++++++++++++++++++++++++++ > 4 files changed, 40 insertions(+), 1 deletions(-) > I just had to move this to the hs20 section as it wouldn't apply with hs19 and caused a build failure: http://mail.openjdk.java.net/pipermail/icedtea-test/2011-May/000369.html Did you test this with both HotSpot builds? Will the release branches be affected in the same way? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From omajid at redhat.com Mon May 30 12:12:11 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 30 May 2011 15:12:11 -0400 Subject: /hg/icedtea6: PR689: Shark fails to find LLVM 2.9 System headers... In-Reply-To: <20110530190438.GB8921@rivendell.middle-earth.co.uk> References: <20110530190438.GB8921@rivendell.middle-earth.co.uk> Message-ID: <4DE3EC0B.1050809@redhat.com> On 05/30/2011 03:04 PM, Dr Andrew John Hughes wrote: > On 14:17 Tue 12 Apr , xranby at icedtea.classpath.org wrote: >> changeset 307d19e0cca0 in /hg/icedtea6 >> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=307d19e0cca0 >> author: Xerxes R?nby >> date: Tue Apr 12 15:56:56 2011 +0200 >> >> PR689: Shark fails to find LLVM 2.9 System headers during build >> >> 2011-04-12 Xerxes R?nby >> >> PR689: Shark fails to find LLVM 2.9 System headers during >> build >> * Makefile.am: Add patch. >> * patches/shark-llvm-2.9.patch: In LLVM 2.9 System headers are >> moved to Support. >> * NEWS: Updated. >> >> >> diffstat: >> >> ChangeLog | 8 ++++++++ >> Makefile.am | 3 ++- >> NEWS | 2 ++ >> patches/shark-llvm-2.9.patch | 28 ++++++++++++++++++++++++++++ >> 4 files changed, 40 insertions(+), 1 deletions(-) >> > > I just had to move this to the hs20 section as it wouldn't apply with hs19 > and caused a build failure: > http://mail.openjdk.java.net/pipermail/icedtea-test/2011-May/000369.html > > Did you test this with both HotSpot builds? Will the release branches > be affected in the same way? Erm. I think this might have been my mistake. I replaced Xerxes's patch with the hg export of an upstream changeset (only on HEAD though). The only difference between the patch and the hg export was a copyright change in the year. That might have broken this. Sorry. Omair From bugzilla-daemon at icedtea.classpath.org Mon May 30 14:09:03 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 21:09:03 +0000 Subject: [Bug 740] JavaFx applications fail to start In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=740 --- Comment #3 from Omair Majid 2011-05-30 21:09:03 --- (In reply to comment #2) > I noticed that the hosts used to host the javafx 1.3 files are down > http://dl.javafx.com/1.3 > FWIW, the proprietary javaws can run these applications just fine. I wonder how it finds javafx. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Mon May 30 14:19:13 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 May 2011 21:19:13 +0000 Subject: [Bug 740] JavaFx applications fail to start In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=740 --- Comment #4 from Omair Majid 2011-05-30 21:19:13 --- Hmm... icedtea-web downloads javafx's jars just fine. It just fails to start it. Before following the steps below, delete ~/.java* and ~/.icedtea. Here is what doesn't work: Run a javafx program using icedtea-web Here is what will work: 1. Run a javafx program using proprietary javaws (works) 2. Run a javafx program using icedtea-web (works!) Almost looks like javafx needs to be bootstrapped with the proprietary javaws before it will work. Something strange that I noticed is that running a javafx program the first time brings up an EULA. I dont see that EULA with icedtea-web. Once I accept this EULA, javafx works with icedtea-web every time from then on. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From ahughes at redhat.com Mon May 30 16:39:57 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 31 May 2011 00:39:57 +0100 Subject: [RFC][Icedtea-web]: Remove/hide invalid option in itweb-settings In-Reply-To: <2054057646.370549.1306768842737.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <235906036.370443.1306768396908.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <2054057646.370549.1306768842737.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <20110530233957.GC8921@rivendell.middle-earth.co.uk> On 11:20 Mon 30 May , Andrew Su wrote: > Hello, > > This patch removes the option to set the option for showing applet lifetime exception from the debugging panel in itweb-settings. > > ChangeLog: > > 2011-05-30 Andrew Su > > * netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java: > (properties): Removed property. > (addComponents): Removed checkbox. > > I want to remove this option from HEAD and 1.1 as it is specified in: http://download.oracle.com/javase/6/docs/technotes/guides/deployment/deployment-guide/properties.html > > Cheers, > Andrew I don't follow why we're removing this. It doesn't even seem to be listed on the referenced page. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and IcedTea http://www.gnu.org/software/classpath http://icedtea.classpath.org PGP Key: F5862A37 (https://keys.indymedia.org/) Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37 From asu at redhat.com Mon May 30 18:23:01 2011 From: asu at redhat.com (Andrew Su) Date: Mon, 30 May 2011 21:23:01 -0400 (EDT) Subject: [RFC][Icedtea-web]: Remove/hide invalid option in itweb-settings In-Reply-To: <20110530233957.GC8921@rivendell.middle-earth.co.uk> Message-ID: <1877288167.374645.1306804981009.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> ----- Original Message ----- > From: "Dr Andrew John Hughes" > To: "Andrew Su" > Cc: distro-pkg-dev at openjdk.java.net > Sent: Monday, 30 May, 2011 7:39:57 PM > Subject: Re: [RFC][Icedtea-web]: Remove/hide invalid option in itweb-settings > On 11:20 Mon 30 May , Andrew Su wrote: > > Hello, > > > > This patch removes the option to set the option for showing applet > > lifetime exception from the debugging panel in itweb-settings. > > > > ChangeLog: > > > > 2011-05-30 Andrew Su > > > > * > > netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java: > > (properties): Removed property. > > (addComponents): Removed checkbox. > > > > I want to remove this option from HEAD and 1.1 as it is specified > > in: > > http://download.oracle.com/javase/6/docs/technotes/guides/deployment/deployment-guide/properties.html > > > > Cheers, > > Andrew > > I don't follow why we're removing this. It doesn't even seem to be > listed > on the referenced page. Ah sorry, I meant to say "it is not specified in". --Andrew From xerxes at zafena.se Tue May 31 08:39:32 2011 From: xerxes at zafena.se (Xerxes =?ISO-8859-1?Q?R=E5nby?=) Date: Tue, 31 May 2011 17:39:32 +0200 Subject: [icedtea-web] RFC: make splash screen a JDialog instead of a JFrame In-Reply-To: <4DD597A3.9050803@redhat.com> References: <4DD597A3.9050803@redhat.com> Message-ID: <1306856372.7244.14.camel@xranby-ESPRIMO-P7935> tor 2011-05-19 klockan 18:20 -0400 skrev Omair Majid: > Hi, > > The attached patch makes the splash screen a JDialog instead of a > JFrame. The patch makes the splash screen play nice with tiling window > managers. I think this patch looks good, making the splash screen a JDialog will prevent the windowmanager from auto resizing it. I think this new behaviour are correct. > > Okay to commit? Is this suitable for inclusion in 1.1? Yes. Do Oracle's javaws also uses a JDialogs for its splash screens? > > ChangeLog: > 2011-05-19 Omair Majid > > * netx/net/sourceforge/jnlp/JNLPSplashScreen.java: Subclass JDialog, > not JFrame. > > Thanks, > Omair Cheers Xerxes From omajid at redhat.com Tue May 31 08:47:20 2011 From: omajid at redhat.com (Omair Majid) Date: Tue, 31 May 2011 11:47:20 -0400 Subject: [icedtea-web] RFC: make splash screen a JDialog instead of a JFrame In-Reply-To: <1306856372.7244.14.camel@xranby-ESPRIMO-P7935> References: <4DD597A3.9050803@redhat.com> <1306856372.7244.14.camel@xranby-ESPRIMO-P7935> Message-ID: <4DE50D88.1030806@redhat.com> On 05/31/2011 11:39 AM, Xerxes R?nby wrote: > tor 2011-05-19 klockan 18:20 -0400 skrev Omair Majid: >> The attached patch makes the splash screen a JDialog instead of a >> JFrame. The patch makes the splash screen play nice with tiling window >> managers. > > I think this patch looks good, making the splash screen a JDialog will > prevent the windowmanager from auto resizing it. I think this new > behaviour are correct. > Thanks for taking a look at the patch! >> >> Okay to commit? Is this suitable for inclusion in 1.1? > > Yes. > > Do Oracle's javaws also uses a JDialogs for its splash screens? > Well, I am not sure if they use a JDialog or the awt SplashScreen, but the window manager does not resize it. Thanks, Omair From omajid at icedtea.classpath.org Tue May 31 09:00:29 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 31 May 2011 16:00:29 +0000 Subject: /hg/icedtea-web: make splash screen a JDialog instead of a JFrame Message-ID: changeset af1ed34483d1 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=af1ed34483d1 author: Omair Majid date: Tue May 31 12:00:01 2011 -0400 make splash screen a JDialog instead of a JFrame We dont want the splash screen to be resized. Tiling window managers will resize JFrames but not JDialogs. 2011-05-31 Omair Majid * netx/net/sourceforge/jnlp/JNLPSplashScreen.java: Subclass JDialog, not JFrame. diffstat: ChangeLog | 5 +++++ netx/net/sourceforge/jnlp/JNLPSplashScreen.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diffs (30 lines): diff -r 03f8f75457dc -r af1ed34483d1 ChangeLog --- a/ChangeLog Mon May 30 14:03:23 2011 -0400 +++ b/ChangeLog Tue May 31 12:00:01 2011 -0400 @@ -1,3 +1,8 @@ +2011-05-31 Omair Majid + + * netx/net/sourceforge/jnlp/JNLPSplashScreen.java: Subclass JDialog, not + JFrame. + 2011-05-30 Andrew Su * netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java: diff -r 03f8f75457dc -r af1ed34483d1 netx/net/sourceforge/jnlp/JNLPSplashScreen.java --- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Mon May 30 14:03:23 2011 -0400 +++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Tue May 31 12:00:01 2011 -0400 @@ -10,12 +10,12 @@ import java.net.URL; import javax.imageio.ImageIO; -import javax.swing.JFrame; +import javax.swing.JDialog; import net.sourceforge.jnlp.cache.ResourceTracker; import net.sourceforge.jnlp.runtime.JNLPRuntime; -public class JNLPSplashScreen extends JFrame { +public class JNLPSplashScreen extends JDialog { String applicationTitle; String applicationVendor; From bugzilla-daemon at icedtea.classpath.org Tue May 31 11:44:43 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 18:44:43 +0000 Subject: [Bug 510] System.load on applet hang the second time In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=510 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Target Milestone|--- |1.1 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:01:32 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:01:32 +0000 Subject: [Bug 443] Iceweasel freezes and is unresponsive In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=443 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Status|NEW |RESOLVED Resolution| |FIXED --- Comment #4 from Deepak Bhole 2011-05-31 19:01:31 --- https://panopticlick.eff.org/ works fine with HEAD. I am unable to verify, but closing due to no response from reporter. Please feel free to reopen if it is still happening. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:19:45 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:19:45 +0000 Subject: [Bug 395] firefox with openjdk-plugin hangs whenever jmol app is used In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=395 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Status|NEW |RESOLVED Resolution| |FIXED --- Comment #4 from Deepak Bhole 2011-05-31 19:19:44 --- JMol has been working fine for a while now. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:24:38 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:24:38 +0000 Subject: [Bug 439] Build fails on 64-bit systems due to upstream XPCOM bug In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=439 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |WONTFIX --- Comment #3 from Deepak Bhole 2011-05-31 19:24:37 --- IcedTea6-1.7 is no longer supported. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:28:54 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:28:54 +0000 Subject: [Bug 721] IcedTeaPlugin.so cannot run g_main_context_iteration on a different thread unless a different GMainContext *context is used [Crashes Mozilla Nightly] In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=721 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gerald.holzinger.public at gmai | |l.com --- Comment #7 from Deepak Bhole 2011-05-31 19:28:53 --- *** Bug 511 has been marked as a duplicate of this bug. *** -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:28:54 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:28:54 +0000 Subject: [Bug 511] chromium constantly crash when IcedTea is installed on opensuse In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=511 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Status|NEW |RESOLVED Resolution| |DUPLICATE Target Milestone|--- |1.1 --- Comment #2 from Deepak Bhole 2011-05-31 19:28:53 --- Appears to be a dupe of 721. Closing accordingly. *** This bug has been marked as a duplicate of bug 721 *** -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:34:00 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:34:00 +0000 Subject: [Bug 527] Bad variable in hotspot.method_entry|exit probes from hotspot.stp In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=527 Jon VanAlten changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED --- Comment #1 from Jon VanAlten 2011-05-31 19:34:00 --- I can see that this is no longer a problem in HEAD. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:37:05 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:37:05 +0000 Subject: [Bug 564] NetX depends on sun.misc.BASE64Encoder In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=564 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Target Milestone|--- |2.0 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:37:10 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:37:10 +0000 Subject: [Bug 570] NetX depends on sun.applet.AppletViewPanel In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=570 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Target Milestone|--- |2.0 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:37:15 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:37:15 +0000 Subject: [Bug 571] NetX depends on com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager.java In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=571 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Target Milestone|--- |2.0 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:47:22 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:47:22 +0000 Subject: [Bug 411] Applet cannot load j2pkcs11 library In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=411 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Target Milestone|--- |1.1 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:55:24 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:55:24 +0000 Subject: [Bug 395] firefox with openjdk-plugin hangs whenever jmol app is used In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=395 Paulo Cesar Pereira de Andrade changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |pcpa at mandriva.com.br --- Comment #5 from Paulo Cesar Pereira de Andrade 2011-05-31 19:55:23 --- (In reply to comment #4) > JMol has been working fine for a while now. Yes. The patch was required for i586 only and for an old version of java-1.6.0-openjdk and firefox. I also recently updated Mandriva to use openjdk b22, icedtea 1.10.1 and icedtea-web 1.0.2 as after recent firefox and chromium-browser-unstable it works with the jmol plugin (my main test of the plugin is testing the sagemath notebook interface in my Mandriva sagemath package). -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:56:30 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:56:30 +0000 Subject: [Bug 577] icedtea and keepvid.com In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=577 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |dbhole at redhat.com Status|NEW |RESOLVED Resolution| |FIXED Target Milestone|--- |1.1 --- Comment #1 from Deepak Bhole 2011-05-31 19:56:30 --- Works with HEAD. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 12:57:36 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 19:57:36 +0000 Subject: [Bug 737] Passing Number and Array parameters to applet methods doesn't work In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=737 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |1.1.1 --- Comment #1 from Deepak Bhole 2011-05-31 19:57:35 --- Targeting for 1.1.1 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 13:03:52 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 20:03:52 +0000 Subject: [Bug 735] Firefox 4 sometimes freezes if the applet calls showDocument() In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=735 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|--- |1.1 --- Comment #2 from Deepak Bhole 2011-05-31 20:03:51 --- Fixed in 1.1/HEAD. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 13:07:46 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 20:07:46 +0000 Subject: [Bug 708] can't copy or paste text in the text areas In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=708 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |INVALID --- Comment #3 from Deepak Bhole 2011-05-31 20:07:46 --- Hi. That is an unsigned app. Unsigned apps do not have clipboard access for security reasons. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 13:12:59 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 20:12:59 +0000 Subject: [Bug 692] africanking at win2day.at does not work In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=692 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Target Milestone|--- |1.1.1 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 13:13:28 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 20:13:28 +0000 Subject: [Bug 721] IcedTeaPlugin.so cannot run g_main_context_iteration on a different thread unless a different GMainContext *context is used [Crashes Mozilla Nightly] In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=721 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |1.1 --- Comment #8 from Deepak Bhole 2011-05-31 20:13:27 --- Targeting for 1.1 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla-daemon at icedtea.classpath.org Tue May 31 15:13:56 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 May 2011 22:13:56 +0000 Subject: [Bug 740] JavaFx applications fail to start In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=740 --- Comment #5 from Omair Majid 2011-05-31 22:13:56 --- Some more information. The stack trace in the exception shows classes from icedtea-web, icedtea6 and javafx. All of these classes have full permissions either because they are part of the system or they have the necessary privileges. The permissions are missing because the of call to doIntersectionPrivilege(AccessControlContext.java:105) This intersects the permissions of the current stack with the permissions of the stack when the event was created. This AWTEvent (InvocationEvent, to be exact) was created by a call hierarchy that includes the main application: Thread [BrickBreaker] (Suspended (entry into method in InvocationEvent)) InvocationEvent.(Object, int, Runnable, Object, boolean) line: 202 InvocationEvent.(Object, Runnable, Object, boolean) line: 170 InvocationEvent.(Object, Runnable) line: 134 EventQueue.invokeLater(Runnable) line: 1002 SwingToolkit.startup(Runnable) line: not available NativeMethodAccessorImpl.invoke0(Method, Object, Object[]) line: not available [native method] NativeMethodAccessorImpl.invoke(Object, Object[]) line: 57 DelegatingMethodAccessorImpl.invoke(Object, Object[]) line: 43 Method.invoke(Object, Object...) line: 616 GUIRuntimeProvider.run(Method, String...) line: not available Entry.start(Class, String[]) line: not available Main.main(String[]) line: not available Main.main(String[]) line: 35 NativeMethodAccessorImpl.invoke0(Method, Object, Object[]) line: not available [native method] NativeMethodAccessorImpl.invoke(Object, Object[]) line: 57 DelegatingMethodAccessorImpl.invoke(Object, Object[]) line: 43 Method.invoke(Object, Object...) line: 616 Launcher.launchApplication(JNLPFile) line: 617 Launcher$TgThread.run() line: 926 The main method is com.sun.javafx.runtime.main.Main, which is part of the unsigned BrickBreaker.jar. The intersection of permissions hence results in a set that does not include permissions to get the thread's context ClassLoader. Given the intentional security design, I cant fathom how this works with the proprietary JDK/javaws. A doPrivileged() wrapper in javafx when calling Thread.getContextClassLoader should fix this problem for us. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From andrew at icedtea.classpath.org Tue May 31 18:35:52 2011 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 01 Jun 2011 01:35:52 +0000 Subject: /hg/icedtea6-hg: 6 new changesets Message-ID: changeset cb5177de9f0b in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cb5177de9f0b author: ptisnovs date: Thu May 19 12:39:01 2011 +0200 Test enhancement - make the test compatible with OpenJDK7/IcedTea7, disabling printing unnecessary information to error output. changeset 0224254fcf75 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0224254fcf75 author: Denis Lila date: Fri May 20 08:55:31 2011 -0400 No focus to disabled components. changeset fc898988b053 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fc898988b053 author: Xerxes R?nby date: Fri May 27 16:55:49 2011 +0200 JamVM: Updated to 2011-04-28 revision, implemented remaining OpenJDK Array reflection interface. 2011-05-27 Xerxes R?nby JamVM - Fix leak of native thread structure. - Consistent naming for classlib functions. - Add extra includes to get rid off compiler warning. - Rework OpenJDK storage of native thread structure. - Implement remaining OpenJDK Array reflection interface. * NEWS: Updated. * Makefile.am (JAMVM_VERSION): Updated JamVM to 2011-04-28 revision. (JAMVM_SHA256SUM): Updated. changeset 0034f5cfd96a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0034f5cfd96a author: doko at ubuntu.com date: Sat May 28 12:37:23 2011 +0200 Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with-javac. duplicate the pattern to keep syntax highlighting happy. 2011-05-28 Matthias Klose * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with- javac. changeset e191909a7c6e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e191909a7c6e author: Andrew John Hughes date: Mon May 30 19:21:44 2011 +0100 Fix build failure caused by hs20 only LLVM 2.9 fix. 2011-05-30 Andrew John Hughes * patches/openjdk/7036220-shark_llvm_29_headers.patch: Moved to... * Makefile.am: Only apply 7036220 to hs20. * patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch: ...here. changeset b1123c5a67f7 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b1123c5a67f7 author: Andrew John Hughes date: Wed Jun 01 02:35:43 2011 +0100 Merge diffstat: ChangeLog | 104 ++ INSTALL | 16 +- Makefile.am | 53 +- NEWS | 6 + acinclude.m4 | 4 +- hotspot.map | 1 - patches/arm.patch | 56 + patches/gcc-suffix.patch | 29 + patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch | 173 ---- patches/hotspot/hs20/arm.patch | 56 - patches/hotspot/hs20/gcc-suffix.patch | 29 - patches/hotspot/hs20/ia64-fix.patch | 14 - patches/hotspot/hs20/params-cast-size_t.patch | 259 ------ patches/hotspot/hs20/powerpc-stacksize.patch | 39 - patches/hotspot/hs20/sparc-buildfixes.patch | 24 - patches/hotspot/hs20/systemtap.patch | 99 -- patches/hotspot/hs20/text-relocations.patch | 60 - patches/hotspot/original/7032388-work_without_cmov_instruction.patch | 152 --- patches/hotspot/original/arm.patch | 54 - patches/hotspot/original/gcc-suffix.patch | 29 - patches/hotspot/original/ia64-fix.patch | 28 - patches/hotspot/original/no-precompiled-headers.patch | 33 - patches/hotspot/original/params-cast-size_t.patch | 284 ------- patches/hotspot/original/sparc-buildfixes.patch | 32 - patches/hotspot/original/systemtap.patch | 97 -- patches/hotspot/original/text-relocations.patch | 58 - patches/hotspot/original/too-many-args.patch | 45 - patches/ia64-fix.patch | 14 + patches/jaxp-serial-version-uid.patch | 51 - patches/jtreg-6929067-fix.patch | 2 +- patches/openjdk/4685768-focus.patch | 390 ++++++++++ patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch | 21 - patches/openjdk/6633275-shaped_translucent_windows.patch | 117 +- patches/openjdk/6768387-jtable_not_serializable.patch | 104 -- patches/openjdk/6997495-test_correction_6857159.patch | 20 - patches/openjdk/7029905-demo_applet_html_files.patch | 52 - patches/openjdk/7032388-work_without_cmov_instruction.patch | 173 ++++ patches/openjdk/7042040-no_disk_space_check.patch | 112 -- patches/params-cast-size_t.patch | 259 ++++++ patches/powerpc-stacksize.patch | 39 + patches/sparc-buildfixes.patch | 24 + patches/systemtap.patch | 99 ++ patches/text-relocations.patch | 60 + 43 files changed, 1330 insertions(+), 2041 deletions(-) diffs (truncated from 4326 to 500 lines): diff -r 9cd3b8769614 -r b1123c5a67f7 ChangeLog --- a/ChangeLog Wed May 18 09:04:01 2011 -0400 +++ b/ChangeLog Wed Jun 01 02:35:43 2011 +0100 @@ -1,3 +1,89 @@ +2011-05-30 Andrew John Hughes + + * patches/openjdk/7036220-shark_llvm_29_headers.patch: + Moved to... + * Makefile.am: Only apply 7036220 to hs20. + * patches/hotspot/hs20/7036220-shark_llvm_29_headers.patch: + ...here. + +2011-05-28 Matthias Klose + + * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Filter-out --with-javac. + +2011-05-27 Xerxes R??nby + + JamVM + - Fix leak of native thread structure. + - Consistent naming for classlib functions. + - Add extra includes to get rid off compiler warning. + - Rework OpenJDK storage of native thread structure. + - Implement remaining OpenJDK Array reflection interface. + * NEWS: Updated. + * Makefile.am + (JAMVM_VERSION): Updated JamVM to 2011-04-28 revision. + (JAMVM_SHA256SUM): Updated. + +2011-05-19 Denis Lila + + * Makefile.am: Apply patch. + * NEWS: Update with backport. + * patches/openjdk/4685768-focus.patchpatch: The restore focus + procedure now skips disabled components. + +2011-05-19 Pavel Tisnovsky + + * patches/jtreg-6929067-fix.patch: Test enhancement - + make the test compatible with OpenJDK7/IcedTea7, disabling printing + unnecessary information to error output. + +2011-05-18 Andrew John Hughes + + * patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch, + * patches/hotspot/hs20/arm.patch, + * patches/hotspot/hs20/gcc-suffix.patch, + * patches/hotspot/hs20/ia64-fix.patch, + * patches/hotspot/hs20/params-cast-size_t.patch, + * patches/hotspot/hs20/powerpc-stacksize.patch, + * patches/hotspot/hs20/sparc-buildfixes.patch, + * patches/hotspot/hs20/systemtap.patch, + * patches/hotspot/hs20/text-relocations.patch: + Moved to main tree. + * patches/hotspot/original/7032388-work_without_cmov_instruction.patch, + * patches/hotspot/original/arm.patch, + * patches/hotspot/original/gcc-suffix.patch, + * patches/hotspot/original/ia64-fix.patch, + * patches/hotspot/original/no-precompiled-headers.patch, + * patches/hotspot/original/params-cast-size_t.patch, + * patches/hotspot/original/sparc-buildfixes.patch, + * patches/hotspot/original/systemtap.patch, + * patches/hotspot/original/text-relocations.patch, + * patches/hotspot/original/too-many-args.patch: + Dropped; hs19 no longer supported. + * patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch, + * patches/openjdk/6997495-test_correction_6857159.patch, + * patches/openjdk/7029905-demo_applet_html_files.patch, + * patches/openjdk/7042040-no_disk_space_check.patch: + Removed; upstream in OpenJDK6. + * INSTALL: Update HotSpot documentation. + * Makefile.am: + (ICEDTEA_PATCHES): Updated. + * acinclude.m4: + (IT_WITH_HOTSPOT_BUILD): Set default back to original. + * hotspot.map: Remove hs19. + * patches/arm.patch, + * patches/gcc-suffix.patch, + * patches/ia64-fix.patch: + Extended with HotSpot segments from hotspot/hs20. + * patches/openjdk/6633275-shaped_translucent_windows.patch: + Recreated due to copyright header change in Component.java. + * patches/openjdk/7032388-work_without_cmov_instruction.patch, + * patches/params-cast-size_t.patch, + * patches/powerpc-stacksize.patch, + * patches/sparc-buildfixes.patch, + * patches/systemtap.patch, + * patches/text-relocations.patch: + Moved from hotspot/hs20. + 2011-05-17 Denis Lila * Makefile.am: Apply patch. @@ -302,6 +388,12 @@ 2011-03-31 Andrew John Hughes + * patches/jaxp-serial-version-uid.patch, + * patches/openjdk/6768387-jtable_not_serializable.patch: + Dropped, upstream. + +2011-03-31 Andrew John Hughes + S7032388, PR682: Make HotSpot work on machines without cmov instruction again * Makefile.am: Add new patch. @@ -321,6 +413,13 @@ 2011-03-31 Andrew John Hughes * Makefile.am: + (JAXP_DROP_ZIP): Update. + (JAXP_DROP_SHA256SUM): Likewise. + (ICEDTEA_PATCHES): Drop above. + +2011-03-31 Andrew John Hughes + + * Makefile.am: Revert broken changes in 478d3f5f6a59409078b1adcfba24150158b92695 (.PHONY): Remove jtregcheck-summary. @@ -559,6 +658,11 @@ 2011-03-03 Andrew John Hughes + * Makefile.am: + Bump to b23. + +2011-03-03 Andrew John Hughes + * INSTALL: Update documentation to match current settings. * NEWS: Mention change to hs20. diff -r 9cd3b8769614 -r b1123c5a67f7 INSTALL --- a/INSTALL Wed May 18 09:04:01 2011 -0400 +++ b/INSTALL Wed Jun 01 02:35:43 2011 +0100 @@ -318,16 +318,13 @@ download stage and just verifies that the zip's MD5 sum matches that of the requested build. -At present, IcedTea6 supports the 'original' HotSpot 19 provided as -part of the upstream tarball and HotSpot 20 ('hs20') from the stable -hs20 tree at http://hg.openjdk.java.net/hsx/hsx20/master. The default -is 'hs20' which will use the version of hs20 specified in hotspot.map. -Note that the norm. is for up to one alternate (non-default) build to -be supported and just passing --with-hotspot-build (equivalent to ---with-hotspot-build=yes) will always provide the alternate build -(currently hs20). Conversely, passing --without-hotspot-build -(equivalent to --with-hotspot-build=no) provides the original build -from the OpenJDK tarball (currently hs19). +At present, IcedTea6 supports the 'original' HotSpot 20 provided as +part of the upstream tarball. Note that the norm. is for up to one +alternate (non-default) build to be supported and just passing +--with-hotspot-build (equivalent to --with-hotspot-build=yes) will +always provide the alternate build. Conversely, passing +--without-hotspot-build (equivalent to --with-hotspot-build=no) +provides the original build from the OpenJDK tarball. Javascript Support ================== diff -r 9cd3b8769614 -r b1123c5a67f7 Makefile.am --- a/Makefile.am Wed May 18 09:04:01 2011 -0400 +++ b/Makefile.am Wed Jun 01 02:35:43 2011 +0100 @@ -2,7 +2,7 @@ OPENJDK_DATE = 28_feb_2011 OPENJDK_MD5SUM = 2d2bbbb0f9b81f1fec41ec730da8a933 -OPENJDK_VERSION = b22 +OPENJDK_VERSION = b23 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ CACAO_VERSION = d6264eb66506 @@ -11,8 +11,8 @@ CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz -JAMVM_VERSION = a95ca049d3bb257d730535a5d5ec3f73a943d0aa -JAMVM_SHA256SUM = 18bb5c97c03fb73f70b481440e3e11803448d327c024d4570a338b899693fefd +JAMVM_VERSION = 2e52a601883dda84c824b43363c02881def3e06d +JAMVM_SHA256SUM = b26bc67ddfb50c98761aa4939254470ec9a8f88e9a22628b858603099a784af8 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz @@ -24,9 +24,8 @@ JAF_DROP_ZIP = jdk6-jaf-b20.zip JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 JAXP_DROP_URL = http://icedtea.classpath.org/download/drops -JAXP_DROP_ZIP = jaxp144_01.zip -JAXP_DROP_SHA256SUM = d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186 - +JAXP_DROP_ZIP = jaxp144_02.zip +JAXP_DROP_SHA256SUM = 29edfda4b7e5e2f87da5a172b4d3e3cf05b1c1ec60e5ebb0144470edcb2a9c1d OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6 HOTSPOT_SRC_ZIP = hotspot.tar.gz @@ -188,11 +187,6 @@ SECURITY_PATCHES = -if WITH_ALT_HSBUILD -SECURITY_PATCHES += \ - patches/security/20110215/6878713.patch -endif - ICEDTEA_PATCHES = \ $(SECURITY_PATCHES) \ patches/stdc-limit-macros.patch \ @@ -200,6 +194,7 @@ patches/openjdk/6637796-set_bounds.patch \ patches/openjdk/6607660-treelock.patch \ patches/openjdk/6607170-request_focus.patch \ + patches/openjdk/4685768-focus.patch \ patches/openjdk/6616323-component_array.patch \ patches/openjdk/6682046-shape_calculation.patch \ patches/openjdk/6797195-hw_lw_mixing.patch \ @@ -216,12 +211,11 @@ patches/lucene-crash.patch \ patches/version.patch \ patches/version-hotspot.patch \ - patches/hotspot/$(HSBUILD)/text-relocations.patch \ + patches/text-relocations.patch \ patches/openjdk/7043921-java_rmi_cgi.patch \ patches/use-system-tzdata.patch \ patches/headers.patch \ patches/gcc-suffix.patch \ - patches/hotspot/$(HSBUILD)/gcc-suffix.patch \ patches/memory-limits.patch \ patches/libraries.patch \ patches/jvmtiEnv.patch \ @@ -236,7 +230,7 @@ patches/alt-jar.patch \ patches/jdk-use-ssize_t.patch \ patches/use-idx_t.patch \ - patches/hotspot/$(HSBUILD)/params-cast-size_t.patch \ + patches/params-cast-size_t.patch \ patches/clean-crypto.patch \ patches/arch.patch \ patches/lc_ctype.patch \ @@ -245,11 +239,10 @@ patches/testenv.patch \ patches/samejvm-safe.patch \ patches/pr261.patch \ - patches/hotspot/$(HSBUILD)/sparc-buildfixes.patch \ + patches/sparc-buildfixes.patch \ patches/sparc64-linux.patch \ patches/sparc-ptracefix.patch \ patches/sparc-trapsfix.patch \ - patches/openjdk/7029905-demo_applet_html_files.patch \ patches/jtreg-6592792.patch \ patches/s390-noinline.patch \ patches/jtreg-dnd.patch \ @@ -267,9 +260,7 @@ patches/applet_hole.patch \ patches/jtreg-httpTest.patch \ patches/arm.patch \ - patches/hotspot/$(HSBUILD)/arm.patch \ patches/debug-dir.patch \ - patches/openjdk/7042040-no_disk_space_check.patch \ patches/override-redirect-metacity.patch \ patches/openjdk/6967533-pre_epoch.patch \ patches/fonts-rhel.patch \ @@ -290,7 +281,7 @@ patches/openjdk/6800846-printing-quality.patch \ patches/rh661505-jpeg.patch \ patches/6703377-freetypescaler.patch \ - patches/hotspot/$(HSBUILD)/ia64-fix.patch \ + patches/ia64-fix.patch \ patches/openjdk/6642612-filechooser_button_sizes.patch \ patches/jtreg-international-fonts-styles.patch \ patches/openjdk/6736649-text_bearings.patch \ @@ -320,39 +311,27 @@ patches/openjdk/6766342-AA-simple-shape-performance.patch \ patches/openjdk/7016856-pisces-performance.patch \ patches/openjdk/6934977-MappedByteBuffer.load.patch \ - patches/jaxp-serial-version-uid.patch \ patches/jtreg-hotspot-bug-6196102.patch \ patches/jtreg-double-to-string.patch \ patches/openjdk/7023591-AAShapePipe.patch \ patches/openjdk/7027667-AAShapePipeRegTest.patch \ patches/openjdk/7019861-AA-regression-fix.patch \ - patches/openjdk/6768387-jtable_not_serializable.patch \ - patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch \ patches/g356743-libpng-1.5.patch \ patches/revert-6885123.patch \ - patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \ + patches/openjdk/7032388-work_without_cmov_instruction.patch \ patches/openjdk/7031385-gcc-register-allocation-fix.patch \ - patches/openjdk/7036220-shark_llvm_29_headers.patch \ patches/openjdk/6986968-crash_on_xim_restart.patch \ patches/openjdk/7036754-stroker-nan.patch \ patches/openjdk/pgram-pipe-regression.patch \ patches/openjdk/7034464-hugepage.patch \ patches/openjdk/7037939-hugepage.patch \ patches/openjdk/7043564-hugepage.patch \ - patches/openjdk/mutter.patch - -if WITH_ALT_HSBUILD -ICEDTEA_PATCHES += \ + patches/openjdk/mutter.patch \ patches/pr639-broken_shark_build.patch \ - patches/hotspot/$(HSBUILD)/powerpc-stacksize.patch \ + patches/powerpc-stacksize.patch \ patches/jtreg-remove-test-6987555.patch \ - patches/jtreg-remove-test-6991596.patch -else -ICEDTEA_PATCHES += \ - patches/hotspot/$(HSBUILD)/no-precompiled-headers.patch \ - patches/hotspot/$(HSBUILD)/too-many-args.patch \ - patches/openjdk/6997495-test_correction_6857159.patch -endif + patches/jtreg-remove-test-6991596.patch \ + patches/openjdk/7036220-shark_llvm_29_headers.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -394,7 +373,6 @@ if ENABLE_SYSTEMTAP ICEDTEA_PATCHES += patches/systemtap.patch \ - patches/hotspot/$(HSBUILD)/systemtap.patch \ patches/systemtap-gcc-4.5.patch \ patches/systemtap-alloc-size-workaround.patch endif @@ -1951,6 +1929,7 @@ --disable-docs \ $(filter-out '--with-jdk-home=% '--with-ecj=% \ '--with-java=% '--with-javah=% \ + '--with-javac=% '--with-javac=% \ '--with-rmic=% '--with-additional-vms=% \ '--with-openjdk '--with-openjdk=% , \ $(CONFIGURE_ARGS)) \ diff -r 9cd3b8769614 -r b1123c5a67f7 NEWS --- a/NEWS Wed May 18 09:04:01 2011 -0400 +++ b/NEWS Wed Jun 01 02:35:43 2011 +0100 @@ -29,6 +29,7 @@ - S7042040: Remove disk space sanity check - S7043054: REGRESSION - wrong userBounds in Paint.createContext() - S7043963, RH698295: Window manager workaround in AWT was not applied to mutter. Now it is. + - S4685768: Focus set to disabled component, can't Tab/Shift-Tab * Bug fixes - PR637: make check should exit with an error code if any regression test failed. - G356743: Support libpng 1.5. @@ -46,6 +47,11 @@ - CA156: uncaughtExceptionHandler doesn't work with OpenJDK 6 b21. - CA157: ARM SMP Assertion thinlock failed. * JamVM + - Fix leak of native thread structure. + - Consistent naming for classlib functions. + - Add extra includes to get rid off compiler warning. + - Rework OpenJDK storage of native thread structure. + - Implement remaining OpenJDK Array reflection interface. - Ignore all unknown options. - Handle overflow in getPhysicalMemory(). - Base default min and max heap size on physical memory. diff -r 9cd3b8769614 -r b1123c5a67f7 acinclude.m4 --- a/acinclude.m4 Wed May 18 09:04:01 2011 -0400 +++ b/acinclude.m4 Wed Jun 01 02:35:43 2011 +0100 @@ -1044,8 +1044,8 @@ AC_DEFUN([IT_WITH_HOTSPOT_BUILD], [ ORIGINAL_BUILD="original" - ALTERNATE_BUILD="hs20" - DEFAULT_BUILD=${ALTERNATE_BUILD} + ALTERNATE_BUILD="original" + DEFAULT_BUILD=${ORIGINAL_BUILD} AC_MSG_CHECKING([which HotSpot build to use]) AC_ARG_WITH([hotspot-build], [AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use (see hotspot.map))], diff -r 9cd3b8769614 -r b1123c5a67f7 hotspot.map --- a/hotspot.map Wed May 18 09:04:01 2011 -0400 +++ b/hotspot.map Wed Jun 01 02:35:43 2011 +0100 @@ -1,2 +1,1 @@ # version url changeset md5sum -hs20 http://hg.openjdk.java.net/hsx/hsx20/master f0f676c5a2c6 369ad745bf697d525d1a00fc09906829 diff -r 9cd3b8769614 -r b1123c5a67f7 patches/arm.patch --- a/patches/arm.patch Wed May 18 09:04:01 2011 -0400 +++ b/patches/arm.patch Wed Jun 01 02:35:43 2011 +0100 @@ -164,3 +164,60 @@ Thread* t = ThreadLocalStorage::get_thread_slow(); SignalHandlerMark shm(t); +diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp +--- openjdk.orig/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2011-01-25 22:57:24.000000000 +0000 ++++ openjdk/hotspot/src/cpu/zero/vm/bytecodes_zero.hpp 2011-01-28 01:46:18.769782690 +0000 +@@ -1,6 +1,7 @@ + /* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2009 Red Hat, Inc. ++ * Copyright 2009 Edward Nevill + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -26,6 +27,44 @@ + #ifndef CPU_ZERO_VM_BYTECODES_ZERO_HPP + #define CPU_ZERO_VM_BYTECODES_ZERO_HPP + +-// This file is intentionally empty ++#ifdef HOTSPOT_ASM ++#define _iaccess_0 ((Bytecodes::Code)0xdb) ++#define _iaccess_1 ((Bytecodes::Code)0xdc) ++#define _iaccess_2 ((Bytecodes::Code)0xdd) ++#define _iaccess_3 ((Bytecodes::Code)0xde) ++ ++#define _invokeresolved ((Bytecodes::Code)0xdf) ++#define _invokespecialresolved ((Bytecodes::Code)0xe0) ++#define _invokestaticresolved ((Bytecodes::Code)0xe1) ++ ++#define _iload_iload ((Bytecodes::Code)0xe3) ++#define _iload_iload_N ((Bytecodes::Code)0xe4) ++ ++#define _dmac ((Bytecodes::Code)0xe6) ++ ++ _iload_0_iconst_N , // 231 ++ _iload_1_iconst_N , // 232 ++ _iload_2_iconst_N , // 233 ++ _iload_3_iconst_N , // 234 ++ _iload_iconst_N , // 235 ++ _iadd_istore_N , // 236 ++ _isub_istore_N , // 237 ++ _iand_istore_N , // 238 ++ _ior_istore_N , // 239 ++ _ixor_istore_N , // 240 ++ _iadd_u4store , // 241 ++ _isub_u4store , // 242 ++ _iand_u4store , // 243 ++ _ior_u4store , // 244 ++ _ixor_u4store , // 245 ++ _iload_0_iload , // 246 ++ _iload_1_iload , // 247 ++ _iload_2_iload , // 248 ++ _iload_3_iload , // 249 ++ _iload_0_iload_N , // 250 ++ _iload_1_iload_N , // 251 ++ _iload_2_iload_N , // 252 ++ _iload_3_iload_N , // 253 ++#endif // HOTSPOT_ASM + + #endif // CPU_ZERO_VM_BYTECODES_ZERO_HPP diff -r 9cd3b8769614 -r b1123c5a67f7 patches/gcc-suffix.patch --- a/patches/gcc-suffix.patch Wed May 18 09:04:01 2011 -0400 +++ b/patches/gcc-suffix.patch Wed Jun 01 02:35:43 2011 +0100 @@ -46,3 +46,34 @@ endif ifneq ("$(findstring sparc,$(ARCH))", "") # sparc or sparcv9 +diff -Nru openjdk.orig/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile +--- openjdk.orig/hotspot/agent/src/os/linux/Makefile 2011-01-25 22:57:24.000000000 +0000 ++++ openjdk/hotspot/agent/src/os/linux/Makefile 2011-01-28 00:43:20.632487152 +0000 +@@ -23,7 +23,7 @@ + # + + ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi ) +-GCC = gcc ++GCC = gcc$(GCC_SUFFIX) + + JAVAH = ${JAVA_HOME}/bin/javah + +diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make +--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2011-01-28 00:35:53.000000000 +0000 ++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2011-01-28 00:43:56.676866099 +0000 +@@ -28,11 +28,11 @@ + # When cross-compiling the ALT_COMPILER_PATH points + # to the cross-compilation toolset + ifdef CROSS_COMPILE_ARCH +-CPP = $(ALT_COMPILER_PATH)/g++ +-CC = $(ALT_COMPILER_PATH)/gcc ++CPP = $(ALT_COMPILER_PATH)/g++$(GCC_SUFFIX) ++CC = $(ALT_COMPILER_PATH)/gcc$(GCC_SUFFIX) + else +-CPP = g++ +-CC = gcc ++CPP = g++$(GCC_SUFFIX) ++CC = gcc$(GCC_SUFFIX) + endif + + AS = $(CC) -c diff -r 9cd3b8769614 -r b1123c5a67f7 patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch --- a/patches/hotspot/hs20/7032388-work_without_cmov_instruction.patch Wed May 18 09:04:01 2011 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,178 +0,0 @@ ---- openjdk/hotspot/src/cpu/x86/vm/assembler_x86.cpp 2011-03-30 11:31:16.408872134 -0700 -+++ openjdk/hotspot/src/cpu/x86/vm/assembler_x86.cpp 2011-03-30 11:31:16.084614406 -0700 -@@ -7769,6 +7769,28 @@ - } - } - -+void MacroAssembler::cmov32(Condition cc, Register dst, Address src) { -+ if (VM_Version::supports_cmov()) { -+ cmovl(cc, dst, src); -+ } else { -+ Label L; -+ jccb(negate_condition(cc), L); -+ movl(dst, src); -+ bind(L); -+ } -+} -+ -+void MacroAssembler::cmov32(Condition cc, Register dst, Register src) { -+ if (VM_Version::supports_cmov()) { -+ cmovl(cc, dst, src); -+ } else {