read properties using System.getenv()

From jvanek at redhat.com Thu Dec 1 08:30:05 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 01 Dec 2011 17:30:05 +0100 Subject: visualvm harness 1.3 Message-ID: <4ED7AB8D.8090902@redhat.com> I would like to release visualvm harness 1.3 in 8.12.2012. It will be determined for F17. This release contains: * update to visualvm 1.3.3 * compatible with platform13 (packed as 7.0.1-x) In case that netbeans platform will be update, the it probably comes out with platform14, so also update of visualvm harness will be necessary. Ok with this? Best regards J. From bugzilla-daemon at icedtea.classpath.org Thu Dec 1 16:19:19 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Dec 2011 00:19:19 +0000 Subject: [Bug 825] New: OpenOffice crash on opening file (attached) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=825 Bug #: 825 Summary: OpenOffice crash on opening file (attached) Classification: Unclassified Product: IcedTea Version: 6-1.10.4 Platform: x86_64 OS/Version: Linux Status: NEW Severity: critical Priority: P3 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: bugzilla at huber-und-boehm.de Hi there, I installed openSuSE 12.1 some days ago and ran into serious problems on inserting pictures into an OpenOffice document. Shifting images, adding some extra space around an picture or adding new pictures leads to crashes, I encountered a lot of them today :-( Now I got an easy way to reproduce the problem: I saved the document in order to loose at least work as possible on the next crash, ran into a crash on a picture manipulation, and tried to reopen the saved file. But OpenOffice crashes immediately on opening this file ... I attached it. Fortunately btrfs saved me a sane version of this file in the last snapshot less than one hour ago, but I encounter more crashes on trying to insert, resize and move pictures. Reminds me to microsoft word in former times :-( Let me know if I can help on lifting this fog ... Winfried ------ console report added here: ----- win at ara [1051]$ soffice ~/OpenOffice_crashImeediately.odt # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007fe22a62a511, pid=8997, tid=140610186487584 # # 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.4 # Distribution: Dummy Product (x86_64), package suse-1.2-x86_64 # Problematic frame: # C [libswlx.so+0x5c3511] SwTxtNode::GetDropSize(int&, int&, int&) const+0xade1 # # An error report file with more information is saved as: # /home2/win/not/segeln/sgm/Upcoming/hs_err_pid8997.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # -- 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 Dec 1 16:54:27 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Dec 2011 00:54:27 +0000 Subject: [Bug 825] OpenOffice crash on opening file (attached) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=825 --- Comment #1 from Winfried Huber 2011-12-02 00:54:27 UTC --- Created attachment 616 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=616 the error log the console log tells to add -- 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 Dec 1 17:02:28 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 2 Dec 2011 01:02:28 +0000 Subject: visualvm harness 1.3 In-Reply-To: <4ED7AB8D.8090902@redhat.com> References: <4ED7AB8D.8090902@redhat.com> Message-ID: <20111202010228.GA8239@rivendell.middle-earth.co.uk> On 17:30 Thu 01 Dec , Jiri Vanek wrote: > I would like to release visualvm harness 1.3 in 8.12.2012. It will be determined for F17. > > This release contains: > * update to visualvm 1.3.3 > * compatible with platform13 (packed as 7.0.1-x) > > In case that netbeans platform will be update, the it probably comes out with platform14, so also update of visualvm harness will be necessary. > > > Ok with this? > > > Best regards > J. Are there still changes to be done or is everything ready for release? -- 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: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111202/2d97c04b/attachment.bin From bugzilla-daemon at icedtea.classpath.org Thu Dec 1 17:47:16 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Dec 2011 01:47:16 +0000 Subject: [Bug 825] OpenOffice crash on opening file (attached) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=825 --- Comment #2 from Winfried Huber 2011-12-02 01:47:16 UTC --- The file that crashes LibreOffice on opening may be downloaded from ... http://huber-und-boehm.dyndns.org/bugzilla/LibreOfficeCrashImmediately.odt It is about 50 MB and thus too big to get 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 jvanek at redhat.com Thu Dec 1 22:25:28 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Fri, 02 Dec 2011 07:25:28 +0100 Subject: visualvm harness 1.3 In-Reply-To: <20111202010228.GA8239@rivendell.middle-earth.co.uk> References: <4ED7AB8D.8090902@redhat.com> <20111202010228.GA8239@rivendell.middle-earth.co.uk> Message-ID: <4ED86F58.2000807@redhat.com> On 12/02/2011 02:02 AM, Dr Andrew John Hughes wrote: > On 17:30 Thu 01 Dec , Jiri Vanek wrote: >> I would like to release visualvm harness 1.3 in 8.12.2012. It will be determined for F17. >> >> This release contains: >> * update to visualvm 1.3.3 >> * compatible with platform13 (packed as 7.0.1-x) >> >> In case that netbeans platform will be update, the it probably comes out with platform14, so also update of visualvm harness will be necessary. >> >> >> Ok with this? >> >> >> Best regards >> J. > > Are there still changes to be done or is everything ready for release? If there will be no changes in packages we depend on (especially nb platform), then everything is prepared. J. From bugzilla-daemon at icedtea.classpath.org Fri Dec 2 01:01:44 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Dec 2011 09:01:44 +0000 Subject: [Bug 825] OpenOffice crash on opening file (attached) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=825 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |xerxes at zafena.se --- Comment #3 from Xerxes R?nby 2011-12-02 09:01:44 UTC --- Hi thank you for the report, excellent that you provide a testcase! , the error # SIGSEGV (0xb) at pc=0x00007fe22a62a511, pid=8997, tid=140610186487584 ... # Problematic frame: # C [libswlx.so+0x5c3511] SwTxtNode::GetDropSize(int&, int&, int&) const+0xade1 Indicates that the crash happened when executing C code that belong to the libre office libswlx.so . This most likely also means that the bug sits outside the openjdk/icedtea codebase, I recommend you to do the following: 1. Forward this bug to OpenSuse. 2. Forward this bug to LibreOffice. A crash like this can indicate that your document are exposing a not yet known security hole in the LibreOffice libswlx.so C code. Myself i am not able to reproduce your bug. I have been able to open the document fine on my Ubuntu 11.10 system and I have been able to view all of the 38 pages using LibreOffice 3.4.4 OOO340m1 (Build:402) -- 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 Fri Dec 2 08:45:55 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Dec 2011 16:45:55 +0000 Subject: [Bug 825] OpenOffice crash on opening file (attached) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=825 --- Comment #4 from Winfried Huber 2011-12-02 16:45:55 UTC --- (In reply to comment #3) > Hi thank you for the report, excellent that you provide a testcase! > > , the error > # SIGSEGV (0xb) at pc=0x00007fe22a62a511, pid=8997, tid=140610186487584 > ... > # Problematic frame: > # C [libswlx.so+0x5c3511] SwTxtNode::GetDropSize(int&, int&, int&) > const+0xade1 > > Indicates that the crash happened when executing C code that belong to the > libre office libswlx.so . This most likely also means that the bug sits outside > the openjdk/icedtea codebase, > > I recommend you to do the following: > 1. Forward this bug to OpenSuse. > 2. Forward this bug to LibreOffice. A crash like this can indicate that your > document are exposing a not yet known security hole in the LibreOffice > libswlx.so C code. > > Myself i am not able to reproduce your bug. > I have been able to open the document fine on my Ubuntu 11.10 system > and I have been able to view all of the 38 pages using LibreOffice 3.4.4 > OOO340m1 (Build:402) Ok, as you suggested I cross posted this bug to... https://bugs.freedesktop.org/show_bug.cgi?id=43464 https://bugzilla.novell.com/show_bug.cgi?id=734475 Thanks for the hints! -- 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 Fri Dec 2 11:01:39 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 02 Dec 2011 19:01:39 +0000 Subject: [Bug 818] Upon normal cut-and-paste operations between applications the soffice.bin binary crashes. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=818 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |dbhole at redhat.com Resolution| |MOVED --- Comment #1 from Deepak Bhole 2011-12-02 19:01:39 UTC --- The error is coming from native code and the JDK cannot do anything about this. Please re-file this with LibreOffice at https://bugs.freedesktop.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 rcook at wyrms.net Sat Dec 3 17:48:50 2011 From: rcook at wyrms.net (Robin Cook) Date: Sat, 03 Dec 2011 19:48:50 -0600 Subject: icedtea6 1.10.4 - changing openjdk version.... In-Reply-To: References: Message-ID: <1322963330.4318.4.camel@pheuri.wyrms.net> Hello, Is there an easy way to have icedtea6 1.10.4 build openjdk-6-src-b24-14_nov_2011.tar.gz instead of openjdk-6-src-b22-28_feb_2011.tar.gz? Thanks -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111203/b156c883/attachment.bin From bugzilla-daemon at icedtea.classpath.org Sat Dec 3 20:01:30 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 04 Dec 2011 04:01:30 +0000 Subject: [Bug 787] IcedTea javac fails to compile certain generic expressions (Reduced test case included) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=787 rcook at wyrms.net changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |rcook at wyrms.net --- Comment #1 from rcook at wyrms.net 2011-12-04 04:01:30 UTC --- I am getting this also but not sure if it is an icedtea or openjdk issue. I even tried the mercurial version just to see if it was fixed there. java -version java version "1.6.0_24" OpenJDK Runtime Environment (IcedTea6 1.11pre+r0a0072170876+) (Source Mage build 1.6.0_24-b24) OpenJDK 64-Bit Server VM (build 20.0-b12, mixed mode) -- 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 Dec 4 10:08:26 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 04 Dec 2011 18:08:26 +0000 Subject: [Bug 787] IcedTea javac fails to compile certain generic expressions (Reduced test case included) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=787 Deepak Bhole changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |dbhole at redhat.com Resolution| |WONTFIX --- Comment #2 from Deepak Bhole 2011-12-04 18:08:26 UTC --- This looks like the same issue as RH706066/S6369605 fixed in OpenJDK7: http://hg.openjdk.java.net/jdk7/jdk7/langtools/rev/dc550520ed6f I've confirmed by applying the patch and trying to re-compile the test. It was rejected from application to IcedTea. You can find the discussion in this thread: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-June/014574.html Since the concerns for backport still stand, I would suggest manually specifying the type parameters in your code instead of having the compiler infer them. That is what Denis's patch did for commons-discovery: https://issues.apache.org/jira/browse/DISCOVERY-18 I am going to close this as WONTFIX. -- 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 Dec 4 12:55:04 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 04 Dec 2011 20:55:04 +0000 Subject: [Bug 826] New: compile failing due to gawk, head, test, wc, egrep, and grep being in different directories. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=826 Bug #: 826 Summary: compile failing due to gawk, head, test, wc, egrep, and grep being in different directories. Classification: Unclassified Product: IcedTea Version: 6-hg Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: rcook at wyrms.net Created attachment 617 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=617 compile log with no symbolic links. My distribution has gawk, head, test, wc, egrep, and grep in different directories than the build is looking for them. If I create symbolic links to where it is looking it builds. The only one that it doesn't fail compile if the link is not there is grep. 1.10.4 is the same except tail is added to the list. ln -sfn /bin/gawk /usr/bin/gawk ln -sfn /bin/head /usr/bin/head ln -sfn /bin/test /usr/bin/test ln -sfn /bin/wc /usr/bin/wc ln -sfn /usr/bin/egrep /bin/egrep ln -sfn /usr/bin/grep /bin/grep I will attach the compile logs that I have. -- 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 Dec 4 12:56:31 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 04 Dec 2011 20:56:31 +0000 Subject: [Bug 826] compile failing due to gawk, head, test, wc, egrep, and grep being in different directories. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=826 --- Comment #1 from rcook at wyrms.net 2011-12-04 20:56:31 UTC --- Created attachment 618 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=618 compile log with symbolic links for gawk, head, and egrep -- 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 Dec 4 12:57:40 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 04 Dec 2011 20:57:40 +0000 Subject: [Bug 826] compile failing due to gawk, head, test, wc, egrep, and grep being in different directories. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=826 --- Comment #2 from rcook at wyrms.net 2011-12-04 20:57:40 UTC --- Created attachment 619 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=619 compile log with symbolic links for gawk, head, test, and egrep -- 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 Dec 4 13:01:47 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 04 Dec 2011 21:01:47 +0000 Subject: [Bug 826] compile failing due to gawk, head, test, wc, egrep, and grep being in different directories. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=826 --- Comment #3 from rcook at wyrms.net 2011-12-04 21:01:47 UTC --- I have the compile logs that successfully compiled with links for gawk, head, test, wc, and egrep and one that has the links for all. -- 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 fw at deneb.enyo.de Sun Dec 4 22:51:42 2011 From: fw at deneb.enyo.de (Florian Weimer) Date: Mon, 05 Dec 2011 07:51:42 +0100 Subject: Bootstrapping IcedTea6 with IcedTea6 Message-ID: <8762hvbjep.fsf@mid.deneb.enyo.de> In the light of , I wonder what's the correct way of building IcedTea6 when you haven't got GCJ, but only an older IcedTea6 version? Is this possible at all? From ptisnovs at icedtea.classpath.org Mon Dec 5 01:49:00 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 05 Dec 2011 09:49:00 +0000 Subject: /hg/gfx-test: 2011-12-05 Pavel Tisnovsky Message-ID: changeset 57cdb69f27a1 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=57cdb69f27a1 author: Pavel Tisnovsky date: Mon Dec 05 10:51:16 2011 +0100 2011-12-05 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java: Added 12 new tests to this test suite (rendering clipped circle using texture paint). diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java | 286 +++++++++++ 2 files changed, 292 insertions(+), 0 deletions(-) diffs (309 lines): diff -r f81d252641cf -r 57cdb69f27a1 ChangeLog --- a/ChangeLog Wed Nov 30 11:03:18 2011 +0100 +++ b/ChangeLog Mon Dec 05 10:51:16 2011 +0100 @@ -1,3 +1,9 @@ +2011-12-05 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java: + Added 12 new tests to this test suite (rendering clipped circle + using texture paint). + 2011-11-30 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java: diff -r f81d252641cf -r 57cdb69f27a1 src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java Wed Nov 30 11:03:18 2011 +0100 +++ b/src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java Mon Dec 05 10:51:16 2011 +0100 @@ -642,6 +642,292 @@ } /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaCheckerTexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingCheckerTexture(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaDiagonalCheckerTexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingDiagonalCheckerTexture(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaGridTexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingGridTexture(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaDiagonalGridTexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingDiagonalGridTexture(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaColorDotsTexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingColorDotsTexture(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaHorizontalStripesTexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingHorizontalStripesTexture(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaVerticalStripesTexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingVerticalStripesTexture(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaDiagonalStripesTexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingDiagonalStripesTexture(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaHorizontalColorStripesTexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingHorizontalColorStripesTexture(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaVerticalColorStripesTexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingVerticalColorStripesTexture(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaRGB1TexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingRGBTexture1(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaRGB2TexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingRGBTexture2(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by an ellipse shape. Circle is + * rendered using texture paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaRGB3TexturePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set the texture + CommonRenderingStyles.setTextureFillUsingRGBTexture3(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByEllipseShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** * Entry point to the test suite. * * @param args From xerxes at zafena.se Mon Dec 5 02:48:59 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Mon, 05 Dec 2011 11:48:59 +0100 Subject: Bootstrapping IcedTea6 with IcedTea6 In-Reply-To: <8762hvbjep.fsf@mid.deneb.enyo.de> References: <8762hvbjep.fsf@mid.deneb.enyo.de> Message-ID: <4EDCA19B.3090103@zafena.se> 2011-12-05 07:51, Florian Weimer skrev: > In the light of, > I wonder what's the correct way of building IcedTea6 when you haven't > got GCJ, but only an older IcedTea6 version? Is this possible at all? It are possible by simply passing --disable-bootstrap to icedtea6 configure. The build will then use the system installed OpenJDK JDK instead of having to first compile a bootstrap compiler using GCJ/ECJ. Passing that option will also cut compile time in half. We use the --disable-bootstrap option frequently when we build and test icedtea6 on the icedtea buildbots for all the "quick" builders: http://builder.classpath.org/icedtea/buildbot/grid Cheers Xerxes From bugzilla-daemon at icedtea.classpath.org Mon Dec 5 05:51:11 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 05 Dec 2011 13:51:11 +0000 Subject: [Bug 825] OpenOffice crash on opening file (attached) In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=825 --- Comment #5 from Winfried Huber 2011-12-05 13:51:11 UTC --- Since my machine suffers from a severe kernel bug in btrfs for the moment (see https://bugzilla.novell.com/show_bug.cgi?id=734825 ) I offer the LibreOffice file from a different place ... http://huber-und-boehm.de/download/LibreOfficeCrashImmeditely.odt This machine has a faster internet connection anyway. - Winfried -- 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 Mon Dec 5 07:25:35 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 5 Dec 2011 10:25:35 -0500 Subject: Icedtea-web f16 In-Reply-To: <4ECB9186.7060308@redhat.com> References: <4ECB9186.7060308@redhat.com> Message-ID: <20111205152447.GB19751@redhat.com> * Jiri Vanek [2011-11-22 07:10]: > Hi! > > I remember, then when new api for xulrunner reached fedoras, You have added icedtea-web-1.0.6-npapi-fix.patch to specfiles. Then you said (IIRC) that you will add it to sources, but you are not able to detect version correctly. How does this goes? Any progress? > Compiling small program during configure is not enough? Something similar (nasty) I have done at first when I was trying to make it compatible with rhel5? > Hmm, missed this email. The issue is that none of the npapi headers expose an API version. As a result, there is no way to conditionally compile based on version. There is a bug open for this: http://code.google.com/p/npapi-sdk/issues/detail?id=10 Danesh is looking into a solution involving compiling a test program, seeing it it fails and setting a flag accordingly. Adding him to cc: Cheers, Deepak > Best Regards > J. > diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc > --- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav 2011-11-08 17:27:29.046520865 -0500 > +++ ./plugin/icedteanp/IcedTeaNPPlugin.cc 2011-11-08 17:27:40.469611421 -0500 > @@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT > > // Returns a string describing the MIME type that this plugin > // handles. > -char* > +const char* > NP_GetMIMEDescription () > { > PLUGIN_DEBUG ("NP_GetMIMEDescription\n"); > diff -r bd59947fa857 Makefile.am > --- a/Makefile.am Mon Aug 22 15:09:47 2011 -0400 > +++ b/Makefile.am Thu Aug 25 11:41:59 2011 +0200 > @@ -208,9 +208,16 @@ > IcedTeaPluginUtils.o > > $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc > + if [ "$(GLIBCVERSION)" == "no" ] ; then \ > + RHEL5COMPATIBLE="-DRhel5Compatible" ;\ > + else \ > + RHEL5COMPATIBLE="" ;\ > + fi; \ > + echo "rhel5comaptible="$$RHEL5COMPATIBLE ;\ > mkdir -p $(PLUGIN_DIR) && \ > cd $(PLUGIN_DIR) && \ > $(CXX) $(CXXFLAGS) \ > + $$RHEL5COMPATIBLE \ > -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \ > -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \ > -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \ > @@ -224,8 +231,15 @@ > -fPIC -o $@ -c $< > > $(PLUGIN_DIR)/IcedTeaPlugin.so: $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) > + if [ "$(GLIBCVERSION)" == "no" ] ; then \ > + RHEL5COMPATIBLE="-DRhel5Compatible";\ > + else \ > + RHEL5COMPATIBLE=""; \ > + fi; \ > + echo "rhel5comaptible="$$RHEL5COMPATIBLE ;\ > cd $(PLUGIN_DIR) && \ > $(CXX) $(CXXFLAGS) \ > + $$RHEL5COMPATIBLE \ > $(PLUGIN_OBJECTS) \ > $(GLIB_LIBS) \ > $(GTK_LIBS) \ > diff -r bd59947fa857 acinclude.m4 > --- a/acinclude.m4 Mon Aug 22 15:09:47 2011 -0400 > +++ b/acinclude.m4 Thu Aug 25 11:41:59 2011 +0200 > @@ -458,6 +458,34 @@ > AC_SUBST(PKGVERSION) > ]) > > +AC_DEFUN_ONCE([IT_GET_GLIBCVERSION], > +[ > +AC_MSG_CHECKING([for glibc version >= 2.12]) > +AC_LANG_PUSH(C++) > +CXXFLAGS_BACKUP=$CXXFLAGS > +CXXFLAGS=$CXXFLAGS" "$GLIB_CFLAGS" "$GTK_CFLAGS" "$GLIB_LIBS" "$GTK_LIB > +AC_TRY_LINK([ > +#include > +],[ > +GHashTable* instance_to_id_map = g_hash_table_new(NULL, NULL); > +GHashTableIter iter; > +gpointer id, instance; > +g_hash_table_iter_init (&iter, instance_to_id_map); > +g_hash_table_iter_next (&iter, &instance, &id); > +g_strcmp0 ("hell", "hello"); > +],[ > +AC_MSG_RESULT(yes) > +GLIBCVERSION="yes" > +],[ > +GLIBCVERSION="no" > +]) > +CXXFLAGS=$CXXFLAGS_BACKUP > +AC_LANG_POP(C++) > +AC_MSG_RESULT([${GLIBCVERSION}]) > +AC_SUBST(GLIBCVERSION) > +] > +) > + > AC_DEFUN([IT_CHECK_WITH_GCJ], > [ > AC_MSG_CHECKING([whether to compile ecj natively]) > diff -r bd59947fa857 configure.ac > --- a/configure.ac Mon Aug 22 15:09:47 2011 -0400 > +++ b/configure.ac Thu Aug 25 11:41:59 2011 +0200 > @@ -82,7 +82,7 @@ > # > # Find optional depedencies > # > - > +IT_GET_GLIBCVERSION > IT_FIND_OPTIONAL_JAR([rhino], RHINO, > [/usr/share/java/js.jar /usr/share/rhino-1.6/lib/js.jar]) > IT_FIND_OPTIONAL_JAR([junit], JUNIT, > diff -r bd59947fa857 plugin/icedteanp/IcedTeaNPPlugin.cc > --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Aug 22 15:09:47 2011 -0400 > +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Aug 25 11:41:59 2011 +0200 > @@ -47,6 +47,10 @@ > #include > #include > > +#ifdef Rhel5Compatible > +#include > +#endif > + > // Liveconnect extension > #include "IcedTeaScriptablePluginObject.h" > #include "IcedTeaNPPlugin.h" > @@ -869,6 +873,16 @@ > PLUGIN_DEBUG ("ITNP_URLNotify return\n"); > } > > +#ifdef Rhel5Compatible > +// 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; > +} > +#endif > + > NPError > get_cookie_info(const char* siteAddr, char** cookieString, uint32_t* len) > { > @@ -913,19 +927,33 @@ > // valid. So we just pick the first valid one and use it. Proxy/Cookie > // information is not instance specific anyway, it is URL specific. > > +#ifdef Rhel5Compatible > if (browser_functions.getvalueforurl) > { > - 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); > > return browser_functions.getvalueforurl((NPP) instance, NPNURLVCookie, siteAddr, cookieString, len); > } else > { > return NPERR_GENERIC_ERROR; > } > +#else > + if (browser_functions.getvalueforurl) > + { > + GHashTableIter iter; > + gpointer id, instance; > + > + 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 > + { > + return NPERR_GENERIC_ERROR; > + } > +#endif > > #endif > > @@ -1363,21 +1391,38 @@ > > #else > > +#ifdef Rhel5Compatible > if (browser_functions.getvalueforurl) > { > > // As in get_cookie_info, we use the first active instance > - 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); > > browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len); > } else > { > return NPERR_GENERIC_ERROR; > } > +#else > + if (browser_functions.getvalueforurl) > + { > + > + // As in get_cookie_info, we use the first active instance > + GHashTableIter iter; > + gpointer id, instance; > + > + g_hash_table_iter_init (&iter, instance_to_id_map); > + g_hash_table_iter_next (&iter, &instance, &id); > + > + browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len); > + } else > + { > + return NPERR_GENERIC_ERROR; > + } > +#endif > + > #endif > > return NPERR_NO_ERROR; > @@ -1403,6 +1448,17 @@ > return FALSE; > } > > +#ifdef Rhel5Compatible > +int > +strcmp0(char *str1, char *str2) > +{ > + if (str1 != NULL) > + return str2 != NULL ? strcmp(str1, str2) : 1; > + else // str1 == NULL > + return str2 != NULL ? 1 : 0; > +} > +#endif > + > // 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. > @@ -1424,7 +1480,11 @@ > components = g_strsplit (path_old, ":", -1); > for (i1 = 0, i2 = 0; components[i1] != NULL; i1++) > { > +#ifdef Rhel5Compatible > + if (strcmp0 (components[i1], moz_home) == 0 > +#else > if (g_strcmp0 (components[i1], moz_home) == 0 > +#endif > || g_str_has_prefix (components[i1], moz_home)) > components[i2] = components[i1]; > else From dbhole at redhat.com Mon Dec 5 07:51:08 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 5 Dec 2011 10:51:08 -0500 Subject: [RFC][icedtea-web] Change icon for AccessWarningPane dialogs In-Reply-To: <4ECD4B3E.6080102@redhat.com> References: <4ECD4B3E.6080102@redhat.com> Message-ID: <20111205155107.GA8137@redhat.com> * Danesh Dadachanji [2011-11-23 14:45]: > Hi, > > I noticed that dialogs for access warnings use the warning icon > (yellow exclamation). This, to me, implies something went wrong and > seems too alarming. I would like to change it to the question icon > instead. Thoughts? > > The attached patch can be tested with one of the webstart tests - I > used persistserv.jnlp[1] > Patch looks fine. Where is question.png btw? I'd like to take a look before approving. Cheers, Deepak > ChangeLog: > +2011-11-23 Danesh Dadachanji > + > + Update UI for AccessWarningPane > + * netx/net/sourceforge/jnlp/security/AccessWarningPane.java: > + Use the question.png instead of the warning.png for access dialogs. > + > > Does this look good for HEAD? > > Regards, > Danesh > [1] http://www.pscode.org/jws/persistserv.jnlp > diff -r 22db4e09bbc7 netx/net/sourceforge/jnlp/security/AccessWarningPane.java > --- a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java Fri Nov 11 14:40:26 2011 +0100 > +++ b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java Wed Nov 23 13:56:39 2011 -0500 > @@ -150,7 +150,7 @@ public class AccessWarningPane extends S > topLabelText = R("SNetworkAccess", "(address here)"); > } > > - ImageIcon icon = new ImageIcon((new sun.misc.Launcher()).getClassLoader().getResource("net/sourceforge/jnlp/resources/warning.png")); > + ImageIcon icon = new ImageIcon((new sun.misc.Launcher()).getClassLoader().getResource("net/sourceforge/jnlp/resources/question.png")); > JLabel topLabel = new JLabel(htmlWrap(topLabelText), icon, SwingConstants.LEFT); > topLabel.setFont(new Font(topLabel.getFont().toString(), > Font.BOLD, 12)); From jvanek at redhat.com Mon Dec 5 08:00:16 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 05 Dec 2011 17:00:16 +0100 Subject: Icedtea-web f16 In-Reply-To: <20111205152447.GB19751@redhat.com> References: <4ECB9186.7060308@redhat.com> <20111205152447.GB19751@redhat.com> Message-ID: <4EDCEA90.5020102@redhat.com> On 12/05/2011 04:25 PM, Deepak Bhole wrote: > * Jiri Vanek [2011-11-22 07:10]: >> Hi! >> >> I remember, then when new api for xulrunner reached fedoras, You have added icedtea-web-1.0.6-npapi-fix.patch to specfiles. Then you said (IIRC) that you will add it to sources, but you are not able to detect version correctly. How does this goes? Any progress? >> Compiling small program during configure is not enough? Something similar (nasty) I have done at first when I was trying to make it compatible with rhel5? >> > > Hmm, missed this email. > > The issue is that none of the npapi headers expose an API version. As a > result, there is no way to conditionally compile based on version. There > is a bug open for this: > > http://code.google.com/p/npapi-sdk/issues/detail?id=10 > > Danesh is looking into a solution involving compiling a test program, > seeing it it fails and setting a flag accordingly. Adding him to cc: > > Cheers, > Deepak > >> Best Regards >> J. > >> diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc >> --- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav 2011-11-08 17:27:29.046520865 -0500 >> +++ ./plugin/icedteanp/IcedTeaNPPlugin.cc 2011-11-08 17:27:40.469611421 -0500 >> @@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT >> >> // Returns a string describing the MIME type that this plugin >> // handles. >> -char* >> +const char* >> NP_GetMIMEDescription () >> { >> PLUGIN_DEBUG ("NP_GetMIMEDescription\n"); > >> diff -r bd59947fa857 Makefile.am >> --- a/Makefile.am Mon Aug 22 15:09:47 2011 -0400 >> +++ b/Makefile.am Thu Aug 25 11:41:59 2011 +0200 >> @@ -208,9 +208,16 @@ >> IcedTeaPluginUtils.o >> >> $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc >> + if [ "$(GLIBCVERSION)" == "no" ] ; then \ >> + RHEL5COMPATIBLE="-DRhel5Compatible" ;\ >> + else \ >> + RHEL5COMPATIBLE="" ;\ >> + fi; \ >> + echo "rhel5comaptible="$$RHEL5COMPATIBLE ;\ >> mkdir -p $(PLUGIN_DIR)&& \ >> cd $(PLUGIN_DIR)&& \ >> $(CXX) $(CXXFLAGS) \ >> + $$RHEL5COMPATIBLE \ >> -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \ >> -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \ >> -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \ >> @@ -224,8 +231,15 @@ >> -fPIC -o $@ -c $< >> >> $(PLUGIN_DIR)/IcedTeaPlugin.so: $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) >> + if [ "$(GLIBCVERSION)" == "no" ] ; then \ >> + RHEL5COMPATIBLE="-DRhel5Compatible";\ >> + else \ >> + RHEL5COMPATIBLE=""; \ >> + fi; \ >> + echo "rhel5comaptible="$$RHEL5COMPATIBLE ;\ >> cd $(PLUGIN_DIR)&& \ >> $(CXX) $(CXXFLAGS) \ >> + $$RHEL5COMPATIBLE \ >> $(PLUGIN_OBJECTS) \ >> $(GLIB_LIBS) \ >> $(GTK_LIBS) \ >> diff -r bd59947fa857 acinclude.m4 >> --- a/acinclude.m4 Mon Aug 22 15:09:47 2011 -0400 >> +++ b/acinclude.m4 Thu Aug 25 11:41:59 2011 +0200 >> @@ -458,6 +458,34 @@ >> AC_SUBST(PKGVERSION) >> ]) >> >> +AC_DEFUN_ONCE([IT_GET_GLIBCVERSION], >> +[ >> +AC_MSG_CHECKING([for glibc version>= 2.12]) >> +AC_LANG_PUSH(C++) >> +CXXFLAGS_BACKUP=$CXXFLAGS >> +CXXFLAGS=$CXXFLAGS" "$GLIB_CFLAGS" "$GTK_CFLAGS" "$GLIB_LIBS" "$GTK_LIB >> +AC_TRY_LINK([ >> +#include >> +],[ >> +GHashTable* instance_to_id_map = g_hash_table_new(NULL, NULL); >> +GHashTableIter iter; >> +gpointer id, instance; >> +g_hash_table_iter_init (&iter, instance_to_id_map); >> +g_hash_table_iter_next (&iter,&instance,&id); >> +g_strcmp0 ("hell", "hello"); >> +],[ >> +AC_MSG_RESULT(yes) >> +GLIBCVERSION="yes" >> +],[ >> +GLIBCVERSION="no" >> +]) >> +CXXFLAGS=$CXXFLAGS_BACKUP >> +AC_LANG_POP(C++) >> +AC_MSG_RESULT([${GLIBCVERSION}]) >> +AC_SUBST(GLIBCVERSION) >> +] >> +) >> + >> AC_DEFUN([IT_CHECK_WITH_GCJ], >> [ >> AC_MSG_CHECKING([whether to compile ecj natively]) >> diff -r bd59947fa857 configure.ac >> --- a/configure.ac Mon Aug 22 15:09:47 2011 -0400 >> +++ b/configure.ac Thu Aug 25 11:41:59 2011 +0200 >> @@ -82,7 +82,7 @@ >> # >> # Find optional depedencies >> # >> - >> +IT_GET_GLIBCVERSION >> IT_FIND_OPTIONAL_JAR([rhino], RHINO, >> [/usr/share/java/js.jar /usr/share/rhino-1.6/lib/js.jar]) >> IT_FIND_OPTIONAL_JAR([junit], JUNIT, >> diff -r bd59947fa857 plugin/icedteanp/IcedTeaNPPlugin.cc >> --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Aug 22 15:09:47 2011 -0400 >> +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Aug 25 11:41:59 2011 +0200 >> @@ -47,6 +47,10 @@ >> #include >> #include >> >> +#ifdef Rhel5Compatible >> +#include >> +#endif >> + >> // Liveconnect extension >> #include "IcedTeaScriptablePluginObject.h" >> #include "IcedTeaNPPlugin.h" >> @@ -869,6 +873,16 @@ >> PLUGIN_DEBUG ("ITNP_URLNotify return\n"); >> } >> >> +#ifdef Rhel5Compatible >> +// 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; >> +} >> +#endif >> + >> NPError >> get_cookie_info(const char* siteAddr, char** cookieString, uint32_t* len) >> { >> @@ -913,19 +927,33 @@ >> // valid. So we just pick the first valid one and use it. Proxy/Cookie >> // information is not instance specific anyway, it is URL specific. >> >> +#ifdef Rhel5Compatible >> if (browser_functions.getvalueforurl) >> { >> - 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); >> >> return browser_functions.getvalueforurl((NPP) instance, NPNURLVCookie, siteAddr, cookieString, len); >> } else >> { >> return NPERR_GENERIC_ERROR; >> } >> +#else >> + if (browser_functions.getvalueforurl) >> + { >> + GHashTableIter iter; >> + gpointer id, instance; >> + >> + 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 >> + { >> + return NPERR_GENERIC_ERROR; >> + } >> +#endif >> >> #endif >> >> @@ -1363,21 +1391,38 @@ >> >> #else >> >> +#ifdef Rhel5Compatible >> if (browser_functions.getvalueforurl) >> { >> >> // As in get_cookie_info, we use the first active instance >> - 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); >> >> browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len); >> } else >> { >> return NPERR_GENERIC_ERROR; >> } >> +#else >> + if (browser_functions.getvalueforurl) >> + { >> + >> + // As in get_cookie_info, we use the first active instance >> + GHashTableIter iter; >> + gpointer id, instance; >> + >> + g_hash_table_iter_init (&iter, instance_to_id_map); >> + g_hash_table_iter_next (&iter,&instance,&id); >> + >> + browser_functions.getvalueforurl((NPP) instance, NPNURLVProxy, siteAddr, proxy, len); >> + } else >> + { >> + return NPERR_GENERIC_ERROR; >> + } >> +#endif >> + >> #endif >> >> return NPERR_NO_ERROR; >> @@ -1403,6 +1448,17 @@ >> return FALSE; >> } >> >> +#ifdef Rhel5Compatible >> +int >> +strcmp0(char *str1, char *str2) >> +{ >> + if (str1 != NULL) >> + return str2 != NULL ? strcmp(str1, str2) : 1; >> + else // str1 == NULL >> + return str2 != NULL ? 1 : 0; >> +} >> +#endif >> + >> // 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. >> @@ -1424,7 +1480,11 @@ >> components = g_strsplit (path_old, ":", -1); >> for (i1 = 0, i2 = 0; components[i1] != NULL; i1++) >> { >> +#ifdef Rhel5Compatible >> + if (strcmp0 (components[i1], moz_home) == 0 >> +#else >> if (g_strcmp0 (components[i1], moz_home) == 0 >> +#endif >> || g_str_has_prefix (components[i1], moz_home)) >> components[i2] = components[i1]; >> else > This is exactly what I have suggested. I had some work finished upon this case. :(( Bad luck You have missed it :(( J. From ddadacha at redhat.com Mon Dec 5 07:59:25 2011 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Mon, 05 Dec 2011 10:59:25 -0500 Subject: [RFC][icedtea-web] Change icon for AccessWarningPane dialogs In-Reply-To: <20111205155107.GA8137@redhat.com> References: <4ECD4B3E.6080102@redhat.com> <20111205155107.GA8137@redhat.com> Message-ID: <4EDCEA5D.3070402@redhat.com> Hi, On 05/12/11 10:51 AM, Deepak Bhole wrote: > > Patch looks fine. Where is question.png btw? I'd like to take a look > before approving. > It's been in HEAD for a while, it's the same icon that appears when you verify a trusted cert. It's stored in icedtea-web/netx/net/sourceforge/jnlp/resources/ Thanks for the review! Danesh From omajid at redhat.com Mon Dec 5 08:03:04 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 05 Dec 2011 11:03:04 -0500 Subject: [RFC][icedtea-web] Change icon for AccessWarningPane dialogs In-Reply-To: <4EDCEA5D.3070402@redhat.com> References: <4ECD4B3E.6080102@redhat.com> <20111205155107.GA8137@redhat.com> <4EDCEA5D.3070402@redhat.com> Message-ID: <4EDCEB38.5060309@redhat.com> On 12/05/2011 10:59 AM, Danesh Dadachanji wrote: > Hi, > > On 05/12/11 10:51 AM, Deepak Bhole wrote: >> >> Patch looks fine. Where is question.png btw? I'd like to take a look >> before approving. >> > > It's been in HEAD for a while, it's the same icon that appears when you > verify a trusted cert. It's stored in > icedtea-web/netx/net/sourceforge/jnlp/resources/ It's available online at: http://icedtea.classpath.org/hg/icedtea-web/raw-file/71f338e881d2/netx/net/sourceforge/jnlp/resources/question.png Cheers, Omair From dbhole at redhat.com Mon Dec 5 08:05:49 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 5 Dec 2011 11:05:49 -0500 Subject: [RFC][icedtea-web] Change icon for AccessWarningPane dialogs In-Reply-To: <4EDCEB38.5060309@redhat.com> References: <4ECD4B3E.6080102@redhat.com> <20111205155107.GA8137@redhat.com> <4EDCEA5D.3070402@redhat.com> <4EDCEB38.5060309@redhat.com> Message-ID: <20111205160548.GA8668@redhat.com> * Omair Majid [2011-12-05 11:03]: > On 12/05/2011 10:59 AM, Danesh Dadachanji wrote: > >Hi, > > > >On 05/12/11 10:51 AM, Deepak Bhole wrote: > >> > >>Patch looks fine. Where is question.png btw? I'd like to take a look > >>before approving. > >> > > > >It's been in HEAD for a while, it's the same icon that appears when you > >verify a trusted cert. It's stored in > >icedtea-web/netx/net/sourceforge/jnlp/resources/ > > > It's available online at: > > http://icedtea.classpath.org/hg/icedtea-web/raw-file/71f338e881d2/netx/net/sourceforge/jnlp/resources/question.png > Doh. Okay yes if it is in HEAD, okay for 1.0 and 1.1 too. Cheers, Deepak From ddadacha at redhat.com Mon Dec 5 08:30:27 2011 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Mon, 05 Dec 2011 11:30:27 -0500 Subject: [RFC][icedtea-web] Change icon for AccessWarningPane dialogs In-Reply-To: <20111205160548.GA8668@redhat.com> References: <4ECD4B3E.6080102@redhat.com> <20111205155107.GA8137@redhat.com> <4EDCEA5D.3070402@redhat.com> <4EDCEB38.5060309@redhat.com> <20111205160548.GA8668@redhat.com> Message-ID: <4EDCF1A3.3070505@redhat.com> On 05/12/11 11:05 AM, Deepak Bhole wrote: > * Omair Majid [2011-12-05 11:03]: >> On 12/05/2011 10:59 AM, Danesh Dadachanji wrote: >>> Hi, >>> >>> On 05/12/11 10:51 AM, Deepak Bhole wrote: >>>> >>>> Patch looks fine. Where is question.png btw? I'd like to take a look >>>> before approving. >>>> >>> >>> It's been in HEAD for a while, it's the same icon that appears when you >>> verify a trusted cert. It's stored in >>> icedtea-web/netx/net/sourceforge/jnlp/resources/ >> >> >> It's available online at: >> >> http://icedtea.classpath.org/hg/icedtea-web/raw-file/71f338e881d2/netx/net/sourceforge/jnlp/resources/question.png >> > > Doh. Okay yes if it is in HEAD, okay for 1.0 and 1.1 too. > FWIW, the icon isn't in 1.0 or 1.1, it was added in a different changeset[1]. Not sure if I should be adding the png to this changeset or backporting the other changeset. It's been soaked by HEAD for a while now. I also think it might be a good idea since it affects user interaction with the plugin. Pushing this to HEAD for now. Regards, Danesh [1] http://icedtea.classpath.org/hg/icedtea-web/rev/61e08e67b176 From fw at deneb.enyo.de Mon Dec 5 09:34:45 2011 From: fw at deneb.enyo.de (Florian Weimer) Date: Mon, 05 Dec 2011 18:34:45 +0100 Subject: Bootstrapping IcedTea6 with IcedTea6 In-Reply-To: <4EDCA19B.3090103@zafena.se> ("Xerxes =?iso-8859-1?Q?R=E5nby?= =?iso-8859-1?Q?=22's?= message of "Mon, 05 Dec 2011 11:48:59 +0100") References: <8762hvbjep.fsf@mid.deneb.enyo.de> <4EDCA19B.3090103@zafena.se> Message-ID: <87ehwivs5m.fsf@mid.deneb.enyo.de> * Xerxes R?nby: > 2011-12-05 07:51, Florian Weimer skrev: >> In the light of, >> I wonder what's the correct way of building IcedTea6 when you haven't >> got GCJ, but only an older IcedTea6 version? Is this possible at all? > > It are possible by simply passing --disable-bootstrap to icedtea6 > configure. But bug 631 says that this isn't a supported configuration. > The build will then use the system installed OpenJDK JDK instead of > having to first compile a bootstrap compiler using GCJ/ECJ. This doesn't work if you've got IcedTea6 1.8.7 (say) and want to build 1.8.10. It seems to me that I have to build with Icedtea6, but still enable bootstrapping. Is this possible? From aph at redhat.com Mon Dec 5 09:38:45 2011 From: aph at redhat.com (Andrew Haley) Date: Mon, 05 Dec 2011 17:38:45 +0000 Subject: ARM: Volatile handlers Message-ID: <4EDD01A5.60802@redhat.com> I've rewritten all the volatile code. The previous version I posted was buggy and unmaintainable. I've rewritten it to duplicate every handler into a volatile and a non-volatile version. This bloats the code rather, but it's more efficient and much easier to understand. Xerxes, please have a look. Thanks, Andrew. 2011-12-05 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): Use class Opcodes to do the disassembly. (Thumb2_Enter): Update ISTATE_SELF_LINK. (T_DMB): New. (fullBarrier): New. (storeBarrier): New. (Thumb2_Accessor): Add volatile barriers. (Thumb2_codegen): Likewise. (Thumb2_Initialize): Check UseCompiler. (class Opcodes): New. Load libopcodes.so lazily. * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: For every {get,put}field handler, add a test for volatility and duplicate the code path into two parts, volatile and non-volatile. Add barriers to the volatile path. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (dmb) (dmb_st): New macros. (abort_table): Add entries for volatile versions of all the field handlers. ({put,get}field_volatile_*): Add volatile versions of all handlers. (Thumb2_{put,get}field_*_stub): Likewise. * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (print_vm_offsets): Add CP_CACHE_VOLATILE_FIELD_FLAG_BIT and CP_CACHE_FLAGS. diff -r 0a0072170876 arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp Mon Nov 28 20:06:41 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp Mon Dec 05 12:33:28 2011 -0500 @@ -489,6 +489,8 @@ print_def("CONSTANTPOOL_CACHE", offset_of(constantPoolOopDesc, _cache)); print_def("CONSTANTPOOL_POOL_HOLDER", offset_of(constantPoolOopDesc, _pool_holder)); print_def("CONSTANTPOOL_BASE", sizeof(constantPoolOopDesc)); + print_def("CP_CACHE_VOLATILE_FIELD_FLAG_BIT", ConstantPoolCacheEntry::volatileField); + print_def("CP_CACHE_FLAGS", offset_of(ConstantPoolCacheEntry, _flags)); nl(); print_def("CP_OFFSET", in_bytes(constantPoolCacheOopDesc::base_offset())); nl(); diff -r 0a0072170876 arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def --- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Nov 28 20:06:41 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Dec 05 12:33:28 2011 -0500 @@ -1573,6 +1573,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT .abortentry78: @@ -1581,6 +1582,17 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry78_v: + ldr tmp2, [tmp1, tmp2] + dmb + DISPATCH_NEXT + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } (bgetfield) bgetfield { @@ -1592,6 +1604,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT .abortentry79: @@ -1600,6 +1613,17 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry79_v: + ldrsb tmp2, [tmp1, tmp2] + dmb + DISPATCH_NEXT + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } (cgetfield) cgetfield { @@ -1611,6 +1635,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT .abortentry80: @@ -1619,6 +1644,17 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry80_v: + ldrh tmp2, [tmp1, tmp2] + dmb + DISPATCH_NEXT + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } (sgetfield) sgetfield { @@ -1630,6 +1666,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT .abortentry81: @@ -1638,6 +1675,17 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry81_v: + ldrsh tmp2, [tmp1, tmp2] + dmb + DISPATCH_NEXT + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } (lgetfield) lgetfield { @@ -1649,6 +1697,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT add tmp2, tmp1, tmp2 @@ -1658,6 +1707,19 @@ DISPATCH_NEXT PUSH tmp2, tmp1 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT + add tmp2, tmp1, tmp2 + DISPATCH_NEXT + dmb_st +.abortentry82_v: + ldmia tmp2, {tmp2, tmp1} + dmb + DISPATCH_NEXT + PUSH tmp2, tmp1 + DISPATCH_FINISH } (iputfield) iputfield { @@ -1669,6 +1731,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r2, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT DISPATCH_NEXT @@ -1676,6 +1739,17 @@ .abortentry83: str r3, [tmp1, tmp2] DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT + DISPATCH_NEXT + DISPATCH_NEXT + dmb_st +.abortentry83_v: + str r3, [tmp1, tmp2] + dmb + DISPATCH_FINISH } (cputfield) cputfield { @@ -1687,6 +1761,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r2, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT DISPATCH_NEXT @@ -1694,6 +1769,17 @@ .abortentry84: strh r3, [tmp1, tmp2] DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT + DISPATCH_NEXT + DISPATCH_NEXT + dmb_st +.abortentry84_v: + strh r3, [tmp1, tmp2] + dmb + DISPATCH_FINISH } (bputfield) bputfield { @@ -1705,6 +1791,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r2, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT DISPATCH_NEXT @@ -1712,6 +1799,17 @@ .abortentry85: strb r3, [tmp1, tmp2] DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT + DISPATCH_NEXT + DISPATCH_NEXT + dmb_st +.abortentry85_v: + strb r3, [tmp1, tmp2] + dmb + DISPATCH_FINISH } (aputfield) aputfield { @@ -1721,12 +1819,23 @@ add tmp2, tmp2, r2, lsl #4 SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r2, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] .abortentry113: str r3, [tmp1, tmp2] mov r0, tmp1 bl Helper_aputfield DISPATCH 3 +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + dmb_st +.abortentry113_v: + str r3, [tmp1, tmp2] + dmb + mov r0, tmp1 + bl Helper_aputfield + DISPATCH 3 } (lputfield) lputfield { @@ -1738,6 +1847,7 @@ DISPATCH_NEXT SW_NPC cmp lr, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r2, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT add tmp2, lr, tmp2 @@ -1746,6 +1856,18 @@ .abortentry86: stm tmp2, {r3, tmp1} DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT + add tmp2, lr, tmp2 + DISPATCH_NEXT + DISPATCH_NEXT + dmb_st +.abortentry86_v: + stm tmp2, {r3, tmp1} + dmb + DISPATCH_FINISH } #endif // FAST_BYTECODES @@ -1760,6 +1882,7 @@ and r3, r3, #0x00ff0000 cmp r3, #opc_getstatic << 16 blne resolve_get_put + GO_IF_VOLATILE r2, tmp2, 3f ldr r3, [tmp2, #CP_OFFSET+4] ldr r2, [tmp2, #CP_OFFSET+12] ldr lr, [tmp2, #CP_OFFSET+8] @@ -1770,6 +1893,18 @@ tst r2, #2 bne getstatic_dw b getstatic_sh +3: + VOLATILE_VERSION + ldr r3, [tmp2, #CP_OFFSET+4] + ldr r2, [tmp2, #CP_OFFSET+12] + ldr lr, [tmp2, #CP_OFFSET+8] + movs r2, r2, lsr #29 + bhi getstatic_volatile_w @ C = 1, Z = 0 => R2 == 3, 5, 7 + bcs getstatic_volatile_h @ C = 1 => R2 = 1 + beq getstatic_volatile_sb @ Z = 1 => R2 = 0 + tst r2, #2 + bne getstatic_volatile_dw + b getstatic_volatile_sh } @ r2 = [jpc, #1] @@ -1782,6 +1917,7 @@ and r3, r3, #0xff000000 cmp r3, #opc_putstatic << 24 blne resolve_get_put + GO_IF_VOLATILE r2, tmp2, 3f ldr r3, [tmp2, #CP_OFFSET+4] @ r3 = object ldr lr, [tmp2, #CP_OFFSET+12] @ lr = tos_type ldr r2, [tmp2, #CP_OFFSET+8] @ r2 = offset @@ -1792,6 +1928,18 @@ tst lr, #2 bne putstatic_dw b putstatic_sh +3: + VOLATILE_VERSION + ldr r3, [tmp2, #CP_OFFSET+4] @ r3 = object + ldr lr, [tmp2, #CP_OFFSET+12] @ lr = tos_type + ldr r2, [tmp2, #CP_OFFSET+8] @ r2 = offset + movs lr, lr, lsr #29 + bhi putstatic_volatile_w @ C = 1, Z = 0 => R2 == 3, 5, 7 + bcs putstatic_volatile_h @ C = 1 => R2 = 1 + beq putstatic_volatile_sb @ Z = 1 => R2 = 0 + tst lr, #2 + bne putstatic_volatile_dw + b putstatic_volatile_sh } #ifdef NOTICE_SAFEPOINTS @@ -2216,6 +2364,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f DISPATCH_NEXT ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT @@ -2224,6 +2373,16 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + DISPATCH_NEXT + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry87_v: + ldr tmp2, [tmp1, tmp2] + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } @ r2 = [jpc, #1] @@ -4086,6 +4245,7 @@ SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 DISPATCH_NEXT + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT .abortentry88: @@ -4093,6 +4253,15 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry88_v: + ldr tmp2, [tmp1, tmp2] + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } @ --- iconst; store ------------------------------------------------- diff -r 0a0072170876 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Nov 28 20:06:41 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Dec 05 12:33:28 2011 -0500 @@ -585,6 +585,32 @@ .fpu softvfp #endif // HW_FP +#ifndef __ARM_ARCH_7A__ +# define dmb VOLATILE_BARRIER +# define dmb_st VOLATILE_BARRIER +#else +# define dmb_st .word 0xf57ff05e +#endif + + .macro VOLATILE_BARRIER arg + stmfd sp!, {r2, lr} + mov r2, #0xfa0 + movt r2, #0xffff + blx r2 + ldmfd sp!, {r2, lr} + .endm + + .macro GO_IF_VOLATILE reg, cp_cache, label + ldr \reg, [\cp_cache, #CP_OFFSET+CP_CACHE_FLAGS] + tst \reg, #(1<> 1 @ >> 1 due to lsr #29 above + beq putstatic_volatile_a + DISPATCH_START 3 + POP tmp2 + DISPATCH_NEXT + dmb_st + str tmp2, [r3, r2] + dmb + DISPATCH_FINISH +putstatic_volatile_sb: + DISPATCH_START 3 + POP tmp2 + DISPATCH_NEXT + dmb_st + strb tmp2, [r3, r2] + dmb + DISPATCH_FINISH +putstatic_volatile_dw: + DISPATCH_START 3 + add r2, r2, r3 + POP r3, tmp2 + DISPATCH_NEXT + dmb_st + stm r2, {r3, tmp2} + dmb + DISPATCH_FINISH +putstatic_volatile_a: + POP tmp2 + dmb_st + str tmp2, [r3, r2] + mov r0, r3 + bl Helper_aputfield + DISPATCH 3 + resolve_invokeinterface: mov r1, #opc_invokeinterface b resolve_invoke @@ -5524,6 +5643,8 @@ mov r2, Rthread blx r3 + dmb_st + ldr Rthread, [istate, #ISTATE_THREAD] ldr stack, [Rthread, #THREAD_JAVA_SP] @@ -5569,9 +5690,17 @@ cmp r3, #0 beq field_null_ptr_exception + GO_IF_VOLATILE r2, r2, 3f + ldr r3, [r3, ip] str r3, [stack, #-4]! @ PUSH r3 bx lr +3: + + ldr r3, [r3, ip] + dmb + str r3, [stack, #-4]! @ PUSH r3 + bx lr 1: mov ip, lr bl getfield_stub_unresolved @@ -5595,9 +5724,16 @@ cmp r3, #0 beq field_null_ptr_exception + GO_IF_VOLATILE r2, r2, 3f + ldrsh r3, [r3, ip] str r3, [stack, #-4]! @ PUSH r3 bx lr +3: + ldrsh r3, [r3, ip] + dmb + str r3, [stack, #-4]! @ PUSH r3 + bx lr 1: mov ip, lr bl getfield_stub_unresolved @@ -5621,9 +5757,16 @@ cmp r3, #0 beq field_null_ptr_exception + GO_IF_VOLATILE r2, r2, 3f + ldrh r3, [r3, ip] str r3, [stack, #-4]! @ PUSH r3 bx lr +3: + ldrh r3, [r3, ip] + dmb + str r3, [stack, #-4]! @ PUSH r3 + bx lr 1: mov ip, lr bl getfield_stub_unresolved @@ -5647,9 +5790,16 @@ cmp r3, #0 beq field_null_ptr_exception + GO_IF_VOLATILE r2, r2, 3f + ldrsb r3, [r3, ip] str r3, [stack, #-4]! @ PUSH r3 bx lr +3: + ldrsb r3, [r3, ip] + dmb + str r3, [stack, #-4]! @ PUSH r3 + bx lr 1: mov ip, lr bl getfield_stub_unresolved @@ -5673,9 +5823,16 @@ cmp r3, #0 beq field_null_ptr_exception + GO_IF_VOLATILE r2, r2, 3f + ldrd r2, r3, [r3, ip] stmdb stack!, {r2, r3} @ PUSH r2, r3 bx lr +3: + ldrd r2, r3, [r3, ip] + dmb + stmdb stack!, {r2, r3} @ PUSH r2, r3 + bx lr 1: mov ip, lr bl getfield_stub_unresolved @@ -5739,6 +5896,8 @@ cmp r3, #opc_putfield << 24 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr ip, [r2, #CP_OFFSET+8] ldmia stack!, {r2, r3} @ r2 = value, r3 = obj cmp r3, #0 @@ -5746,6 +5905,16 @@ str r2, [r3, ip] bx lr +3: + ldr ip, [r2, #CP_OFFSET+8] + ldmia stack!, {r2, r3} @ r2 = value, r3 = obj + cmp r3, #0 + beq field_null_ptr_exception + + dmb_st + str r2, [r3, ip] + dmb + bx lr 1: mov ip, lr bl putfield_stub_unresolved @@ -5762,6 +5931,8 @@ cmp r3, #opc_putfield << 24 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr ip, [r2, #CP_OFFSET+8] ldmia stack!, {r2, r3} @ r2 = value, r3 = obj cmp r3, #0 @@ -5769,6 +5940,16 @@ strh r2, [r3, ip] bx lr +3: + ldr ip, [r2, #CP_OFFSET+8] + ldmia stack!, {r2, r3} @ r2 = value, r3 = obj + cmp r3, #0 + beq field_null_ptr_exception + + dmb_st + strh r2, [r3, ip] + dmb + bx lr 1: mov ip, lr bl putfield_stub_unresolved @@ -5785,6 +5966,8 @@ cmp r3, #opc_putfield << 24 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr ip, [r2, #CP_OFFSET+8] ldmia stack!, {r2, r3} @ r2 = value, r3 = obj cmp r3, #0 @@ -5792,6 +5975,16 @@ strb r2, [r3, ip] bx lr +3: + ldr ip, [r2, #CP_OFFSET+8] + ldmia stack!, {r2, r3} @ r2 = value, r3 = obj + cmp r3, #0 + beq field_null_ptr_exception + + dmb_st + strb r2, [r3, ip] + dmb + bx lr 1: mov ip, lr bl putfield_stub_unresolved @@ -5808,6 +6001,8 @@ cmp r3, #opc_putfield << 24 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr ip, [r2, #CP_OFFSET+8] ldmia stack!, {r2, r3} @ r2 = value, r3 = obj cmp r3, #0 @@ -5817,6 +6012,18 @@ ldr ip, helper_aputfield_adcon mov r0, r3 bx ip +3: + ldr ip, [r2, #CP_OFFSET+8] + ldmia stack!, {r2, r3} @ r2 = value, r3 = obj + cmp r3, #0 + beq field_null_ptr_exception + + dmb_st + str r2, [r3, ip] + dmb + ldr ip, helper_aputfield_adcon + mov r0, r3 + bx ip 1: mov ip, lr bl putfield_stub_unresolved @@ -5833,6 +6040,8 @@ cmp r3, #opc_putfield << 24 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr r1, [r2, #CP_OFFSET+8] ldmia stack!, {r2, r3, ip} @ r2,r3 = value, ip = obj cmp ip, #0 @@ -5840,6 +6049,16 @@ strd r2,r3, [ip, r1] bx lr +3: + ldr r1, [r2, #CP_OFFSET+8] + ldmia stack!, {r2, r3, ip} @ r2,r3 = value, ip = obj + cmp ip, #0 + beq field_null_ptr_exception + + dmb_st + strd r2,r3, [ip, r1] + dmb + bx lr 1: mov ip, lr bl putfield_stub_unresolved @@ -5858,12 +6077,22 @@ cmp r3, #opc_getstatic << 16 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr r3, [r2, #CP_OFFSET+4] ldr ip, [r2, #CP_OFFSET+8] ldr r3, [r3, ip] str r3, [stack, #-4]! @ PUSH r3 bx lr +3: + ldr r3, [r2, #CP_OFFSET+4] + ldr ip, [r2, #CP_OFFSET+8] + + ldr r3, [r3, ip] + dmb + str r3, [stack, #-4]! @ PUSH r3 + bx lr 1: mov ip, lr bl getstatic_stub_unresolved @@ -5880,12 +6109,22 @@ cmp r3, #opc_getstatic << 16 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr r3, [r2, #CP_OFFSET+4] ldr ip, [r2, #CP_OFFSET+8] ldrh r3, [r3, ip] str r3, [stack, #-4]! @ PUSH r3 bx lr +3: + ldr r3, [r2, #CP_OFFSET+4] + ldr ip, [r2, #CP_OFFSET+8] + + ldrh r3, [r3, ip] + dmb + str r3, [stack, #-4]! @ PUSH r3 + bx lr 1: mov ip, lr bl getstatic_stub_unresolved @@ -5902,12 +6141,22 @@ cmp r3, #opc_getstatic << 16 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr r3, [r2, #CP_OFFSET+4] ldr ip, [r2, #CP_OFFSET+8] ldrsh r3, [r3, ip] str r3, [stack, #-4]! @ PUSH r3 bx lr +3: + ldr r3, [r2, #CP_OFFSET+4] + ldr ip, [r2, #CP_OFFSET+8] + + ldrsh r3, [r3, ip] + dmb + str r3, [stack, #-4]! @ PUSH r3 + bx lr 1: mov ip, lr bl getstatic_stub_unresolved @@ -5924,12 +6173,22 @@ cmp r3, #opc_getstatic << 16 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr r3, [r2, #CP_OFFSET+4] ldr ip, [r2, #CP_OFFSET+8] ldrsb r3, [r3, ip] str r3, [stack, #-4]! @ PUSH r3 bx lr +3: + ldr r3, [r2, #CP_OFFSET+4] + ldr ip, [r2, #CP_OFFSET+8] + + ldrsb r3, [r3, ip] + dmb + str r3, [stack, #-4]! @ PUSH r3 + bx lr 1: mov ip, lr bl getstatic_stub_unresolved @@ -5946,12 +6205,22 @@ cmp r3, #opc_getstatic << 16 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr r3, [r2, #CP_OFFSET+4] ldr ip, [r2, #CP_OFFSET+8] ldrd r2, r3, [r3, ip] stmdb stack!, {r2, r3} @ PUSH r2, r3 bx lr +3: + ldr r3, [r2, #CP_OFFSET+4] + ldr ip, [r2, #CP_OFFSET+8] + + ldrd r2, r3, [r3, ip] + dmb + stmdb stack!, {r2, r3} @ PUSH r2, r3 + bx lr 1: mov ip, lr bl getstatic_stub_unresolved @@ -5970,12 +6239,23 @@ cmp r3, #opc_putstatic << 24 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr r3, [r2, #CP_OFFSET+4] ldr ip, [r2, #CP_OFFSET+8] ldr r2, [stack], #4 @ POP r2 str r2, [r3, ip] bx lr +3: + ldr r3, [r2, #CP_OFFSET+4] + ldr ip, [r2, #CP_OFFSET+8] + ldr r2, [stack], #4 @ POP r2 + + dmb_st + str r2, [r3, ip] + dmb + bx lr 1: mov ip, lr bl putstatic_stub_unresolved @@ -5994,12 +6274,23 @@ cmp r3, #opc_putstatic << 24 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr r3, [r2, #CP_OFFSET+4] ldr ip, [r2, #CP_OFFSET+8] ldr r2, [stack], #4 @ POP r2 strh r2, [r3, ip] bx lr +3: + ldr r3, [r2, #CP_OFFSET+4] + ldr ip, [r2, #CP_OFFSET+8] + ldr r2, [stack], #4 @ POP r2 + + dmb_st + strh r2, [r3, ip] + dmb + bx lr 1: mov ip, lr bl putstatic_stub_unresolved @@ -6018,12 +6309,23 @@ cmp r3, #opc_putstatic << 24 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr r3, [r2, #CP_OFFSET+4] ldr ip, [r2, #CP_OFFSET+8] ldr r2, [stack], #4 @ POP r2 strb r2, [r3, ip] bx lr +3: + ldr r3, [r2, #CP_OFFSET+4] + ldr ip, [r2, #CP_OFFSET+8] + ldr r2, [stack], #4 @ POP r2 + + dmb_st + strb r2, [r3, ip] + dmb + bx lr 1: mov ip, lr bl putstatic_stub_unresolved @@ -6042,12 +6344,23 @@ cmp r3, #opc_putstatic << 24 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr r1, [r2, #CP_OFFSET+4] ldr ip, [r2, #CP_OFFSET+8] ldmia stack!, {r2, r3} strd r2,r3, [r1, ip] bx lr +3: + ldr r1, [r2, #CP_OFFSET+4] + ldr ip, [r2, #CP_OFFSET+8] + ldmia stack!, {r2, r3} + + dmb_st + strd r2,r3, [r1, ip] + dmb + bx lr 1: mov ip, lr bl putstatic_stub_unresolved @@ -6066,6 +6379,8 @@ cmp r3, #opc_putstatic << 24 bne 1f 2: + GO_IF_VOLATILE r3, r2, 3f + ldr r3, [r2, #CP_OFFSET+4] ldr ip, [r2, #CP_OFFSET+8] ldr r2, [stack], #4 @ POP r2 @@ -6074,6 +6389,17 @@ ldr ip, helper_aputfield_adcon mov r0, r3 bx ip +3: + ldr r3, [r2, #CP_OFFSET+4] + ldr ip, [r2, #CP_OFFSET+8] + ldr r2, [stack], #4 @ POP r2 + + dmb_st + str r2, [r3, ip] + dmb + ldr ip, helper_aputfield_adcon + mov r0, r3 + bx ip 1: mov ip, lr bl putstatic_stub_unresolved diff -r 0a0072170876 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Nov 28 20:06:41 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Dec 05 12:33:28 2011 -0500 @@ -27,7 +27,7 @@ #define T2EE_PRINT_COMPILATION #define T2EE_PRINT_STATISTICS -//#define T2EE_PRINT_DISASS +#define T2EE_PRINT_DISASS #define T2EE_PRINT_REGUSAGE #ifdef T2EE_PRINT_COMPILATION @@ -717,6 +717,43 @@ static const char *local_types[] = { "int", "long", "float", "double", "ref" }; #ifdef T2EE_PRINT_DISASS + +class Opcodes { +public: + typeof (::print_insn_little_arm) *print_insn_little_arm; + typeof (::init_disassemble_info) *init_disassemble_info; + typeof (::disassemble_init_for_target) *disassemble_init_for_target; + + // Load libopcodes.so lazily. + Opcodes() + { + void *lib; + if (t2ee_print_disass) { + if (lib = dlopen("libopcodes.so", RTLD_NOW)) { + print_insn_little_arm + = (typeof print_insn_little_arm)dlsym(lib, "print_insn_little_arm"); + init_disassemble_info + = (typeof init_disassemble_info)dlsym(lib, "init_disassemble_info"); + disassemble_init_for_target + = (typeof disassemble_init_for_target)dlsym(lib, "disassemble_init_for_target"); + } + + if (! (print_insn_little_arm + && init_disassemble_info + && disassemble_init_for_target)) + { + fprintf (stderr, "The environment variable T2EE_PRINT_DISASS is set, but\n" + "libopcodes.so has not been found or is invalid. If you want to\n" + "see a disassembly, please ensure that a valid copy of\n" + "libopcodes.so is present somewhere in your library load path.\n"); + abort(); + } + } + } +}; + +static Opcodes opcodes; + void Thumb2_disass(Thumb2_Info *jinfo) { unsigned code_size = jinfo->code_size; @@ -747,9 +784,9 @@ } #endif - init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); + opcodes.init_disassemble_info(&info, stdout, (fprintf_ftype)fprintf); info.arch = bfd_arch_arm; - disassemble_init_for_target(&info); + opcodes.disassemble_init_for_target(&info); info.endian = BFD_ENDIAN_LITTLE; info.endian_code = BFD_ENDIAN_LITTLE; info.buffer = (bfd_byte *)codebuf; @@ -823,7 +860,7 @@ for (i = 0; i < 4; i++) { printf("0x%08x:\t", (int)codebuf+idx); { - int len = print_insn_little_arm((bfd_vma)codebuf+idx, &info); + int len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info); if (len == -1) len = 2; idx += len; putchar('\n'); @@ -898,7 +935,7 @@ len = 4; } } else { - len = print_insn_little_arm((bfd_vma)codebuf+idx, &info); + len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx, &info); if (len == -1) len = 2; idx += len; } @@ -2058,7 +2095,9 @@ #define T_CHKA(size, idx) (0xca00 | (((size) & 8) << (7-3)) | ((idx) << 3) | ((size) & 7)) #define T_HBL(handler) (0xc300 | (handler)) -#define T_ENTER_LEAVE(enter) (0xf3bf8f0f | ((enter)<<4)) +#define T_MISC_CONTROL(op, option) (0xf3bf8f00 | ((op)<<4) | option) +#define T_ENTER_LEAVE(enter) (T_MISC_CONTROL(enter, 0xf)) +#define T_DMB(option) (T_MISC_CONTROL(5, option)) #define T1_ADD_IMM(dst, src, imm3) (0x1c00 | ((imm3) << 6) | ((src) << 3) | (dst)) #define T2_ADD_IMM(r, imm8) (0x3000 | ((r) << 8) | (imm8)) @@ -2878,6 +2917,16 @@ } #endif +int fullBarrier(CodeBuf *codebuf) +{ + return out_16x2(codebuf, T_DMB(0xf)); +} + +int storeBarrier(CodeBuf *codebuf) +{ + return out_16x2(codebuf, T_DMB(0xe)); +} + int tbh(CodeBuf *codebuf, Reg base, Reg idx) { out_16x2(codebuf, T_TBH(base, idx)); @@ -4558,6 +4607,10 @@ else ldr_imm(jinfo->codebuf, ARM_R0, ARM_R0, field_offset, 1, 0); str_imm(jinfo->codebuf, ARM_R0, ARM_R1, 0, 1, 0); + + if (cache->is_volatile()) + fullBarrier(jinfo->codebuf); + // deoptimized_frames = 0 mov_imm(jinfo->codebuf, ARM_R0, 0); mov_reg(jinfo->codebuf, ARM_PC, ARM_LR); @@ -4695,6 +4748,8 @@ str_imm(jinfo->codebuf, ARM_R2, Ristate, ISTATE_THREAD, 1, 0); str_imm(jinfo->codebuf, ARM_R0, Ristate, ISTATE_METHOD, 1, 0); + str_imm(jinfo->codebuf, Ristate, Ristate, ISTATE_SELF_LINK, 1, 0); + mov_reg(jinfo->codebuf, Rthread, ARM_R2); if (jinfo->method->is_synchronized()) { @@ -5620,6 +5675,10 @@ else ldr_imm(jinfo->codebuf, r, r_obj, field_offset, 1, 0); } + + if (cache->is_volatile()) + fullBarrier(jinfo->codebuf); + break; } @@ -5682,6 +5741,10 @@ else ldr_imm(jinfo->codebuf, r, r, field_offset, 1, 0); } + + if (cache->is_volatile()) + fullBarrier(jinfo->codebuf); + break; } @@ -5692,6 +5755,7 @@ Reg r_obj; cache = cp->entry_at(index); + if (!cache->is_resolved((Bytecodes::Code)opcode)) { int java_index = GET_NATIVE_U2(code_base+bci+1); constantPoolOop pool = jinfo->method->constants(); @@ -5703,16 +5767,20 @@ if (c == 'J' || c == 'D') handler = H_PUTFIELD_DW; if (c == 'B' || c == 'Z') handler = H_PUTFIELD_B; if (c == 'C' || c == 'S') handler = H_PUTFIELD_H; - if (c == '[' || c == 'L') handler = H_PUTFIELD_A; + if (c == '[' || c == 'L') handler = H_PUTFIELD_A; Thumb2_Flush(jinfo); Thumb2_save_locals(jinfo, stackdepth); mov_imm(jinfo->codebuf, ARM_R0, bci+CONSTMETHOD_CODEOFFSET); mov_imm(jinfo->codebuf, ARM_R1, index); blx(jinfo->codebuf, handlers[handler]); Thumb2_restore_locals(jinfo, bc_stackinfo[bci+len] & ~BC_FLAGS_MASK); + break; } + if (cache->is_volatile()) + storeBarrier(jinfo->codebuf); + TosState tos_type = cache->flag_state(); int field_offset = cache->f2(); @@ -5741,6 +5809,10 @@ } } } + + if (cache->is_volatile()) + fullBarrier(jinfo->codebuf); + break; } @@ -5771,6 +5843,9 @@ break; } + if (cache->is_volatile()) + storeBarrier(jinfo->codebuf); + TosState tos_type = cache->flag_state(); int field_offset = cache->f2(); Reg r_obj; @@ -5808,6 +5883,10 @@ } } } + + if (cache->is_volatile()) + fullBarrier(jinfo->codebuf); + break; } @@ -7163,7 +7242,7 @@ u32 loc_irem, loc_idiv, loc_ldiv; int rc; - if (!(CPUInfo & ARCH_THUMBEE)) { + if (!(CPUInfo & ARCH_THUMBEE) || !UseCompiler) { DisableCompiler = 1; return; } From ddadacha at icedtea.classpath.org Mon Dec 5 10:20:05 2011 From: ddadacha at icedtea.classpath.org (ddadacha at icedtea.classpath.org) Date: Mon, 05 Dec 2011 18:20:05 +0000 Subject: /hg/icedtea-web: Change icon for AccessWarningPane dialogs Message-ID: changeset df87375f72cd in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=df87375f72cd author: Danesh Dadachanji date: Mon Dec 05 13:15:32 2011 -0500 Change icon for AccessWarningPane dialogs diffstat: ChangeLog | 6 ++++++ netx/net/sourceforge/jnlp/security/AccessWarningPane.java | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diffs (25 lines): diff -r 71f338e881d2 -r df87375f72cd ChangeLog --- a/ChangeLog Tue Nov 29 17:13:03 2011 +0100 +++ b/ChangeLog Mon Dec 05 13:15:32 2011 -0500 @@ -1,3 +1,9 @@ +2011-12-05 Danesh Dadachanji + + Update UI for AccessWarningPane + * netx/net/sourceforge/jnlp/security/AccessWarningPane.java: + Use question.png instead of warning.png for access dialogs. + 2011-11-28 Jiri Vanek Added code-coverage generation targets diff -r 71f338e881d2 -r df87375f72cd netx/net/sourceforge/jnlp/security/AccessWarningPane.java --- a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java Tue Nov 29 17:13:03 2011 +0100 +++ b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java Mon Dec 05 13:15:32 2011 -0500 @@ -150,7 +150,7 @@ topLabelText = R("SNetworkAccess", "(address here)"); } - ImageIcon icon = new ImageIcon((new sun.misc.Launcher()).getClassLoader().getResource("net/sourceforge/jnlp/resources/warning.png")); + ImageIcon icon = new ImageIcon((new sun.misc.Launcher()).getClassLoader().getResource("net/sourceforge/jnlp/resources/question.png")); JLabel topLabel = new JLabel(htmlWrap(topLabelText), icon, SwingConstants.LEFT); topLabel.setFont(new Font(topLabel.getFont().toString(), Font.BOLD, 12)); From xerxes at zafena.se Tue Dec 6 01:14:47 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Tue, 06 Dec 2011 10:14:47 +0100 Subject: Bootstrapping IcedTea6 with IcedTea6 In-Reply-To: <87ehwivs5m.fsf@mid.deneb.enyo.de> References: <8762hvbjep.fsf@mid.deneb.enyo.de> <4EDCA19B.3090103@zafena.se> <87ehwivs5m.fsf@mid.deneb.enyo.de> Message-ID: <4EDDDD07.7070604@zafena.se> 2011-12-05 18:34, Florian Weimer skrev: > * Xerxes R?nby: > >> 2011-12-05 07:51, Florian Weimer skrev: >>> In the light of, >>> I wonder what's the correct way of building IcedTea6 when you haven't >>> got GCJ, but only an older IcedTea6 version? Is this possible at all? >> >> It are possible by simply passing --disable-bootstrap to icedtea6 >> configure. To clarify this --disable-bootstrap configuration option are only supported by the icedtea6 1.9.x release and later. > > But bug 631 says that this isn't a supported configuration. > >> The build will then use the system installed OpenJDK JDK instead of >> having to first compile a bootstrap compiler using GCJ/ECJ. > > This doesn't work if you've got IcedTea6 1.8.7 (say) and want to build > 1.8.10. unrelated, bug 631 are not related to the 1.8.x branch at all it was a 1.9 release bug. please file a new bug if you are seeing issues with the 1.8 branch. For the 1.8.x release branch a similar option existed to build icedtea6 without first building a bootstrap compiler using gcj/ecj but here under a different name: here you have to specify --with-openjdk to configure > > It seems to me that I have to build with Icedtea6, but still enable > bootstrapping. Is this possible? Building the bootstrap compiler (openjdk-ecj) using system installed icedtea6 instead of gcj/ecj are to my knowledge not supported on the icedtea6 branch. For IcedTea7 things are much cleaner but we still are not able to build the openjdk-bootstrap using icedtea6 see bug: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=716 Cheers and have a great day. Xerxes From ptisnovs at icedtea.classpath.org Tue Dec 6 02:44:24 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 06 Dec 2011 10:44:24 +0000 Subject: /hg/gfx-test: 2011-12-06 Pavel Tisnovsky Message-ID: changeset f866b8c554e0 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=f866b8c554e0 author: Pavel Tisnovsky date: Tue Dec 06 11:46:32 2011 +0100 2011-12-06 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: Added new to this test suite. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java | 234 +++++++++- 2 files changed, 237 insertions(+), 2 deletions(-) diffs (270 lines): diff -r 57cdb69f27a1 -r f866b8c554e0 ChangeLog --- a/ChangeLog Mon Dec 05 10:51:16 2011 +0100 +++ b/ChangeLog Tue Dec 06 11:46:32 2011 +0100 @@ -1,3 +1,8 @@ +2011-12-06 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: + Added new to this test suite. + 2011-12-05 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByEllipseShape.java: diff -r 57cdb69f27a1 -r f866b8c554e0 src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java Mon Dec 05 10:51:16 2011 +0100 +++ b/src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java Tue Dec 06 11:46:32 2011 +0100 @@ -80,7 +80,7 @@ */ private static void basicSetupForRendering(TestImage image, Graphics2D graphics2d) { - // create clip shape which is constructed from rectangular area + // create clip shape which is constructed from rectangular shape CommonClippingOperations.createClipUsingRectangleShape(image, graphics2d); } @@ -120,7 +120,57 @@ /** * Draw circle clipped by rectangle. Circle is drawn using alpha paint with - * blue color. + * red color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAlphaPaintRed(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillRedColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleShape(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** + * Draw circle clipped by rectangle. Circle is drawn using alpha paint with + * green color and selected transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @param transparency + * selected transparency (0..100 percent) + */ + private void drawCircleClippedByRectangleAlphaPaintGreen(TestImage image, Graphics2D graphics2d, int transparency) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set fill color + CommonRenderingStyles.setTransparentFillGreenColor(graphics2d, transparency); + // create clip area + CommonClippingOperations.createClipUsingRectangleShape(image, graphics2d); + // fill the shape + CommonShapesRenderer.drawFilledCircle(image, graphics2d); + } + + /** + * Draw circle clipped by rectangle. Circle is drawn using alpha paint with + * blue color and selected transparency. * * @param image * work image @@ -235,6 +285,186 @@ /** * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with red color at 0% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintRed000(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 0% transparency + drawCircleClippedByRectangleAlphaPaintRed(image, graphics2d, 0); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with red color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintRed025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 25% transparency + drawCircleClippedByRectangleAlphaPaintRed(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with red color at 50% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintRed050(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 50% transparency + drawCircleClippedByRectangleAlphaPaintRed(image, graphics2d, 50); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with red color at 75% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintRed075(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 75% transparency + drawCircleClippedByRectangleAlphaPaintRed(image, graphics2d, 75); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with red color at 100% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintRed100(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 100% transparency + drawCircleClippedByRectangleAlphaPaintRed(image, graphics2d, 100); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with green color at 0% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintGreen000(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 0% transparency + drawCircleClippedByRectangleAlphaPaintGreen(image, graphics2d, 0); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with green color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintGreen025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 25% transparency + drawCircleClippedByRectangleAlphaPaintGreen(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with green color at 50% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintGreen050(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 50% transparency + drawCircleClippedByRectangleAlphaPaintGreen(image, graphics2d, 50); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with green color at 75% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintGreen075(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 75% transparency + drawCircleClippedByRectangleAlphaPaintGreen(image, graphics2d, 75); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is + * rendered using alpha paint with green color at 100% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintGreen100(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 100% transparency + drawCircleClippedByRectangleAlphaPaintGreen(image, graphics2d, 100); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangular shape. Circle is * rendered using alpha paint with blue color at 0% transparency. * * @param image From xranby at icedtea.classpath.org Tue Dec 6 04:31:24 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Tue, 06 Dec 2011 12:31:24 +0000 Subject: /hg/icedtea6: CACAO CA162: Make class init protection aware of m... Message-ID: changeset cc68ed67e963 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cc68ed67e963 author: Xerxes Ranby date: Tue Dec 06 14:01:50 2011 +0100 CACAO CA162: Make class init protection aware of multiple threads; CA163: descriptor_params_from_paramtypes is protected by a mutex now. 2011-12-06 Xerxes Ranby CACAO: - CA162: Make class init protection aware of multiple threads. - CA163: descriptor_params_from_paramtypes is protected by a mutex now. - Removed return value from descriptor_params_from_paramtypes. - Removed fields from classinfo and related functions from descriptor pool. - src/vm/jit/jit.cpp: Eliminate one instance of useless cache flushing. * NEWS: Updated. * Makefile.am: (CACAO_VERSION): Updated CACAO to 2011-12-01 revision. (CACAO_SHA256SUM): Updated. diffstat: ChangeLog | 15 +++++++++++++++ Makefile.am | 4 ++-- NEWS | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diffs (48 lines): diff -r 0a0072170876 -r cc68ed67e963 ChangeLog --- a/ChangeLog Mon Nov 28 20:06:41 2011 +0000 +++ b/ChangeLog Tue Dec 06 14:01:50 2011 +0100 @@ -1,3 +1,18 @@ +2011-12-06 Xerxes R??nby + + CACAO: + - CA162: Make class init protection aware of multiple threads. + - CA163: descriptor_params_from_paramtypes is protected by a mutex now. + - Removed return value from descriptor_params_from_paramtypes. + - Removed fields from classinfo and related functions from + descriptor pool. + - src/vm/jit/jit.cpp: Eliminate one instance of useless cache flushing. + * NEWS: + Updated. + * Makefile.am: + (CACAO_VERSION): Updated CACAO to 2011-12-01 revision. + (CACAO_SHA256SUM): Updated. + 2011-11-28 Andrew John Hughes * NEWS: diff -r 0a0072170876 -r cc68ed67e963 Makefile.am --- a/Makefile.am Mon Nov 28 20:06:41 2011 +0000 +++ b/Makefile.am Tue Dec 06 14:01:50 2011 +0100 @@ -5,8 +5,8 @@ OPENJDK_VERSION = b24 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ -CACAO_VERSION = 2204b08fcae9 -CACAO_SHA256SUM = bb6ce286fcdc7350ed9913acfe5177921f515e187e74e773f6e62adba005f0a3 +CACAO_VERSION = ea0e1b9ccf8d +CACAO_SHA256SUM = cce66fecc290f3f7450a0463e460959028e6c81b0d7b130bb6c54bcbccf39efe 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 0a0072170876 -r cc68ed67e963 NEWS --- a/NEWS Mon Nov 28 20:06:41 2011 +0000 +++ b/NEWS Tue Dec 06 14:01:50 2011 +0100 @@ -387,6 +387,8 @@ * CACAO - CA149: Used wrong class loader. - CA159: Exception handler blocks / register mixup. + - CA162: Make class init protection aware of multiple threads. + - CA163: descriptor_params_from_paramtypes is protected by a mutex now. - ARM: Remove broken support for float argument passing in registers. - ARM: Remove hack for return value in float registers. - ARM: Fixed use of uninitialized variable. From bugzilla-daemon at icedtea.classpath.org Tue Dec 6 18:28:32 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 07 Dec 2011 02:28:32 +0000 Subject: [Bug 826] compile failing due to gawk, head, test, wc, egrep, and grep being in different directories. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=826 --- Comment #4 from rcook at wyrms.net 2011-12-07 02:28:32 UTC --- Created attachment 620 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=620 patch I created to correct fixed paths Tried to create a patch similar to the one from linux from scratch but when I apply it I get the error below. Any suggestions as to the correct fix? http://www.linuxfromscratch.org/patches/blfs/svn/icedtea6-1.9.7-fixed_paths-1.patch xpansion argument file @/usr/src/icedtea6-1.10.4/openjdk.build-ecj/hotspot/outputdir/linux_amd64_compiler2/product/../agent1.classes.list does not exist or cannot be read make[8]: *** [/usr/src/icedtea6-1.10.4/openjdk.build-ecj/hotspot/outputdir/linux_amd64_compiler2/product/../generated/sa-jdi.jar] Error 255 -- 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 Tue Dec 6 18:54:04 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 7 Dec 2011 02:54:04 +0000 Subject: Bootstrapping IcedTea6 with IcedTea6 In-Reply-To: <4EDDDD07.7070604@zafena.se> References: <8762hvbjep.fsf@mid.deneb.enyo.de> <4EDCA19B.3090103@zafena.se> <87ehwivs5m.fsf@mid.deneb.enyo.de> <4EDDDD07.7070604@zafena.se> Message-ID: <20111207025404.GB21300@rivendell.middle-earth.co.uk> On 10:14 Tue 06 Dec , Xerxes R?nby wrote: > 2011-12-05 18:34, Florian Weimer skrev: > > * Xerxes R?nby: > > > >> 2011-12-05 07:51, Florian Weimer skrev: > >>> In the light of, > >>> I wonder what's the correct way of building IcedTea6 when you haven't > >>> got GCJ, but only an older IcedTea6 version? Is this possible at all? > >> > >> It are possible by simply passing --disable-bootstrap to icedtea6 > >> configure. > > To clarify this --disable-bootstrap configuration option are only supported by the icedtea6 1.9.x release and later. > No. --with-openjdk was split into --disable-bootstrap and --with-jdk-home at that point, but there has been an option to do a quick single build for a long time. It was just tied to a badly named option. Please be careful about spreading such misinformation. > > > > But bug 631 says that this isn't a supported configuration. > > > >> The build will then use the system installed OpenJDK JDK instead of > >> having to first compile a bootstrap compiler using GCJ/ECJ. > > > > This doesn't work if you've got IcedTea6 1.8.7 (say) and want to build > > 1.8.10. > > unrelated, bug 631 are not related to the 1.8.x branch at all it was a 1.9 release bug. please file a new bug if you are seeing issues with the 1.8 branch. > > For the 1.8.x release branch a similar option existed to build icedtea6 without first building a bootstrap compiler using gcj/ecj but here under a different name: > here you have to specify --with-openjdk to configure > I'm also confused about how this bug is related to your issue. Please spell out your exact issue clearly. A full bootstrap is the recommended way of building as it ensures that the just-built JDK is usable (i.e. because it can build itself). The quick option is useful for speed but prone to breakage as classes change and conflicts arise. A full bootstrap with a GNU Classpath VM like gcj is the most tested option and the one I'd recommend as it's least likely to be prone to issue with class conflicts (not having the sun.* and com.sun.* classes in the way). You should be working with the 1.10 series unless there is some strong reason not to. 1.8 will reached end-of-life upon the release of 1.11, and that's likely to be soon. > > > > It seems to me that I have to build with Icedtea6, but still enable > > bootstrapping. Is this possible? > > Building the bootstrap compiler (openjdk-ecj) using system installed icedtea6 instead of gcj/ecj are to my knowledge not supported on the icedtea6 branch. No. The only issue I'm aware of is the one below with IcedTea7 (as 7 needs a lot more workarounds). A full bootstrap of IcedTea6 with IcedTea6 should work from 1.10 on. > > For IcedTea7 things are much cleaner but we still are not able to build the openjdk-bootstrap using icedtea6 see bug: > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=716 > If someone wants to work on this, feel free. > > Cheers and have a great day. > Xerxes -- 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: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111207/52e97577/attachment.bin From bugzilla-daemon at icedtea.classpath.org Tue Dec 6 19:37:10 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 07 Dec 2011 03:37:10 +0000 Subject: [Bug 826] compile failing due to gawk, head, test, wc, egrep, and grep being in different directories. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=826 --- Comment #5 from rcook at wyrms.net 2011-12-07 03:37:10 UTC --- Think I found it in openjdk/hotspot/make/linux/makefiles/sa.make -- 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 Dec 6 19:52:05 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 07 Dec 2011 03:52:05 +0000 Subject: [Bug 826] compile failing due to gawk, head, test, wc, egrep, and grep being in different directories. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=826 --- Comment #6 from rcook at wyrms.net 2011-12-07 03:52:05 UTC --- Well that didn't fix it as it cause patches/ecj/hotspot.patch to fail. -- 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 Dec 6 20:37:39 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 07 Dec 2011 04:37:39 +0000 Subject: [Bug 826] compile failing due to gawk, head, test, wc, egrep, and grep being in different directories. In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=826 --- Comment #7 from rcook at wyrms.net 2011-12-07 04:37:39 UTC --- actually caused patches/hotspot/original/too-many-args.patch to fail which caused the other to fail. So now able to build once I redid the patch to patch both the sa.make and too-many--args.patch files. -- 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 Wed Dec 7 02:05:51 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 07 Dec 2011 10:05:51 +0000 Subject: /hg/gfx-test: 2011-12-07 Pavel Tisnovsky Message-ID: changeset fe1013f76915 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=fe1013f76915 author: Pavel Tisnovsky date: Wed Dec 07 11:08:08 2011 +0100 2011-12-07 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: Added new tests - rendering using gradient paint. Reformating of Javadoc. * src/org/gfxtest/testsuites/ClippingCircleByRoundRectangleShape.java: Added fourteen new tests to this test suite (incl. transparency tests). diffstat: ChangeLog | 8 + src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java | 133 ++++- src/org/gfxtest/testsuites/ClippingCircleByRoundRectangleShape.java | 268 +++++++++- 3 files changed, 393 insertions(+), 16 deletions(-) diffs (truncated from 554 to 500 lines): diff -r f866b8c554e0 -r fe1013f76915 ChangeLog --- a/ChangeLog Tue Dec 06 11:46:32 2011 +0100 +++ b/ChangeLog Wed Dec 07 11:08:08 2011 +0100 @@ -1,3 +1,11 @@ +2011-12-07 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: + Added new tests - rendering using gradient paint. Reformating of + Javadoc. + * src/org/gfxtest/testsuites/ClippingCircleByRoundRectangleShape.java: + Added fourteen new tests to this test suite (incl. transparency tests). + 2011-12-06 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: diff -r f866b8c554e0 -r fe1013f76915 src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java Tue Dec 06 11:46:32 2011 +0100 +++ b/src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java Wed Dec 07 11:08:08 2011 +0100 @@ -295,7 +295,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintRed000(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 0% transparency + // draw circle clipped by rectangle using alpha paint with 0% + // transparency drawCircleClippedByRectangleAlphaPaintRed(image, graphics2d, 0); // test result return TestResult.PASSED; @@ -313,7 +314,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintRed025(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 25% transparency + // draw circle clipped by rectangle using alpha paint with 25% + // transparency drawCircleClippedByRectangleAlphaPaintRed(image, graphics2d, 25); // test result return TestResult.PASSED; @@ -331,7 +333,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintRed050(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 50% transparency + // draw circle clipped by rectangle using alpha paint with 50% + // transparency drawCircleClippedByRectangleAlphaPaintRed(image, graphics2d, 50); // test result return TestResult.PASSED; @@ -349,7 +352,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintRed075(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 75% transparency + // draw circle clipped by rectangle using alpha paint with 75% + // transparency drawCircleClippedByRectangleAlphaPaintRed(image, graphics2d, 75); // test result return TestResult.PASSED; @@ -367,7 +371,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintRed100(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 100% transparency + // draw circle clipped by rectangle using alpha paint with 100% + // transparency drawCircleClippedByRectangleAlphaPaintRed(image, graphics2d, 100); // test result return TestResult.PASSED; @@ -385,7 +390,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintGreen000(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 0% transparency + // draw circle clipped by rectangle using alpha paint with 0% + // transparency drawCircleClippedByRectangleAlphaPaintGreen(image, graphics2d, 0); // test result return TestResult.PASSED; @@ -403,7 +409,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintGreen025(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 25% transparency + // draw circle clipped by rectangle using alpha paint with 25% + // transparency drawCircleClippedByRectangleAlphaPaintGreen(image, graphics2d, 25); // test result return TestResult.PASSED; @@ -421,7 +428,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintGreen050(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 50% transparency + // draw circle clipped by rectangle using alpha paint with 50% + // transparency drawCircleClippedByRectangleAlphaPaintGreen(image, graphics2d, 50); // test result return TestResult.PASSED; @@ -439,7 +447,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintGreen075(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 75% transparency + // draw circle clipped by rectangle using alpha paint with 75% + // transparency drawCircleClippedByRectangleAlphaPaintGreen(image, graphics2d, 75); // test result return TestResult.PASSED; @@ -457,7 +466,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintGreen100(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 100% transparency + // draw circle clipped by rectangle using alpha paint with 100% + // transparency drawCircleClippedByRectangleAlphaPaintGreen(image, graphics2d, 100); // test result return TestResult.PASSED; @@ -475,7 +485,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintBlue000(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 0% transparency + // draw circle clipped by rectangle using alpha paint with 0% + // transparency drawCircleClippedByRectangleAlphaPaintBlue(image, graphics2d, 0); // test result return TestResult.PASSED; @@ -493,7 +504,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintBlue025(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 25% transparency + // draw circle clipped by rectangle using alpha paint with 25% + // transparency drawCircleClippedByRectangleAlphaPaintBlue(image, graphics2d, 25); // test result return TestResult.PASSED; @@ -511,7 +523,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintBlue050(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 50% transparency + // draw circle clipped by rectangle using alpha paint with 50% + // transparency drawCircleClippedByRectangleAlphaPaintBlue(image, graphics2d, 50); // test result return TestResult.PASSED; @@ -529,7 +542,8 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintBlue075(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 75% transparency + // draw circle clipped by rectangle using alpha paint with 75% + // transparency drawCircleClippedByRectangleAlphaPaintBlue(image, graphics2d, 75); // test result return TestResult.PASSED; @@ -547,13 +561,102 @@ */ public TestResult testClipCircleByRectangleShapeAlphaPaintBlue100(TestImage image, Graphics2D graphics2d) { - // draw circle clipped by rectangle using alpha paint with 100% transparency + // draw circle clipped by rectangle using alpha paint with 100% + // transparency drawCircleClippedByRectangleAlphaPaintBlue(image, graphics2d, 100); // test result return TestResult.PASSED; } /** + * Check if circle shape could be clipped by a rectangle shape. Circle is + * rendered using horizontal gradient paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaHorizontalGradientPaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set horizontal gradient paint + CommonRenderingStyles.setHorizontalGradientFill(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangle shape. Circle is + * rendered using vertical gradient paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaVerticalGradientPaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set vertical gradient paint + CommonRenderingStyles.setVerticalGradientFill(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangle shape. Circle is + * rendered using diagonal gradient paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaDiagonalGradientPaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set diagonal gradient paint + CommonRenderingStyles.setDiagonalGradientFill(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a rectangle shape. Circle is + * rendered using radial gradient paint. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleAreaRadialGradientPaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set radial gradient paint + CommonRenderingStyles.setRadialGradientFill(image, graphics2d); + // set clip region and render filled circle + drawFilledCircleClippedByRectangleShape(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** * Entry point to the test suite. * * @param args diff -r f866b8c554e0 -r fe1013f76915 src/org/gfxtest/testsuites/ClippingCircleByRoundRectangleShape.java --- a/src/org/gfxtest/testsuites/ClippingCircleByRoundRectangleShape.java Tue Dec 06 11:46:32 2011 +0100 +++ b/src/org/gfxtest/testsuites/ClippingCircleByRoundRectangleShape.java Wed Dec 07 11:08:08 2011 +0100 @@ -147,7 +147,7 @@ private void drawFilledCircleUsingAlphaPaint(TestImage image, Graphics2D graphics2d) { // create clip area - CommonClippingOperations.createClipUsingRectangleShape(image, graphics2d); + CommonClippingOperations.createClipUsingRoundRectangleShape(image, graphics2d); // fill the shape CommonShapesRenderer.drawFilledCircle(image, graphics2d); } @@ -307,6 +307,196 @@ /** * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with red color at 0% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintRed000(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 0% + // transparency + drawCircleClippedByRoundRectangleAlphaPaintRed(image, graphics2d, 0); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with red color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintRed025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 25% + // transparency + drawCircleClippedByRoundRectangleAlphaPaintRed(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with red color at 50% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintRed050(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 50% + // transparency + drawCircleClippedByRoundRectangleAlphaPaintRed(image, graphics2d, 50); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with red color at 75% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintRed075(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 75% + // transparency + drawCircleClippedByRoundRectangleAlphaPaintRed(image, graphics2d, 75); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with red color at 100% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintRed100(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 100% + // transparency + drawCircleClippedByRoundRectangleAlphaPaintRed(image, graphics2d, 100); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with green color at 0% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintGreen000(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 0% + // transparency + drawCircleClippedByRoundRectangleAlphaPaintGreen(image, graphics2d, 0); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with green color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintGreen025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 25% + // transparency + drawCircleClippedByRoundRectangleAlphaPaintGreen(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with green color at 50% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintGreen050(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 50% + // transparency + drawCircleClippedByRoundRectangleAlphaPaintGreen(image, graphics2d, 50); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with green color at 75% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintGreen075(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 75% + // transparency + drawCircleClippedByRoundRectangleAlphaPaintGreen(image, graphics2d, 75); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with green color at 100% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintGreen100(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 100% + // transparency + drawCircleClippedByRoundRectangleAlphaPaintGreen(image, graphics2d, 100); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a round rectangular shape. * Circle is rendered using alpha paint with blue color at 0% transparency. * * @param image @@ -325,6 +515,82 @@ } /** + * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with blue color at 25% transparency. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCircleByRectangleShapeAlphaPaintBlue025(TestImage image, Graphics2D graphics2d) + { + // draw circle clipped by rectangle using alpha paint with 25% + // transparency + drawCircleClippedByRoundRectangleAlphaPaintBlue(image, graphics2d, 25); + // test result + return TestResult.PASSED; + } + + /** + * Check if circle shape could be clipped by a round rectangular shape. + * Circle is rendered using alpha paint with blue color at 50% transparency. + * + * @param image + * work image + * @param graphics2d From xerxes at zafena.se Wed Dec 7 02:18:05 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Wed, 07 Dec 2011 11:18:05 +0100 Subject: ARM: Volatile handlers In-Reply-To: <4EDD01A5.60802@redhat.com> References: <4EDD01A5.60802@redhat.com> Message-ID: <4EDF3D5D.10806@zafena.se> 2011-12-05 18:38, Andrew Haley skrev: > I've rewritten all the volatile code. The previous version I posted > was buggy and unmaintainable. I've rewritten it to duplicate every > handler into a volatile and a non-volatile version. This bloats the > code rather, but it's more efficient and much easier to understand. > > Xerxes, please have a look. > > Thanks, > Andrew. > Hi Andrew I have primed myself with Doug Leas JSR-133 cookbook http://gee.cs.oswego.edu/dl/jmm/cookbook.html I am still proofreading to check if the correct barrier are at the right location, so far the code looks reasonable. I have found some issues with the new macros, comments are in-lined below. > --- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Nov 28 20:06:41 2011 +0000 > +++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Dec 05 12:33:28 2011 -0500 > @@ -1573,6 +1573,7 @@ > DISPATCH_NEXT > SW_NPC cmp tmp1, #0 > SW_NPC beq null_ptr_exception_jpc_3 > + GO_IF_VOLATILE r3, tmp2, 3f > ldr tmp2, [tmp2, #CP_OFFSET+8] > DISPATCH_NEXT > .abortentry78: > @@ -1581,6 +1582,17 @@ > DISPATCH_NEXT > PUSH tmp2 > DISPATCH_FINISH > +3: > + VOLATILE_VERSION > + ldr tmp2, [tmp2, #CP_OFFSET+8] > + DISPATCH_NEXT > +.abortentry78_v: > + ldr tmp2, [tmp1, tmp2] > + dmb Suggestion it would be a little clearer if we had put a new LoadLoad macro here instead of the dmb directly. Such an change would allow us to better maintain the code in the future to take advantage of new less expensive barriers when they get introduced in newer ARM ISA, for example make it trivial to update the code if ARM would introduce a new barrier similar to IA64 ld.acq. > (iputfield) iputfield { > @@ -1669,6 +1731,7 @@ > DISPATCH_NEXT > SW_NPC cmp tmp1, #0 > SW_NPC beq null_ptr_exception_jpc_3 > + GO_IF_VOLATILE r2, tmp2, 3f > ldr tmp2, [tmp2, #CP_OFFSET+8] > DISPATCH_NEXT > DISPATCH_NEXT > @@ -1676,6 +1739,17 @@ > .abortentry83: > str r3, [tmp1, tmp2] > DISPATCH_FINISH > +3: > + VOLATILE_VERSION > + ldr tmp2, [tmp2, #CP_OFFSET+8] > + DISPATCH_NEXT > + DISPATCH_NEXT > + DISPATCH_NEXT > + dmb_st Similar here we could use a StoreStore macro instead of dmb_st > +.abortentry83_v: > + str r3, [tmp1, tmp2] > + dmb And here we could use a StoreLoad macro instead of the dmb I think such use of new macros would make the code more portable and readable as well. > @@ -1687,6 +1761,7 @@ > diff -r 0a0072170876 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S > --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Nov 28 20:06:41 2011 +0000 > +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Dec 05 12:33:28 2011 -0500 > @@ -585,6 +585,32 @@ > .fpu softvfp > #endif // HW_FP > > +#ifndef __ARM_ARCH_7A__ Can we make this #ifndef armv8 future proof? > +# define dmb VOLATILE_BARRIER > +# define dmb_st VOLATILE_BARRIER > +#else > +# define dmb_st .word 0xf57ff05e > +#endif Please move this define section down below the VOLATILE_BARRIER define to prevent compile errors on non armv7 machines. > + > + .macro VOLATILE_BARRIER arg > + stmfd sp!, {r2, lr} > + mov r2, #0xfa0 better to use movw here? > + movt r2, #0xffff I would suggest to replace these two instructions with a single mov r2, #0xffff0fa0 @ kernel_dmb > + blx r2 > + ldmfd sp!, {r2, lr} > + .endm > + > + .macro GO_IF_VOLATILE reg, cp_cache, label > + ldr \reg, [\cp_cache, #CP_OFFSET+CP_CACHE_FLAGS] > + tst \reg, #(1< + bne \label > + .set dispatch_saved, dispatch_state > + .endm Here it would be nice with a comment, something like: @ the macros used by the non-volatile version in between @ the GO_IF_VOLATILE and VOLATILE_VERSION will @ alter the dispatch_state, save it! > + .macro VOLATILE_VERSION I would suggest to add a sanity check at the start of this macro: .if dispatch_state == 0 > + .set dispatch_state, dispatch_saved .else .error "VOLATILE_VERSION macro used before non-volatile DISPATCH_FINNISH." .endif > + .endm > --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Nov 28 20:06:41 2011 +0000 > +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Dec 05 12:33:28 2011 -0500 > @@ -27,7 +27,7 @@ > > #define T2EE_PRINT_COMPILATION > #define T2EE_PRINT_STATISTICS > -//#define T2EE_PRINT_DISASS > +#define T2EE_PRINT_DISASS ... > - len = print_insn_little_arm((bfd_vma)codebuf+idx,&info); > + len = opcodes.print_insn_little_arm((bfd_vma)codebuf+idx,&info); > if (len == -1) len = 2; > idx += len; > } OK! Super to have this debug disass support enabled by default without adding a new build dependency! > @@ -7163,7 +7242,7 @@ > u32 loc_irem, loc_idiv, loc_ldiv; > int rc; > > - if (!(CPUInfo& ARCH_THUMBEE)) { > + if (!(CPUInfo& ARCH_THUMBEE) || !UseCompiler) { > DisableCompiler = 1; > return; > } Nice. i assume this will make -Xint work to disable the t2jit. I will post a follow up code-review when i have proof-read the placement of all the barriers in the .S ASM interpreter, the .def bytecode defines and the .cpp thumb2 jit according to the JSR-133 cookbook. Cheers Xerxes From aph at redhat.com Wed Dec 7 02:37:29 2011 From: aph at redhat.com (Andrew Haley) Date: Wed, 07 Dec 2011 10:37:29 +0000 Subject: ARM: Volatile handlers In-Reply-To: <4EDF3D5D.10806@zafena.se> References: <4EDD01A5.60802@redhat.com> <4EDF3D5D.10806@zafena.se> Message-ID: <4EDF41E9.1010205@redhat.com> On 12/07/2011 10:18 AM, Xerxes R?nby wrote: > 2011-12-05 18:38, Andrew Haley skrev: >> I've rewritten all the volatile code. The previous version I posted >> was buggy and unmaintainable. I've rewritten it to duplicate every >> handler into a volatile and a non-volatile version. This bloats the >> code rather, but it's more efficient and much easier to understand. >> >> Xerxes, please have a look. >> >> Thanks, >> Andrew. >> > > Hi Andrew I have primed myself with Doug Leas JSR-133 cookbook > http://gee.cs.oswego.edu/dl/jmm/cookbook.html > > I am still proofreading to check if the correct barrier are at the > right location, so far the code looks reasonable. > > I have found some issues with the new macros, comments are in-lined below. > >> --- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Nov 28 20:06:41 2011 +0000 >> +++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Dec 05 12:33:28 2011 -0500 >> @@ -1573,6 +1573,7 @@ >> DISPATCH_NEXT >> SW_NPC cmp tmp1, #0 >> SW_NPC beq null_ptr_exception_jpc_3 >> + GO_IF_VOLATILE r3, tmp2, 3f >> ldr tmp2, [tmp2, #CP_OFFSET+8] >> DISPATCH_NEXT >> .abortentry78: >> @@ -1581,6 +1582,17 @@ >> DISPATCH_NEXT >> PUSH tmp2 >> DISPATCH_FINISH >> +3: >> + VOLATILE_VERSION >> + ldr tmp2, [tmp2, #CP_OFFSET+8] >> + DISPATCH_NEXT >> +.abortentry78_v: >> + ldr tmp2, [tmp1, tmp2] >> + dmb > > Suggestion it would be a little clearer if we had put a new LoadLoad > macro here instead of the dmb directly. Such an change would allow > us to better maintain the code in the future to take advantage of > new less expensive barriers when they get introduced in newer ARM > ISA, for example make it trivial to update the code if ARM would > introduce a new barrier similar to IA64 ld.acq. That's never going to happen. The ARM already has eight different kinds of memory barrier. >> +.abortentry83_v: >> + str r3, [tmp1, tmp2] >> + dmb > > And here we could use a StoreLoad macro instead of the dmb > > I think such use of new macros would make the code more portable and > readable as well. Portable? :-) OK, I'll give this idea some thought. >> @@ -1687,6 +1761,7 @@ >> diff -r 0a0072170876 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S >> --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Nov 28 20:06:41 2011 +0000 >> +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Dec 05 12:33:28 2011 -0500 >> @@ -585,6 +585,32 @@ >> .fpu softvfp >> #endif // HW_FP >> >> +#ifndef __ARM_ARCH_7A__ > Can we make this #ifndef armv8 future proof? I'd love to, but I do not know what macros GCC developers are going to use. >> +# define dmb VOLATILE_BARRIER >> +# define dmb_st VOLATILE_BARRIER >> +#else >> +# define dmb_st .word 0xf57ff05e >> +#endif > > Please move this define section down below the VOLATILE_BARRIER > define to prevent compile errors on non armv7 machines. I don't understand this comment. >> + >> + .macro VOLATILE_BARRIER arg >> + stmfd sp!, {r2, lr} > >> + mov r2, #0xfa0 > better to use movw here? >> + movt r2, #0xffff > I would suggest to replace these two instructions with a single > mov r2, #0xffff0fa0 @ kernel_dmb Pardon? What ARM are you using? :-) >> + blx r2 >> + ldmfd sp!, {r2, lr} >> + .endm >> + >> + .macro GO_IF_VOLATILE reg, cp_cache, label >> + ldr \reg, [\cp_cache, #CP_OFFSET+CP_CACHE_FLAGS] >> + tst \reg, #(1<> + bne \label >> + .set dispatch_saved, dispatch_state >> + .endm > > Here it would be nice with a comment, something like: > @ the macros used by the non-volatile version in between > @ the GO_IF_VOLATILE and VOLATILE_VERSION will > @ alter the dispatch_state, save it! OK. >> + .macro VOLATILE_VERSION > I would suggest to add a sanity check at the start of this macro: > .if dispatch_state == 0 >> + .set dispatch_state, dispatch_saved > .else > .error "VOLATILE_VERSION macro used before non-volatile DISPATCH_FINNISH." > .endif >> + .endm OK. >> @@ -7163,7 +7242,7 @@ >> u32 loc_irem, loc_idiv, loc_ldiv; >> int rc; >> >> - if (!(CPUInfo& ARCH_THUMBEE)) { >> + if (!(CPUInfo& ARCH_THUMBEE) || !UseCompiler) { >> DisableCompiler = 1; >> return; >> } > Nice. i assume this will make -Xint work to disable the t2jit. It does. Thanks, Andrew. From bugzilla-daemon at icedtea.classpath.org Wed Dec 7 16:40:33 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 08 Dec 2011 00:40:33 +0000 Subject: [Bug 827] New: unable to start davmail Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=827 Bug #: 827 Summary: unable to start davmail Classification: Unclassified Product: IcedTea Version: unspecified Platform: x86_64 OS/Version: Linux Status: NEW Severity: blocker Priority: P3 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: inpost at gmail.com An attempt to start davmail fails: # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x0000003931414da0, pid=3802, tid=140709191612176 # # JRE version: 6.0_17-b17 # Java VM: OpenJDK 64-Bit Server VM (14.0-b16 mixed mode linux-amd64 ) # Derivative: IcedTea6 1.7.4 # Distribution: Custom build (Thu Nov 11 07:16:52 GMT 2010) # Problematic frame: # C [ld-linux-x86-64.so.2+0x14da0] # # 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 (0x00007ff964007800): JavaThread "main" [_thread_in_native, id=3803, stack(0x00007ff96951f000,0x00007ff969620000)] siginfo:si_signo=SIGSEGV: si_errno=0, si_code=128 (), si_addr=0x0000000000000000 Registers: RAX=0x0000000000000001, RBX=0x00007ff9641b45d0, RCX=0x000000001dbae3bf, RDX=0x00000000bfebfbff RSP=0x00007ff96961c058, RBP=0x00007ff96961c1a0, RSI=0x0000000000000000, RDI=0x0000000000000058 R8 =0x0000000000000000, R9 =0x0000000000000000, R10=0x00007ff96961bfd0, R11=0x00007ff9641b45d0 R12=0x00007ff96961c1c8, R13=0x00007ff964166560, R14=0x0000000000000000, R15=0x0000000000000000 RIP=0x0000003931414da0, EFL=0x0000000000010202, CSGSFS=0x0000000000000033, ERR=0x0000000000000000 TRAPNO=0x000000000000000d Top of Stack: (sp=0x00007ff96961c058) 0x00007ff96961c058: 000000393140ab07 0000000000000000 0x00007ff96961c068: 0000000000000000 00007ff900000005 0x00007ff96961c078: 0000000000000000 0000000000000001 0x00007ff96961c088: 00007ff964166560 0000000000000000 0x00007ff96961c098: 00007ff900000000 0000000000000000 0x00007ff96961c0a8: 0000000000000058 0000000000000004 0x00007ff96961c0b8: 00007ff9641668b8 0000000000000035 0x00007ff96961c0c8: 00007ff90a882670 00007ff90000000a 0x00007ff96961c0d8: 00000001e80575c8 00007ff964007800 0x00007ff96961c0e8: 00007ff90a875db9 0000000000000000 0x00007ff96961c0f8: 00007ff8e80575c8 00007ff96961c170 0x00007ff96961c108: 00007ff969b337cf 00007ff964007800 0x00007ff96961c118: 00007ff900000000 00007ff96961c338 0x00007ff96961c128: 00007ff96961c2f0 00007ff964006180 0x00007ff96961c138: 000000031c140b18 0000000000000000 0x00007ff96961c148: 00007ff9640065c0 00007ff90aad1548 0x00007ff96961c158: 00007ff9641b45d0 00007ff964007800 0x00007ff96961c168: 00000000ffffffff 00007ff96961c1d0 0x00007ff96961c178: 0000000000000005 0000000000246540 0x00007ff96961c188: 0000000000000000 00007ff96961c2f0 0x00007ff96961c198: 00007ff964007800 00007ff90a874000 0x00007ff96961c1a8: 000000393140df00 00007ff900000005 0x00007ff96961c1b8: 0000000000000000 00007ff9641f3d40 0x00007ff96961c1c8: 00007ff90a874b48 00007ff964007800 0x00007ff96961c1d8: 00007ff9641f3d40 00007ff96961c270 0x00007ff96961c1e8: 00007ff9640079b8 000000000000001c 0x00007ff96961c1f8: 00000039314147e5 0000000000000000 0x00007ff96961c208: 6f6e6f4d20736e61 00007ff96a063a10 0x00007ff96961c218: 00007ff94ddaea84 00007ff9641f3d40 0x00007ff96961c228: 657571696c624f20 0000000000000025 0x00007ff96961c238: 00007ff964166560 0000000000000043 0x00007ff96961c248: 00007ff90a8826db 00007ff91c976098 Instructions: (pc=0x0000003931414da0) 0x0000003931414d90: 10 75 02 f7 d8 89 05 dd b1 20 00 83 f8 00 78 51 0x0000003931414da0: 64 c5 fd 7f 04 25 80 00 00 00 64 c5 fd 7f 0c 25 Stack: [0x00007ff96951f000,0x00007ff969620000], sp=0x00007ff96961c058, free space=1012k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [ld-linux-x86-64.so.2+0x14da0] Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j sun.font.NativeFont.fontExists([B)Z+0 j sun.font.NativeFont.fontExists(Ljava/lang/String;)Z+19 j sun.awt.X11GraphicsEnvironment.getX11FontName(Ljava/lang/String;)Ljava/lang/String;+10 j sun.awt.X11GraphicsEnvironment.getFileNameFromPlatformName(Ljava/lang/String;)Ljava/lang/String;+321 j sun.java2d.SunGraphicsEnvironment.initCompositeFonts(Lsun/awt/FontConfiguration;Ljava/util/concurrent/ConcurrentHashMap;)V+32 j sun.java2d.SunGraphicsEnvironment.access$600(Lsun/java2d/SunGraphicsEnvironment;Lsun/awt/FontConfiguration;Ljava/util/concurrent/ConcurrentHashMap;)V+3 j sun.java2d.SunGraphicsEnvironment$2.run()Ljava/lang/Object;+769 v ~StubRoutines::call_stub j java.security.AccessController.doPrivileged(Ljava/security/PrivilegedAction;)Ljava/lang/Object;+0 j sun.java2d.SunGraphicsEnvironment.()V+44 j sun.awt.X11GraphicsEnvironment.()V+1 v ~StubRoutines::call_stub j sun.reflect.NativeConstructorAccessorImpl.newInstance0(Ljava/lang/reflect/Constructor;[Ljava/lang/Object;)Ljava/lang/Object;+0 j sun.reflect.NativeConstructorAccessorImpl.newInstance([Ljava/lang/Object;)Ljava/lang/Object;+72 j sun.reflect.DelegatingConstructorAccessorImpl.newInstance([Ljava/lang/Object;)Ljava/lang/Object;+5 j java.lang.reflect.Constructor.newInstance([Ljava/lang/Object;)Ljava/lang/Object;+92 j java.lang.Class.newInstance0()Ljava/lang/Object;+118 j java.lang.Class.newInstance()Ljava/lang/Object;+15 j java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment()Ljava/awt/GraphicsEnvironment;+27 j sun.awt.X11.XToolkit.()V+107 v ~StubRoutines::call_stub j java.lang.Class.forName0(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;+0 j java.lang.Class.forName(Ljava/lang/String;)Ljava/lang/Class;+5 j java.awt.Toolkit$2.run()Ljava/lang/Object;+13 v ~StubRoutines::call_stub j java.security.AccessController.doPrivileged(Ljava/security/PrivilegedAction;)Ljava/lang/Object;+0 j java.awt.Toolkit.getDefaultToolkit()Ljava/awt/Toolkit;+16 j javax.swing.UIManager.getSystemLookAndFeelClassName()Ljava/lang/String;+58 j davmail.ui.tray.SwtGatewayTray.init()V+7 j davmail.ui.tray.DavGatewayTray.init()V+35 j davmail.DavGateway.main([Ljava/lang/String;)V+15 v ~StubRoutines::call_stub --------------- P R O C E S S --------------- Java Threads: ( => current thread ) 0x00007ff9641fd000 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=3820, stack(0x00007ff90b5d3000,0x00007ff90b6d4000)] 0x00007ff96409f000 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=3814, stack(0x00007ff90b865000,0x00007ff90b966000)] 0x00007ff96409b800 JavaThread "CompilerThread1" daemon [_thread_in_native, id=3813, stack(0x00007ff90b966000,0x00007ff90ba67000)] 0x00007ff964099800 JavaThread "CompilerThread0" daemon [_thread_blocked, id=3812, stack(0x00007ff90ba67000,0x00007ff90bb68000)] 0x00007ff964097800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=3811, stack(0x00007ff96803a000,0x00007ff96813b000)] 0x00007ff964076000 JavaThread "Finalizer" daemon [_thread_blocked, id=3810, stack(0x00007ff96813b000,0x00007ff96823c000)] 0x00007ff964074000 JavaThread "Reference Handler" daemon [_thread_blocked, id=3809, stack(0x00007ff90bb68000,0x00007ff90bc69000)] =>0x00007ff964007800 JavaThread "main" [_thread_in_native, id=3803, stack(0x00007ff96951f000,0x00007ff969620000)] Other Threads: 0x00007ff96406f800 VMThread [stack: 0x00007ff90bc69000,0x00007ff90bd6a000] [id=3808] 0x00007ff9640a1800 WatcherThread [stack: 0x00007ff90b764000,0x00007ff90b865000] [id=3815] VM state:not at safepoint (normal execution) VM Mutex/Monitor currently owned by a thread: None Heap PSYoungGen total 17472K, used 5848K [0x00007ff94d800000, 0x00007ff94eb70000, 0x00007ff961000000) eden space 15040K, 38% used [0x00007ff94d800000,0x00007ff94ddb6080,0x00007ff94e6b0000) from space 2432K, 0% used [0x00007ff94e910000,0x00007ff94e910000,0x00007ff94eb70000) to space 2432K, 0% used [0x00007ff94e6b0000,0x00007ff94e6b0000,0x00007ff94e910000) PSOldGen total 39936K, used 0K [0x00007ff926800000, 0x00007ff928f00000, 0x00007ff94d800000) object space 39936K, 0% used [0x00007ff926800000,0x00007ff926800000,0x00007ff928f00000) PSPermGen total 21248K, used 9695K [0x00007ff91c000000, 0x00007ff91d4c0000, 0x00007ff926800000) object space 21248K, 45% used [0x00007ff91c000000,0x00007ff91c977cc8,0x00007ff91d4c0000) Dynamic libraries: 00400000-00408000 r-xp 00000000 fd:00 1311360 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/bin/java 00608000-00609000 rw-p 00008000 fd:00 1311360 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/bin/java 00746000-00767000 rw-p 00000000 00:00 0 [heap] 3931400000-393141e000 r-xp 00000000 fd:00 655759 /lib64/ld-2.12.so 393161e000-393161f000 r--p 0001e000 fd:00 655759 /lib64/ld-2.12.so 393161f000-3931620000 rw-p 0001f000 fd:00 655759 /lib64/ld-2.12.so 3931620000-3931621000 rw-p 00000000 00:00 0 3931800000-3931804000 r-xp 00000000 fd:00 1311303 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/jli/libjli.so 3931804000-3931a03000 ---p 00004000 fd:00 1311303 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/jli/libjli.so 3931a03000-3931a04000 rw-p 00003000 fd:00 1311303 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/jli/libjli.so 3931c00000-3931d75000 r-xp 00000000 fd:00 655760 /lib64/libc-2.12.so 3931d75000-3931f75000 ---p 00175000 fd:00 655760 /lib64/libc-2.12.so 3931f75000-3931f79000 r--p 00175000 fd:00 655760 /lib64/libc-2.12.so 3931f79000-3931f7a000 rw-p 00179000 fd:00 655760 /lib64/libc-2.12.so 3931f7a000-3931f7f000 rw-p 00000000 00:00 0 3932000000-3932002000 r-xp 00000000 fd:00 655762 /lib64/libdl-2.12.so 3932002000-3932202000 ---p 00002000 fd:00 655762 /lib64/libdl-2.12.so 3932202000-3932203000 r--p 00002000 fd:00 655762 /lib64/libdl-2.12.so 3932203000-3932204000 rw-p 00003000 fd:00 655762 /lib64/libdl-2.12.so 3932400000-3932417000 r-xp 00000000 fd:00 655768 /lib64/libpthread-2.12.so 3932417000-3932617000 ---p 00017000 fd:00 655768 /lib64/libpthread-2.12.so 3932617000-3932618000 r--p 00017000 fd:00 655768 /lib64/libpthread-2.12.so 3932618000-3932619000 rw-p 00018000 fd:00 655768 /lib64/libpthread-2.12.so 3932619000-393261d000 rw-p 00000000 00:00 0 3932800000-3932883000 r-xp 00000000 fd:00 655783 /lib64/libm-2.12.so 3932883000-3932a82000 ---p 00083000 fd:00 655783 /lib64/libm-2.12.so 3932a82000-3932a83000 r--p 00082000 fd:00 655783 /lib64/libm-2.12.so 3932a83000-3932a84000 rw-p 00083000 fd:00 655783 /lib64/libm-2.12.so 3932c00000-3932c07000 r-xp 00000000 fd:00 655779 /lib64/librt-2.12.so 3932c07000-3932e06000 ---p 00007000 fd:00 655779 /lib64/librt-2.12.so 3932e06000-3932e07000 r--p 00006000 fd:00 655779 /lib64/librt-2.12.so 3932e07000-3932e08000 rw-p 00007000 fd:00 655779 /lib64/librt-2.12.so 3933000000-393301d000 r-xp 00000000 fd:00 655765 /lib64/libselinux.so.1 393301d000-393321c000 ---p 0001d000 fd:00 655765 /lib64/libselinux.so.1 393321c000-393321d000 r--p 0001c000 fd:00 655765 /lib64/libselinux.so.1 393321d000-393321e000 rw-p 0001d000 fd:00 655765 /lib64/libselinux.so.1 393321e000-393321f000 rw-p 00000000 00:00 0 3933400000-3933415000 r-xp 00000000 fd:00 655785 /lib64/libz.so.1.2.3 3933415000-3933614000 ---p 00015000 fd:00 655785 /lib64/libz.so.1.2.3 3933614000-3933615000 rw-p 00014000 fd:00 655785 /lib64/libz.so.1.2.3 3933800000-3933816000 r-xp 00000000 fd:00 655764 /lib64/libresolv-2.12.so 3933816000-3933a16000 ---p 00016000 fd:00 655764 /lib64/libresolv-2.12.so 3933a16000-3933a17000 r--p 00016000 fd:00 655764 /lib64/libresolv-2.12.so 3933a17000-3933a18000 rw-p 00017000 fd:00 655764 /lib64/libresolv-2.12.so 3933a18000-3933a1a000 rw-p 00000000 00:00 0 3934000000-3934043000 r-xp 00000000 fd:00 655776 /lib64/libgobject-2.0.so.0.2200.5 3934043000-3934243000 ---p 00043000 fd:00 655776 /lib64/libgobject-2.0.so.0.2200.5 3934243000-3934245000 rw-p 00043000 fd:00 655776 /lib64/libgobject-2.0.so.0.2200.5 3934400000-3934403000 r-xp 00000000 fd:00 655777 /lib64/libgmodule-2.0.so.0.2200.5 3934403000-3934602000 ---p 00003000 fd:00 655777 /lib64/libgmodule-2.0.so.0.2200.5 3934602000-3934603000 rw-p 00002000 fd:00 655777 /lib64/libgmodule-2.0.so.0.2200.5 3934800000-39348a8000 r-xp 00000000 fd:00 655778 /lib64/libgio-2.0.so.0.2200.5 39348a8000-3934aa7000 ---p 000a8000 fd:00 655778 /lib64/libgio-2.0.so.0.2200.5 3934aa7000-3934aaa000 rw-p 000a7000 fd:00 655778 /lib64/libgio-2.0.so.0.2200.5 3934aaa000-3934aab000 rw-p 00000000 00:00 0 3934c00000-3934c02000 r-xp 00000000 fd:00 1202337 /usr/lib64/libXau.so.6.0.0 3934c02000-3934e02000 ---p 00002000 fd:00 1202337 /usr/lib64/libXau.so.6.0.0 3934e02000-3934e03000 rw-p 00002000 fd:00 1202337 /usr/lib64/libXau.so.6.0.0 3935000000-3935004000 r-xp 00000000 fd:00 655782 /lib64/libgthread-2.0.so.0.2200.5 3935004000-3935203000 ---p 00004000 fd:00 655782 /lib64/libgthread-2.0.so.0.2200.5 3935203000-3935204000 rw-p 00003000 fd:00 655782 /lib64/libgthread-2.0.so.0.2200.5 3935400000-3935539000 r-xp 00000000 fd:00 1202339 /usr/lib64/libX11.so.6.3.0 3935539000-3935739000 ---p 00139000 fd:00 1202339 /usr/lib64/libX11.so.6.3.0 3935739000-393573f000 rw-p 00139000 fd:00 1202339 /usr/lib64/libX11.so.6.3.0 3935800000-393581b000 r-xp 00000000 fd:00 1202338 /usr/lib64/libxcb.so.1.1.0 393581b000-3935a1a000 ---p 0001b000 fd:00 1202338 /usr/lib64/libxcb.so.1.1.0 3935a1a000-3935a1b000 rw-p 0001a000 fd:00 1202338 /usr/lib64/libxcb.so.1.1.0 3935c00000-3935c97000 r-xp 00000000 fd:00 1202334 /usr/lib64/libfreetype.so.6.3.22 3935c97000-3935e96000 ---p 00097000 fd:00 1202334 /usr/lib64/libfreetype.so.6.3.22 3935e96000-3935e9c000 rw-p 00096000 fd:00 1202334 /usr/lib64/libfreetype.so.6.3.22 3936000000-3936026000 r-xp 00000000 fd:00 1202336 /usr/lib64/libpng12.so.0.44.0 3936026000-3936225000 ---p 00026000 fd:00 1202336 /usr/lib64/libpng12.so.0.44.0 3936225000-3936226000 rw-p 00025000 fd:00 1202336 /usr/lib64/libpng12.so.0.44.0 3936400000-3936411000 r-xp 00000000 fd:00 1202345 /usr/lib64/libXext.so.6.4.0 3936411000-3936611000 ---p 00011000 fd:00 1202345 /usr/lib64/libXext.so.6.4.0 3936611000-3936612000 rw-p 00011000 fd:00 1202345 /usr/lib64/libXext.so.6.4.0 3936c00000-3936c26000 r-xp 00000000 fd:00 655784 /lib64/libexpat.so.1.5.2 3936c26000-3936e25000 ---p 00026000 fd:00 655784 /lib64/libexpat.so.1.5.2 3936e25000-3936e28000 rw-p 00025000 fd:00 655784 /lib64/libexpat.so.1.5.2 3937000000-393700f000 r-xp 00000000 fd:00 1202347 /usr/lib64/libXi.so.6.1.0 393700f000-393720e000 ---p 0000f000 fd:00 1202347 /usr/lib64/libXi.so.6.1.0 393720e000-393720f000 rw-p 0000e000 fd:00 1202347 /usr/lib64/libXi.so.6.1.0 3937400000-3937434000 r-xp 00000000 fd:00 1202335 /usr/lib64/libfontconfig.so.1.4.4 3937434000-3937634000 ---p 00034000 fd:00 1202335 /usr/lib64/libfontconfig.so.1.4.4 3937634000-3937636000 rw-p 00034000 fd:00 1202335 /usr/lib64/libfontconfig.so.1.4.4 3937800000-3937809000 r-xp 00000000 fd:00 1202340 /usr/lib64/libXrender.so.1.3.0 3937809000-3937a09000 ---p 00009000 fd:00 1202340 /usr/lib64/libXrender.so.1.3.0 3937a09000-3937a0a000 rw-p 00009000 fd:00 1202340 /usr/lib64/libXrender.so.1.3.0 3937c00000-3937c02000 r-xp 00000000 fd:00 1202351 /usr/lib64/libXcomposite.so.1.0.0 3937c02000-3937e01000 ---p 00002000 fd:00 1202351 /usr/lib64/libXcomposite.so.1.0.0 3937e01000-3937e02000 rw-p 00001000 fd:00 1202351 /usr/lib64/libXcomposite.so.1.0.0 3938000000-3938002000 r-xp 00000000 fd:00 1202352 /usr/lib64/libXdamage.so.1.1.0 3938002000-3938201000 ---p 00002000 fd:00 1202352 /usr/lib64/libXdamage.so.1.1.0 3938201000-3938202000 rw-p 00001000 fd:00 1202352 /usr/lib64/libXdamage.so.1.1.0 3938400000-393840b000 r-xp 00000000 fd:00 1202344 /usr/lib64/libpangocairo-1.0.so.0.2800.1 393840b000-393860b000 ---p 0000b000 fd:00 1202344 /usr/lib64/libpangocairo-1.0.so.0.2800.1 393860b000-393860c000 rw-p 0000b000 fd:00 1202344 /usr/lib64/libpangocairo-1.0.so.0.2800.1 3938800000-3938809000 r-xp 00000000 fd:00 1202350 /usr/lib64/libXcursor.so.1.0.2 3938809000-3938a09000 ---p 00009000 fd:00 1202350 /usr/lib64/libXcursor.so.1.0.2 3938a09000-3938a0a000 rw-p 00009000 fd:00 1202350 /usr/lib64/libXcursor.so.1.0.2 3938c00000-3938c57000 r-xp 00000000 fd:00 1202333 /usr/lib64/libpixman-1.so.0.16.6 3938c57000-3938e57000 ---p 00057000 fd:00 1202333 /usr/lib64/libpixman-1.so.0.16.6 3938e57000-3938e5a000 rw-p 00057000 fd:00 1202333 /usr/lib64/libpixman-1.so.0.16.6 3939000000-393901e000 r-xp 00000000 fd:00 1202353 /usr/lib64/libgdk_pixbuf-2.0.so.0.1800.9 393901e000-393921e000 ---p 0001e000 fd:00 1202353 /usr/lib64/libgdk_pixbuf-2.0.so.0.1800.9 393921e000-393921f000 rw-p 0001e000 fd:00 1202353 /usr/lib64/libgdk_pixbuf-2.0.so.0.1800.9 3939400000-3939402000 r-xp 00000000 fd:00 1202346 /usr/lib64/libXinerama.so.1.0.0 3939402000-3939601000 ---p 00002000 fd:00 1202346 /usr/lib64/libXinerama.so.1.0.0 3939601000-3939602000 rw-p 00001000 fd:00 1202346 /usr/lib64/libXinerama.so.1.0.0 3939800000-3939805000 r-xp 00000000 fd:00 1202349 /usr/lib64/libXfixes.so.3.1.0 3939805000-3939a04000 ---p 00005000 fd:00 1202349 /usr/lib64/libXfixes.so.3.1.0 3939a04000-3939a05000 rw-p 00004000 fd:00 1202349 /usr/lib64/libXfixes.so.3.1.0 393a000000-393a01e000 r-xp 00000000 fd:00 1202355 /usr/lib64/libatk-1.0.so.0.2809.1 393a01e000-393a21d000 ---p 0001e000 fd:00 1202355 /usr/lib64/libatk-1.0.so.0.2809.1 393a21d000-393a220000 rw-p 0001d000 fd:00 1202355 /usr/lib64/libatk-1.0.so.0.2809.1 393a400000-393a448000 r-xp 00000000 fd:00 1202342 /usr/lib64/libpango-1.0.so.0.2800.1 393a448000-393a648000 ---p 00048000 fd:00 1202342 /usr/lib64/libpango-1.0.so.0.2800.1 393a648000-393a64b000 rw-p 00048000 fd:00 1202342 /usr/lib64/libpango-1.0.so.0.2800.1 393a800000-393a876000 r-xp 00000000 fd:00 1202341 /usr/lib64/libcairo.so.2.10800.8 393a876000-393aa76000 ---p 00076000 fd:00 1202341 /usr/lib64/libcairo.so.2.10800.8 393aa76000-393aa79000 rw-p 00076000 fd:00 1202341 /usr/lib64/libcairo.so.2.10800.8 393ac00000-393acb6000 r-xp 00000000 fd:00 1202354 /usr/lib64/libgdk-x11-2.0.so.0.1800.9 393acb6000-393aeb6000 ---p 000b6000 fd:00 1202354 /usr/lib64/libgdk-x11-2.0.so.0.1800.9 393aeb6000-393aebb000 rw-p 000b6000 fd:00 1202354 /usr/lib64/libgdk-x11-2.0.so.0.1800.9 393b000000-393b45d000 r-xp 00000000 fd:00 1202356 /usr/lib64/libgtk-x11-2.0.so.0.1800.9 393b45d000-393b65c000 ---p 0045d000 fd:00 1202356 /usr/lib64/libgtk-x11-2.0.so.0.1800.9 393b65c000-393b667000 rw-p 0045c000 fd:00 1202356 /usr/lib64/libgtk-x11-2.0.so.0.1800.9 393b667000-393b669000 rw-p 00000000 00:00 0 393b800000-393b829000 r-xp 00000000 fd:00 1202343 /usr/lib64/libpangoft2-1.0.so.0.2800.1 393b829000-393ba28000 ---p 00029000 fd:00 1202343 /usr/lib64/libpangoft2-1.0.so.0.2800.1 393ba28000-393ba2a000 rw-p 00028000 fd:00 1202343 /usr/lib64/libpangoft2-1.0.so.0.2800.1 393bc00000-393bc08000 r-xp 00000000 fd:00 1202348 /usr/lib64/libXrandr.so.2.2.0 393bc08000-393be07000 ---p 00008000 fd:00 1202348 /usr/lib64/libXrandr.so.2.2.0 393be07000-393be08000 rw-p 00007000 fd:00 1202348 /usr/lib64/libXrandr.so.2.2.0 393f000000-393f016000 r-xp 00000000 fd:00 655788 /lib64/libgcc_s-4.4.4-20100726.so.1 393f016000-393f215000 ---p 00016000 fd:00 655788 /lib64/libgcc_s-4.4.4-20100726.so.1 393f215000-393f216000 rw-p 00015000 fd:00 655788 /lib64/libgcc_s-4.4.4-20100726.so.1 3941400000-3941416000 r-xp 00000000 fd:00 655795 /lib64/libnsl-2.12.so 3941416000-3941615000 ---p 00016000 fd:00 655795 /lib64/libnsl-2.12.so 3941615000-3941616000 r--p 00015000 fd:00 655795 /lib64/libnsl-2.12.so 3941616000-3941617000 rw-p 00016000 fd:00 655795 /lib64/libnsl-2.12.so 3941617000-3941619000 rw-p 00000000 00:00 0 3942000000-3942005000 r-xp 00000000 fd:00 1202482 /usr/lib64/libXtst.so.6.1.0 3942005000-3942205000 ---p 00005000 fd:00 1202482 /usr/lib64/libXtst.so.6.1.0 3942205000-3942206000 rw-p 00005000 fd:00 1202482 /usr/lib64/libXtst.so.6.1.0 7ff8d8000000-7ff8d8021000 rw-p 00000000 00:00 0 7ff8d8021000-7ff8dc000000 ---p 00000000 00:00 0 7ff8e0000000-7ff8e0021000 rw-p 00000000 00:00 0 7ff8e0021000-7ff8e4000000 ---p 00000000 00:00 0 7ff8e4000000-7ff8e4021000 rw-p 00000000 00:00 0 7ff8e4021000-7ff8e8000000 ---p 00000000 00:00 0 7ff8e8000000-7ff8e82c2000 rw-p 00000000 00:00 0 7ff8e82c2000-7ff8ec000000 ---p 00000000 00:00 0 7ff8ec000000-7ff8ec342000 rw-p 00000000 00:00 0 7ff8ec342000-7ff8f0000000 ---p 00000000 00:00 0 7ff8f0000000-7ff8f0021000 rw-p 00000000 00:00 0 7ff8f0021000-7ff8f4000000 ---p 00000000 00:00 0 7ff8f616f000-7ff8fc000000 r--p 00000000 fd:00 1181068 /usr/lib/locale/locale-archive 7ff8fc000000-7ff8fc021000 rw-p 00000000 00:00 0 7ff8fc021000-7ff900000000 ---p 00000000 00:00 0 7ff900000000-7ff900021000 rw-p 00000000 00:00 0 7ff900021000-7ff904000000 ---p 00000000 00:00 0 7ff904000000-7ff904021000 rw-p 00000000 00:00 0 7ff904021000-7ff908000000 ---p 00000000 00:00 0 7ff90a457000-7ff90a45f000 r-xp 00000000 fd:00 1314240 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libnio.so 7ff90a45f000-7ff90a65e000 ---p 00008000 fd:00 1314240 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libnio.so 7ff90a65e000-7ff90a65f000 rw-p 00007000 fd:00 1314240 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libnio.so 7ff90a65f000-7ff90a673000 r-xp 00000000 fd:00 1314239 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libnet.so 7ff90a673000-7ff90a873000 ---p 00014000 fd:00 1314239 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libnet.so 7ff90a873000-7ff90a874000 rw-p 00014000 fd:00 1314239 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libnet.so 7ff90a874000-7ff90a8b8000 r-xp 00000000 fd:00 1314221 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libfontmanager.so 7ff90a8b8000-7ff90aab7000 ---p 00044000 fd:00 1314221 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libfontmanager.so 7ff90aab7000-7ff90aabb000 rw-p 00043000 fd:00 1314221 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libfontmanager.so 7ff90aabb000-7ff90aacd000 rw-p 00000000 00:00 0 7ff90aacd000-7ff90ab18000 r-xp 00000000 fd:00 1448475 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/xawt/libmawt.so 7ff90ab18000-7ff90ad17000 ---p 0004b000 fd:00 1448475 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/xawt/libmawt.so 7ff90ad17000-7ff90ad1b000 rw-p 0004a000 fd:00 1448475 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/xawt/libmawt.so 7ff90ad1b000-7ff90ad1c000 rw-p 00000000 00:00 0 7ff90ad1c000-7ff90adbe000 r-xp 00000000 fd:00 1314219 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libawt.so 7ff90adbe000-7ff90afbe000 ---p 000a2000 fd:00 1314219 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libawt.so 7ff90afbe000-7ff90afc9000 rw-p 000a2000 fd:00 1314219 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libawt.so 7ff90afc9000-7ff90afee000 rw-p 00000000 00:00 0 7ff90afee000-7ff90b0d2000 r-xp 00000000 fd:00 655775 /lib64/libglib-2.0.so.0.2200.5 7ff90b0d2000-7ff90b2d2000 ---p 000e4000 fd:00 655775 /lib64/libglib-2.0.so.0.2200.5 7ff90b2d2000-7ff90b2d3000 rw-p 000e4000 fd:00 655775 /lib64/libglib-2.0.so.0.2200.5 7ff90b2d3000-7ff90b2d4000 rw-p 00000000 00:00 0 7ff90b2d4000-7ff90b348000 r-xp 00000000 fd:00 2364460 /root/.swt/lib/linux/x86_64/libswt-pi-gtk-3735.so 7ff90b348000-7ff90b447000 ---p 00074000 fd:00 2364460 /root/.swt/lib/linux/x86_64/libswt-pi-gtk-3735.so 7ff90b447000-7ff90b44a000 rw-p 00073000 fd:00 2364460 /root/.swt/lib/linux/x86_64/libswt-pi-gtk-3735.so 7ff90b44a000-7ff90b44c000 rw-p 00000000 00:00 0 7ff90b44c000-7ff90b4ca000 r-xp 00000000 fd:00 2364459 /root/.swt/lib/linux/x86_64/libswt-gtk-3735.so 7ff90b4ca000-7ff90b5c9000 ---p 0007e000 fd:00 2364459 /root/.swt/lib/linux/x86_64/libswt-gtk-3735.so 7ff90b5c9000-7ff90b5d0000 rw-p 0007d000 fd:00 2364459 /root/.swt/lib/linux/x86_64/libswt-gtk-3735.so 7ff90b5d0000-7ff90b5d3000 rw-p 00000000 00:00 0 7ff90b5d3000-7ff90b5d6000 ---p 00000000 00:00 0 7ff90b5d6000-7ff90b6d4000 rw-p 00000000 00:00 0 7ff90b6d4000-7ff90b6eb000 r--s 00112000 fd:00 1453013 /usr/local/davmail/davmail/lib/xercesImpl-2.8.1.jar 7ff90b6eb000-7ff90b6f1000 r--s 00071000 fd:00 1453012 /usr/local/davmail/davmail/lib/woodstox-core-asl-4.0.9.jar 7ff90b6f1000-7ff90b706000 r--s 0018b000 fd:00 1453011 /usr/local/davmail/davmail/lib/swt-3.7-gtk-linux-x86_64.jar 7ff90b706000-7ff90b708000 r--s 00005000 fd:00 1453009 /usr/local/davmail/davmail/lib/stax-api-1.0.1.jar 7ff90b708000-7ff90b70c000 r--s 00029000 fd:00 1453010 /usr/local/davmail/davmail/lib/stax2-api-3.0.3.jar 7ff90b70c000-7ff90b70d000 r--s 00001000 fd:00 1453008 /usr/local/davmail/davmail/lib/slf4j-log4j12-1.3.1.jar 7ff90b70d000-7ff90b70e000 r--s 00002000 fd:00 1453007 /usr/local/davmail/davmail/lib/slf4j-api-1.3.1.jar 7ff90b70e000-7ff90b715000 r--s 0006a000 fd:00 1453006 /usr/local/davmail/davmail/lib/mail-1.4.3.jar 7ff90b715000-7ff90b71e000 r--s 0006d000 fd:00 1453005 /usr/local/davmail/davmail/lib/log4j-1.2.16.jar 7ff90b71e000-7ff90b721000 r--s 0001b000 fd:00 1453004 /usr/local/davmail/davmail/lib/junit-3.8.1.jar 7ff90b721000-7ff90b724000 r--s 00023000 fd:00 1453003 /usr/local/davmail/davmail/lib/jdom-1.0.jar 7ff90b724000-7ff90b72a000 r--s 0005b000 fd:00 1453002 /usr/local/davmail/davmail/lib/jcifs-1.3.14.jar 7ff90b72a000-7ff90b72c000 r--s 00006000 fd:00 1453001 /usr/local/davmail/davmail/lib/jcharset-1.3.jar 7ff90b72c000-7ff90b733000 r--s 00041000 fd:00 1453000 /usr/local/davmail/davmail/lib/jackrabbit-webdav-1.4.jar 7ff90b733000-7ff90b735000 r--s 0000d000 fd:00 1452999 /usr/local/davmail/davmail/lib/htmlcleaner-2.1.jar 7ff90b735000-7ff90b737000 r--s 00008000 fd:00 1452998 /usr/local/davmail/davmail/lib/commons-logging-1.0.4.jar 7ff90b737000-7ff90b73d000 r--s 00045000 fd:00 1452997 /usr/local/davmail/davmail/lib/commons-httpclient-3.1.jar 7ff90b73d000-7ff90b74a000 r--s 0007c000 fd:00 1452996 /usr/local/davmail/davmail/lib/commons-collections-3.1.jar 7ff90b74a000-7ff90b74c000 r--s 0000a000 fd:00 1452995 /usr/local/davmail/davmail/lib/commons-codec-1.3.jar 7ff90b74c000-7ff90b74e000 r--s 0000c000 fd:00 1452994 /usr/local/davmail/davmail/lib/activation-1.1.1.jar 7ff90b74e000-7ff90b751000 r--s 0007a000 fd:00 1314265 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/jsse.jar 7ff90b751000-7ff90b758000 r--s 00078000 fd:00 1452992 /usr/local/davmail/davmail/davmail.jar 7ff90b758000-7ff90b761000 r--s 00065000 fd:00 1578467 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/ext/gnome-java-bridge.jar 7ff90b761000-7ff90b764000 r--s 0000f000 fd:00 1578470 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/ext/pulse-java.jar 7ff90b764000-7ff90b765000 ---p 00000000 00:00 0 7ff90b765000-7ff90b865000 rw-p 00000000 00:00 0 7ff90b865000-7ff90b868000 ---p 00000000 00:00 0 7ff90b868000-7ff90b966000 rw-p 00000000 00:00 0 7ff90b966000-7ff90b969000 ---p 00000000 00:00 0 7ff90b969000-7ff90ba67000 rw-p 00000000 00:00 0 7ff90ba67000-7ff90ba6a000 ---p 00000000 00:00 0 7ff90ba6a000-7ff90bb68000 rw-p 00000000 00:00 0 7ff90bb68000-7ff90bb6b000 ---p 00000000 00:00 0 7ff90bb6b000-7ff90bc69000 rw-p 00000000 00:00 0 7ff90bc69000-7ff90bc6a000 ---p 00000000 00:00 0 7ff90bc6a000-7ff90be42000 rw-p 00000000 00:00 0 7ff90be42000-7ff90bfd8000 r--s 03906000 fd:00 1314280 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/rt.jar 7ff90bfd8000-7ff90c000000 rw-p 00000000 00:00 0 7ff90c000000-7ff90c021000 rw-p 00000000 00:00 0 7ff90c021000-7ff910000000 ---p 00000000 00:00 0 7ff910000000-7ff910021000 rw-p 00000000 00:00 0 7ff910021000-7ff914000000 ---p 00000000 00:00 0 7ff914000000-7ff914021000 rw-p 00000000 00:00 0 7ff914021000-7ff918000000 ---p 00000000 00:00 0 7ff918000000-7ff918021000 rw-p 00000000 00:00 0 7ff918021000-7ff91c000000 ---p 00000000 00:00 0 7ff91c000000-7ff91d4c0000 rwxp 00000000 00:00 0 7ff91d4c0000-7ff926800000 rwxp 00000000 00:00 0 7ff926800000-7ff928f00000 rwxp 00000000 00:00 0 7ff928f00000-7ff94d800000 rwxp 00000000 00:00 0 7ff94d800000-7ff94eb70000 rwxp 00000000 00:00 0 7ff94eb70000-7ff961000000 rwxp 00000000 00:00 0 7ff961000000-7ff961270000 rwxp 00000000 00:00 0 7ff961270000-7ff964000000 rwxp 00000000 00:00 0 7ff964000000-7ff964251000 rw-p 00000000 00:00 0 7ff964251000-7ff968000000 ---p 00000000 00:00 0 7ff968001000-7ff968005000 r--s 00000000 fd:00 1577907 /var/cache/fontconfig/87f5e051180a7a75f16eb6fe7dbd3749-le64.cache-3 7ff968005000-7ff96800e000 r--s 00000000 fd:00 1577843 /var/cache/fontconfig/b79f3aaa7d385a141ab53ec885cc22a8-le64.cache-3 7ff96800e000-7ff968011000 r--s 00000000 fd:00 1580898 /var/cache/fontconfig/0b1bcc92b4d25cc154d77dafe3bceaa0-le64.cache-3 7ff968011000-7ff968013000 r--s 00000000 fd:00 1580909 /var/cache/fontconfig/2e1514a9fdd499050989183bb65136db-le64.cache-3 7ff968013000-7ff968016000 r--s 00000000 fd:00 1580912 /var/cache/fontconfig/5c755b2f27115486aa6359c84dd3cbda-le64.cache-3 7ff968016000-7ff968017000 r--s 00000000 fd:00 1580907 /var/cache/fontconfig/b966c23d19cce9e9a98d55765cf2a0c7-le64.cache-3 7ff968017000-7ff968019000 r--s 00000000 fd:00 1580902 /var/cache/fontconfig/3f821257dd33660ba7bbb45c32deb84c-le64.cache-3 7ff968019000-7ff96801b000 r--s 00000000 fd:00 1580914 /var/cache/fontconfig/830f035fa84a65ce80e050178dbb630d-le64.cache-3 7ff96801b000-7ff96801c000 r--s 00000000 fd:00 1576157 /var/cache/fontconfig/81a173283b451552b599cfaafd6236bd-le64.cache-3 7ff96801c000-7ff96801d000 r--s 00000000 fd:00 1580906 /var/cache/fontconfig/ac68f755438cc3dc5a526084839fc7ca-le64.cache-3 7ff96801d000-7ff96801e000 r--s 00000000 fd:00 1580910 /var/cache/fontconfig/6cfc7d49b27ba7d3eb71ab86e04def2c-le64.cache-3 7ff96801e000-7ff96801f000 r--s 00000000 fd:00 1577931 /var/cache/fontconfig/6fcb01a03a016cc71057b587cdea6709-le64.cache-3 7ff96801f000-7ff968020000 r--s 00000000 fd:00 1580916 /var/cache/fontconfig/46d51d90fe9d963f6f4186edb936a931-le64.cache-3 7ff968020000-7ff968021000 r--s 00000000 fd:00 1580915 /var/cache/fontconfig/b887eea8f1b96e1d899b44ed6681fc27-le64.cache-3 7ff968021000-7ff968022000 r--s 00000000 fd:00 1580913 /var/cache/fontconfig/860639f272b8b4b3094f9e399e41bccd-le64.cache-3 7ff968022000-7ff968023000 r--s 00000000 fd:00 1580911 /var/cache/fontconfig/211368abcb0ff835c229ff05c9ec01dc-le64.cache-3 7ff968023000-7ff968024000 r--s 00000000 fd:00 1580917 /var/cache/fontconfig/c46020d7221988a13df853d2b46304fc-le64.cache-3 7ff968024000-7ff968025000 r--s 00000000 fd:00 1580904 /var/cache/fontconfig/df893b4576ad6107f9397134092c4059-le64.cache-3 7ff968025000-7ff968026000 r--s 00000000 fd:00 1576156 /var/cache/fontconfig/900402270e15d763a6e008bb2d4c7686-le64.cache-3 7ff968026000-7ff968027000 r--s 00000000 fd:00 1580908 /var/cache/fontconfig/47f48679023f44a4d1e44699a69464f6-le64.cache-3 7ff968027000-7ff968028000 r--s 00000000 fd:00 1580900 /var/cache/fontconfig/2881ed3fd21ca306ddad6f9b0dd3189f-le64.cache-3 7ff968028000-7ff968029000 r--s 00000000 fd:00 1580899 /var/cache/fontconfig/3c3fb04d32a5211b073874b125d29701-le64.cache-3 7ff968029000-7ff96802a000 r--s 00000000 fd:00 1580901 /var/cache/fontconfig/e61abf8156cc476151baa07d67337cae-le64.cache-3 7ff96802a000-7ff96802e000 r--s 00000000 fd:00 1577932 /var/cache/fontconfig/b67b32625a2bb51b023d3814a918f351-le64.cache-3 7ff96802e000-7ff96802f000 r--s 00000000 fd:00 1580895 /var/cache/fontconfig/991510d2da7f7b2bf8468002aae90060-le64.cache-3 7ff96802f000-7ff968031000 r--s 00000000 fd:00 1580905 /var/cache/fontconfig/d3379abda271c4acd2ad0c01f565d0b0-le64.cache-3 7ff968031000-7ff96803a000 r--s 00000000 fd:00 1577842 /var/cache/fontconfig/12b26b760a24f8b4feb03ad48a333a72-le64.cache-3 7ff96803a000-7ff96803d000 ---p 00000000 00:00 0 7ff96803d000-7ff96813b000 rw-p 00000000 00:00 0 7ff96813b000-7ff96813e000 ---p 00000000 00:00 0 7ff96813e000-7ff96823c000 rw-p 00000000 00:00 0 7ff96823c000-7ff96823d000 ---p 00000000 00:00 0 7ff96823d000-7ff96833d000 rw-p 00000000 00:00 0 7ff96833d000-7ff96833e000 ---p 00000000 00:00 0 7ff96833e000-7ff96843e000 rw-p 00000000 00:00 0 7ff96843e000-7ff96843f000 ---p 00000000 00:00 0 7ff96843f000-7ff96853f000 rw-p 00000000 00:00 0 7ff96853f000-7ff968540000 ---p 00000000 00:00 0 7ff968540000-7ff968640000 rw-p 00000000 00:00 0 7ff968640000-7ff96864b000 rwxp 00000000 00:00 0 7ff96864b000-7ff968694000 rwxp 00000000 00:00 0 7ff968694000-7ff9686a8000 rwxp 00000000 00:00 0 7ff9686a8000-7ff9687cc000 rwxp 00000000 00:00 0 7ff9687cc000-7ff9687d7000 rwxp 00000000 00:00 0 7ff9687d7000-7ff968820000 rwxp 00000000 00:00 0 7ff968820000-7ff968834000 rwxp 00000000 00:00 0 7ff968834000-7ff968958000 rwxp 00000000 00:00 0 7ff968958000-7ff968962000 rwxp 00000000 00:00 0 7ff968962000-7ff9689f4000 rwxp 00000000 00:00 0 7ff9689f4000-7ff9689ff000 rwxp 00000000 00:00 0 7ff9689ff000-7ff968ab5000 rwxp 00000000 00:00 0 7ff968ab5000-7ff968abc000 r-xp 00000000 fd:00 1314248 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libzip.so 7ff968abc000-7ff968cbb000 ---p 00007000 fd:00 1314248 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libzip.so 7ff968cbb000-7ff968cbc000 rw-p 00006000 fd:00 1314248 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libzip.so 7ff968cbc000-7ff968cc8000 r-xp 00000000 fd:00 655390 /lib64/libnss_files-2.12.so 7ff968cc8000-7ff968ec7000 ---p 0000c000 fd:00 655390 /lib64/libnss_files-2.12.so 7ff968ec7000-7ff968ec8000 r--p 0000b000 fd:00 655390 /lib64/libnss_files-2.12.so 7ff968ec8000-7ff968ec9000 rw-p 0000c000 fd:00 655390 /lib64/libnss_files-2.12.so 7ff968eca000-7ff968ed1000 r--s 00000000 fd:00 1580984 /var/cache/fontconfig/928306c3ad40271d946e41014a49fc28-le64.cache-3 7ff968ed1000-7ff968ed8000 r--s 000fe000 fd:00 1314278 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/resources.jar 7ff968ed8000-7ff968ee0000 r-xp 00000000 fd:00 1448469 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/native_threads/libhpi.so 7ff968ee0000-7ff9690df000 ---p 00008000 fd:00 1448469 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/native_threads/libhpi.so 7ff9690df000-7ff9690e0000 rw-p 00007000 fd:00 1448469 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/native_threads/libhpi.so 7ff9690e0000-7ff9690e1000 rw-p 00000000 00:00 0 7ff9690e1000-7ff96910d000 r-xp 00000000 fd:00 1314228 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libjava.so 7ff96910d000-7ff96930c000 ---p 0002c000 fd:00 1314228 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libjava.so 7ff96930c000-7ff969310000 rw-p 0002b000 fd:00 1314228 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libjava.so 7ff969310000-7ff96931e000 r-xp 00000000 fd:00 1314247 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libverify.so 7ff96931e000-7ff96951d000 ---p 0000e000 fd:00 1314247 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libverify.so 7ff96951d000-7ff96951f000 rw-p 0000d000 fd:00 1314247 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/libverify.so 7ff96951f000-7ff969522000 ---p 00000000 00:00 0 7ff969522000-7ff969620000 rw-p 00000000 00:00 0 7ff969620000-7ff969dcd000 r-xp 00000000 fd:00 1448473 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server/libjvm.so 7ff969dcd000-7ff969fcc000 ---p 007ad000 fd:00 1448473 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server/libjvm.so 7ff969fcc000-7ff96a05a000 rw-p 007ac000 fd:00 1448473 /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/jre/lib/amd64/server/libjvm.so 7ff96a05a000-7ff96a09b000 rw-p 00000000 00:00 0 7ff96a09b000-7ff96a09c000 r--s 00000000 fd:00 1580897 /var/cache/fontconfig/b4d0b56f766d89640448751fcd18ec1e-le64.cache-3 7ff96a09c000-7ff96a09d000 r--s 00000000 fd:00 1580903 /var/cache/fontconfig/1248881498ac025e45c3042f6afe9284-le64.cache-3 7ff96a09d000-7ff96a0a0000 r--s 00000000 fd:00 1580556 /var/cache/fontconfig/beeeeb3dfe132a8a0633a017c99ce0c0-le64.cache-3 7ff96a0a0000-7ff96a0a8000 rw-s 00000000 fd:00 524449 /tmp/hsperfdata_root/3802 7ff96a0a8000-7ff96a0a9000 rw-p 00000000 00:00 0 7ff96a0a9000-7ff96a0aa000 r--p 00000000 00:00 0 7ff96a0aa000-7ff96a0ab000 rw-p 00000000 00:00 0 7fffb1a8b000-7fffb1aa0000 rw-p 00000000 00:00 0 [stack] 7fffb1b82000-7fffb1b83000 r-xp 00000000 00:00 0 [vdso] ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall] VM Arguments: java_command: davmail.DavGateway Launcher Type: SUN_STANDARD Environment Variables: CLASSPATH=:./lib/activation-1.1.1.jar:./lib/commons-codec-1.3.jar:./lib/commons-collections-3.1.jar:./lib/commons-httpclient-3.1.jar:./lib/commons-logging-1.0.4.jar:./lib/htmlcleaner-2.1.jar:./lib/jackrabbit-webdav-1.4.jar:./lib/jcharset-1.3.jar:./lib/jcifs-1.3.14.jar:./lib/jdom-1.0.jar:./lib/junit-3.8.1.jar:./lib/log4j-1.2.16.jar:./lib/mail-1.4.3.jar:./lib/slf4j-api-1.3.1.jar:./lib/slf4j-log4j12-1.3.1.jar:./lib/stax2-api-3.0.3.jar:./lib/stax-api-1.0.1.jar:./lib/swt-3.7-gtk-linux-x86_64.jar:./lib/woodstox-core-asl-4.0.9.jar:./lib/xercesImpl-2.8.1.jar PATH=/usr/lib64/qt-3.3/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/r/bin USERNAME=r 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.0 Signal Handlers: SIGSEGV: [libjvm.so+0x650360], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGBUS: [libjvm.so+0x650360], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGFPE: [libjvm.so+0x531d10], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGPIPE: [libjvm.so+0x531d10], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGXFSZ: [libjvm.so+0x531d10], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGILL: [libjvm.so+0x531d10], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGUSR2: [libjvm.so+0x5314c0], sa_mask[0]=0x00000000, sa_flags=0x10000004 SIGHUP: [libjvm.so+0x5338f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGINT: [libjvm.so+0x5338f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGTERM: [libjvm.so+0x5338f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGQUIT: [libjvm.so+0x5338f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 -- 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 aph at icedtea.classpath.org Thu Dec 8 02:10:07 2011 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Thu, 08 Dec 2011 10:10:07 +0000 Subject: /hg/icedtea6: 6 new changesets Message-ID: changeset b792105e5b1a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b792105e5b1a author: aph date: Fri Dec 02 13:28:02 2011 -0500 The big volatile patch. changeset c3830a06fd60 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c3830a06fd60 author: aph date: Mon Dec 05 10:32:03 2011 -0500 More volatile fixups. changeset 7818ff550f62 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7818ff550f62 author: aph date: Mon Dec 05 10:48:00 2011 -0500 More volatile tidying-up. changeset 3ca12f50fff3 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3ca12f50fff3 author: aph date: Tue Dec 06 06:17:49 2011 -0500 Volatile rewrite. 011-12-05 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (Thumb2_disass): Use class Opcodes to do the disassembly. (Thumb2_Enter): Update ISTATE_SELF_LINK. (T_DMB): New. (fullBarrier): New. (storeBarrier): New. (Thumb2_Accessor): Add volatile barriers. (Thumb2_codegen): Likewise. (Thumb2_Initialize): Check UseCompiler. (class Opcodes): New. Load libopcodes.so lazily. * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: For every {get,put}field handler, add a test for volatility and duplicate the code path into two parts, volatile and non-volatile. Add barriers to the volatile path. * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (dmb) (dmb_st): New macros. (abort_table): Add entries for volatile versions of all the field handlers. ({put,get}field_volatile_*): Add volatile versions of all handlers. (Thumb2_{put,get}field_*_stub): Likewise. * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp (print_vm_offsets): Add CP_CACHE_VOLATILE_FIELD_FLAG_BIT and CP_CACHE_FLAGS. changeset 357ee1a7d452 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=357ee1a7d452 author: aph date: Wed Dec 07 18:14:25 2011 +0000 xranby's suggested improvements. changeset 6a04d4888cc0 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6a04d4888cc0 author: aph date: Thu Dec 08 10:09:28 2011 +0000 merge diffstat: ChangeLog | 42 ++ Makefile.am | 4 +- NEWS | 2 + arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp | 2 + arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 168 ++++++++ arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 341 +++++++++++++++++- arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 95 ++++- 7 files changed, 643 insertions(+), 11 deletions(-) diffs (truncated from 1326 to 500 lines): diff -r 0a0072170876 -r 6a04d4888cc0 ChangeLog --- a/ChangeLog Mon Nov 28 20:06:41 2011 +0000 +++ b/ChangeLog Thu Dec 08 10:09:28 2011 +0000 @@ -1,3 +1,45 @@ +2011-12-07 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp + (Thumb2_disass): Use class Opcodes to do the disassembly. + (Thumb2_Enter): Update ISTATE_SELF_LINK. + (T_DMB): New. + (fullBarrier): New. + (storeBarrier): New. + (Thumb2_Accessor): Add volatile barriers. + (Thumb2_codegen): Likewise. + (Thumb2_Initialize): Check UseCompiler. + (class Opcodes): New. Load libopcodes.so lazily. + * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def: For every + {get,put}field handler, add a test for volatility and duplicate + the code path into two parts, volatile and non-volatile. Add + barriers to the volatile path. + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (dmb) + (dmb_st, FullBarrier, StoreLoadBarrier, StoreStoreBarrier): New + macros. + (abort_table): Add entries for volatile versions of all the field + handlers. + ({put,get}field_volatile_*): Add volatile versions of all handlers. + (Thumb2_{put,get}field_*_stub): Likewise. + * arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp + (print_vm_offsets): Add CP_CACHE_VOLATILE_FIELD_FLAG_BIT and + CP_CACHE_FLAGS. + +2011-12-06 Xerxes R??nby + + CACAO: + - CA162: Make class init protection aware of multiple threads. + - CA163: descriptor_params_from_paramtypes is protected by a mutex now. + - Removed return value from descriptor_params_from_paramtypes. + - Removed fields from classinfo and related functions from + descriptor pool. + - src/vm/jit/jit.cpp: Eliminate one instance of useless cache flushing. + * NEWS: + Updated. + * Makefile.am: + (CACAO_VERSION): Updated CACAO to 2011-12-01 revision. + (CACAO_SHA256SUM): Updated. + 2011-11-28 Andrew John Hughes * NEWS: diff -r 0a0072170876 -r 6a04d4888cc0 Makefile.am --- a/Makefile.am Mon Nov 28 20:06:41 2011 +0000 +++ b/Makefile.am Thu Dec 08 10:09:28 2011 +0000 @@ -5,8 +5,8 @@ OPENJDK_VERSION = b24 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ -CACAO_VERSION = 2204b08fcae9 -CACAO_SHA256SUM = bb6ce286fcdc7350ed9913acfe5177921f515e187e74e773f6e62adba005f0a3 +CACAO_VERSION = ea0e1b9ccf8d +CACAO_SHA256SUM = cce66fecc290f3f7450a0463e460959028e6c81b0d7b130bb6c54bcbccf39efe 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 0a0072170876 -r 6a04d4888cc0 NEWS --- a/NEWS Mon Nov 28 20:06:41 2011 +0000 +++ b/NEWS Thu Dec 08 10:09:28 2011 +0000 @@ -387,6 +387,8 @@ * CACAO - CA149: Used wrong class loader. - CA159: Exception handler blocks / register mixup. + - CA162: Make class init protection aware of multiple threads. + - CA163: descriptor_params_from_paramtypes is protected by a mutex now. - ARM: Remove broken support for float argument passing in registers. - ARM: Remove hack for return value in float registers. - ARM: Fixed use of uninitialized variable. diff -r 0a0072170876 -r 6a04d4888cc0 arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp Mon Nov 28 20:06:41 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/asm_helper.cpp Thu Dec 08 10:09:28 2011 +0000 @@ -489,6 +489,8 @@ print_def("CONSTANTPOOL_CACHE", offset_of(constantPoolOopDesc, _cache)); print_def("CONSTANTPOOL_POOL_HOLDER", offset_of(constantPoolOopDesc, _pool_holder)); print_def("CONSTANTPOOL_BASE", sizeof(constantPoolOopDesc)); + print_def("CP_CACHE_VOLATILE_FIELD_FLAG_BIT", ConstantPoolCacheEntry::volatileField); + print_def("CP_CACHE_FLAGS", offset_of(ConstantPoolCacheEntry, _flags)); nl(); print_def("CP_OFFSET", in_bytes(constantPoolCacheOopDesc::base_offset())); nl(); diff -r 0a0072170876 -r 6a04d4888cc0 arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def --- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Nov 28 20:06:41 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Thu Dec 08 10:09:28 2011 +0000 @@ -1573,6 +1573,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT .abortentry78: @@ -1581,6 +1582,17 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry78_v: + ldr tmp2, [tmp1, tmp2] + FullBarrier + DISPATCH_NEXT + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } (bgetfield) bgetfield { @@ -1592,6 +1604,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT .abortentry79: @@ -1600,6 +1613,17 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry79_v: + ldrsb tmp2, [tmp1, tmp2] + FullBarrier + DISPATCH_NEXT + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } (cgetfield) cgetfield { @@ -1611,6 +1635,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT .abortentry80: @@ -1619,6 +1644,17 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry80_v: + ldrh tmp2, [tmp1, tmp2] + FullBarrier + DISPATCH_NEXT + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } (sgetfield) sgetfield { @@ -1630,6 +1666,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT .abortentry81: @@ -1638,6 +1675,17 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry81_v: + ldrsh tmp2, [tmp1, tmp2] + FullBarrier + DISPATCH_NEXT + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } (lgetfield) lgetfield { @@ -1649,6 +1697,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT add tmp2, tmp1, tmp2 @@ -1658,6 +1707,18 @@ DISPATCH_NEXT PUSH tmp2, tmp1 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT + add tmp2, tmp1, tmp2 + DISPATCH_NEXT +.abortentry82_v: + ldmia tmp2, {tmp2, tmp1} + FullBarrier + DISPATCH_NEXT + PUSH tmp2, tmp1 + DISPATCH_FINISH } (iputfield) iputfield { @@ -1669,6 +1730,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r2, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT DISPATCH_NEXT @@ -1676,6 +1738,17 @@ .abortentry83: str r3, [tmp1, tmp2] DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT + DISPATCH_NEXT + DISPATCH_NEXT + StoreStoreBarrier +.abortentry83_v: + str r3, [tmp1, tmp2] + StoreLoadBarrier + DISPATCH_FINISH } (cputfield) cputfield { @@ -1687,6 +1760,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r2, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT DISPATCH_NEXT @@ -1694,6 +1768,17 @@ .abortentry84: strh r3, [tmp1, tmp2] DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT + DISPATCH_NEXT + DISPATCH_NEXT + StoreStoreBarrier +.abortentry84_v: + strh r3, [tmp1, tmp2] + StoreLoadBarrier + DISPATCH_FINISH } (bputfield) bputfield { @@ -1705,6 +1790,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r2, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT DISPATCH_NEXT @@ -1712,6 +1798,17 @@ .abortentry85: strb r3, [tmp1, tmp2] DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT + DISPATCH_NEXT + DISPATCH_NEXT + StoreStoreBarrier +.abortentry85_v: + strb r3, [tmp1, tmp2] + StoreLoadBarrier + DISPATCH_FINISH } (aputfield) aputfield { @@ -1721,12 +1818,23 @@ add tmp2, tmp2, r2, lsl #4 SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r2, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] .abortentry113: str r3, [tmp1, tmp2] mov r0, tmp1 bl Helper_aputfield DISPATCH 3 +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + StoreStoreBarrier +.abortentry113_v: + str r3, [tmp1, tmp2] + StoreLoadBarrier + mov r0, tmp1 + bl Helper_aputfield + DISPATCH 3 } (lputfield) lputfield { @@ -1738,6 +1846,7 @@ DISPATCH_NEXT SW_NPC cmp lr, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r2, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT add tmp2, lr, tmp2 @@ -1746,6 +1855,18 @@ .abortentry86: stm tmp2, {r3, tmp1} DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT + add tmp2, lr, tmp2 + DISPATCH_NEXT + DISPATCH_NEXT + StoreStoreBarrier +.abortentry86_v: + stm tmp2, {r3, tmp1} + StoreLoadBarrier + DISPATCH_FINISH } #endif // FAST_BYTECODES @@ -1760,6 +1881,7 @@ and r3, r3, #0x00ff0000 cmp r3, #opc_getstatic << 16 blne resolve_get_put + GO_IF_VOLATILE r2, tmp2, 3f ldr r3, [tmp2, #CP_OFFSET+4] ldr r2, [tmp2, #CP_OFFSET+12] ldr lr, [tmp2, #CP_OFFSET+8] @@ -1770,6 +1892,18 @@ tst r2, #2 bne getstatic_dw b getstatic_sh +3: + VOLATILE_VERSION + ldr r3, [tmp2, #CP_OFFSET+4] + ldr r2, [tmp2, #CP_OFFSET+12] + ldr lr, [tmp2, #CP_OFFSET+8] + movs r2, r2, lsr #29 + bhi getstatic_volatile_w @ C = 1, Z = 0 => R2 == 3, 5, 7 + bcs getstatic_volatile_h @ C = 1 => R2 = 1 + beq getstatic_volatile_sb @ Z = 1 => R2 = 0 + tst r2, #2 + bne getstatic_volatile_dw + b getstatic_volatile_sh } @ r2 = [jpc, #1] @@ -1782,6 +1916,7 @@ and r3, r3, #0xff000000 cmp r3, #opc_putstatic << 24 blne resolve_get_put + GO_IF_VOLATILE r2, tmp2, 3f ldr r3, [tmp2, #CP_OFFSET+4] @ r3 = object ldr lr, [tmp2, #CP_OFFSET+12] @ lr = tos_type ldr r2, [tmp2, #CP_OFFSET+8] @ r2 = offset @@ -1792,6 +1927,18 @@ tst lr, #2 bne putstatic_dw b putstatic_sh +3: + VOLATILE_VERSION + ldr r3, [tmp2, #CP_OFFSET+4] @ r3 = object + ldr lr, [tmp2, #CP_OFFSET+12] @ lr = tos_type + ldr r2, [tmp2, #CP_OFFSET+8] @ r2 = offset + movs lr, lr, lsr #29 + bhi putstatic_volatile_w @ C = 1, Z = 0 => R2 == 3, 5, 7 + bcs putstatic_volatile_h @ C = 1 => R2 = 1 + beq putstatic_volatile_sb @ Z = 1 => R2 = 0 + tst lr, #2 + bne putstatic_volatile_dw + b putstatic_volatile_sh } #ifdef NOTICE_SAFEPOINTS @@ -2216,6 +2363,7 @@ DISPATCH_NEXT SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 + GO_IF_VOLATILE r3, tmp2, 3f DISPATCH_NEXT ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT @@ -2224,6 +2372,16 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + DISPATCH_NEXT + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry87_v: + ldr tmp2, [tmp1, tmp2] + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } @ r2 = [jpc, #1] @@ -4086,6 +4244,7 @@ SW_NPC cmp tmp1, #0 SW_NPC beq null_ptr_exception_jpc_3 DISPATCH_NEXT + GO_IF_VOLATILE r3, tmp2, 3f ldr tmp2, [tmp2, #CP_OFFSET+8] DISPATCH_NEXT .abortentry88: @@ -4093,6 +4252,15 @@ DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH +3: + VOLATILE_VERSION + ldr tmp2, [tmp2, #CP_OFFSET+8] + DISPATCH_NEXT +.abortentry88_v: + ldr tmp2, [tmp1, tmp2] + DISPATCH_NEXT + PUSH tmp2 + DISPATCH_FINISH } @ --- iconst; store ------------------------------------------------- diff -r 0a0072170876 -r 6a04d4888cc0 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Nov 28 20:06:41 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Dec 08 10:09:28 2011 +0000 @@ -529,6 +529,7 @@ ldrb r1, [jpc, lr] bic ip, ip, #7 ldr pc, [ip, r1, lsl #2] + .ltorg .endm #define FFI_TYPE_VOID 0 @@ -585,6 +586,45 @@ .fpu softvfp #endif // HW_FP +#ifndef __ARM_ARCH_7A__ +# define dmb VOLATILE_BARRIER +# define dmb_st VOLATILE_BARRIER +#else +# define dmb_st .inst 0xf57ff05e +#endif + +#define StoreStoreBarrier dmb_st +#define StoreLoadBarrier dmb +#define FullBarrier dmb + + .macro VOLATILE_BARRIER arg + stmfd sp!, {r2, lr} + ldr r2, =0xffff0fa0 @ kernel_dmb + blx r2 + ldmfd sp!, {r2, lr} + .endm + + .macro GO_IF_VOLATILE reg, cp_cache, label + ldr \reg, [\cp_cache, #CP_OFFSET+CP_CACHE_FLAGS] + tst \reg, #(1< I'm not too worried about the AWT results because this is a very stripped-down box, and it is missing graphics components. Some JDI fails are to be expected, because AFAIK the hooks aren't there. I'll investigate some of these fails to try to figure out what's going on. Andrew. Error: com/sun/jdi/EarlyReturnTest.java Error: com/sun/jdi/PopAsynchronousTest.java Error: java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html Error: java/lang/management/MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh Error: java/nio/channels/FileChannel/ExpandingMap.java Error: java/nio/channels/FileChannel/Transfers.java Error: java/nio/channels/SocketChannel/Connect.java Error: java/nio/charset/coders/BashStreams.java Error: java/util/Locale/Bug4518797.java Error: javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java Error: sun/java2d/cmm/ColorConvertOp/MTSafetyTest.java Error: sun/java2d/OpenGL/GradientPaints.java Error: sun/nio/cs/FindDecoderBugs.java Error: sun/nio/cs/FindEncoderBugs.java Error: sun/nio/cs/FindOneCharEncoderBugs.java Error: sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java Error: tools/pack200/Pack200Simple.sh Error: vm/verifier/VerifyProtectedConstructor.java Error: vm/verifier/VerifyStackForExceptionHandlers.java FAILED: com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java FAILED: com/sun/jdi/AllLineLocations.java FAILED: com/sun/jdi/MethodExitReturnValuesTest.java FAILED: com/sun/jdi/PopAndInvokeTest.java FAILED: com/sun/jdi/PopAndStepTest.java FAILED: com/sun/jdi/PopSynchronousTest.java FAILED: com/sun/jdi/RedefineCrossStart.java FAILED: com/sun/jdi/Redefine-g.sh FAILED: com/sun/net/httpserver/bugs/B6361557.java FAILED: com/sun/net/httpserver/Test13.java FAILED: java/awt/event/KeyEvent/CorrectTime/CorrectTime.java FAILED: java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java FAILED: java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java FAILED: java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java FAILED: java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html FAILED: java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java FAILED: java/awt/font/InternationalFonts/InternationalFontsRendering.java FAILED: java/awt/font/InternationalFonts/InternationalFontsStyles.java FAILED: java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java FAILED: java/awt/Graphics2D/DrawString/AlphaSurfaceText.java FAILED: java/awt/Graphics2D/DrawString/RotTransText.java FAILED: java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html FAILED: java/awt/print/PrinterJob/ExceptionTest.java FAILED: java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html FAILED: java/awt/Window/GrabSequence/GrabSequence.java FAILED: java/awt/xembed/server/RunTestXEmbed.java FAILED: java/beans/XMLEncoder/javax_swing_tree_TreePath.java FAILED: java/lang/Double/ToString.java FAILED: java/lang/management/MXBean/MXBeanBehavior.java FAILED: java/net/MulticastSocket/NoLoopbackPackets.java FAILED: java/net/MulticastSocket/SetLoopbackMode.java FAILED: java/net/MulticastSocket/Test.java FAILED: java/net/URL/TestHttps.java FAILED: java/nio/charset/Charset/NIOCharsetAvailabilityTest.java FAILED: java/nio/MappedByteBuffer/Truncate.java FAILED: java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java FAILED: java/util/logging/AnonLoggerWeakRefLeak.sh FAILED: java/util/logging/LoggerWeakRefLeak.sh FAILED: javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java FAILED: sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java FAILED: sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java FAILED: sun/java2d/cmm/ColorConvertOp/MTColConvTest.java FAILED: sun/management/HotspotThreadMBean/GetInternalThreads.java FAILED: sun/nio/cs/TestSJIS0213.java FAILED: sun/security/validator/CertReplace.java FAILED: sun/tools/jinfo/Basic.sh FAILED: sun/tools/jstat/jstatPrintCompilationOutput1.sh Report written to test/jdk/JTreport/html/report.html Results written to /home/aph/iced-arm/icedtea6/test/jdk/JTwork Test results: passed: 3,353; failed: 47; error: 19 From aph at redhat.com Thu Dec 8 02:22:23 2011 From: aph at redhat.com (Andrew Haley) Date: Thu, 08 Dec 2011 10:22:23 +0000 Subject: Time to branch for IcedTea6 1.11 ? Message-ID: <4EE08FDF.6080207@redhat.com> I'd like to do a release, primarily for ARM. As far as I can see the trunk is stable. Does anyone have anything they're working on they'd like to get in for 1.11 ? Andrew. From ptisnovs at icedtea.classpath.org Thu Dec 8 02:54:57 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 08 Dec 2011 10:54:57 +0000 Subject: /hg/gfx-test: 2011-12-08 Pavel Tisnovsky Message-ID: changeset f1181d8e0365 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=f1181d8e0365 author: Pavel Tisnovsky date: Thu Dec 08 11:57:09 2011 +0100 2011-12-08 Pavel Tisnovsky * src/org/gfxtest/framework/CommonPathsGenerator.java: Created new class containing methods used by test suites which work with paths. * src/org/gfxtest/framework/CommonRenderingStyles.java: Added two methods used by tests. * src/org/gfxtest/framework/GfxTest.java: Changed to support print tests (not really finished yet). * Makefile: updated diffstat: ChangeLog | 11 + Makefile | 1 + src/org/gfxtest/framework/CommonPathsGenerator.java | 215 +++++++++++++++++++ src/org/gfxtest/framework/CommonRenderingStyles.java | 28 ++ src/org/gfxtest/framework/GfxTest.java | 100 ++++++-- 5 files changed, 331 insertions(+), 24 deletions(-) diffs (443 lines): diff -r fe1013f76915 -r f1181d8e0365 ChangeLog --- a/ChangeLog Wed Dec 07 11:08:08 2011 +0100 +++ b/ChangeLog Thu Dec 08 11:57:09 2011 +0100 @@ -1,3 +1,14 @@ +2011-12-08 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonPathsGenerator.java: + Created new class containing methods used by test suites + which work with paths. + * src/org/gfxtest/framework/CommonRenderingStyles.java: + Added two methods used by tests. + * src/org/gfxtest/framework/GfxTest.java: + Changed to support print tests (not really finished yet). + * Makefile: updated + 2011-12-07 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingCircleByRectangleShape.java: diff -r fe1013f76915 -r f1181d8e0365 Makefile --- a/Makefile Wed Dec 07 11:08:08 2011 +0100 +++ b/Makefile Thu Dec 08 11:57:09 2011 +0100 @@ -80,6 +80,7 @@ $(CLASSES)/$(FRAMEWORK_DIR)/CommonRenderingStyles.class \ $(CLASSES)/$(FRAMEWORK_DIR)/CommonShapesRenderer.class \ $(CLASSES)/$(FRAMEWORK_DIR)/CommonClippingOperations.class \ + $(CLASSES)/$(FRAMEWORK_DIR)/CommonPathsGenerator.class \ $(CLASSES)/$(FRAMEWORK_DIR)/EntityRenderingStyle.class \ $(CLASSES)/$(FRAMEWORK_DIR)/TestResult.class \ $(CLASSES)/$(FRAMEWORK_DIR)/ParameterNotFoundException.class \ diff -r fe1013f76915 -r f1181d8e0365 src/org/gfxtest/framework/CommonPathsGenerator.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/framework/CommonPathsGenerator.java Thu Dec 08 11:57:09 2011 +0100 @@ -0,0 +1,215 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. +*/ + +package org.gfxtest.framework; + +import java.awt.geom.Path2D; + + + +/** + * This class contains static methods used to create various types of paths. + * + * @author Pavel Tisnovsky + */ +public class CommonPathsGenerator +{ + /** + * Default Y offset of curve end points. + */ + private static final int DEFAULT_Y_OFFSET_FOR_QUADRATIC_CURVES = 40; + + /** + * Create new path using Path2D.Float() which contains just one quadratic + * curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @return created path + */ + public static Path2D createQuadraticPathFloat(int width, int height) + { + return createQuadraticPathFloat(width, height, 0); + } + + /** + * Create new path using Path2D.Float() which contains just one quadratic + * curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @param yoffset + * vertical offset + * @return created path + */ + public static Path2D createQuadraticPathFloat(int width, int height, int yoffset) + { + Path2D path = new Path2D.Float(); + // start point + int x1 = computeQuadraticPathX1(width); + int y1 = computeQuadraticPathY1() + yoffset; + // control point + int x2 = computeQuadraticPathX2(width); + int y2 = computeQuadraticPathY2(height) + yoffset; + // end point + int x3 = computeQuadraticPathX3(width); + int y3 = computeQuadraticPathY3() + yoffset; + path.moveTo(x1, y1); + path.quadTo(x2, y2, x3, y3); + return path; + } + + /** + * Create new path using Path2D.Double() which contains just one quadratic + * curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @return created path + */ + public static Path2D createQuadraticPathDouble(int width, int height) + { + return createQuadraticPathDouble(width, height, 0); + } + + /** + * Create new path using Path2D.Double() which contains just one quadratic + * curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @param yoffset + * vertical offset + * @return created path + */ + public static Path2D createQuadraticPathDouble(int width, int height, int yoffset) + { + Path2D path = new Path2D.Double(); + // start point + int x1 = computeQuadraticPathX1(width); + int y1 = computeQuadraticPathY1() + yoffset; + // control point + int x2 = computeQuadraticPathX2(width); + int y2 = computeQuadraticPathY2(height) + yoffset; + // end point + int x3 = computeQuadraticPathX3(width); + int y3 = computeQuadraticPathY3() + yoffset; + path.moveTo(x1, y1); + path.quadTo(x2, y2, x3, y3); + return path; + } + + /** + * Compute X coordinate of first curve end point. + * + * @param width + * canvas width + * @return X coordinate of first curve end point. + */ + public static int computeQuadraticPathX1(int width) + { + return width >> 2; + } + + /** + * Compute X coordinate of curve control point. + * + * @param width + * canvas width + * @return X coordinate of curve control point. + */ + public static int computeQuadraticPathX2(int width) + { + return width >> 1; + } + + /** + * Compute X coordinate of second curve end point. + * + * @param width + * canvas width + * @return X coordinate of second curve end point. + */ + public static int computeQuadraticPathX3(int width) + { + return width * 3 / 4; + } + + /** + * Compute Y coordinate of first curve end point. + * + * @return Y coordinate of first curve end point. + */ + public static int computeQuadraticPathY1() + { + return DEFAULT_Y_OFFSET_FOR_QUADRATIC_CURVES; + } + + /** + * Compute Y coordinate of curve control point. + * + * @param height + * canvas height + * @return Y coordinate of curve control point. + */ + public static int computeQuadraticPathY2(int height) + { + return DEFAULT_Y_OFFSET_FOR_QUADRATIC_CURVES + height * 2 / 3; + } + + /** + * Compute Y coordinate of second curve end point. + * + * @return Y coordinate of second curve end point. + */ + public static int computeQuadraticPathY3() + { + return DEFAULT_Y_OFFSET_FOR_QUADRATIC_CURVES; + } + +} diff -r fe1013f76915 -r f1181d8e0365 src/org/gfxtest/framework/CommonRenderingStyles.java --- a/src/org/gfxtest/framework/CommonRenderingStyles.java Wed Dec 07 11:08:08 2011 +0100 +++ b/src/org/gfxtest/framework/CommonRenderingStyles.java Thu Dec 08 11:57:09 2011 +0100 @@ -1189,6 +1189,34 @@ } /** + * Set 10 pixels wide stroke and specified cap style. + * + * @param graphics + * graphics context for image + * @param capStyle + * the decoration of the ends of a BasicStroke + */ + public static void setStrokeZeroThick(Graphics2D graphics, int capStyle) + { + graphics.setStroke(new BasicStroke(0, capStyle, BasicStroke.JOIN_BEVEL)); + } + + /** + * Set 10 pixels wide stroke and specified cap style and join style. + * + * @param graphics + * graphics context for image + * @param capStyle + * the decoration of the ends of a BasicStroke + * @param joinStyle + * the decoration applied where path segments meet + */ + public static void setStrokeZeroThick(Graphics2D graphics, int capStyle, int joinStyle) + { + graphics.setStroke(new BasicStroke(0, capStyle, joinStyle)); + } + + /** * Set 10 pixels wide stroke and default cap and join style. * * @param graphics diff -r fe1013f76915 -r f1181d8e0365 src/org/gfxtest/framework/GfxTest.java --- a/src/org/gfxtest/framework/GfxTest.java Wed Dec 07 11:08:08 2011 +0100 +++ b/src/org/gfxtest/framework/GfxTest.java Thu Dec 08 11:57:09 2011 +0100 @@ -48,8 +48,17 @@ import java.lang.reflect.Method; import org.gfxtest.common.ConfigurationException; +import org.gfxtest.framework.annotations.TestType; import org.gfxtest.framework.annotations.Zoom; + + +/** + * Base class which should be extended by each test suite. Only methods which + * name begins with "test..." are run as test methods. + * + * @author Pavel Tisnovsky + */ public abstract class GfxTest { protected Log log = null; @@ -92,6 +101,9 @@ */ public static final int OFFSET = 80; + /** + * Step between two arc radiuses. + */ protected static final int ARC_STEP = 10; /** @@ -211,11 +223,13 @@ */ private void runAllTests(GfxTestConfiguration configuration) { + Class testClass = getClass(); this.log.logBegin("common tests"); //$NON-NLS-1$ - Method[] methods = getClass().getDeclaredMethods(); + Method[] methods = testClass.getDeclaredMethods(); + TestType testType = testClass.getAnnotation(TestType.class); for (Method method : methods) { - tryToInvokeTestMethod(configuration, method); + tryToInvokeTestMethod(testType, configuration, method); } this.log.logEnd("common tests"); //$NON-NLS-1$ this.log.logBegin("other tests"); //$NON-NLS-1$ @@ -409,42 +423,70 @@ this.log.logSet("arc height", entityRenderingStyle.getArcHeight()); } - private void tryToInvokeTestMethod(GfxTestConfiguration configuration, Method method) + private void tryToInvokeTestMethod(TestType testType, GfxTestConfiguration configuration, Method method) { String methodName = method.getName(); if (method.getName().startsWith("test")) //$NON-NLS-1$ { this.log.logBegin(methodName); - int zoom = getZoom(); - TestImage image = new TestImage(configuration, zoom); - Graphics2D gc = image.getGraphics(); - TestResult result = null; + switch (testType.value()) + { + case RENDER_TEST: + tryToRunRenderTest(configuration, method, methodName); + break; + case PRINT_TEST: + tryToRunPrintTest(configuration, method, methodName); + break; + } + } + } + + /** + * @param configuration + * @param method + * @param methodName + */ + private void tryToRunRenderTest(GfxTestConfiguration configuration, Method method, String methodName) + { + int zoom = getZoom(); + TestImage image = new TestImage(configuration, zoom); + Graphics2D gc = image.getGraphics(); + TestResult result = null; + try + { + result = (TestResult) method.invoke(this, new Object[] { image, gc }); + } + catch (Exception e) + { + e.printStackTrace(); + result = TestResult.ERROR; + } + finally + { + gc.dispose(); + logTestResult(result); try { - result = (TestResult) method.invoke(this, new Object[] { image, gc }); + writeZoomedImage(configuration, image, methodName, zoom); } - catch (Exception e) + catch (IOException e) { e.printStackTrace(); - result = TestResult.ERROR; } - finally - { - gc.dispose(); - logTestResult(result); - try - { - writeZoomedImage(configuration, image, methodName, zoom); - } - catch (IOException e) - { - e.printStackTrace(); - } - this.log.logEnd(methodName); - } + this.log.logEnd(methodName); } } + /** + * @param configuration + * @param method + * @param methodName + */ + private void tryToRunPrintTest(GfxTestConfiguration configuration, Method method, String methodName) + { + // TODO + } + private void writeZoomedImage(GfxTestConfiguration configuration, TestImage sourceImage, String methodName, int zoom) throws IOException { if (zoom == 1) @@ -497,6 +539,16 @@ } /** + * Returns test type set by annotation. + * + * @return actual test type value + */ + protected TestType getTestType() + { + return this.getClass().getAnnotation(TestType.class); + } + + /** * Write test result to log file. * * @param result status of the last invoked test From xerxes at zafena.se Thu Dec 8 03:08:07 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Thu, 08 Dec 2011 12:08:07 +0100 Subject: Time to branch for IcedTea6 1.11 ? In-Reply-To: <4EE08FDF.6080207@redhat.com> References: <4EE08FDF.6080207@redhat.com> Message-ID: <4EE09A97.60904@zafena.se> 2011-12-08 11:22, Andrew Haley skrev: > I'd like to do a release, primarily for ARM. > > As far as I can see the trunk is stable. Does anyone > have anything they're working on they'd like to get in > for 1.11 ? > > Andrew. The .def file need more barriers ;) apart from fixing that one Stefan Ring are working on a fix for CACAO CA164 http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=164 Thats all on top of my head. Xerxes From mark at klomp.org Thu Dec 8 03:24:01 2011 From: mark at klomp.org (Mark Wielaard) Date: Thu, 08 Dec 2011 12:24:01 +0100 Subject: Moving the builder, planet and icedtea-backup servers Message-ID: <1323343441.18084.33.camel@springer.wildebeest.org> Hi, Unfortunately builder.classpath.org, planet.classpath.org and icedtea.wildebeest.org (which acts as the icedtea backup server) need to move to a different internet connection... twice... First they will move today/tomorrow to a slower connection, and then one or two weeks later they will hopefully move to a much faster connection. Each time the IP addresses will change. This might cause some unexpected downtime or make the servers unreachable for some time. You might notice some warnings emitted when committing to one of the repositories that trigger the buildbot when it cannot reach builder.classpath.org. These are "harmless", except that your commit will not be tested by the autobuilders. So please be extra careful what you commit in the next couple of days. Apologies for the inconvenience, Mark From bugzilla-daemon at icedtea.classpath.org Thu Dec 8 04:38:21 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 08 Dec 2011 12:38:21 +0000 Subject: [Bug 828] New: firefox-8.0/npfunctions.h:303:24: error: ambiguates old declaration 'const char* NP_GetMIMEDescription() Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=828 Bug #: 828 Summary: firefox-8.0/npfunctions.h:303:24: error: ambiguates old declaration 'const char* NP_GetMIMEDescription() Classification: Unclassified Product: IcedTea-Web Version: hg Platform: arm OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: Plugin AssignedTo: dbhole at redhat.com ReportedBy: xerxes at zafena.se CC: unassigned at icedtea.classpath.org the armv7 oneiric buildbot are using fails to build icedtea-web in combination with its firefox-8.0 headers. http://builder.classpath.org/icedtea/buildbot/builders/icedtea-web-natty-armv7l/builds/115/steps/compile/logs/stdio mkdir -p /var/lib/buildbot/icedtea/icedtea-web-natty-armv7l/build/plugin/icedteanp && \ cd /var/lib/buildbot/icedtea/icedtea-web-natty-armv7l/build/plugin/icedteanp && \ g++ -g -O2 \ -DPACKAGE_NAME=\"icedtea-web\" -DPACKAGE_TARNAME=\"icedtea-web\" -DPACKAGE_VERSION=\"1.2pre\" -DPACKAGE_STRING=\"icedtea-web\ 1.2pre\" -DPACKAGE_BUGREPORT=\"distro-pkg-dev at openjdk.java.net\" -DPACKAGE_URL=\"http://icedtea.classpath.org/wiki/IcedTea-Web\" -DPACKAGE=\"icedtea-web\" -DVERSION=\"1.2pre\" -DHAVE_LIBZ=1 \ -DJDK_UPDATE_VERSION="\"50\"" \ -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \ -DPLUGIN_VERSION="\"IcedTea-Web 1.2pre+rdf87375f72cd\"" \ -DPACKAGE_URL="\"http://icedtea.classpath.org/wiki/IcedTea-Web\"" \ -DMOZILLA_VERSION_COLLAPSED="8000000" \ -DICEDTEA_WEB_JRE="\"/usr/lib/jvm/java-6-openjdk/jre\"" \ -DPLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:/usr/local/share/icedtea-web/netx.jar:/usr/local/share/icedtea-web/plugin.jar:/usr/share/java/js.jar"' \ -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabi/glib-2.0/include \ -pthread -I/usr/include/gtk-2.0 -I/usr/lib/arm-linux-gnueabi/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabi/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 \ -DXP_UNIX -I/usr/include/firefox-8.0 \ -fPIC -o /var/lib/buildbot/icedtea/icedtea-web-natty-armv7l/build/plugin/icedteanp/IcedTeaScriptablePluginObject.o -c /var/lib/buildbot/icedtea/icedtea-web-natty-armv7l/build/../src/plugin/icedteanp/IcedTeaScriptablePluginObject.cc /var/lib/buildbot/icedtea/icedtea-web-natty-armv7l/build/../src/plugin/icedteanp/IcedTeaNPPlugin.cc: In function 'char* NP_GetMIMEDescription()': /var/lib/buildbot/icedtea/icedtea-web-natty-armv7l/build/../src/plugin/icedteanp/IcedTeaNPPlugin.cc:2295:24: error: new declaration 'char* NP_GetMIMEDescription()' /usr/include/firefox-8.0/npfunctions.h:303:24: error: ambiguates old declaration 'const char* NP_GetMIMEDescription()' make: *** [/var/lib/buildbot/icedtea/icedtea-web-natty-armv7l/build/plugin/icedteanp/IcedTeaNPPlugin.o] Error 1 make: *** Waiting for unfinished jobs.... program finished with exit code 2 elapsedTime=16.043701 -- 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 stefan at complang.tuwien.ac.at Thu Dec 8 04:51:17 2011 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Thu, 8 Dec 2011 13:51:17 +0100 Subject: Time to branch for IcedTea6 1.11 ? In-Reply-To: <4EE09A97.60904@zafena.se> References: <4EE08FDF.6080207@redhat.com> <4EE09A97.60904@zafena.se> Message-ID: > Stefan Ring are working on a fix for CACAO CA164 > http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=164 Thanks for paying attention to this! I've just pushed the fix. This is the first time ever that CACAO does not have any _known_ race conditions/nondeterministic instabilities left. But some memory barriers for ARM SMP are still missing. I'll try to tackle this in the coming weeks. Cheers From xranby at icedtea.classpath.org Thu Dec 8 05:36:49 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Thu, 08 Dec 2011 13:36:49 +0000 Subject: /hg/icedtea6: CACAO CA164: Get rid of mysterious 10 trailing byt... Message-ID: changeset 0d15daf94aed in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0d15daf94aed author: Xerxes Ranby date: Thu Dec 08 15:07:53 2011 +0100 CACAO CA164: Get rid of mysterious 10 trailing bytes in literal strings. 2011-12-08 Xerxes Ranby CACAO: - CA164: Get rid of mysterious 10 trailing bytes in literal strings. * NEWS: Updated. * Makefile.am: (CACAO_VERSION): Updated CACAO to 2011-12-08 revision. (CACAO_SHA256SUM): Updated. diffstat: ChangeLog | 10 ++++++++++ Makefile.am | 4 ++-- NEWS | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diffs (42 lines): diff -r 6a04d4888cc0 -r 0d15daf94aed ChangeLog --- a/ChangeLog Thu Dec 08 10:09:28 2011 +0000 +++ b/ChangeLog Thu Dec 08 15:07:53 2011 +0100 @@ -1,3 +1,13 @@ +2011-12-08 Xerxes R??nby + + CACAO: + - CA164: Get rid of mysterious 10 trailing bytes in literal strings. + * NEWS: + Updated. + * Makefile.am: + (CACAO_VERSION): Updated CACAO to 2011-12-08 revision. + (CACAO_SHA256SUM): Updated. + 2011-12-07 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp diff -r 6a04d4888cc0 -r 0d15daf94aed Makefile.am --- a/Makefile.am Thu Dec 08 10:09:28 2011 +0000 +++ b/Makefile.am Thu Dec 08 15:07:53 2011 +0100 @@ -5,8 +5,8 @@ OPENJDK_VERSION = b24 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ -CACAO_VERSION = ea0e1b9ccf8d -CACAO_SHA256SUM = cce66fecc290f3f7450a0463e460959028e6c81b0d7b130bb6c54bcbccf39efe +CACAO_VERSION = cff92704c4e0 +CACAO_SHA256SUM = dc768c9d097fb056ad34fc6d5a57e8fd4f3b24bf515be92acc5ee4208160eb3f 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 6a04d4888cc0 -r 0d15daf94aed NEWS --- a/NEWS Thu Dec 08 10:09:28 2011 +0000 +++ b/NEWS Thu Dec 08 15:07:53 2011 +0100 @@ -389,6 +389,7 @@ - CA159: Exception handler blocks / register mixup. - CA162: Make class init protection aware of multiple threads. - CA163: descriptor_params_from_paramtypes is protected by a mutex now. + - CA164: Get rid of mysterious 10 trailing bytes in literal strings. - ARM: Remove broken support for float argument passing in registers. - ARM: Remove hack for return value in float registers. - ARM: Fixed use of uninitialized variable. From xerxes at zafena.se Thu Dec 8 05:39:17 2011 From: xerxes at zafena.se (=?UTF-8?B?WGVyeGVzIFLDpW5ieQ==?=) Date: Thu, 08 Dec 2011 14:39:17 +0100 Subject: Time to branch for IcedTea6 1.11 ? In-Reply-To: References: <4EE08FDF.6080207@redhat.com> <4EE09A97.60904@zafena.se> Message-ID: <4EE0BE05.6090409@zafena.se> 2011-12-08 13:51, Stefan Ring skrev: >> Stefan Ring are working on a fix for CACAO CA164 >> http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=164 > > Thanks for paying attention to this! > > I've just pushed the fix. This is the first time ever that CACAO does > not have any _known_ race conditions/nondeterministic instabilities > left. But some memory barriers for ARM SMP are still missing. I'll try > to tackle this in the coming weeks. > > Cheers Ok thank you Stefan, i have pushed your change. http://icedtea.classpath.org/hg/icedtea6/rev/0d15daf94aed To my knowledge CACAO still have the IA32 specific "Exception in thread "ReadAheadIterator1" java.util.NoSuchElementException" bug left. Testcase on IA32: xranby at xranby-ESPRIMO-P7935:~/icedtea6-cacao-8dec$ time make check-langtools ... Passed: com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java Exception in thread "ReadAheadIterator1" java.util.NoSuchElementException at java.util.LinkedList.remove(LinkedList.java:805) at java.util.LinkedList.removeFirst(LinkedList.java:151) at com.sun.javatest.TRT_Iterator.nextElement(TRT_Iterator.java:176) at com.sun.javatest.TRT_Iterator.next(TRT_Iterator.java:200) at com.sun.javatest.util.ReadAheadIterator.readAhead(ReadAheadIterator.java:258) at com.sun.javatest.util.ReadAheadIterator.access$000(ReadAheadIterator.java:36) at com.sun.javatest.util.ReadAheadIterator$1.run(ReadAheadIterator.java:192) From aph at icedtea.classpath.org Thu Dec 8 05:51:53 2011 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Thu, 08 Dec 2011 13:51:53 +0000 Subject: /hg/icedtea6: Add a couple of missing barriers. Message-ID: changeset db64ac99a1ee in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=db64ac99a1ee author: aph date: Thu Dec 08 13:51:11 2011 +0000 Add a couple of missing barriers. 2011-12-08 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (aload_N_getfield, [iaf]load_igetfield): Add a couple of missing barriers. diffstat: ChangeLog | 6 ++++++ arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diffs (32 lines): diff -r 0d15daf94aed -r db64ac99a1ee ChangeLog --- a/ChangeLog Thu Dec 08 15:07:53 2011 +0100 +++ b/ChangeLog Thu Dec 08 13:51:11 2011 +0000 @@ -1,3 +1,9 @@ +2011-12-08 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def + (aload_N_getfield, [iaf]load_igetfield): Add a couple of missing + barriers. + 2011-12-08 Xerxes R??nby CACAO: diff -r 0d15daf94aed -r db64ac99a1ee arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def --- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Thu Dec 08 15:07:53 2011 +0100 +++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Thu Dec 08 13:51:11 2011 +0000 @@ -2379,6 +2379,7 @@ DISPATCH_NEXT .abortentry87_v: ldr tmp2, [tmp1, tmp2] + FullBarrier DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH @@ -4258,6 +4259,7 @@ DISPATCH_NEXT .abortentry88_v: ldr tmp2, [tmp1, tmp2] + FullBarrier DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH From stefan at complang.tuwien.ac.at Thu Dec 8 05:59:05 2011 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Thu, 8 Dec 2011 14:59:05 +0100 Subject: Time to branch for IcedTea6 1.11 ? In-Reply-To: <4EE0BE05.6090409@zafena.se> References: <4EE08FDF.6080207@redhat.com> <4EE09A97.60904@zafena.se> <4EE0BE05.6090409@zafena.se> Message-ID: > Ok thank you Stefan, i have pushed your change. > http://icedtea.classpath.org/hg/icedtea6/rev/0d15daf94aed > > To my knowledge CACAO still have the IA32 specific "Exception in thread > "ReadAheadIterator1" java.util.NoSuchElementException" bug left. Hmm, I will need to port over the memory barriers for volatiles and test again. Only x86_64 has them at the moment. From bugzilla-daemon at icedtea.classpath.org Thu Dec 8 06:21:34 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 08 Dec 2011 14:21:34 +0000 Subject: [Bug 829] New: CACAO javadoc: error - java.lang.OutOfMemoryError: Please increase memory. during docs while using CACAO for self-hosting purposes. Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=829 Bug #: 829 Summary: CACAO javadoc: error - java.lang.OutOfMemoryError: Please increase memory. during docs while using CACAO for self-hosting purposes. Classification: Unclassified Product: IcedTea Version: 6-hg Platform: x86 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: CACAO AssignedTo: unassigned at icedtea.classpath.org ReportedBy: xerxes at zafena.se Testcase full bootstrap and then rebuild using cacao for full bootstrap. hg clone http://icedtea.classpath.org/hg/icedtea6 cd icedtea6 ./autogen.sh mkdir ../icedtea6-cacao-8dec cd ../icedtea6-cacao-8dec ../icedtea6/configure --enable-cacao --disable-bootstrap --disable-docs --with-parallel-jobs=4 make mkdir ../icedtea6-cacao-8dec-selfhost cd ../icedtea6-cacao-8dec-selfhost ../icedtea6/configure --disable-bootstrap --with-jdk-home=/home/xranby/icedtea6-cacao-8dec/openjdk.build/j2sdk-image make ... linux i586 1.6.0_24 build finished: 11-12-08 14:59 Begin Processing OTHERSUBDIRS: docs >>>Recursively making docs docs @ Thu Dec 8 14:59:17 CET 2011 ... make[4]: Entering directory `/home/xranby/icedtea6-cacao-8dec-selfhost/openjdk/jdk/make/docs' ... /home/xranby/icedtea6-cacao-8dec-selfhost/bootstrap/jdk1.6.0/bin/java -client -Xmx512m -Xms128m -XX:PermSize=32m -XX:MaxPermSize=160m "-Xbootclasspath/p:/home/xranby/icedtea6-cacao-8dec-selfhost/openjdk.build/langtools/dist/bootstrap/lib/javadoc.jar:/home/xranby/icedtea6-cacao-8dec-selfhost/openjdk.build/langtools/dist/bootstrap/lib/javac.jar:/home/xranby/icedtea6-cacao-8dec-selfhost/openjdk.build/langtools/dist/bootstrap/lib/doclets.jar" -jar /home/xranby/icedtea6-cacao-8dec-selfhost/openjdk.build/langtools/dist/bootstrap/lib/javadoc.jar -d /home/xranby/icedtea6-cacao-8dec-selfhost/openjdk.build/docs/api \ @/home/xranby/icedtea6-cacao-8dec-selfhost/openjdk.build/tmp/docs/doctmp/coredocs.options @/home/xranby/icedtea6-cacao-8dec-selfhost/openjdk.build/tmp/docs/doctmp/coredocs.packages java.lang.OutOfMemoryError at java.nio.CharBuffer.wrap(CharBuffer.java:367) ... at com.sun.tools.javadoc.Main.main(Main.java:49) javadoc: error - java.lang.OutOfMemoryError: Please increase memory. For example, on the JDK Classic or HotSpot VMs, add the option -J-Xmx such as -J-Xmx32m. 1 error make[4]: *** [/home/xranby/icedtea6-cacao-8dec-selfhost/openjdk.build/docs/api/index.html] Error 1 make[4]: Leaving directory `/home/xranby/icedtea6-cacao-8dec-selfhost/openjdk/jdk/make/docs' make[3]: *** [docs] Error 1 make[3]: Leaving directory `/home/xranby/icedtea6-cacao-8dec-selfhost/openjdk/jdk/make' make[2]: *** [jdk-build] Error 2 make[2]: Leaving directory `/home/xranby/icedtea6-cacao-8dec-selfhost/openjdk' make[1]: *** [build_product_image] Fel 2 make[1]: L?mnar katalogen "/home/xranby/icedtea6-cacao-8dec-selfhost/openjdk" make: *** [stamps/icedtea.stamp] Fel 2 real 32m7.588s user 30m55.856s sys 3m41.670s -- 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 Thu Dec 8 06:49:08 2011 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Thu, 08 Dec 2011 14:49:08 +0000 Subject: /hg/icedtea6: Fix running jamvm jdk tests when configured with a... Message-ID: changeset 96ea1d0f5dc4 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=96ea1d0f5dc4 author: doko at ubuntu.com date: Thu Dec 08 15:39:55 2011 +0100 Fix running jamvm jdk tests when configured with a separate relative build dir 2011-12-08 Matthias Klose * Makefile.am (JTREG_SRCS): Use abs_top_srcdir. diffstat: ChangeLog | 4 ++++ Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diffs (23 lines): diff -r db64ac99a1ee -r 96ea1d0f5dc4 ChangeLog --- a/ChangeLog Thu Dec 08 13:51:11 2011 +0000 +++ b/ChangeLog Thu Dec 08 15:39:55 2011 +0100 @@ -1,3 +1,7 @@ +2011-12-08 Matthias Klose + + * Makefile.am (JTREG_SRCS): Use abs_top_srcdir. + 2011-12-08 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def diff -r db64ac99a1ee -r 96ea1d0f5dc4 Makefile.am --- a/Makefile.am Thu Dec 08 13:51:11 2011 +0000 +++ b/Makefile.am Thu Dec 08 15:39:55 2011 +0100 @@ -193,7 +193,7 @@ # Sources list REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java -JTREG_SRCS = $(top_srcdir)/jtreg +JTREG_SRCS = $(abs_top_srcdir)/jtreg # Patch list From bugzilla-daemon at icedtea.classpath.org Thu Dec 8 07:36:33 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 08 Dec 2011 15:36:33 +0000 Subject: [Bug 828] firefox-8.0/npfunctions.h:303:24: error: ambiguates old declaration 'const char* NP_GetMIMEDescription() In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=828 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |omajid at redhat.com --- Comment #1 from Omair Majid 2011-12-08 15:36:33 UTC --- Please see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-November/016240.html for an explanation and a workaround. -- 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 aph at redhat.com Thu Dec 8 09:04:31 2011 From: aph at redhat.com (Andrew Haley) Date: Thu, 08 Dec 2011 17:04:31 +0000 Subject: ARM: Volatile handlers In-Reply-To: <4EDF41E9.1010205@redhat.com> References: <4EDD01A5.60802@redhat.com> <4EDF3D5D.10806@zafena.se> <4EDF41E9.1010205@redhat.com> Message-ID: <4EE0EE1F.40506@redhat.com> Also: 2011-12-08 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (aload_N_getfield, [iaf]load_igetfield): Add a couple of missing barriers. diff -r 0d15daf94aed -r db64ac99a1ee arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def --- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Thu Dec 08 15:07:53 2011 +0100 +++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Thu Dec 08 13:51:11 2011 +0000 @@ -2379,6 +2379,7 @@ DISPATCH_NEXT .abortentry87_v: ldr tmp2, [tmp1, tmp2] + FullBarrier DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH @@ -4258,6 +4259,7 @@ DISPATCH_NEXT .abortentry88_v: ldr tmp2, [tmp1, tmp2] + FullBarrier DISPATCH_NEXT PUSH tmp2 DISPATCH_FINISH From bugzilla-daemon at icedtea.classpath.org Thu Dec 8 09:34:59 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 08 Dec 2011 17:34:59 +0000 Subject: [Bug 830] New: icedtea6: Important Channel Binding Patch is missing Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=830 Bug #: 830 Summary: icedtea6: Important Channel Binding Patch is missing Classification: Unclassified Product: IcedTea Version: 6-1.10.4 Platform: all OS/Version: Linux Status: NEW Severity: major Priority: P3 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: o.flebbe at science-computing.de Created attachment 621 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=621 Official Patch for openJDK7, applies cleanly. The Patch from Bug http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6851973 is missing in icedtea6 but is included in Oracle JDK 1.6 Update 19 See: http://www.oracle.com/technetwork/java/javase/6u19-141078.html This missing patch creates a major interoperability problem, since Oracle JRE/JDK accepts Security contexts from Win7 and W2K8, but openjdk -- as in RHEL6.1 and ubuntu LTS -- does not accept kerberos gss contexts. So there is no solution until now for http://support.microsoft.com/kb/976918 with icetea6. For technical details have a look into the bug database link above. The Patch from http://hg.openjdk.java.net/jdk7/tl/jdk/rev/37ed72fe7561 applies cleanly to jdk6. I will add it as attachment. -- 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 Dec 8 09:45:02 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 08 Dec 2011 17:45:02 +0000 Subject: [Bug 827] unable to start davmail In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=827 Omair Majid changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |omajid at redhat.com --- Comment #1 from Omair Majid 2011-12-08 17:45:02 UTC --- (In reply to comment #0) > An attempt to start davmail fails: > Is this reproducible? > # > # A fatal error has been detected by the Java Runtime Environment: > # > # SIGSEGV (0xb) at pc=0x0000003931414da0, pid=3802, tid=140709191612176 > # > # JRE version: 6.0_17-b17 > # Java VM: OpenJDK 64-Bit Server VM (14.0-b16 mixed mode linux-amd64 ) > # Derivative: IcedTea6 1.7.4 That's a very old version of icedtea6. Can you try this with a newer version by any chance? > Stack: [0x00007ff96951f000,0x00007ff969620000], sp=0x00007ff96961c058, free > space=1012k > Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) > C [ld-linux-x86-64.so.2+0x14da0] > > Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) > j sun.font.NativeFont.fontExists([B)Z+0 Okay, so this does look like (possibly) a problem in the JDK code. Would you mind detailing the steps to reproduce 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 Dec 8 10:16:17 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 08 Dec 2011 18:16:17 +0000 Subject: [Bug 827] unable to start davmail In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=827 --- Comment #2 from inpost at gmail.com 2011-12-08 18:16:17 UTC --- (In reply to comment #1) > (In reply to comment #0) > > That's a very old version of icedtea6. Can you try this with a newer version by > any chance? > No, it was supplied with centos60 > > Okay, so this does look like (possibly) a problem in the JDK code. > > Would you mind detailing the steps to reproduce this? Install davmail Try and execute davmail shell script file (davmail.sh) -- 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 Thu Dec 8 11:57:56 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 08 Dec 2011 14:57:56 -0500 Subject: [icedtea-web] RFC: print arguments passed to application's main method in debug mode Message-ID: <4EE116C4.7040601@redhat.com> Hi, The attached patch makes javaws print out the arguments it is passing to main when running in debug mode. It would come in handy when trying to track down bugs like this: https://bugzilla.redhat.com/show_bug.cgi?id=759099 where we are not sure why the url (specified as an argument through the jnlp file) is invalid. I would like apply the attached patch to icedtea-web HEAD. Any concerns? Thanks, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: print-args-to-main.patch Type: text/x-patch Size: 1190 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111208/49351d17/print-args-to-main.patch From fw at deneb.enyo.de Thu Dec 8 12:19:09 2011 From: fw at deneb.enyo.de (Florian Weimer) Date: Thu, 08 Dec 2011 21:19:09 +0100 Subject: Bootstrapping IcedTea6 with IcedTea6 In-Reply-To: <20111207025404.GB21300@rivendell.middle-earth.co.uk> (Andrew John Hughes's message of "Wed, 7 Dec 2011 02:54:04 +0000") References: <8762hvbjep.fsf@mid.deneb.enyo.de> <4EDCA19B.3090103@zafena.se> <87ehwivs5m.fsf@mid.deneb.enyo.de> <4EDDDD07.7070604@zafena.se> <20111207025404.GB21300@rivendell.middle-earth.co.uk> Message-ID: <87wra63jgi.fsf@mid.deneb.enyo.de> * Andrew John Hughes: > I'm also confused about how this bug is related to your issue. > Please spell out your exact issue clearly. Here's an excerpt from the build log: cd build && LIBFFI_LIBS=-lffi_pic ../configure --with-openjdk=/usr/lib/jvm/java-6-openjdk --with-pkgversion="6b18-1.8.7-2~lenny1" --with-rhino=/usr/share/java/js.jar --with-xalan2-jar=/usr/share/java/xalan2.jar --with-xalan2-serializer-jar=/usr/share/java/serializer.jar --with-openjdk-src-zip=/build/buildd-openjdk-6_6b18-1.8.7-2~lenny1-ia64-LC5yAj/openjdk-6-6b18-1.8.7/openjdk-6-src-b18-16_feb_2010-dfsg.tar.gz --with-jaf-drop-zip=/build/buildd-openjdk-6_6b18-1.8.7-2~lenny1-ia64-LC5yAj/openjdk-6-6b18-1.8.7/drops/jdk6-jaf-2009_10_27.zip --with-jaxp-drop-zip=/build/buildd-openjdk-6_6b18-1.8.7-2~lenny1-ia64-LC5yAj/openjdk-6-6b18-1.8.7/drops/jdk6-jaxp-2009_10_13.zip --with-jaxws-drop-zip=/build/buildd-openjdk-6_6b18-1.8.7-2~lenny1-ia64-LC5yAj/openjdk-6-6b18-1.8.7/drops/jdk6-jaxws-2009_10_27.zip --with-hotspot-build=original --enable-zero --disable-docs --with-parallel-jobs=2 --enable-xrender --disable-plugin --host=ia64-linux-gnu --build=ia64-linux-gnu [...] for dir in openjdk-ecj/jdk/src/share/classes/com/sun/jdi openjdk-ecj/jdk/src/share/classes/com/sun/net/httpserver openjdk-ecj/jdk/src/share/classes/com/sun/tools/jdi openjdk-ecj/jdk/src/share/classes/java/io openjdk-ecj/jdk/src/share/classes/java/security/cert openjdk-ecj/jdk/src/share/classes/java/util openjdk-ecj/jdk/src/share/classes/java/rmi openjdk-ecj/jdk/src/share/classes/sun/awt/ openjdk-ecj/jdk/src/share/classes/sun/nio/cs openjdk-ecj/jdk/src/share/classes/sun/rmi/rmic openjdk-ecj/jdk/src/share/classes/sun/tools/java openjdk-ecj/jdk/src/share/classes/javax/net/ssl openjdk-ecj/jdk/src/share/classes/javax/script openjdk-ecj/jdk/src/share/classes/javax/security/auth/kerberos openjdk-ecj/jdk/src/share/classes/javax/security/sasl openjdk-ecj/langtools/src/share/classes/com/sun/mirror openjdk-ecj/langtools/src/share/classes/com/sun/tools/apt ; \ do \ /usr/bin/find /build/buildd-openjdk-6_6b18-1.8.7-2~lenny1-ia64-LC5yAj/openjdk-6-6b18-1.8.7/build/$dir -name '*.java' >> rt-source-files.txt; \ done for files in openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java openjdk-ecj/jdk/src/share/classes/javax/management/StandardMBean.java ; \ do \ echo $files >> rt-source-files.txt ; \ done mkdir -p lib/rt /build/buildd-openjdk-6_6b18-1.8.7-2~lenny1-ia64-LC5yAj/openjdk-6-6b18-1.8.7/build/bootstrap/jdk1.6.0/bin/javac -J-Xmx1024m -g -d lib/rt \ -source 1.5 \ -sourcepath /build/buildd-openjdk-6_6b18-1.8.7-2~lenny1-ia64-LC5yAj/openjdk-6-6b18-1.8.7/build/generated:openjdk-ecj/jdk/src/share/classes:openjdk-ecj/jdk/src/solaris/classes:openjdk-ecj/langtools/src/share/classes:openjdk-ecj/corba/src/share/classes \ -classpath /usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar \ -bootclasspath \'\' @rt-source-files.txt ; openjdk-ecj/jdk/src/share/classes/javax/swing/TransferHandler.java:133: getTransferHandler() is already defined in javax.swing.TransferHandler.HasGetTransferHandler public TransferHandler getTransferHandler(); ^ /build/buildd-openjdk-6_6b18-1.8.7-2~lenny1-ia64-LC5yAj/openjdk-6-6b18-1.8.7/build/openjdk-ecj/jdk/src/share/classes/sun/rmi/rmic/Main.java:882: warning: non-varargs call of varargs method with inexact argument type for last parameter; cast to java.lang.Object for a varargs call cast to java.lang.Object[] for a non-varargs call and to suppress this warning return java.text.MessageFormat.format(format, args); ^ /build/buildd-openjdk-6_6b18-1.8.7-2~lenny1-ia64-LC5yAj/openjdk-6-6b18-1.8.7/build/openjdk-ecj/jdk/src/share/classes/sun/rmi/rmic/newrmic/Resources.java:72: warning: non-varargs call of varargs method with inexact argument type for last parameter; cast to java.lang.Object for a varargs call cast to java.lang.Object[] for a non-varargs call and to suppress this warning return MessageFormat.format(format, args); ^ Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. Note: Some input files use unchecked or unsafe operations. Note: Recompile with -Xlint:unchecked for details. 1 error 2 warnings make[1]: *** [stamps/rt-class-files.stamp] Error 1 make[1]: Leaving directory `/build/buildd-openjdk-6_6b18-1.8.7-2~lenny1-ia64-LC5yAj/openjdk-6-6b18-1.8.7/build' This bootstrap attempt was done with IcedTea6 1.8.3. As you can see, the error message is similar to the one in bug 631. I can probably bootstrap ia64 one off GCJ. But for alpha, my buildds no longer have GCJ, and the build dies in the same spot, as shown here: https://buildd.debian.org/status/fetch.php?pkg=openjdk-6&arch=alpha&ver=6b18-1.8.7-1&stamp=1299051822 From ddadacha at redhat.com Thu Dec 8 12:27:32 2011 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Thu, 08 Dec 2011 15:27:32 -0500 Subject: [icedtea-web] RFC: print arguments passed to application's main method in debug mode In-Reply-To: <4EE116C4.7040601@redhat.com> References: <4EE116C4.7040601@redhat.com> Message-ID: <4EE11DB4.3080001@redhat.com> Hi Omair, On 08/12/11 02:57 PM, Omair Majid wrote: > Hi, > > The attached patch makes javaws print out the arguments it is passing to > main when running in debug mode. It would come in handy when trying to > track down bugs like this: > https://bugzilla.redhat.com/show_bug.cgi?id=759099 > where we are not sure why the url (specified as an argument through the > jnlp file) is invalid. > > I would like apply the attached patch to icedtea-web HEAD. Any concerns? This looks fine to me. What about backporting this to 1.0 and 1.1 as well? I imagine the releases would find it useful as well. Thoughts? Cheers, Danesh From omajid at redhat.com Thu Dec 8 12:58:52 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 08 Dec 2011 15:58:52 -0500 Subject: [icedtea-web] RFC: print arguments passed to application's main method in debug mode In-Reply-To: <4EE11DB4.3080001@redhat.com> References: <4EE116C4.7040601@redhat.com> <4EE11DB4.3080001@redhat.com> Message-ID: <4EE1250C.6010501@redhat.com> On 12/08/2011 03:27 PM, Danesh Dadachanji wrote: > Hi Omair, > > On 08/12/11 02:57 PM, Omair Majid wrote: >> Hi, >> >> The attached patch makes javaws print out the arguments it is passing to >> main when running in debug mode. It would come in handy when trying to >> track down bugs like this: >> https://bugzilla.redhat.com/show_bug.cgi?id=759099 >> where we are not sure why the url (specified as an argument through the >> jnlp file) is invalid. >> >> I would like apply the attached patch to icedtea-web HEAD. Any concerns? > > This looks fine to me. Thanks for looking over the patch. > What about backporting this to 1.0 and 1.1 as > well? I imagine the releases would find it useful as well. Thoughts? > Sure, I can add it to all 3. Cheers, Omair From omajid at icedtea.classpath.org Thu Dec 8 13:02:03 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 08 Dec 2011 21:02:03 +0000 Subject: /hg/icedtea-web: Print the arguments passed to the application's... Message-ID: changeset fb5e54f2b97e in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fb5e54f2b97e author: Omair Majid date: Thu Dec 08 16:01:06 2011 -0500 Print the arguments passed to the application's main method 2011-12-08 Omair Majid * netx/net/sourceforge/jnlp/Launcher.java (launchApplication): Print arguments being passed to the application's main method in debug mode. diffstat: ChangeLog | 6 ++++++ netx/net/sourceforge/jnlp/Launcher.java | 5 +++++ 2 files changed, 11 insertions(+), 0 deletions(-) diffs (35 lines): diff -r df87375f72cd -r fb5e54f2b97e ChangeLog --- a/ChangeLog Mon Dec 05 13:15:32 2011 -0500 +++ b/ChangeLog Thu Dec 08 16:01:06 2011 -0500 @@ -1,3 +1,9 @@ +2011-12-08 Omair Majid + + * netx/net/sourceforge/jnlp/Launcher.java + (launchApplication): Print arguments being passed to the application's + main method in debug mode. + 2011-12-05 Danesh Dadachanji Update UI for AccessWarningPane diff -r df87375f72cd -r fb5e54f2b97e netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Mon Dec 05 13:15:32 2011 -0500 +++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Dec 08 16:01:06 2011 -0500 @@ -25,6 +25,7 @@ import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -586,6 +587,10 @@ handler.launchStarting(app); main.setAccessible(true); + + if (JNLPRuntime.isDebug()) { + System.out.println("Invoking main() with args: " + Arrays.toString(args)); + } main.invoke(null, new Object[] { args }); return app; From omajid at redhat.com Thu Dec 8 13:23:07 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 08 Dec 2011 16:23:07 -0500 Subject: [icedtea-web] RFC: print arguments passed to application's main method in debug mode In-Reply-To: <4EE11DB4.3080001@redhat.com> References: <4EE116C4.7040601@redhat.com> <4EE11DB4.3080001@redhat.com> Message-ID: <4EE12ABB.7050507@redhat.com> On 12/08/2011 03:27 PM, Danesh Dadachanji wrote: > Hi Omair, > > On 08/12/11 02:57 PM, Omair Majid wrote: >> Hi, >> >> The attached patch makes javaws print out the arguments it is passing to >> main when running in debug mode. It would come in handy when trying to >> track down bugs like this: >> https://bugzilla.redhat.com/show_bug.cgi?id=759099 >> where we are not sure why the url (specified as an argument through the >> jnlp file) is invalid. >> >> I would like apply the attached patch to icedtea-web HEAD. Any concerns? > > This looks fine to me. What about backporting this to 1.0 and 1.1 as > well? I imagine the releases would find it useful as well. Thoughts? I have pushed the changes to HEAD: http://icedtea.classpath.org/hg/icedtea-web/rev/fb5e54f2b97e I have attached the changesets for 1.0 and 1.1. Okay to push those? Thanks, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: debug-1.0.patch Type: text/x-patch Size: 1667 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111208/223f54e6/debug-1.0.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: debug-1.1.patch Type: text/x-patch Size: 1655 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111208/223f54e6/debug-1.1.patch From ddadacha at redhat.com Thu Dec 8 13:42:58 2011 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Thu, 08 Dec 2011 16:42:58 -0500 Subject: [icedtea-web] RFC: print arguments passed to application's main method in debug mode In-Reply-To: <4EE12ABB.7050507@redhat.com> References: <4EE116C4.7040601@redhat.com> <4EE11DB4.3080001@redhat.com> <4EE12ABB.7050507@redhat.com> Message-ID: <4EE12F62.4080208@redhat.com> On 08/12/11 04:23 PM, Omair Majid wrote: > On 12/08/2011 03:27 PM, Danesh Dadachanji wrote: >> Hi Omair, >> >> On 08/12/11 02:57 PM, Omair Majid wrote: >>> Hi, >>> >>> The attached patch makes javaws print out the arguments it is passing to >>> main when running in debug mode. It would come in handy when trying to >>> track down bugs like this: >>> https://bugzilla.redhat.com/show_bug.cgi?id=759099 >>> where we are not sure why the url (specified as an argument through the >>> jnlp file) is invalid. >>> >>> I would like apply the attached patch to icedtea-web HEAD. Any concerns? >> >> This looks fine to me. What about backporting this to 1.0 and 1.1 as >> well? I imagine the releases would find it useful as well. Thoughts? > > I have pushed the changes to HEAD: > http://icedtea.classpath.org/hg/icedtea-web/rev/fb5e54f2b97e > > I have attached the changesets for 1.0 and 1.1. Okay to push those? Yes, that looks good. Thanks for the backports! Cheers, Danesh From omajid at icedtea.classpath.org Thu Dec 8 13:43:17 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 08 Dec 2011 21:43:17 +0000 Subject: /hg/release/icedtea-web-1.1: Print the arguments passed to the a... Message-ID: changeset d494ec44a194 in /hg/release/icedtea-web-1.1 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=d494ec44a194 author: Omair Majid date: Thu Dec 08 16:09:22 2011 -0500 Print the arguments passed to the application's main method 2011-12-08 Omair Majid * netx/net/sourceforge/jnlp/Launcher.java (launchApplication): Print arguments being passed to the application's main method in debug mode. diffstat: ChangeLog | 6 ++++++ netx/net/sourceforge/jnlp/Launcher.java | 5 +++++ 2 files changed, 11 insertions(+), 0 deletions(-) diffs (35 lines): diff -r 452aa7fc0e7f -r d494ec44a194 ChangeLog --- a/ChangeLog Fri Oct 28 17:28:53 2011 -0400 +++ b/ChangeLog Thu Dec 08 16:09:22 2011 -0500 @@ -1,3 +1,9 @@ +2011-12-08 Omair Majid + + * netx/net/sourceforge/jnlp/Launcher.java + (launchApplication): Print arguments being passed to the application's + main method in debug mode. + 2011-09-28 Deepak Bhole * NEWS: Prepare for 1.1.5 diff -r 452aa7fc0e7f -r d494ec44a194 netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Fri Oct 28 17:28:53 2011 -0400 +++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Dec 08 16:09:22 2011 -0500 @@ -25,6 +25,7 @@ import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -587,6 +588,10 @@ handler.launchStarting(app); main.setAccessible(true); + + if (JNLPRuntime.isDebug()) { + System.out.println("Invoking main() with args: " + Arrays.toString(args)); + } main.invoke(null, new Object[] { args }); return app; From omajid at icedtea.classpath.org Thu Dec 8 13:43:24 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 08 Dec 2011 21:43:24 +0000 Subject: /hg/release/icedtea-web-1.0: Print the arguments passed to the a... Message-ID: changeset 8cb4e38427cc in /hg/release/icedtea-web-1.0 details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=8cb4e38427cc author: Omair Majid date: Thu Dec 08 16:20:51 2011 -0500 Print the arguments passed to the application's main method 2011-12-08 Omair Majid * netx/net/sourceforge/jnlp/Launcher.java (launchApplication): Print arguments being passed to the application's main method in debug mode. diffstat: ChangeLog | 6 ++++++ netx/net/sourceforge/jnlp/Launcher.java | 5 +++++ 2 files changed, 11 insertions(+), 0 deletions(-) diffs (35 lines): diff -r 8d2ac271064f -r 8cb4e38427cc ChangeLog --- a/ChangeLog Fri Oct 28 17:27:54 2011 -0400 +++ b/ChangeLog Thu Dec 08 16:20:51 2011 -0500 @@ -1,3 +1,9 @@ +2011-12-08 Omair Majid + + * netx/net/sourceforge/jnlp/Launcher.java + (launchApplication): Print arguments being passed to the application's + main method in debug mode. + 2011-10-28 Deepak Bhole * configure.ac: Prepare for 1.0.7 diff -r 8d2ac271064f -r 8cb4e38427cc netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Fri Oct 28 17:27:54 2011 -0400 +++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Dec 08 16:20:51 2011 -0500 @@ -32,6 +32,7 @@ import java.net.UnknownHostException; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.jar.JarFile; @@ -476,6 +477,10 @@ } main.setAccessible(true); + + if (JNLPRuntime.isDebug()) { + System.out.println("Invoking main() with args: " + Arrays.toString(args)); + } main.invoke(null, new Object[] { args }); return app; From omajid at redhat.com Thu Dec 8 13:44:43 2011 From: omajid at redhat.com (Omair Majid) Date: Thu, 08 Dec 2011 16:44:43 -0500 Subject: [icedtea-web] RFC: print arguments passed to application's main method in debug mode In-Reply-To: <4EE12F62.4080208@redhat.com> References: <4EE116C4.7040601@redhat.com> <4EE11DB4.3080001@redhat.com> <4EE12ABB.7050507@redhat.com> <4EE12F62.4080208@redhat.com> Message-ID: <4EE12FCB.1000806@redhat.com> On 12/08/2011 04:42 PM, Danesh Dadachanji wrote: > On 08/12/11 04:23 PM, Omair Majid wrote: >> On 12/08/2011 03:27 PM, Danesh Dadachanji wrote: >>> On 08/12/11 02:57 PM, Omair Majid wrote: >>>> >>>> The attached patch makes javaws print out the arguments it is >>>> passing to main when running in debug mode. It would come in >>>> handy when trying to track down bugs like this: >>>> https://bugzilla.redhat.com/show_bug.cgi?id=759099 where we are >>>> not sure why the url (specified as an argument through the jnlp >>>> file) is invalid. >>>> >>> >>> This looks fine to me. What about backporting this to 1.0 and 1.1 >>> as well? I imagine the releases would find it useful as well. >>> Thoughts? >> >> I have attached the changesets for 1.0 and 1.1. Okay to push >> those? > > Yes, that looks good. Thanks for the backports! Thanks for the quick reviews. Pushed. Cheers, Omair From drazzib at drazzib.com Thu Dec 8 14:29:30 2011 From: drazzib at drazzib.com (Damien Raude-Morvan) Date: Thu, 8 Dec 2011 23:29:30 +0100 Subject: RFC: backport S7104625 to icedtea7 forest Message-ID: <201112082329.31173.drazzib@drazzib.com> Hi, I would like someone to backport the fix for 7104625 into icedtea7 forest for me (I don't have commit rights). This bug in sun.awt.X11.XEvent is creating megabytes of char[], just for logging, even if logging is disabled. The fix is to add simple if statements whether logging is enabled or not. Please see the original email for details: http://mail.openjdk.java.net/pipermail/awt-dev/2011-October/001954.html It has been backported this revision from jdk8 repo : http://hg.openjdk.java.net/jdk8/jdk8/jdk/rev/7636a62aba7e Please find a patch, for icedtea7-forest-jdk, attached. Regards, -- Damien -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea7-forest-jdk_7104625-XEvent_wrap_logging_calls_with_if.patch Type: text/x-patch Size: 2209 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111208/beadcdbb/icedtea7-forest-jdk_7104625-XEvent_wrap_logging_calls_with_if.patch From aph at redhat.com Fri Dec 9 03:05:18 2011 From: aph at redhat.com (Andrew Haley) Date: Fri, 09 Dec 2011 11:05:18 +0000 Subject: ARM test results In-Reply-To: <4EE08F54.5070703@redhat.com> References: <4EE08F54.5070703@redhat.com> Message-ID: <4EE1EB6E.8090206@redhat.com> On 12/08/2011 10:20 AM, Andrew Haley wrote: > > I'll investigate some of these fails to try to figure out what's > going on. I tried to run the regression tests on the old Zero-based ARM OpenJDK, but without success. It always hangs at some point with what looks like a deadlock in the test harness. Andrew. From stefan at complang.tuwien.ac.at Fri Dec 9 03:27:55 2011 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Fri, 9 Dec 2011 12:27:55 +0100 Subject: ARM test results In-Reply-To: <4EE1EB6E.8090206@redhat.com> References: <4EE08F54.5070703@redhat.com> <4EE1EB6E.8090206@redhat.com> Message-ID: > I tried to run the regression tests on the old Zero-based > ARM OpenJDK, but without success. ?It always hangs at some > point with what looks like a deadlock in the test harness. Sounds very much like what is going on with CACAO on i386. CACAO i386 doesn?t yet have proper memory barriers for volatiles, and has broken handling of volatile longs, so I put the blame on this. But I cannot say for sure. From thomas at m3y3r.de Fri Dec 9 04:27:17 2011 From: thomas at m3y3r.de (Thomas Meyer) Date: Fri, 09 Dec 2011 13:27:17 +0100 Subject: [PATCH] getMember: Fix comment Message-ID: <20111209132717.99454o6axj91emjp@webmail.your-server.de> Actual method is called _getMember not _sendMember Signed-off-by: Thomas Meyer diff -r df87375f72cd -r 3fdb4c8ea881 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Mon Dec 05 13:15:32 2011 -0500 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Dec 08 10:44:36 2011 +0100 @@ -477,7 +477,7 @@ * This is a static function, called in another thread. Since certain data * can only be requested from the main thread in Mozilla, this function * does whatever it can seperately, and then makes an internal request that - * causes _sendMember to do the rest of the work. + * causes _getMember to do the rest of the work. * * @param message_parts The request message */ From xerxes at zafena.se Fri Dec 9 04:32:52 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Fri, 09 Dec 2011 13:32:52 +0100 Subject: ARM gcc 4.3.3 fix and armv5 .ltorg Message-ID: <4EE1FFF4.4000100@zafena.se> Hi the following patch will re-enable compilation of the cppInterpreter_arm.S using GCC 4.3.3. The second part will unbreak the armv5 buildbots where they currently complain that bytecodes_arm.s:2717: Error: invalid literal constant: pool needs to be closer the problematic opcode block of the generated bytecodes_arm.s then looks like this: @----------------------------------------------------------------------------- .macro iaccess_0 jpc_off=0, seq_len=4 ... DISPATCH_FINISH .endm Opcode iaccess_0 iaccess_0 <--- line 2717 the patch will fix the compile error by turning the generated opcode block into: @----------------------------------------------------------------------------- .macro iaccess_0 jpc_off=0, seq_len=4 ... DISPATCH_FINISH .endm Opcode iaccess_0 iaccess_0 .ltorg OK to push into icedtea6 HEAD? Cheers Xerxes diff -r 96ea1d0f5dc4 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Dec 08 15:39:55 2011 +0100 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Dec 09 13:19:33 2011 +0100 @@ -624,15 +624,15 @@ .error "VOLATILE_VERSION macro used before non-volatile DISPATCH_FINISH." .endif .endm - - .eabi_attribute Tag_ABI_FP_denormal, 1 - .eabi_attribute Tag_ABI_FP_exceptions, 1 - .eabi_attribute Tag_ABI_FP_number_model, 3 - .eabi_attribute Tag_ABI_align8_needed, 1 - .eabi_attribute Tag_ABI_align8_preserved, 1 - .eabi_attribute Tag_ABI_enum_size, 2 - .eabi_attribute Tag_ABI_optimization_goals, 2 - .eabi_attribute Tag_ABI_PCS_wchar_t, 4 + + .eabi_attribute 20, 1 @ Tag_ABI_FP_denormal + .eabi_attribute 21, 1 @ Tag_ABI_FP_exceptions + .eabi_attribute 23, 3 @ Tag_ABI_FP_number_model + .eabi_attribute 24, 1 @ Tag_ABI_align8_needed + .eabi_attribute 25, 1 @ Tag_ABI_align8_preserved + .eabi_attribute 26, 2 @ Tag_ABI_enum_size + .eabi_attribute 30, 2 @ Tag_ABI_optimization_goals + .eabi_attribute 18, 4 @ Tag_ABI_PCS_wchar_t .text diff -r 96ea1d0f5dc4 arm_port/hotspot/tools/mkbc.c --- a/arm_port/hotspot/tools/mkbc.c Thu Dec 08 15:39:55 2011 +0100 +++ b/arm_port/hotspot/tools/mkbc.c Fri Dec 09 13:19:33 2011 +0100 @@ -529,6 +529,7 @@ // fprintf(bci_f, "%s:\n", impl->do_name); fprintf(bci_f, "\t%s\n", impl->name); // fprintf(bci_f, "\tDISPATCH\t%d\n", impl->len); + fprintf(bci_f, "\t.ltorg\n"); } impl = impl->next; } From thomas at m3y3r.de Fri Dec 9 04:27:57 2011 From: thomas at m3y3r.de (Thomas Meyer) Date: Fri, 09 Dec 2011 13:27:57 +0100 Subject: [PATCH] getMember: Fix returned object type Message-ID: <20111209132757.10622chctlouo5al@webmail.your-server.de> Use createJavaObjectFromVariant() on NPVariant returned by NPN_GetProperty() to create the Java object. This should create the correct object return type. See also bug report: https://bugzilla.redhat.com/show_bug.cgi?id=586194 Signed-off-by: Thomas Meyer --- Untested patch! Please review and comment on this! diff -r 3fdb4c8ea881 -r 30830fbb7c7b plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Dec 08 10:44:36 2011 +0100 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri Dec 09 11:30:43 2011 +0100 @@ -490,12 +490,12 @@ JavaRequestProcessor java_request = JavaRequestProcessor(); JavaResultData* java_result; NPVariant* parent_ptr; + NPVariant* member_ptr; //int reference; std::string member_id = std::string(); - std::string jsObjectClassID = std::string(); - std::string jsObjectConstructorID = std::string(); std::string response = std::string(); + std::string result_id = std::string(); NPIdentifier member_identifier; @@ -551,50 +551,9 @@ PLUGIN_DEBUG("Member PTR after internal request: %s\n", thread_data.result.c_str()); - java_result = java_request.findClass(0, "netscape.javascript.JSObject"); + member_ptr = IcedTeaPluginUtilities::stringToJSID(thread_data.result); - // the result we want is in result_string (assuming there was no error) - if (java_result->error_occurred) - { - printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str()); - //goto cleanup; - } - - jsObjectClassID.append(*(java_result->return_string)); - - args = std::vector(); - std::string longArg = "J"; - args.push_back(longArg); - - java_result = java_request.getMethodID(jsObjectClassID, - browser_functions.getstringidentifier(""), - args); - - // the result we want is in result_string (assuming there was no error) - if (java_result->error_occurred) - { - printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str()); - //goto cleanup; - } - - jsObjectConstructorID.append(*(java_result->return_string)); - - // We have the method id. Now create a new object. - - args.clear(); - args.push_back(thread_data.result); - java_result = java_request.newObjectWithConstructor("", - jsObjectClassID, - jsObjectConstructorID, - args); - - // the result we want is in result_string (assuming there was no error) - if (java_result->error_occurred) - { - printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str()); - //goto cleanup; - } - + createJavaObjectFromVariant(instance, member_ptr, &result_id); IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); if (*(message_parts->at(2)) == "GetSlot") @@ -603,7 +562,7 @@ } else { response.append(" JavaScriptGetSlot "); } - response.append(java_result->return_string->c_str()); + response.append(result_id->c_str()); plugin_to_java_bus->post(response.c_str()); } From xerxes at zafena.se Fri Dec 9 04:59:38 2011 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Fri, 09 Dec 2011 13:59:38 +0100 Subject: ARM gcc 4.3.3 fix and armv5 .ltorg second version In-Reply-To: <4EE1FFF4.4000100@zafena.se> References: <4EE1FFF4.4000100@zafena.se> Message-ID: <4EE2063A.2090501@zafena.se> 2011-12-09 13:32, Xerxes R?nby skrev: > Hi the following patch will re-enable compilation of the cppInterpreter_arm.S using GCC 4.3.3. > > The second part will unbreak the armv5 buildbots where they currently complain that > bytecodes_arm.s:2717: Error: invalid literal constant: pool needs to be closer > The updated patch below fixes the same error by only touching the cppInterpreter_arm.S file. Less need to look into the generated files. The commit message would be: 2011-12-09 Xerxes R?nby *arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S: (DISPATCH_FINISH): Add .ltorg at end of the macro to un-break armv5 build-bots. (.eabi_attribute Tag_ABI_FP_*): Replaced by numerical values to stay compatible with GCC 4.3.3. > OK to push into icedtea6 HEAD? > Cheers > Xerxes diff -r 96ea1d0f5dc4 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Dec 08 15:39:55 2011 +0100 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Dec 09 13:50:24 2011 +0100 @@ -506,6 +506,7 @@ bic ip, ip, #7 ldr pc, [ip, r1, lsl #2] .set dispatch_state, 0 + .ltorg .endm .macro DISPATCH_BYTECODE @@ -624,15 +625,15 @@ .error "VOLATILE_VERSION macro used before non-volatile DISPATCH_FINISH." .endif .endm - - .eabi_attribute Tag_ABI_FP_denormal, 1 - .eabi_attribute Tag_ABI_FP_exceptions, 1 - .eabi_attribute Tag_ABI_FP_number_model, 3 - .eabi_attribute Tag_ABI_align8_needed, 1 - .eabi_attribute Tag_ABI_align8_preserved, 1 - .eabi_attribute Tag_ABI_enum_size, 2 - .eabi_attribute Tag_ABI_optimization_goals, 2 - .eabi_attribute Tag_ABI_PCS_wchar_t, 4 + + .eabi_attribute 20, 1 @ Tag_ABI_FP_denormal + .eabi_attribute 21, 1 @ Tag_ABI_FP_exceptions + .eabi_attribute 23, 3 @ Tag_ABI_FP_number_model + .eabi_attribute 24, 1 @ Tag_ABI_align8_needed + .eabi_attribute 25, 1 @ Tag_ABI_align8_preserved + .eabi_attribute 26, 2 @ Tag_ABI_enum_size + .eabi_attribute 30, 2 @ Tag_ABI_optimization_goals + .eabi_attribute 18, 4 @ Tag_ABI_PCS_wchar_t .text From ptisnovs at icedtea.classpath.org Fri Dec 9 05:20:32 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 09 Dec 2011 13:20:32 +0000 Subject: /hg/gfx-test: 2011-12-09 Pavel Tisnovsky Message-ID: changeset b8eeeed237a2 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=b8eeeed237a2 author: Pavel Tisnovsky date: Fri Dec 09 14:21:10 2011 +0100 2011-12-09 Pavel Tisnovsky * src/org/gfxtest/framework/CommonPathsGenerator.java: Added methods for tests which use cubic paths. * src/org/gfxtest/framework/CubicCurvePointSet.java: New static method used by tests. diffstat: ChangeLog | 7 + src/org/gfxtest/framework/CommonPathsGenerator.java | 346 +++++++++++++++++++- src/org/gfxtest/framework/CubicCurvePointSet.java | 15 +- 3 files changed, 364 insertions(+), 4 deletions(-) diffs (407 lines): diff -r f1181d8e0365 -r b8eeeed237a2 ChangeLog --- a/ChangeLog Thu Dec 08 11:57:09 2011 +0100 +++ b/ChangeLog Fri Dec 09 14:21:10 2011 +0100 @@ -1,3 +1,10 @@ +2011-12-09 Pavel Tisnovsky + + * src/org/gfxtest/framework/CommonPathsGenerator.java: + Added methods for tests which use cubic paths. + * src/org/gfxtest/framework/CubicCurvePointSet.java: + New static method used by tests. + 2011-12-08 Pavel Tisnovsky * src/org/gfxtest/framework/CommonPathsGenerator.java: diff -r f1181d8e0365 -r b8eeeed237a2 src/org/gfxtest/framework/CommonPathsGenerator.java --- a/src/org/gfxtest/framework/CommonPathsGenerator.java Thu Dec 08 11:57:09 2011 +0100 +++ b/src/org/gfxtest/framework/CommonPathsGenerator.java Fri Dec 09 14:21:10 2011 +0100 @@ -52,7 +52,7 @@ public class CommonPathsGenerator { /** - * Default Y offset of curve end points. + * Default Y offset of quadratic curve end points. */ private static final int DEFAULT_Y_OFFSET_FOR_QUADRATIC_CURVES = 40; @@ -145,6 +145,350 @@ } /** + * Create new path using Path2D.Float() which contains just one cubic + * curve. + * + * @param image + * test image + * @return created path + */ + public static Path2D createCubicPathFloat(TestImage image) + { + // compute image dimensions + int width = image.getWidth(); + int height = image.getHeight(); + // construct path containing cubic curve + return createCubicPathFloat(width, height); + } + + /** + * Create new path using Path2D.Float() which contains just one cubic + * curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @return created path + */ + public static Path2D createCubicPathFloat(int width, int height) + { + // construct path containing cubic curve + return createCubicPathFloat(width, height, new int[] {1,2,3,4}); + } + + /** + * Create new path using Path2D.Float() which contains just one cubic + * curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @param pointIndexes + * indexes of control point to use to draw the curve (default + * value should be {1,2,3,4}) + * @return created path + */ + public static Path2D createCubicPathFloat(int width, int height, int[] pointIndexes) + { + // construct point set which consists of all four curve control points + CubicCurvePointSet pointSet = new CubicCurvePointSet(width, height); + + // fill in arrays containing coordinates for all cubic curve control points + int[] x = pointSet.getXPointArray(); + int[] y = pointSet.getYPointArray(); + + // construct path containing cubic curve + return createCubicPathFloat(width, height, x, y, pointIndexes); + } + + /** + * Create new path using Path2D.Float() which contains just one cubic + * curve. + * + * @param image + * test image + * @param height + * canvas height + * @param xarray + * array containing x coordinates of all four control points of + * cubic curve + * @param yarray + * array containing y coordinates of all four control points of + * cubic curve + * @param pointIndexes + * indexes of control point to use to draw the curve (default + * value should be {1,2,3,4}) + * @return + */ + public static Path2D createCubicPathFloat(TestImage image, int[] xarray, int[] yarray, int[] pointIndexes) + { + // compute image dimensions + int width = image.getWidth(); + int height = image.getHeight(); + // construct path containing cubic curve + return createCubicPathFloat(width, height, xarray, yarray, pointIndexes); + } + + /** + * Create new path using Path2D.Float() which contains just one cubic + * curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @param xarray + * array containing x coordinates of all four control points of + * cubic curve + * @param yarray + * array containing y coordinates of all four control points of + * cubic curve + * @param pointIndexes + * indexes of control point to use to draw the curve (default + * value should be {1,2,3,4}) + * @return + */ + public static Path2D createCubicPathFloat(int width, int height, int[] xarray, int[] yarray, int[] pointIndexes) + { + // construct path containing cubic curve + return createCubicPathFloat(width, height, xarray, yarray, pointIndexes, 0); + } + + /** + * Create new path using Path2D.Float() which contains just one cubic curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @param xarray + * array containing x coordinates of all four control points of + * cubic curve + * @param yarray + * array containing y coordinates of all four control points of + * cubic curve + * @param pointIndexes + * indexes of control point to use to draw the curve (default + * value should be {1,2,3,4}) + * @param yoffset + * offset for all y-coordinates + * @return + */ + public static Path2D createCubicPathFloat(int width, int height, int[] xarray, int[] yarray, int[] pointIndexes, int yoffset) + { + // construct path containing cubic curve + Path2D path = new Path2D.Float(); + path.moveTo(xarray[pointIndexes[0]-1], yarray[pointIndexes[0]-1] + yoffset); + path.curveTo(xarray[pointIndexes[1]-1], yarray[pointIndexes[1]-1] + yoffset, + xarray[pointIndexes[2]-1], yarray[pointIndexes[2]-1] + yoffset, + xarray[pointIndexes[3]-1], yarray[pointIndexes[3]-1] + yoffset); + return path; + } + + /** + * Create new path using Path2D.Float() which contains just one cubic curve. + * + * @param image + * test image + * @param height + * canvas height + * @param xarray + * array containing x coordinates of all four control points of + * cubic curve + * @param yarray + * array containing y coordinates of all four control points of + * cubic curve + * @param pointIndexes + * indexes of control point to use to draw the curve (default + * value should be {1,2,3,4}) + * @param yoffset + * offset for all y-coordinates + * @return + */ + public static Path2D createCubicPathFloat(TestImage image, int[] xarray, int[] yarray, int[] pointIndexes, int yoffset) + { + // image dimensions + int width = image.getWidth(); + int height = image.getHeight(); + // create and return the path + return createCubicPathFloat(width, height, xarray, yarray, pointIndexes, yoffset); + } + + /** + * Create new path using Path2D.Float() which contains just one cubic + * curve. + * + * @param image + * test image + * @return created path + */ + public static Path2D createCubicPathDouble(TestImage image) + { + // compute image dimensions + int width = image.getWidth(); + int height = image.getHeight(); + // construct path containing cubic curve + return createCubicPathDouble(width, height); + } + + /** + * Create new path using Path2D.Double() which contains just one cubic + * curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @return created path + */ + public static Path2D createCubicPathDouble(int width, int height) + { + // construct path containing cubic curve + return createCubicPathDouble(width, height, new int[] {1,2,3,4}); + } + + /** + * Create new path using Path2D.Double() which contains just one cubic + * curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @param pointIndexes + * indexes of control point to use to draw the curve (default + * value should be {1,2,3,4}) + * @return created path + */ + public static Path2D createCubicPathDouble(int width, int height, int[] pointIndexes) + { + // construct point set which consists of all four curve control points + CubicCurvePointSet pointSet = new CubicCurvePointSet(width, height); + + // fill in arrays containing coordinates for all cubic curve control points + int[] x = pointSet.getXPointArray(); + int[] y = pointSet.getYPointArray(); + + // construct path containing cubic curve + return createCubicPathDouble(width, height, x, y, pointIndexes); + } + + /** + * Create new path using Path2D.Double() which contains just one cubic + * curve. + * + * @param image + * test image + * @param height + * canvas height + * @param xarray + * array containing x coordinates of all four control points of + * cubic curve + * @param yarray + * array containing y coordinates of all four control points of + * cubic curve + * @param pointIndexes + * indexes of control point to use to draw the curve (default + * value should be {1,2,3,4}) + * @return + */ + public static Path2D createCubicPathDouble(TestImage image, int[] xarray, int[] yarray, int[] pointIndexes) + { + // compute image dimensions + int width = image.getWidth(); + int height = image.getHeight(); + // construct path containing cubic curve + return createCubicPathDouble(width, height, xarray, yarray, pointIndexes); + } + + /** + * Create new path using Path2D.Double() which contains just one cubic + * curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @param xarray + * array containing x coordinates of all four control points of + * cubic curve + * @param yarray + * array containing y coordinates of all four control points of + * cubic curve + * @param pointIndexes + * indexes of control point to use to draw the curve (default + * value should be {1,2,3,4}) + * @return + */ + public static Path2D createCubicPathDouble(int width, int height, int[] xarray, int[] yarray, int[] pointIndexes) + { + return createCubicPathDouble(width, height, xarray, yarray, pointIndexes, 0); + } + + /** + * Create new path using Path2D.Double() which contains just one cubic + * curve. + * + * @param width + * canvas width + * @param height + * canvas height + * @param xarray + * array containing x coordinates of all four control points of + * cubic curve + * @param yarray + * array containing y coordinates of all four control points of + * cubic curve + * @param pointIndexes + * indexes of control point to use to draw the curve (default + * value should be {1,2,3,4}) + * @param yoffset + * offset for all y-coordinates + * @return + */ + public static Path2D createCubicPathDouble(int width, int height, int[] xarray, int[] yarray, int[] pointIndexes, int yoffset) + { + // construct path containing cubic curve + Path2D path = new Path2D.Double(); + path.moveTo(xarray[pointIndexes[0]-1], yarray[pointIndexes[0]-1] + yoffset); + path.curveTo(xarray[pointIndexes[1]-1], yarray[pointIndexes[1]-1] + yoffset, + xarray[pointIndexes[2]-1], yarray[pointIndexes[2]-1] + yoffset, + xarray[pointIndexes[3]-1], yarray[pointIndexes[3]-1] + yoffset); + return path; + } + + /** + * Create new path using Path2D.Double() which contains just one cubic curve. + * + * @param image + * test image + * @param height + * canvas height + * @param xarray + * array containing x coordinates of all four control points of + * cubic curve + * @param yarray + * array containing y coordinates of all four control points of + * cubic curve + * @param pointIndexes + * indexes of control point to use to draw the curve (default + * value should be {1,2,3,4}) + * @param yoffset + * offset for all y-coordinates + * @return + */ + public static Path2D createCubicPathDouble(TestImage image, int[] xarray, int[] yarray, int[] pointIndexes, int yoffset) + { + // image dimensions + int width = image.getWidth(); + int height = image.getHeight(); + // create and return the path + return createCubicPathDouble(width, height, xarray, yarray, pointIndexes, yoffset); + } + + /** * Compute X coordinate of first curve end point. * * @param width diff -r f1181d8e0365 -r b8eeeed237a2 src/org/gfxtest/framework/CubicCurvePointSet.java --- a/src/org/gfxtest/framework/CubicCurvePointSet.java Thu Dec 08 11:57:09 2011 +0100 +++ b/src/org/gfxtest/framework/CubicCurvePointSet.java Fri Dec 09 14:21:10 2011 +0100 @@ -69,14 +69,23 @@ * Constructor which computes all four control points from the dimensions of * test image. * - * @param image + * @param image test image */ public CubicCurvePointSet(TestImage image) { // compute width and height of test image - int width = image.getWidth(); - int height = image.getHeight(); + this(image.getWidth(), image.getHeight()); + } + /** + * Constructor which computes all four control points from the dimensions of + * test image. + * + * @param width image width + * @param height image height + */ + public CubicCurvePointSet(int width, int height) + { // compute control points coordinates this.x[0] = computeX1(width); this.y[0] = computeY1(); From bugzilla-daemon at icedtea.classpath.org Fri Dec 9 07:02:11 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 09 Dec 2011 15:02:11 +0000 Subject: [Bug 830] icedtea6: Important Channel Binding Patch is missing In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=830 --- Comment #1 from Olaf Flebbe 2011-12-09 15:02:11 UTC --- Let me add that we double checked now that the appended patch actually solves our problem. The problem we have is documented in the FAQ (look for Channel Binding) in this wiki: https://wiki.shibboleth.net/confluence/display/SHIB2/Kerberos+Login+Handler+-+FAQ Thanks Olaf -- 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 Fri Dec 9 08:19:25 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 09 Dec 2011 16:19:25 +0000 Subject: [Bug 831] New: Crash every time opening SoapUI Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=831 Bug #: 831 Summary: Crash every time opening SoapUI Classification: Unclassified Product: IcedTea Version: unspecified Platform: x86_64 OS/Version: Linux Status: NEW Severity: blocker Priority: P3 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: roko98 at yahoo.com Created attachment 622 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=622 JVM crash file Every time that SoapUI (v4.0.1) start, the JVM crash in the same way. -- 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 thomas at m3y3r.de Fri Dec 9 10:10:22 2011 From: thomas at m3y3r.de (Thomas Meyer) Date: Fri, 09 Dec 2011 19:10:22 +0100 Subject: [PATCH] getMember: Fix returned object type - v2 In-Reply-To: <20111209132757.10622chctlouo5al@webmail.your-server.de> References: <20111209132757.10622chctlouo5al@webmail.your-server.de> Message-ID: <1323454222.1508.17.camel@localhost.localdomain> Use createJavaObjectFromVariant() on NPVariant returned by NPN_GetProperty() to create the Java object. This should create the correct object return type. See also bug report: https://bugzilla.redhat.com/show_bug.cgi?id=586194 Signed-off-by: Thomas Meyer --- Fixed formating and make source compile. diff -r df87375f72cd -r 3674bf4ef962 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Mon Dec 05 13:15:32 2011 -0500 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri Dec 09 19:05:30 2011 +0100 @@ -477,7 +477,7 @@ * This is a static function, called in another thread. Since certain data * can only be requested from the main thread in Mozilla, this function * does whatever it can seperately, and then makes an internal request that - * causes _sendMember to do the rest of the work. + * causes _getMember to do the rest of the work. * * @param message_parts The request message */ @@ -490,12 +490,12 @@ JavaRequestProcessor java_request = JavaRequestProcessor(); JavaResultData* java_result; NPVariant* parent_ptr; + NPVariant* member_ptr; //int reference; std::string member_id = std::string(); - std::string jsObjectClassID = std::string(); - std::string jsObjectConstructorID = std::string(); std::string response = std::string(); + std::string result_id = std::string(); NPIdentifier member_identifier; @@ -551,50 +551,9 @@ PLUGIN_DEBUG("Member PTR after internal request: %s\n", thread_data.result.c_str()); - java_result = java_request.findClass(0, "netscape.javascript.JSObject"); + member_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result); - // the result we want is in result_string (assuming there was no error) - if (java_result->error_occurred) - { - printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str()); - //goto cleanup; - } - - jsObjectClassID.append(*(java_result->return_string)); - - args = std::vector(); - std::string longArg = "J"; - args.push_back(longArg); - - java_result = java_request.getMethodID(jsObjectClassID, - browser_functions.getstringidentifier(""), - args); - - // the result we want is in result_string (assuming there was no error) - if (java_result->error_occurred) - { - printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str()); - //goto cleanup; - } - - jsObjectConstructorID.append(*(java_result->return_string)); - - // We have the method id. Now create a new object. - - args.clear(); - args.push_back(thread_data.result); - java_result = java_request.newObjectWithConstructor("", - jsObjectClassID, - jsObjectConstructorID, - args); - - // the result we want is in result_string (assuming there was no error) - if (java_result->error_occurred) - { - printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str()); - //goto cleanup; - } - + createJavaObjectFromVariant(instance, *member_ptr, &result_id); IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); if (*(message_parts->at(2)) == "GetSlot") @@ -603,7 +562,7 @@ } else { response.append(" JavaScriptGetSlot "); } - response.append(java_result->return_string->c_str()); + response.append(result_id.c_str()); plugin_to_java_bus->post(response.c_str()); } -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 490 bytes Desc: This is a digitally signed message part Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111209/49782899/attachment.bin From ahughes at redhat.com Fri Dec 9 10:15:17 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 9 Dec 2011 18:15:17 +0000 Subject: Time to branch for IcedTea6 1.11 ? In-Reply-To: <4EE08FDF.6080207@redhat.com> References: <4EE08FDF.6080207@redhat.com> Message-ID: <20111209181517.GC11517@rivendell.middle-earth.co.uk> On 10:22 Thu 08 Dec , Andrew Haley wrote: > I'd like to do a release, primarily for ARM. > > As far as I can see the trunk is stable. Does anyone > have anything they're working on they'd like to get in > for 1.11 ? > > Andrew. I have a couple of patches I'd like to get in (bug fix backports). I should be able to sort those out early next week. -- 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: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111209/44148485/attachment.bin From thomas at m3y3r.de Sat Dec 10 05:11:04 2011 From: thomas at m3y3r.de (Thomas Meyer) Date: Sat, 10 Dec 2011 14:11:04 +0100 Subject: [PATCH] NP_GetMIMEDescription() returns const char* Message-ID: <1323522664.1412.5.camel@localhost.localdomain> # HG changeset patch # User Thomas Meyer # Date 1323522372 -3600 # Node ID 2b69ce95feb38023b2be8bec3bc87f2219d0c80b # Parent 3674bf4ef962a752a05bf7bfa5aee19a817c4834 /usr/include/xulrunner-sdk-2/npfunctions.h defines "const char* NP_GetMIMEDescription(void);" make icedtea-web version also return a const char* This fix is needed to make icedtea-web compile on Fedora 16. diff -r 3674bf4ef962 -r 2b69ce95feb3 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Dec 09 19:05:30 2011 +0100 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Sat Dec 10 14:06:12 2011 +0100 @@ -2291,7 +2291,7 @@ // Returns a string describing the MIME type that this plugin // handles. -char* +const char* NP_GetMIMEDescription () { PLUGIN_DEBUG ("NP_GetMIMEDescription\n"); From thomas at m3y3r.de Fri Dec 9 04:21:13 2011 From: thomas at m3y3r.de (Thomas Meyer) Date: Fri, 09 Dec 2011 13:21:13 +0100 Subject: [PATCH] Fix getMember comment Message-ID: <20111209132113.86433m03c06ves6x@webmail.your-server.de> getMember: Fix comment. Actual method is called _getMember not _sendMember Signed-off-by: Thomas Meyer diff -r df87375f72cd -r 3fdb4c8ea881 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Mon Dec 05 13:15:32 2011 -0500 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Dec 08 10:44:36 2011 +0100 @@ -477,7 +477,7 @@ * This is a static function, called in another thread. Since certain data * can only be requested from the main thread in Mozilla, this function * does whatever it can seperately, and then makes an internal request that - * causes _sendMember to do the rest of the work. + * causes _getMember to do the rest of the work. * * @param message_parts The request message */ From thomas at m3y3r.de Fri Dec 9 04:22:29 2011 From: thomas at m3y3r.de (Thomas Meyer) Date: Fri, 09 Dec 2011 13:22:29 +0100 Subject: [PATCH] getMember: Fix returned object type Message-ID: <20111209132229.22404l83og2o5v9h@webmail.your-server.de> Use createJavaObjectFromVariant() on NPVariant returned by NPN_GetProperty() to create the Java object. This should create the correct object return type. See also bug report: https://bugzilla.redhat.com/show_bug.cgi?id=586194 Signed-off-by: Thomas Meyer --- Untested patch! Please review and comment on this! diff -r 3fdb4c8ea881 -r 30830fbb7c7b plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Dec 08 10:44:36 2011 +0100 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri Dec 09 11:30:43 2011 +0100 @@ -490,12 +490,12 @@ JavaRequestProcessor java_request = JavaRequestProcessor(); JavaResultData* java_result; NPVariant* parent_ptr; + NPVariant* member_ptr; //int reference; std::string member_id = std::string(); - std::string jsObjectClassID = std::string(); - std::string jsObjectConstructorID = std::string(); std::string response = std::string(); + std::string result_id = std::string(); NPIdentifier member_identifier; @@ -551,50 +551,9 @@ PLUGIN_DEBUG("Member PTR after internal request: %s\n", thread_data.result.c_str()); - java_result = java_request.findClass(0, "netscape.javascript.JSObject"); + member_ptr = IcedTeaPluginUtilities::stringToJSID(thread_data.result); - // the result we want is in result_string (assuming there was no error) - if (java_result->error_occurred) - { - printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str()); - //goto cleanup; - } - - jsObjectClassID.append(*(java_result->return_string)); - - args = std::vector(); - std::string longArg = "J"; - args.push_back(longArg); - - java_result = java_request.getMethodID(jsObjectClassID, - browser_functions.getstringidentifier(""), - args); - - // the result we want is in result_string (assuming there was no error) - if (java_result->error_occurred) - { - printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str()); - //goto cleanup; - } - - jsObjectConstructorID.append(*(java_result->return_string)); - - // We have the method id. Now create a new object. - - args.clear(); - args.push_back(thread_data.result); - java_result = java_request.newObjectWithConstructor("", - jsObjectClassID, - jsObjectConstructorID, - args); - - // the result we want is in result_string (assuming there was no error) - if (java_result->error_occurred) - { - printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str()); - //goto cleanup; - } - + createJavaObjectFromVariant(instance, member_ptr, &result_id); IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); if (*(message_parts->at(2)) == "GetSlot") @@ -603,7 +562,7 @@ } else { response.append(" JavaScriptGetSlot "); } - response.append(java_result->return_string->c_str()); + response.append(result_id->c_str()); plugin_to_java_bus->post(response.c_str()); } From bugzilla-daemon at icedtea.classpath.org Sun Dec 11 02:01:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 11 Dec 2011 10:01:18 +0000 Subject: [Bug 831] Crash every time opening SoapUI In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=831 Robert Munteanu changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |robert.munteanu at gmail.com --- Comment #1 from Robert Munteanu 2011-12-11 10:01:18 UTC --- This happens to me as well, openSUSE 12.1 (i586) , with OpenJDK java version "1.6.0_22" OpenJDK Runtime Environment (IcedTea6 1.10.4) (suse-1.2-i386) OpenJDK 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 the assignee for the bug. From bugzilla-daemon at icedtea.classpath.org Sun Dec 11 02:07:21 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 11 Dec 2011 10:07:21 +0000 Subject: [Bug 831] Crash every time opening SoapUI In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=831 --- Comment #2 from Robert Munteanu 2011-12-11 10:07:21 UTC --- If I uncomment the following line in soapui.sh JAVA_OPTS="$JAVA_OPTS -Dsoapui.jxbrowser.disable=true" the crash does not happen anymore. -- 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 mark at klomp.org Sun Dec 11 05:06:50 2011 From: mark at klomp.org (Mark Wielaard) Date: Sun, 11 Dec 2011 14:06:50 +0100 Subject: Call for participation: Free Java @ FOSDEM 2012 Message-ID: <20111211130650.GD7625@toonder.wildebeest.org> We are pleased to announce the Call for Participation in the FOSDEM 2012 Free Java DevRoom! This marks the 9th year that the Free Java DevRoom has been a part of FOSDEM. http://fosdem.org/2012/ Saturday 4th and Sunday 5th of February 2012 Brussels, Belgium The Free Java DevRoom has become unique in that it has attracted upstream, downstream, distrbutors and and Free Software hackers together in one venue. Topics range from the "deep technical" to "deep community". Join us for this year's theme: "Free Java Momentum" Check out our wiki for more details on the conference: http://wiki.debian.org/Java/DevJam/2012/Fosdem And join the freejava-devroom at lists.fosdem.org https://lists.fosdem.org/mailman/listinfo/freejava-devroom Please submit one (or more) 30 minute talk proposal(s) by the 30th of December 2011 to fosdem at developer.classpath.org. A template for submitting a talk can be found at: http://wiki.debian.org/Java/DevJam/2012/Fosdem/CallForParticipation Please join us! --The Free Java DevRoom Organizing Committee Andrew Haley, Red Hat Dalibor Topic, Oracle Dr Andrew John Hughes, Red Hat Mark Wielaard, IcedTea Sylvestre Ledru, Debian Tom Marble, Informatique p.s. We had some nice media coverage last year... FLOSS Weekly 152: FOSDEM http://twit.tv/floss152 Linux Outlaws 191 - Special: FOSDEM Coverage http://old.linuxoutlaws.com/podcast/191 From ptisnovs at icedtea.classpath.org Mon Dec 12 03:29:02 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 12 Dec 2011 11:29:02 +0000 Subject: /hg/gfx-test: 2011-12-12 Pavel Tisnovsky Message-ID: changeset 2b1aa77d67de in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=2b1aa77d67de author: Pavel Tisnovsky date: Mon Dec 12 12:31:21 2011 +0100 2011-12-12 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java: Created new test suite. * src/org/gfxtest/framework/CommonPathsGenerator.java: Added methods for tests which use closed paths. * Makefile: updated diffstat: ChangeLog | 8 + Makefile | 12 +- src/org/gfxtest/framework/CommonPathsGenerator.java | 141 +++++ src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java | 290 ++++++++++++ 4 files changed, 446 insertions(+), 5 deletions(-) diffs (truncated from 501 to 500 lines): diff -r b8eeeed237a2 -r 2b1aa77d67de ChangeLog --- a/ChangeLog Fri Dec 09 14:21:10 2011 +0100 +++ b/ChangeLog Mon Dec 12 12:31:21 2011 +0100 @@ -1,3 +1,11 @@ +2011-12-12 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java: + Created new test suite. + * src/org/gfxtest/framework/CommonPathsGenerator.java: + Added methods for tests which use closed paths. + * Makefile: updated + 2011-12-09 Pavel Tisnovsky * src/org/gfxtest/framework/CommonPathsGenerator.java: diff -r b8eeeed237a2 -r 2b1aa77d67de Makefile --- a/Makefile Fri Dec 09 14:21:10 2011 +0100 +++ b/Makefile Mon Dec 12 12:31:21 2011 +0100 @@ -153,7 +153,8 @@ $(CLASSES)/$(TESTSUITE_DIR)/ClippingCircleByEllipseShape.class \ $(CLASSES)/$(TESTSUITE_DIR)/ClippingCircleByPolygonalShape.class \ $(CLASSES)/$(TESTSUITE_DIR)/ClippingCircleByRectangleShape.class \ - $(CLASSES)/$(TESTSUITE_DIR)/ClippingCircleByRoundRectangleShape.class + $(CLASSES)/$(TESTSUITE_DIR)/ClippingCircleByRoundRectangleShape.class \ + $(CLASSES)/$(TESTSUITE_DIR)/ClippingPathByRectangleArea.class COMPARE_RESULTS = \ $(RESULTS)/Areas \ @@ -205,10 +206,11 @@ $(RESULTS)/TexturePaint \ $(RESULTS)/Clipping \ $(RESULTS)/ClippingCircleByRectangleArea \ - $(RESULTS)/ClippingCircleByEllipseShape.class \ - $(RESULTS)/ClippingCircleByPolygonalShape.class \ - $(RESULTS)/ClippingCircleByRectangleShape.class \ - $(RESULTS)/ClippingCircleByRoundRectangleShape.class + $(RESULTS)/ClippingCircleByEllipseShape \ + $(RESULTS)/ClippingCircleByPolygonalShape \ + $(RESULTS)/ClippingCircleByRectangleShape \ + $(RESULTS)/ClippingCircleByRoundRectangleShape \ + $(RESULTS)/ClippingPathByRectangleArea # targets for all test suites TESTSUITES = $(shell ls -1 src/org/gfxtest/testsuites | sed -n -e 's/$[A-Za-z0-9]*$\.java/\1/p') diff -r b8eeeed237a2 -r 2b1aa77d67de src/org/gfxtest/framework/CommonPathsGenerator.java --- a/src/org/gfxtest/framework/CommonPathsGenerator.java Fri Dec 09 14:21:10 2011 +0100 +++ b/src/org/gfxtest/framework/CommonPathsGenerator.java Mon Dec 12 12:31:21 2011 +0100 @@ -52,11 +52,64 @@ public class CommonPathsGenerator { /** + * Offset used to compute end points of line paths. + */ + private static final int LINE_PATH_OFFSET = 20; + + /** * Default Y offset of quadratic curve end points. */ private static final int DEFAULT_Y_OFFSET_FOR_QUADRATIC_CURVES = 40; /** + * Create new path using Path2D.Float() which contains just one line. + * + * @param image + * test image + * @return created path + */ + public static Path2D createLinePathFloat(TestImage image) + { + return createLinePathFloat(image.getWidth(), image.getHeight()); + } + + /** + * Create new path using Path2D.Float() which contains just one line. + * + * @param width + * canvas width + * @param height + * canvas height + * @return created path + */ + public static Path2D createLinePathFloat(int width, int height) + { + Path2D path = new Path2D.Float(); + // start point + int x1 = LINE_PATH_OFFSET; + int y1 = LINE_PATH_OFFSET; + // end point + int x2 = width - LINE_PATH_OFFSET; + int y2 = height - LINE_PATH_OFFSET; + path.moveTo(x1, y1); + path.lineTo(x2, y2); + return path; + } + + /** + * Create new path using Path2D.Float() which contains just one quadratic + * curve. + * + * @param image + * test image + * @return created path + */ + public static Path2D createQuadraticPathFloat(TestImage image) + { + return createQuadraticPathFloat(image.getWidth(), image.getHeight()); + } + + /** * Create new path using Path2D.Float() which contains just one quadratic * curve. * @@ -489,6 +542,94 @@ } /** + * Create simple new path using Path2D.Float() which contains just lines. + * + * @param image + * test image + * @return created path + */ + public static Path2D createClosedPathFloat(TestImage image) + { + return createClosedPathFloat(image.getWidth(), image.getHeight()); + } + + /** + * Create simple new path using Path2D.Float() which contains just lines. + * + * @param width + * canvas width + * @param height + * canvas height + * @return created path + */ + public static Path2D createClosedPathFloat(int width, int height) + { + Path2D path = new Path2D.Float(); + // 1st vertex + int x1 = LINE_PATH_OFFSET; + int y1 = LINE_PATH_OFFSET; + // 2nd vertex + int x2 = width - LINE_PATH_OFFSET; + int y2 = y1; + // 3rd vertex + int x3 = x2; + int y3 = height - LINE_PATH_OFFSET; + // 4rd vertex + int x4 = x1; + int y4 = y3; + path.moveTo(x1, y1); + path.lineTo(x2, y2); + path.lineTo(x3, y3); + path.lineTo(x4, y4); + path.closePath(); + return path; + } + + /** + * Create new path using Path2D.Float() which contains just lines. + * + * @param image + * test image + * @return created path + */ + public static Path2D createCrossedClosedPathFloat(TestImage image) + { + return createCrossedClosedPathFloat(image.getWidth(), image.getHeight()); + } + + /** + * Create new path using Path2D.Float() which contains just lines. + * + * @param width + * canvas width + * @param height + * canvas height + * @return created path + */ + public static Path2D createCrossedClosedPathFloat(int width, int height) + { + Path2D path = new Path2D.Float(); + // 1st vertex + int x1 = LINE_PATH_OFFSET; + int y1 = LINE_PATH_OFFSET; + // 2nd vertex + int x2 = width - LINE_PATH_OFFSET; + int y2 = height - LINE_PATH_OFFSET; + // 3rd vertex + int x3 = x2; + int y3 = y1; + // 4rd vertex + int x4 = x1; + int y4 = y2; + path.moveTo(x1, y1); + path.lineTo(x2, y2); + path.lineTo(x3, y3); + path.lineTo(x4, y4); + path.closePath(); + return path; + } + + /** * Compute X coordinate of first curve end point. * * @param width diff -r b8eeeed237a2 -r 2b1aa77d67de src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java Mon Dec 12 12:31:21 2011 +0100 @@ -0,0 +1,290 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. + */ + +package org.gfxtest.testsuites; + +import java.awt.Graphics2D; + + + +import org.gfxtest.framework.CommonClippingOperations; +import org.gfxtest.framework.CommonPathsGenerator; +import org.gfxtest.framework.CommonRenderingStyles; +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.TestImage; +import org.gfxtest.framework.TestResult; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + +/** + * This test check if clipping is working correctly for a path which is clipped + * by a rectangle area. Various path and various rendering styles are used for + * rendering. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at Transformation(Transformations.NONE) + at GraphicsPrimitive(GraphicsPrimitives.PATH) + at Zoom(1) +public class ClippingPathByRectangleArea extends GfxTest +{ + /** + * Prepare canvas for the rendering. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + */ + private static void basicSetupForRendering(TestImage image, Graphics2D graphics2d) + { + // create clip area + CommonClippingOperations.createClipUsingRectangleArea(image, graphics2d); + } + + /** + * Draw path consisting of one line only clipped by rectangle area. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + */ + private static void drawLinePathClippedByRectangleArea(TestImage image, Graphics2D graphics2d) + { + // prepare canvas for the rendering + basicSetupForRendering(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // draw the line path + graphics2d.draw(CommonPathsGenerator.createLinePathFloat(image)); + } + + /** + * Draw quadratic path clipped by rectangle area. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + */ + private static void drawQuadraticPathClippedByRectangleArea(TestImage image, Graphics2D graphics2d) + { + // prepare canvas for the rendering + basicSetupForRendering(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // draw the quadratic path + graphics2d.draw(CommonPathsGenerator.createQuadraticPathFloat(image)); + } + + /** + * Draw cubic path clipped by rectangle area. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + */ + private static void drawCubicPathClippedByRectangleArea(TestImage image, Graphics2D graphics2d) + { + // prepare canvas for the rendering + basicSetupForRendering(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // draw the cubic path + graphics2d.draw(CommonPathsGenerator.createCubicPathFloat(image)); + } + + /** + * Draw closed path clipped by rectangle area. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + */ + private static void drawClosedPathClippedByRectangleArea(TestImage image, Graphics2D graphics2d) + { + // prepare canvas for the rendering + basicSetupForRendering(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // draw the closed path + graphics2d.draw(CommonPathsGenerator.createClosedPathFloat(image)); + } + + /** + * Draw crossed closed path clipped by rectangle area. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + */ + private static void drawCrossedClosedPathClippedByRectangleArea(TestImage image, Graphics2D graphics2d) + { + // prepare canvas for the rendering + basicSetupForRendering(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // draw the crossed closed path + graphics2d.draw(CommonPathsGenerator.createCrossedClosedPathFloat(image)); + } + + /** + * Check if line path could be clipped by a rectangle area. Path is + * rendered using stroke paint with default stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipLinePathByRectangleAreaStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set clip region and draw the path + drawLinePathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if quadratic path could be clipped by a rectangle area. Path is + * rendered using stroke paint with default stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipQuadraticPathByRectangleAreaStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set clip region and draw the path + drawQuadraticPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if cubic path could be clipped by a rectangle area. Path is + * rendered using stroke paint with default stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCubicPathByRectangleAreaStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set clip region and draw the path + drawCubicPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by a rectangle area. Path is + * rendered using stroke paint with default stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByRectangleAreaStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set clip region and draw the path + drawClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by a rectangle area. Path is + * rendered using stroke paint with default stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCrossedClosedPathByRectangleAreaStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set clip region and draw the path + drawCrossedClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Entry point to the test suite. + * + * @param args + * graphics test configuration + */ + public static void main(String[] args) + { + new ClippingPathByRectangleArea().runTestSuite(args); + } From xranby at icedtea.classpath.org Mon Dec 12 04:08:41 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Mon, 12 Dec 2011 12:08:41 +0000 Subject: /hg/icedtea6: cppInterpreter_arm.S: Add .ltorg at end of the DIS... Message-ID: changeset c8c66c3cd97a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c8c66c3cd97a author: Xerxes Ranby date: Mon Dec 12 12:45:24 2011 +0100 cppInterpreter_arm.S: Add .ltorg at end of the DISPATCH_FINISH macro to unbreak armv5 build-bots; .eabi_attribute Tag_ABI_* replaced by numerical values to stay compatible with GCC 4.3.3. 2011-12-12 Xerxes Ranby * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (DISPATCH_FINISH): Add .ltorg at end of the macro to unbreak armv5 build-bots. (.eabi_attribute Tag_ABI_*): Replaced by numerical values to stay compatible with GCC 4.3.3. diffstat: ChangeLog | 8 ++++++++ arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 17 +++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diffs (49 lines): diff -r 96ea1d0f5dc4 -r c8c66c3cd97a ChangeLog --- a/ChangeLog Thu Dec 08 15:39:55 2011 +0100 +++ b/ChangeLog Mon Dec 12 12:45:24 2011 +0100 @@ -1,3 +1,11 @@ +2011-12-12 Xerxes R??nby + + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (DISPATCH_FINISH): Add .ltorg at end of the macro to unbreak + armv5 build-bots. + (.eabi_attribute Tag_ABI_*): Replaced by numerical values + to stay compatible with GCC 4.3.3. + 2011-12-08 Matthias Klose * Makefile.am (JTREG_SRCS): Use abs_top_srcdir. diff -r 96ea1d0f5dc4 -r c8c66c3cd97a arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Dec 08 15:39:55 2011 +0100 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Dec 12 12:45:24 2011 +0100 @@ -506,6 +506,7 @@ bic ip, ip, #7 ldr pc, [ip, r1, lsl #2] .set dispatch_state, 0 + .ltorg .endm .macro DISPATCH_BYTECODE @@ -625,14 +626,14 @@ .endif .endm - .eabi_attribute Tag_ABI_FP_denormal, 1 - .eabi_attribute Tag_ABI_FP_exceptions, 1 - .eabi_attribute Tag_ABI_FP_number_model, 3 - .eabi_attribute Tag_ABI_align8_needed, 1 - .eabi_attribute Tag_ABI_align8_preserved, 1 - .eabi_attribute Tag_ABI_enum_size, 2 - .eabi_attribute Tag_ABI_optimization_goals, 2 - .eabi_attribute Tag_ABI_PCS_wchar_t, 4 + .eabi_attribute 20, 1 @ Tag_ABI_FP_denormal + .eabi_attribute 21, 1 @ Tag_ABI_FP_exceptions + .eabi_attribute 23, 3 @ Tag_ABI_FP_number_model + .eabi_attribute 24, 1 @ Tag_ABI_align8_needed + .eabi_attribute 25, 1 @ Tag_ABI_align8_preserved + .eabi_attribute 26, 2 @ Tag_ABI_enum_size + .eabi_attribute 30, 2 @ Tag_ABI_optimization_goals + .eabi_attribute 18, 4 @ Tag_ABI_PCS_wchar_t .text From omajid at redhat.com Mon Dec 12 07:26:18 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 12 Dec 2011 10:26:18 -0500 Subject: [PATCH] NP_GetMIMEDescription() returns const char* In-Reply-To: <1323522664.1412.5.camel@localhost.localdomain> References: <1323522664.1412.5.camel@localhost.localdomain> Message-ID: <4EE61D1A.1080207@redhat.com> Hi Thomas, On 12/10/2011 08:11 AM, Thomas Meyer wrote: > # HG changeset patch > # User Thomas Meyer > # Date 1323522372 -3600 > # Node ID 2b69ce95feb38023b2be8bec3bc87f2219d0c80b > # Parent 3674bf4ef962a752a05bf7bfa5aee19a817c4834 > > /usr/include/xulrunner-sdk-2/npfunctions.h defines "const char* NP_GetMIMEDescription(void);" > make icedtea-web version also return a const char* > This fix is needed to make icedtea-web compile on Fedora 16. > Thanks for the patch. This patch is already included in Fedora [1]. We are aware of the issue [2], but there is so simple fix. If we apply this patch, it breaks icedtea-web builds on distributions using an older version of xulrunner :( Cheers, Omair [1] http://pkgs.fedoraproject.org/gitweb/?p=icedtea-web.git;a=blob;f=icedtea-web-1.1.4-npapi-fix.patch;h=79ca0a6c009d310de5eb082d9ae5291da46e7dde;hb=refs/heads/f16 [2] http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-November/016240.html From omajid at redhat.com Mon Dec 12 07:30:51 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 12 Dec 2011 10:30:51 -0500 Subject: [PATCH] getMember: Fix returned object type - v2 In-Reply-To: <1323454222.1508.17.camel@localhost.localdomain> References: <20111209132757.10622chctlouo5al@webmail.your-server.de> <1323454222.1508.17.camel@localhost.localdomain> Message-ID: <4EE61E2B.3090303@redhat.com> On 12/09/2011 01:10 PM, Thomas Meyer wrote: > Use createJavaObjectFromVariant() on NPVariant returned by > NPN_GetProperty() to > create the Java object. This should create the correct object return type. > See also bug report: https://bugzilla.redhat.com/show_bug.cgi?id=586194 > Thanks for the patch! The change makes sense to me - and I am rather surprised it was not already done that way. I would like Deepak (our plugin guru) to take a look before we accept it, though. Let's see what he has to say about this. Thanks, Omair From jvanalte at redhat.com Mon Dec 12 08:09:48 2011 From: jvanalte at redhat.com (Jon VanAlten) Date: Mon, 12 Dec 2011 11:09:48 -0500 (EST) Subject: [PATCH] NP_GetMIMEDescription() returns const char* In-Reply-To: <4EE61D1A.1080207@redhat.com> Message-ID: <48f1f49e-d14b-45b0-ab7b-9e677159fa25@zmail13.collab.prod.int.phx2.redhat.com> Hi all, ----- Original Message ----- > From: "Omair Majid" > To: "Thomas Meyer" > Cc: "distro-pkg-dev" > Sent: Monday, December 12, 2011 10:26:18 AM > Subject: Re: [PATCH] NP_GetMIMEDescription() returns const char* > > Hi Thomas, > > On 12/10/2011 08:11 AM, Thomas Meyer wrote: > > # HG changeset patch > > # User Thomas Meyer > > # Date 1323522372 -3600 > > # Node ID 2b69ce95feb38023b2be8bec3bc87f2219d0c80b > > # Parent 3674bf4ef962a752a05bf7bfa5aee19a817c4834 > > > > /usr/include/xulrunner-sdk-2/npfunctions.h defines "const char* > > NP_GetMIMEDescription(void);" > > make icedtea-web version also return a const char* > > This fix is needed to make icedtea-web compile on Fedora 16. > > > > Thanks for the patch. This patch is already included in Fedora [1]. > We > are aware of the issue [2], but there is so simple fix. If we apply > this > patch, it breaks icedtea-web builds on distributions using an older > version of xulrunner :( > > Cheers, > Omair > > [1] > http://pkgs.fedoraproject.org/gitweb/?p=icedtea-web.git;a=blob;f=icedtea-web-1.1.4-npapi-fix.patch;h=79ca0a6c009d310de5eb082d9ae5291da46e7dde;hb=refs/heads/f16 > > [2] > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-November/016240.html > Seems to me that if this is a change that is expected to stay in xulrunner going forward, the preferred approach would be to make the change in icedtea-web and document the well-known fix for those building against older xulrunner, rather than the other way around. Just my $0.02. cheers, jon From jvanek at redhat.com Mon Dec 12 08:22:03 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 12 Dec 2011 17:22:03 +0100 Subject: [PATCH] NP_GetMIMEDescription() returns const char* In-Reply-To: <48f1f49e-d14b-45b0-ab7b-9e677159fa25@zmail13.collab.prod.int.phx2.redhat.com> References: <48f1f49e-d14b-45b0-ab7b-9e677159fa25@zmail13.collab.prod.int.phx2.redhat.com> Message-ID: <4EE62A2B.3030205@redhat.com> On 12/12/2011 05:09 PM, Jon VanAlten wrote: > Hi all, > > ----- Original Message ----- >> From: "Omair Majid" >> To: "Thomas Meyer" >> Cc: "distro-pkg-dev" >> Sent: Monday, December 12, 2011 10:26:18 AM >> Subject: Re: [PATCH] NP_GetMIMEDescription() returns const char* >> >> Hi Thomas, >> >> On 12/10/2011 08:11 AM, Thomas Meyer wrote: >>> # HG changeset patch >>> # User Thomas Meyer >>> # Date 1323522372 -3600 >>> # Node ID 2b69ce95feb38023b2be8bec3bc87f2219d0c80b >>> # Parent 3674bf4ef962a752a05bf7bfa5aee19a817c4834 >>> >>> /usr/include/xulrunner-sdk-2/npfunctions.h defines "const char* >>> NP_GetMIMEDescription(void);" >>> make icedtea-web version also return a const char* >>> This fix is needed to make icedtea-web compile on Fedora 16. >>> >> >> Thanks for the patch. This patch is already included in Fedora [1]. >> We >> are aware of the issue [2], but there is so simple fix. If we apply >> this >> patch, it breaks icedtea-web builds on distributions using an older >> version of xulrunner :( >> >> Cheers, >> Omair >> >> [1] >> http://pkgs.fedoraproject.org/gitweb/?p=icedtea-web.git;a=blob;f=icedtea-web-1.1.4-npapi-fix.patch;h=79ca0a6c009d310de5eb082d9ae5291da46e7dde;hb=refs/heads/f16 >> >> [2] >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-November/016240.html >> > > Seems to me that if this is a change that is expected to stay in > xulrunner going forward, the preferred approach would be to make the > change in icedtea-web and document the well-known fix for those > building against older xulrunner, rather than the other way around. > Just my $0.02. Hi, I'm working on this. icedtea-web build process will be changed, so it will be buildable on both currently used xul apis. The fix is based on compiling of small program, and determining by its sucess/falure what to use in icedtea web. Sorry for delay, but I had some more work to do. Tomorow will be D day;) Best regards J. > > cheers, > jon From aph at redhat.com Mon Dec 12 09:49:18 2011 From: aph at redhat.com (Andrew Haley) Date: Mon, 12 Dec 2011 17:49:18 +0000 Subject: Use !UseCompiler instead of DisableCompiler. Message-ID: <4EE63E9E.9000909@redhat.com> ARM JIT used DisableCompiler, not the standard HotSpot UseCompiler, which is used for the same purpose. Fixed thusly. Andrew. Use !UseCompiler instead of DisableCompiler. 2011-12-12 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (DisableCompiler): Delete. (Thumb2_Compile): Use !UseCompiler instead of DisableCompiler. (Thumb2_Initialize): Likewise. --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Dec 08 13:51:11 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Dec 12 12:42:26 2011 -0500 @@ -6905,7 +6905,6 @@ #endif extern unsigned CPUInfo; -static int DisableCompiler = 0; extern "C" unsigned long long Thumb2_Compile(JavaThread *thread, unsigned branch_pc) { @@ -6934,7 +6933,7 @@ Thumb2_Entrypoint thumb_entry; int compiled_accessor; - if (DisableCompiler || method->is_not_compilable()) { + if (!UseCompiler || method->is_not_compilable()) { ic->set(ic->state(), 1); bc->set(ic->state(), 1); return 0; @@ -6991,7 +6990,7 @@ if (rc == COMPILER_RESULT_FAILED) method->set_not_compilable(); if (rc == COMPILER_RESULT_FATAL) - DisableCompiler = 1; + UseCompiler = false; compiling = 0; return 0; } @@ -7242,8 +7241,8 @@ u32 loc_irem, loc_idiv, loc_ldiv; int rc; - if (!(CPUInfo & ARCH_THUMBEE) || !UseCompiler) { - DisableCompiler = 1; + if (!(CPUInfo & ARCH_THUMBEE)) { + UseCompiler = false; return; } @@ -7262,7 +7261,7 @@ cb = (Thumb2_CodeBuf *)mmap(0, THUMB2_CODEBUF_SIZE, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); if (cb == MAP_FAILED) { - DisableCompiler = 1; + UseCompiler = false; return; } @@ -7275,7 +7274,7 @@ codebuf.limit = (unsigned short *)cb->sp - (unsigned short *)cb->hp; if (rc = setjmp(compiler_error_env)) { - DisableCompiler = 1; + UseCompiler = false; return; } From aph at icedtea.classpath.org Mon Dec 12 09:49:31 2011 From: aph at icedtea.classpath.org (aph at icedtea.classpath.org) Date: Mon, 12 Dec 2011 17:49:31 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset e07f3143b2ca in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e07f3143b2ca author: aph date: Mon Dec 12 12:42:26 2011 -0500 Use !UseCompiler instead of DisableCompiler. 2011-12-12 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (DisableCompiler): Delete. (Thumb2_Compile): Use !UseCompiler instead of DisableCompiler. (Thumb2_Initialize): Likewise. changeset d6cf8b242032 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d6cf8b242032 author: aph date: Mon Dec 12 12:46:59 2011 -0500 merge diffstat: ChangeLog | 18 ++++++++++++++++++ Makefile.am | 2 +- arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 17 +++++++++-------- arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp | 13 ++++++------- 4 files changed, 34 insertions(+), 16 deletions(-) diffs (129 lines): diff -r db64ac99a1ee -r d6cf8b242032 ChangeLog --- a/ChangeLog Thu Dec 08 13:51:11 2011 +0000 +++ b/ChangeLog Mon Dec 12 12:46:59 2011 -0500 @@ -1,3 +1,21 @@ +2011-12-12 Andrew Haley + + * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (DisableCompiler): Delete. + (Thumb2_Compile): Use !UseCompiler instead of DisableCompiler. + (Thumb2_Initialize): Likewise. + +2011-12-12 Xerxes R??nby + + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (DISPATCH_FINISH): Add .ltorg at end of the macro to unbreak + armv5 build-bots. + (.eabi_attribute Tag_ABI_*): Replaced by numerical values + to stay compatible with GCC 4.3.3. + +2011-12-08 Matthias Klose + + * Makefile.am (JTREG_SRCS): Use abs_top_srcdir. + 2011-12-08 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def diff -r db64ac99a1ee -r d6cf8b242032 Makefile.am --- a/Makefile.am Thu Dec 08 13:51:11 2011 +0000 +++ b/Makefile.am Mon Dec 12 12:46:59 2011 -0500 @@ -193,7 +193,7 @@ # Sources list REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java -JTREG_SRCS = $(top_srcdir)/jtreg +JTREG_SRCS = $(abs_top_srcdir)/jtreg # Patch list diff -r db64ac99a1ee -r d6cf8b242032 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Thu Dec 08 13:51:11 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Dec 12 12:46:59 2011 -0500 @@ -506,6 +506,7 @@ bic ip, ip, #7 ldr pc, [ip, r1, lsl #2] .set dispatch_state, 0 + .ltorg .endm .macro DISPATCH_BYTECODE @@ -625,14 +626,14 @@ .endif .endm - .eabi_attribute Tag_ABI_FP_denormal, 1 - .eabi_attribute Tag_ABI_FP_exceptions, 1 - .eabi_attribute Tag_ABI_FP_number_model, 3 - .eabi_attribute Tag_ABI_align8_needed, 1 - .eabi_attribute Tag_ABI_align8_preserved, 1 - .eabi_attribute Tag_ABI_enum_size, 2 - .eabi_attribute Tag_ABI_optimization_goals, 2 - .eabi_attribute Tag_ABI_PCS_wchar_t, 4 + .eabi_attribute 20, 1 @ Tag_ABI_FP_denormal + .eabi_attribute 21, 1 @ Tag_ABI_FP_exceptions + .eabi_attribute 23, 3 @ Tag_ABI_FP_number_model + .eabi_attribute 24, 1 @ Tag_ABI_align8_needed + .eabi_attribute 25, 1 @ Tag_ABI_align8_preserved + .eabi_attribute 26, 2 @ Tag_ABI_enum_size + .eabi_attribute 30, 2 @ Tag_ABI_optimization_goals + .eabi_attribute 18, 4 @ Tag_ABI_PCS_wchar_t .text diff -r db64ac99a1ee -r d6cf8b242032 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Thu Dec 08 13:51:11 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Dec 12 12:46:59 2011 -0500 @@ -6905,7 +6905,6 @@ #endif extern unsigned CPUInfo; -static int DisableCompiler = 0; extern "C" unsigned long long Thumb2_Compile(JavaThread *thread, unsigned branch_pc) { @@ -6934,7 +6933,7 @@ Thumb2_Entrypoint thumb_entry; int compiled_accessor; - if (DisableCompiler || method->is_not_compilable()) { + if (!UseCompiler || method->is_not_compilable()) { ic->set(ic->state(), 1); bc->set(ic->state(), 1); return 0; @@ -6991,7 +6990,7 @@ if (rc == COMPILER_RESULT_FAILED) method->set_not_compilable(); if (rc == COMPILER_RESULT_FATAL) - DisableCompiler = 1; + UseCompiler = false; compiling = 0; return 0; } @@ -7242,8 +7241,8 @@ u32 loc_irem, loc_idiv, loc_ldiv; int rc; - if (!(CPUInfo & ARCH_THUMBEE) || !UseCompiler) { - DisableCompiler = 1; + if (!(CPUInfo & ARCH_THUMBEE)) { + UseCompiler = false; return; } @@ -7262,7 +7261,7 @@ cb = (Thumb2_CodeBuf *)mmap(0, THUMB2_CODEBUF_SIZE, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); if (cb == MAP_FAILED) { - DisableCompiler = 1; + UseCompiler = false; return; } @@ -7275,7 +7274,7 @@ codebuf.limit = (unsigned short *)cb->sp - (unsigned short *)cb->hp; if (rc = setjmp(compiler_error_env)) { - DisableCompiler = 1; + UseCompiler = false; return; } From aph at redhat.com Mon Dec 12 10:12:47 2011 From: aph at redhat.com (Andrew Haley) Date: Mon, 12 Dec 2011 18:12:47 +0000 Subject: /hg/icedtea6: Fix running jamvm jdk tests when configured with a... In-Reply-To: References: Message-ID: <4EE6441F.9000802@redhat.com> On 12/08/2011 02:49 PM, doko at icedtea.classpath.org wrote: > changeset 96ea1d0f5dc4 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=96ea1d0f5dc4 > author: doko at ubuntu.com > date: Thu Dec 08 15:39:55 2011 +0100 > > Fix running jamvm jdk tests when configured with a separate relative > build dir > > 2011-12-08 Matthias Klose > > * Makefile.am (JTREG_SRCS): Use abs_top_srcdir. This patch breaks "make dist": cp: cannot stat `.//home/aph/iced-arm/icedtea6/jtreg': No such file or directory make: *** [distdir] Error 1 Andrew. > diffstat: > > ChangeLog | 4 ++++ > Makefile.am | 2 +- > 2 files changed, 5 insertions(+), 1 deletions(-) > > diffs (23 lines): > > diff -r db64ac99a1ee -r 96ea1d0f5dc4 ChangeLog > --- a/ChangeLog Thu Dec 08 13:51:11 2011 +0000 > +++ b/ChangeLog Thu Dec 08 15:39:55 2011 +0100 > @@ -1,3 +1,7 @@ > +2011-12-08 Matthias Klose > + > + * Makefile.am (JTREG_SRCS): Use abs_top_srcdir. > + > 2011-12-08 Andrew Haley > > * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def > diff -r db64ac99a1ee -r 96ea1d0f5dc4 Makefile.am > --- a/Makefile.am Thu Dec 08 13:51:11 2011 +0000 > +++ b/Makefile.am Thu Dec 08 15:39:55 2011 +0100 > @@ -193,7 +193,7 @@ > # Sources list > > REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java > -JTREG_SRCS = $(top_srcdir)/jtreg > +JTREG_SRCS = $(abs_top_srcdir)/jtreg > > # Patch list > From omajid at redhat.com Mon Dec 12 11:04:52 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 12 Dec 2011 14:04:52 -0500 Subject: RFC: backport S7102369 Message-ID: <4EE65054.1090503@redhat.com> Hi, I would like to backport the fix for S7102369 to icedtea6. The fix is already in jdk6, but missed the jdk6b24 cutoff: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c This fixes a regression caused by the recent security update that requires rmiregistry to be started with java.rmi.server.codebase property set. Additional details can be found in this bug report: https://bugzilla.redhat.com/show_bug.cgi?id=751203 The patch for HEAD is attached. If no one has any objections, I will prepare patches for 1.9 and 1.10 as well. ChangeLog: 2011-12-12 Omair Majid S7102369, S7094468: remove java.rmi.server.codebase property parsing from rmiregistry * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. Backport from OpenJDK6. * Makefile.am (ICEDTEA_PATCHES): Apply the patch. Any thoughts or comments? Thanks, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-backport-7102369.patch Type: text/x-patch Size: 19675 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111212/87e17e9a/icedtea6-backport-7102369.patch From omajid at redhat.com Mon Dec 12 13:49:57 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 12 Dec 2011 16:49:57 -0500 Subject: RFC: backport S7104625 to icedtea7 forest In-Reply-To: <201112082329.31173.drazzib@drazzib.com> References: <201112082329.31173.drazzib@drazzib.com> Message-ID: <4EE67705.5030400@redhat.com> On 12/08/2011 05:29 PM, Damien Raude-Morvan wrote: > Hi, > > I would like someone to backport the fix for 7104625 into icedtea7 forest for > me (I don't have commit rights). This bug in sun.awt.X11.XEvent is creating > megabytes of char[], just for logging, even if logging is disabled. The fix is > to add simple if statements whether logging is enabled or not. > Thanks for pointing me to this problem. > Please see the original email for details: > http://mail.openjdk.java.net/pipermail/awt-dev/2011-October/001954.html > > It has been backported this revision from jdk8 repo : > http://hg.openjdk.java.net/jdk8/jdk8/jdk/rev/7636a62aba7e > I have pushed the fix into jdk7u-dev upstream [1]. The next openjdk7 update release (7u4) should contain the fix. I am not sure when the plans for icedtea7 are, but we should get this fix when we next sync icedtea7 with jdk7u-dev. If you need this fix earlier, I can add this to icedtea7 as well. Though I would rather avoid the extra work and just wait until the next sync :) Cheers, Omair [1] http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/9cc780355c09 From ahughes at redhat.com Mon Dec 12 14:41:37 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 12 Dec 2011 22:41:37 +0000 Subject: RFC: backport S7102369 In-Reply-To: <4EE65054.1090503@redhat.com> References: <4EE65054.1090503@redhat.com> Message-ID: <20111212224137.GA31950@rivendell.middle-earth.co.uk> On 14:04 Mon 12 Dec , Omair Majid wrote: > Hi, > > I would like to backport the fix for S7102369 to icedtea6. > > The fix is already in jdk6, but missed the jdk6b24 cutoff: > http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c > > This fixes a regression caused by the recent security update that > requires rmiregistry to be started with java.rmi.server.codebase > property set. Additional details can be found in this bug report: > https://bugzilla.redhat.com/show_bug.cgi?id=751203 > > The patch for HEAD is attached. If no one has any objections, I will > prepare patches for 1.9 and 1.10 as well. > > ChangeLog: > 2011-12-12 Omair Majid > > S7102369, S7094468: remove java.rmi.server.codebase property > parsing from rmiregistry > * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. > Backport from OpenJDK6. > * Makefile.am (ICEDTEA_PATCHES): Apply the patch. > > Any thoughts or comments? > This one was on my own backport TODO list after it was posted to OpenJDK6, so thanks for handling it. I don't like that the patch includes a lot of unnecessary changes to generics but as this is in the original OpenJDK6 patch, I guess we're stuck with it. Is there any reason you're not considering 1.8? It's still supported at present. > Thanks, > Omair > diff -r d6cf8b242032 Makefile.am > --- a/Makefile.am Mon Dec 12 12:46:59 2011 -0500 > +++ b/Makefile.am Mon Dec 12 13:58:27 2011 -0500 > @@ -397,7 +397,8 @@ > patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ > patches/openjdk/7103224-glibc_name_collision.patch \ > patches/arm-debug.patch \ > - patches/openjdk/683768-System-tray-icon.patch > + patches/openjdk/683768-System-tray-icon.patch \ > + patches/openjdk/7102369-7094468-rmiregistry.patch > > if WITH_RHINO > ICEDTEA_PATCHES += \ > diff -r d6cf8b242032 patches/openjdk/7102369-7094468-rmiregistry.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/openjdk/7102369-7094468-rmiregistry.patch Mon Dec 12 13:58:27 2011 -0500 > @@ -0,0 +1,473 @@ > +# HG changeset patch > +# User coffeys > +# Date 1321449297 0 > +# Node ID 6b46f3c7c97cb060f88b196171b95d33bff80b7c > +# Parent 020dcd6d69ac9406809aabe8888a0b8d52912e7f > +7102369: remove java.rmi.server.codebase property parsing from registyimpl > +7094468: rmiregistry clean up > +Reviewed-by: smarks > + > +diff -r 020dcd6d69ac -r 6b46f3c7c97c src/share/classes/sun/rmi/registry/RegistryImpl.java > +--- openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Tue Nov 15 16:44:14 2011 -0800 > ++++ openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Wed Nov 16 13:14:57 2011 +0000 > +@@ -29,6 +29,7 @@ > + import java.util.Hashtable; > + import java.util.MissingResourceException; > + import java.util.ResourceBundle; > ++import java.io.FilePermission; > + import java.io.IOException; > + import java.net.*; > + import java.rmi.*; > +@@ -41,12 +42,12 @@ > + import java.security.AccessControlContext; > + import java.security.AccessController; > + import java.security.CodeSource; > +-import java.security.Policy; > ++import java.security.Policy; > + import java.security.PrivilegedActionException; > + import java.security.PrivilegedExceptionAction; > + import java.security.PermissionCollection; > + import java.security.Permissions; > +-import java.security.ProtectionDomain; > ++import java.security.ProtectionDomain; > + import java.text.MessageFormat; > + import sun.rmi.server.LoaderHandler; > + import sun.rmi.server.UnicastServerRef; > +@@ -54,7 +55,6 @@ > + import sun.rmi.transport.LiveRef; > + import sun.rmi.transport.ObjectTable; > + import sun.rmi.transport.Target; > +-import sun.security.action.GetPropertyAction; > + > + /** > + * A "registry" exists on every node that allows RMI connections to > +@@ -76,8 +76,10 @@ > + > + /* indicate compatibility with JDK 1.1.x version of class */ > + private static final long serialVersionUID = 4666870661827494597L; > +- private Hashtable bindings = new Hashtable(101); > +- private static Hashtable allowedAccessCache = new Hashtable(3); > ++ private Hashtable bindings > ++ = new Hashtable(101); > ++ private static Hashtable allowedAccessCache > ++ = new Hashtable(3); > + private static RegistryImpl registry; > + private static ObjID id = new ObjID(ObjID.REGISTRY_ID); > + > +@@ -129,7 +131,7 @@ > + throws RemoteException, NotBoundException > + { > + synchronized (bindings) { > +- Remote obj = (Remote)bindings.get(name); > ++ Remote obj = bindings.get(name); > + if (obj == null) > + throw new NotBoundException(name); > + return obj; > +@@ -146,7 +148,7 @@ > + { > + checkAccess("Registry.bind"); > + synchronized (bindings) { > +- Remote curr = (Remote)bindings.get(name); > ++ Remote curr = bindings.get(name); > + if (curr != null) > + throw new AlreadyBoundException(name); > + bindings.put(name, obj); > +@@ -163,7 +165,7 @@ > + { > + checkAccess("Registry.unbind"); > + synchronized (bindings) { > +- Remote obj = (Remote)bindings.get(name); > ++ Remote obj = bindings.get(name); > + if (obj == null) > + throw new NotBoundException(name); > + bindings.remove(name); > +@@ -213,10 +215,9 @@ > + InetAddress clientHost; > + > + try { > +- clientHost = (InetAddress) > +- java.security.AccessController.doPrivileged( > +- new java.security.PrivilegedExceptionAction() { > +- public Object run() > ++ clientHost = java.security.AccessController.doPrivileged( > ++ new java.security.PrivilegedExceptionAction() { > ++ public InetAddress run() > + throws java.net.UnknownHostException > + { > + return InetAddress.getByName(clientHostName); > +@@ -238,8 +239,8 @@ > + final InetAddress finalClientHost = clientHost; > + > + java.security.AccessController.doPrivileged( > +- new java.security.PrivilegedExceptionAction() { > +- public Object run() throws java.io.IOException { > ++ new java.security.PrivilegedExceptionAction() { > ++ public Void run() throws java.io.IOException { > + /* > + * if a ServerSocket can be bound to the client's > + * address then that address must be local > +@@ -334,19 +335,6 @@ > + URL[] urls = sun.misc.URLClassPath.pathToURLs(envcp); > + ClassLoader cl = new URLClassLoader(urls); > + > +- String codebaseProperty = null; > +- String prop = java.security.AccessController.doPrivileged( > +- new GetPropertyAction("java.rmi.server.codebase")); > +- if (prop != null && prop.trim().length() > 0) { > +- codebaseProperty = prop; > +- } > +- URL[] codebaseURLs = null; > +- if (codebaseProperty != null) { > +- codebaseURLs = sun.misc.URLClassPath.pathToURLs(codebaseProperty); > +- } else { > +- codebaseURLs = new URL[0]; > +- } > +- > + /* > + * Fix bugid 4242317: Classes defined by this class loader should > + * be annotated with the value of the "java.rmi.server.codebase" > +@@ -364,7 +352,7 @@ > + public RegistryImpl run() throws RemoteException { > + return new RegistryImpl(regPort); > + } > +- }, getAccessControlContext(codebaseURLs)); > ++ }, getAccessControlContext()); > + } catch (PrivilegedActionException ex) { > + throw (RemoteException) ex.getException(); > + } > +@@ -390,11 +378,11 @@ > + } > + > + /** > +- * Generates an AccessControlContext from several URLs. > ++ * Generates an AccessControlContext with minimal permissions. > + * The approach used here is taken from the similar method > + * getAccessControlContext() in the sun.applet.AppletPanel class. > + */ > +- private static AccessControlContext getAccessControlContext(URL[] urls) { > ++ private static AccessControlContext getAccessControlContext() { > + // begin with permissions granted to all code in current policy > + PermissionCollection perms = AccessController.doPrivileged( > + new java.security.PrivilegedAction() { > +@@ -419,17 +407,15 @@ > + > + perms.add(new RuntimePermission("accessClassInPackage.sun.*")); > + > +- // add permissions required to load from codebase URL path > +- LoaderHandler.addPermissionsForURLs(urls, perms, false); > ++ perms.add(new FilePermission("<>", "read")); > + > + /* > + * Create an AccessControlContext that consists of a single > + * protection domain with only the permissions calculated above. > + */ > + ProtectionDomain pd = new ProtectionDomain( > +- new CodeSource((urls.length > 0 ? urls[0] : null), > +- (java.security.cert.Certificate[]) null), > +- perms); > ++ new CodeSource(null, > ++ (java.security.cert.Certificate[]) null), perms); > + return new AccessControlContext(new ProtectionDomain[] { pd }); > + } > + } > +diff -r 020dcd6d69ac -r 6b46f3c7c97c src/share/classes/sun/rmi/server/LoaderHandler.java > +--- openjdk/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Tue Nov 15 16:44:14 2011 -0800 > ++++ openjdk/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Wed Nov 16 13:14:57 2011 +0000 > +@@ -1028,7 +1028,7 @@ > + * loader. A given permission is only added to the collection if > + * it is not already implied by the collection. > + */ > +- public static void addPermissionsForURLs(URL[] urls, > ++ private static void addPermissionsForURLs(URL[] urls, > + PermissionCollection perms, > + boolean forLoader) > + { > +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/readTest.java > +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 > ++++ openjdk/jdk/test/java/rmi/registry/readTest/readTest.java Wed Nov 16 13:14:57 2011 +0000 > +@@ -0,0 +1,59 @@ > ++/* > ++ * 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. > ++ */ > ++ > ++import java.rmi.registry.Registry; > ++import java.rmi.registry.LocateRegistry; > ++import java.rmi.RemoteException; > ++import java.rmi.server.UnicastRemoteObject; > ++ > ++ > ++public class readTest { > ++ > ++ public static void main(String args[]) throws Exception { > ++ int port = 7491; > ++ try { > ++ testPkg.Server obj = new testPkg.Server(); > ++ testPkg.Hello stub = (testPkg.Hello) UnicastRemoteObject.exportObject(obj, 0); > ++ // Bind the remote object's stub in the registry > ++ Registry registry = LocateRegistry.getRegistry(port); > ++ registry.bind("Hello", stub); > ++ > ++ System.err.println("Server ready"); > ++ > ++ // now, let's test client > ++ testPkg.Client client = new testPkg.Client(port); > ++ String testStubReturn = client.testStub(); > ++ if(!testStubReturn.equals(obj.hello)) { > ++ throw new RuntimeException("Test Fails : unexpected string from stub call"); > ++ } else { > ++ System.out.println("Test passed"); > ++ } > ++ registry.unbind("Hello"); > ++ > ++ } catch (Exception e) { > ++ System.err.println("Server exception: " + e.toString()); > ++ e.printStackTrace(); > ++ } > ++ > ++ } > ++} > +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/readTest.sh > +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 > ++++ openjdk/jdk/test/java/rmi/registry/readTest/readTest.sh Wed Nov 16 13:14:57 2011 +0000 > +@@ -0,0 +1,95 @@ > ++# > ++# 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 7102369 7094468 7100592 > ++# @summary remove java.rmi.server.codebase property parsing from registyimpl > ++# @run shell readTest.sh > ++ > ++OS=`uname -s` > ++case "$OS" in > ++ SunOS | Linux ) > ++ PS=":" > ++ FS="/" > ++ FILEURL="file:" > ++ ;; > ++ Windows* | CYGWIN* ) > ++ PS=";" > ++ FS="\\" > ++ FILEURL="file:/" > ++ ;; > ++ * ) > ++ echo "Unrecognized system!" > ++ exit 1; > ++ ;; > ++esac > ++ > ++cp -r ${TESTSRC}${FS}* . > ++${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java > ++${TESTJAVA}${FS}bin${FS}javac readTest.java > ++ > ++mkdir rmi_tmp > ++RMIREG_OUT=rmi.out > ++#start rmiregistry without any local classes on classpath > ++cd rmi_tmp > ++${TESTJAVA}${FS}bin${FS}rmiregistry 7491 > ..${FS}${RMIREG_OUT} 2>&1 & > ++RMIREG_PID=$! > ++# allow some time to start > ++sleep 3 > ++cd .. > ++ > ++# trailing / after code base is important for rmi codebase property. > ++${TESTJAVA}${FS}bin${FS}java -Djava.rmi.server.codebase=${FILEURL}`pwd`/ readTest > OUT.TXT 2>&1 & > ++TEST_PID=$! > ++#bulk of testcase - let it run for a while > ++sleep 5 > ++ > ++#we're done, kill processes first > ++kill -9 ${RMIREG_PID} ${TEST_PID} > ++sleep 3 > ++ > ++echo "Test output : " > ++ > ++cat OUT.TXT > ++echo "==============" > ++echo "rmiregistry output : " > ++cat ${RMIREG_OUT} > ++echo "==============" > ++ > ++grep "Server ready" OUT.TXT > ++result1=$? > ++grep "Test passed" OUT.TXT > ++result2=$? > ++ > ++if [ $result1 -eq 0 -a $result2 -eq 0 ] > ++then > ++ echo "Passed" > ++ exitCode=0; > ++else > ++ echo "Failed" > ++ exitCode=1 > ++fi > ++rm -rf OUT.TXT ${RMIREG_OUT} rmi_tmp > ++exit ${exitCode} > ++ > ++ > +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Client.java > +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 > ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Client.java Wed Nov 16 13:14:57 2011 +0000 > +@@ -0,0 +1,48 @@ > ++/* > ++ * 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. > ++ */ > ++ > ++package testPkg; > ++ > ++import java.rmi.registry.LocateRegistry; > ++import java.rmi.registry.Registry; > ++ > ++public class Client { > ++ int port; > ++ > ++ public Client(int p) { > ++ port = p; > ++ } > ++ > ++ public String testStub() throws Exception { > ++ try { > ++ Registry registry = LocateRegistry.getRegistry(port); > ++ Hello stub = (Hello) registry.lookup("Hello"); > ++ String response = stub.sayHello(); > ++ return response; > ++ } catch (Exception e) { > ++ System.err.println("Client exception: " + e.toString()); > ++ throw e; > ++ } > ++ } > ++ } > ++ > +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Hello.java > +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 > ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Hello.java Wed Nov 16 13:14:57 2011 +0000 > +@@ -0,0 +1,31 @@ > ++/* > ++ * 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. > ++ */ > ++ > ++package testPkg; > ++ > ++import java.rmi.Remote; > ++import java.rmi.RemoteException; > ++ > ++public interface Hello extends Remote { > ++ String sayHello() throws RemoteException; > ++} > +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Server.java > +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 > ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Server.java Wed Nov 16 13:14:57 2011 +0000 > +@@ -0,0 +1,36 @@ > ++/* > ++ * 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. > ++ */ > ++ > ++package testPkg; > ++ > ++public class Server implements Hello { > ++ > ++ public String hello = "Hello, world!"; > ++ > ++ public Server() {} > ++ > ++ public String sayHello() { > ++ return hello; > ++ } > ++ > ++} -- 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: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111212/d25daede/attachment.bin From omajid at redhat.com Mon Dec 12 14:46:06 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 12 Dec 2011 17:46:06 -0500 Subject: RFC: backport S7102369 In-Reply-To: <20111212224137.GA31950@rivendell.middle-earth.co.uk> References: <4EE65054.1090503@redhat.com> <20111212224137.GA31950@rivendell.middle-earth.co.uk> Message-ID: <4EE6842E.608@redhat.com> On 12/12/2011 05:41 PM, Dr Andrew John Hughes wrote: > On 14:04 Mon 12 Dec , Omair Majid wrote: >> Hi, >> >> I would like to backport the fix for S7102369 to icedtea6. >> >> The fix is already in jdk6, but missed the jdk6b24 cutoff: >> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c >> >> This fixes a regression caused by the recent security update that >> requires rmiregistry to be started with java.rmi.server.codebase >> property set. Additional details can be found in this bug report: >> https://bugzilla.redhat.com/show_bug.cgi?id=751203 >> >> The patch for HEAD is attached. If no one has any objections, I will >> prepare patches for 1.9 and 1.10 as well. >> >> ChangeLog: >> 2011-12-12 Omair Majid >> >> S7102369, S7094468: remove java.rmi.server.codebase property >> parsing from rmiregistry >> * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. >> Backport from OpenJDK6. >> * Makefile.am (ICEDTEA_PATCHES): Apply the patch. >> >> Any thoughts or comments? >> > > This one was on my own backport TODO list after it was posted to OpenJDK6, > so thanks for handling it. I don't like that the patch includes a lot of > unnecessary changes to generics but as this is in the original OpenJDK6 > patch, I guess we're stuck with it. > I guess the developer who did the backport just wanted to sync the openjdk6 and openjdk7 versions to avoid any surprises and to (effectively) maintain one version of the code going forward. > Is there any reason you're not considering 1.8? It's still supported at present. Oh, right. I can make a patch for that too. Does the original patch look okay for HEAD? Thanks, Omair From ahughes at redhat.com Mon Dec 12 14:49:51 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 12 Dec 2011 22:49:51 +0000 Subject: RFC: backport S7102369 In-Reply-To: <4EE6842E.608@redhat.com> References: <4EE65054.1090503@redhat.com> <20111212224137.GA31950@rivendell.middle-earth.co.uk> <4EE6842E.608@redhat.com> Message-ID: <20111212224951.GB31950@rivendell.middle-earth.co.uk> On 17:46 Mon 12 Dec , Omair Majid wrote: > On 12/12/2011 05:41 PM, Dr Andrew John Hughes wrote: > > On 14:04 Mon 12 Dec , Omair Majid wrote: > >> Hi, > >> > >> I would like to backport the fix for S7102369 to icedtea6. > >> > >> The fix is already in jdk6, but missed the jdk6b24 cutoff: > >> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c > >> > >> This fixes a regression caused by the recent security update that > >> requires rmiregistry to be started with java.rmi.server.codebase > >> property set. Additional details can be found in this bug report: > >> https://bugzilla.redhat.com/show_bug.cgi?id=751203 > >> > >> The patch for HEAD is attached. If no one has any objections, I will > >> prepare patches for 1.9 and 1.10 as well. > >> > >> ChangeLog: > >> 2011-12-12 Omair Majid > >> > >> S7102369, S7094468: remove java.rmi.server.codebase property > >> parsing from rmiregistry > >> * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. > >> Backport from OpenJDK6. > >> * Makefile.am (ICEDTEA_PATCHES): Apply the patch. > >> > >> Any thoughts or comments? > >> > > > > This one was on my own backport TODO list after it was posted to OpenJDK6, > > so thanks for handling it. I don't like that the patch includes a lot of > > unnecessary changes to generics but as this is in the original OpenJDK6 > > patch, I guess we're stuck with it. > > > > I guess the developer who did the backport just wanted to sync the > openjdk6 and openjdk7 versions to avoid any surprises and to > (effectively) maintain one version of the code going forward. > Still wrong to combine it into one patch IMHO. > > Is there any reason you're not considering 1.8? It's still supported at present. > > Oh, right. I can make a patch for that too. Does the original patch look > okay for HEAD? > Yes, it's just a simple backport and you don't need approval for HEAD. I would suggest adding it there, then posting the backports in a week's time if no issues arise. > 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: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111212/b31f01d6/attachment.bin From omajid at icedtea.classpath.org Mon Dec 12 15:01:46 2011 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Mon, 12 Dec 2011 23:01:46 +0000 Subject: /hg/icedtea6: S7102369, S7094468: remove java.rmi.server.codebas... Message-ID: changeset 67df573b0734 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=67df573b0734 author: Omair Majid date: Mon Dec 12 18:01:38 2011 -0500 S7102369, S7094468: remove java.rmi.server.codebase property parsing from rmiregistry Backport of: S7102369: remove java.rmi.server.codebase property parsing from registyimpl S7094468: rmiregistry clean up Upstream changeset: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b46f3c7c97c Fixes RH751203 2011-12-12 Omair Majid S7102369, S7094468: remove java.rmi.server.codebase property parsing from rmiregistry * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. Backport from OpenJDK6. * Makefile.am (ICEDTEA_PATCHES): Apply the patch. diffstat: ChangeLog | 8 + Makefile.am | 3 +- NEWS | 2 + patches/openjdk/7102369-7094468-rmiregistry.patch | 466 ++++++++++++++++++++++ 4 files changed, 478 insertions(+), 1 deletions(-) diffs (truncated from 517 to 500 lines): diff -r d6cf8b242032 -r 67df573b0734 ChangeLog --- a/ChangeLog Mon Dec 12 12:46:59 2011 -0500 +++ b/ChangeLog Mon Dec 12 18:01:38 2011 -0500 @@ -1,3 +1,11 @@ +2011-12-12 Omair Majid + + S7102369, S7094468: remove java.rmi.server.codebase property parsing from + rmiregistry + * patches/openjdk/7102369-7094468-rmiregistry.patch: New file. Backport + from OpenJDK6. + * Makefile.am (ICEDTEA_PATCHES): Apply the patch. + 2011-12-12 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (DisableCompiler): Delete. diff -r d6cf8b242032 -r 67df573b0734 Makefile.am --- a/Makefile.am Mon Dec 12 12:46:59 2011 -0500 +++ b/Makefile.am Mon Dec 12 18:01:38 2011 -0500 @@ -397,7 +397,8 @@ patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \ patches/openjdk/7103224-glibc_name_collision.patch \ patches/arm-debug.patch \ - patches/openjdk/683768-System-tray-icon.patch + patches/openjdk/683768-System-tray-icon.patch \ + patches/openjdk/7102369-7094468-rmiregistry.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r d6cf8b242032 -r 67df573b0734 NEWS --- a/NEWS Mon Dec 12 12:46:59 2011 -0500 +++ b/NEWS Mon Dec 12 18:01:38 2011 -0500 @@ -383,6 +383,8 @@ - S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false" - S6296893: BMP Writer handles TopDown property incorrectly for some of the compression types - S7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc + - S7102369: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468: rmiregistry clean up * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * CACAO - CA149: Used wrong class loader. diff -r d6cf8b242032 -r 67df573b0734 patches/openjdk/7102369-7094468-rmiregistry.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/7102369-7094468-rmiregistry.patch Mon Dec 12 18:01:38 2011 -0500 @@ -0,0 +1,473 @@ +# HG changeset patch +# User coffeys +# Date 1321449297 0 +# Node ID 6b46f3c7c97cb060f88b196171b95d33bff80b7c +# Parent 020dcd6d69ac9406809aabe8888a0b8d52912e7f +7102369: remove java.rmi.server.codebase property parsing from registyimpl +7094468: rmiregistry clean up +Reviewed-by: smarks + +diff -r 020dcd6d69ac -r 6b46f3c7c97c src/share/classes/sun/rmi/registry/RegistryImpl.java +--- openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Tue Nov 15 16:44:14 2011 -0800 ++++ openjdk/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java Wed Nov 16 13:14:57 2011 +0000 +@@ -29,6 +29,7 @@ + import java.util.Hashtable; + import java.util.MissingResourceException; + import java.util.ResourceBundle; ++import java.io.FilePermission; + import java.io.IOException; + import java.net.*; + import java.rmi.*; +@@ -41,12 +42,12 @@ + import java.security.AccessControlContext; + import java.security.AccessController; + import java.security.CodeSource; +-import java.security.Policy; ++import java.security.Policy; + import java.security.PrivilegedActionException; + import java.security.PrivilegedExceptionAction; + import java.security.PermissionCollection; + import java.security.Permissions; +-import java.security.ProtectionDomain; ++import java.security.ProtectionDomain; + import java.text.MessageFormat; + import sun.rmi.server.LoaderHandler; + import sun.rmi.server.UnicastServerRef; +@@ -54,7 +55,6 @@ + import sun.rmi.transport.LiveRef; + import sun.rmi.transport.ObjectTable; + import sun.rmi.transport.Target; +-import sun.security.action.GetPropertyAction; + + /** + * A "registry" exists on every node that allows RMI connections to +@@ -76,8 +76,10 @@ + + /* indicate compatibility with JDK 1.1.x version of class */ + private static final long serialVersionUID = 4666870661827494597L; +- private Hashtable bindings = new Hashtable(101); +- private static Hashtable allowedAccessCache = new Hashtable(3); ++ private Hashtable bindings ++ = new Hashtable(101); ++ private static Hashtable allowedAccessCache ++ = new Hashtable(3); + private static RegistryImpl registry; + private static ObjID id = new ObjID(ObjID.REGISTRY_ID); + +@@ -129,7 +131,7 @@ + throws RemoteException, NotBoundException + { + synchronized (bindings) { +- Remote obj = (Remote)bindings.get(name); ++ Remote obj = bindings.get(name); + if (obj == null) + throw new NotBoundException(name); + return obj; +@@ -146,7 +148,7 @@ + { + checkAccess("Registry.bind"); + synchronized (bindings) { +- Remote curr = (Remote)bindings.get(name); ++ Remote curr = bindings.get(name); + if (curr != null) + throw new AlreadyBoundException(name); + bindings.put(name, obj); +@@ -163,7 +165,7 @@ + { + checkAccess("Registry.unbind"); + synchronized (bindings) { +- Remote obj = (Remote)bindings.get(name); ++ Remote obj = bindings.get(name); + if (obj == null) + throw new NotBoundException(name); + bindings.remove(name); +@@ -213,10 +215,9 @@ + InetAddress clientHost; + + try { +- clientHost = (InetAddress) +- java.security.AccessController.doPrivileged( +- new java.security.PrivilegedExceptionAction() { +- public Object run() ++ clientHost = java.security.AccessController.doPrivileged( ++ new java.security.PrivilegedExceptionAction() { ++ public InetAddress run() + throws java.net.UnknownHostException + { + return InetAddress.getByName(clientHostName); +@@ -238,8 +239,8 @@ + final InetAddress finalClientHost = clientHost; + + java.security.AccessController.doPrivileged( +- new java.security.PrivilegedExceptionAction() { +- public Object run() throws java.io.IOException { ++ new java.security.PrivilegedExceptionAction() { ++ public Void run() throws java.io.IOException { + /* + * if a ServerSocket can be bound to the client's + * address then that address must be local +@@ -334,19 +335,6 @@ + URL[] urls = sun.misc.URLClassPath.pathToURLs(envcp); + ClassLoader cl = new URLClassLoader(urls); + +- String codebaseProperty = null; +- String prop = java.security.AccessController.doPrivileged( +- new GetPropertyAction("java.rmi.server.codebase")); +- if (prop != null && prop.trim().length() > 0) { +- codebaseProperty = prop; +- } +- URL[] codebaseURLs = null; +- if (codebaseProperty != null) { +- codebaseURLs = sun.misc.URLClassPath.pathToURLs(codebaseProperty); +- } else { +- codebaseURLs = new URL[0]; +- } +- + /* + * Fix bugid 4242317: Classes defined by this class loader should + * be annotated with the value of the "java.rmi.server.codebase" +@@ -364,7 +352,7 @@ + public RegistryImpl run() throws RemoteException { + return new RegistryImpl(regPort); + } +- }, getAccessControlContext(codebaseURLs)); ++ }, getAccessControlContext()); + } catch (PrivilegedActionException ex) { + throw (RemoteException) ex.getException(); + } +@@ -390,11 +378,11 @@ + } + + /** +- * Generates an AccessControlContext from several URLs. ++ * Generates an AccessControlContext with minimal permissions. + * The approach used here is taken from the similar method + * getAccessControlContext() in the sun.applet.AppletPanel class. + */ +- private static AccessControlContext getAccessControlContext(URL[] urls) { ++ private static AccessControlContext getAccessControlContext() { + // begin with permissions granted to all code in current policy + PermissionCollection perms = AccessController.doPrivileged( + new java.security.PrivilegedAction() { +@@ -419,17 +407,15 @@ + + perms.add(new RuntimePermission("accessClassInPackage.sun.*")); + +- // add permissions required to load from codebase URL path +- LoaderHandler.addPermissionsForURLs(urls, perms, false); ++ perms.add(new FilePermission("<>", "read")); + + /* + * Create an AccessControlContext that consists of a single + * protection domain with only the permissions calculated above. + */ + ProtectionDomain pd = new ProtectionDomain( +- new CodeSource((urls.length > 0 ? urls[0] : null), +- (java.security.cert.Certificate[]) null), +- perms); ++ new CodeSource(null, ++ (java.security.cert.Certificate[]) null), perms); + return new AccessControlContext(new ProtectionDomain[] { pd }); + } + } +diff -r 020dcd6d69ac -r 6b46f3c7c97c src/share/classes/sun/rmi/server/LoaderHandler.java +--- openjdk/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Tue Nov 15 16:44:14 2011 -0800 ++++ openjdk/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java Wed Nov 16 13:14:57 2011 +0000 +@@ -1028,7 +1028,7 @@ + * loader. A given permission is only added to the collection if + * it is not already implied by the collection. + */ +- public static void addPermissionsForURLs(URL[] urls, ++ private static void addPermissionsForURLs(URL[] urls, + PermissionCollection perms, + boolean forLoader) + { +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/readTest.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/readTest.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,59 @@ ++/* ++ * 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. ++ */ ++ ++import java.rmi.registry.Registry; ++import java.rmi.registry.LocateRegistry; ++import java.rmi.RemoteException; ++import java.rmi.server.UnicastRemoteObject; ++ ++ ++public class readTest { ++ ++ public static void main(String args[]) throws Exception { ++ int port = 7491; ++ try { ++ testPkg.Server obj = new testPkg.Server(); ++ testPkg.Hello stub = (testPkg.Hello) UnicastRemoteObject.exportObject(obj, 0); ++ // Bind the remote object's stub in the registry ++ Registry registry = LocateRegistry.getRegistry(port); ++ registry.bind("Hello", stub); ++ ++ System.err.println("Server ready"); ++ ++ // now, let's test client ++ testPkg.Client client = new testPkg.Client(port); ++ String testStubReturn = client.testStub(); ++ if(!testStubReturn.equals(obj.hello)) { ++ throw new RuntimeException("Test Fails : unexpected string from stub call"); ++ } else { ++ System.out.println("Test passed"); ++ } ++ registry.unbind("Hello"); ++ ++ } catch (Exception e) { ++ System.err.println("Server exception: " + e.toString()); ++ e.printStackTrace(); ++ } ++ ++ } ++} +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/readTest.sh +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/readTest.sh Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,95 @@ ++# ++# 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 7102369 7094468 7100592 ++# @summary remove java.rmi.server.codebase property parsing from registyimpl ++# @run shell readTest.sh ++ ++OS=`uname -s` ++case "$OS" in ++ SunOS | Linux ) ++ PS=":" ++ FS="/" ++ FILEURL="file:" ++ ;; ++ Windows* | CYGWIN* ) ++ PS=";" ++ FS="\\" ++ FILEURL="file:/" ++ ;; ++ * ) ++ echo "Unrecognized system!" ++ exit 1; ++ ;; ++esac ++ ++cp -r ${TESTSRC}${FS}* . ++${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java ++${TESTJAVA}${FS}bin${FS}javac readTest.java ++ ++mkdir rmi_tmp ++RMIREG_OUT=rmi.out ++#start rmiregistry without any local classes on classpath ++cd rmi_tmp ++${TESTJAVA}${FS}bin${FS}rmiregistry 7491 > ..${FS}${RMIREG_OUT} 2>&1 & ++RMIREG_PID=$! ++# allow some time to start ++sleep 3 ++cd .. ++ ++# trailing / after code base is important for rmi codebase property. ++${TESTJAVA}${FS}bin${FS}java -Djava.rmi.server.codebase=${FILEURL}`pwd`/ readTest > OUT.TXT 2>&1 & ++TEST_PID=$! ++#bulk of testcase - let it run for a while ++sleep 5 ++ ++#we're done, kill processes first ++kill -9 ${RMIREG_PID} ${TEST_PID} ++sleep 3 ++ ++echo "Test output : " ++ ++cat OUT.TXT ++echo "==============" ++echo "rmiregistry output : " ++cat ${RMIREG_OUT} ++echo "==============" ++ ++grep "Server ready" OUT.TXT ++result1=$? ++grep "Test passed" OUT.TXT ++result2=$? ++ ++if [ $result1 -eq 0 -a $result2 -eq 0 ] ++then ++ echo "Passed" ++ exitCode=0; ++else ++ echo "Failed" ++ exitCode=1 ++fi ++rm -rf OUT.TXT ${RMIREG_OUT} rmi_tmp ++exit ${exitCode} ++ ++ +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Client.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Client.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,48 @@ ++/* ++ * 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. ++ */ ++ ++package testPkg; ++ ++import java.rmi.registry.LocateRegistry; ++import java.rmi.registry.Registry; ++ ++public class Client { ++ int port; ++ ++ public Client(int p) { ++ port = p; ++ } ++ ++ public String testStub() throws Exception { ++ try { ++ Registry registry = LocateRegistry.getRegistry(port); ++ Hello stub = (Hello) registry.lookup("Hello"); ++ String response = stub.sayHello(); ++ return response; ++ } catch (Exception e) { ++ System.err.println("Client exception: " + e.toString()); ++ throw e; ++ } ++ } ++ } ++ +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Hello.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Hello.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,31 @@ ++/* ++ * 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. ++ */ ++ ++package testPkg; ++ ++import java.rmi.Remote; ++import java.rmi.RemoteException; ++ ++public interface Hello extends Remote { ++ String sayHello() throws RemoteException; ++} +diff -r 020dcd6d69ac -r 6b46f3c7c97c test/java/rmi/registry/readTest/testPkg/Server.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/rmi/registry/readTest/testPkg/Server.java Wed Nov 16 13:14:57 2011 +0000 +@@ -0,0 +1,36 @@ ++/* ++ * 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 From omajid at redhat.com Mon Dec 12 15:02:53 2011 From: omajid at redhat.com (Omair Majid) Date: Mon, 12 Dec 2011 18:02:53 -0500 Subject: RFC: backport S7102369 In-Reply-To: <20111212224951.GB31950@rivendell.middle-earth.co.uk> References: <4EE65054.1090503@redhat.com> <20111212224137.GA31950@rivendell.middle-earth.co.uk> <4EE6842E.608@redhat.com> <20111212224951.GB31950@rivendell.middle-earth.co.uk> Message-ID: <4EE6881D.7040203@redhat.com> On 12/12/2011 05:49 PM, Dr Andrew John Hughes wrote: > Yes, it's just a simple backport and you don't need approval for HEAD. > I would suggest adding it there, then posting the backports in a week's time if no > issues arise. > Pushed: http://icedtea.classpath.org/hg/icedtea6/rev/67df573b0734 Thanks, Omair From ahughes at redhat.com Mon Dec 12 15:11:55 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 12 Dec 2011 23:11:55 +0000 Subject: RFC: backport S7104625 to icedtea7 forest In-Reply-To: <4EE67705.5030400@redhat.com> References: <201112082329.31173.drazzib@drazzib.com> <4EE67705.5030400@redhat.com> Message-ID: <20111212231155.GC31950@rivendell.middle-earth.co.uk> On 16:49 Mon 12 Dec , Omair Majid wrote: > On 12/08/2011 05:29 PM, Damien Raude-Morvan wrote: > > Hi, > > > > I would like someone to backport the fix for 7104625 into icedtea7 forest for > > me (I don't have commit rights). This bug in sun.awt.X11.XEvent is creating > > megabytes of char[], just for logging, even if logging is disabled. The fix is > > to add simple if statements whether logging is enabled or not. > > > > Thanks for pointing me to this problem. > > > Please see the original email for details: > > http://mail.openjdk.java.net/pipermail/awt-dev/2011-October/001954.html > > > > It has been backported this revision from jdk8 repo : > > http://hg.openjdk.java.net/jdk8/jdk8/jdk/rev/7636a62aba7e > > > > I have pushed the fix into jdk7u-dev upstream [1]. The next openjdk7 > update release (7u4) should contain the fix. I am not sure when the > plans for icedtea7 are, but we should get this fix when we next sync > icedtea7 with jdk7u-dev. > > If you need this fix earlier, I can add this to icedtea7 as well. Though > I would rather avoid the extra work and just wait until the next sync :) > I think this is something we need to discuss. I've not had much luck finding out the schedule for these updates from Oracle. From http://openjdk.java.net/projects/jdk7/builds/ it seems that u2 is supposed to be released tomorrow, but I see little discussion about this on the jdk7u mailing list. There are no dates on that calendar for future releases. We should look at pulling u2 into IcedTea7 and doing a 2.1 release. I'll post a list of changesets to see what this equates to. We also need to discuss how we are going to handle such updates generally. As we don't even know when u4 is going to appear, it may be judicious to backport this particular changeset ourselves to IcedTea7. > Cheers, > Omair > > [1] http://hg.openjdk.java.net/jdk7u/jdk7u-dev/jdk/rev/9cc780355c09 -- 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: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111212/1376791e/attachment.bin From ahughes at redhat.com Mon Dec 12 15:53:39 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 12 Dec 2011 23:53:39 +0000 Subject: [PATCH] NP_GetMIMEDescription() returns const char* In-Reply-To: <48f1f49e-d14b-45b0-ab7b-9e677159fa25@zmail13.collab.prod.int.phx2.redhat.com> References: <4EE61D1A.1080207@redhat.com> <48f1f49e-d14b-45b0-ab7b-9e677159fa25@zmail13.collab.prod.int.phx2.redhat.com> Message-ID: <20111212235339.GG31950@rivendell.middle-earth.co.uk> On 11:09 Mon 12 Dec , Jon VanAlten wrote: > Hi all, > > ----- Original Message ----- > > From: "Omair Majid" > > To: "Thomas Meyer" > > Cc: "distro-pkg-dev" > > Sent: Monday, December 12, 2011 10:26:18 AM > > Subject: Re: [PATCH] NP_GetMIMEDescription() returns const char* > > > > Hi Thomas, > > > > On 12/10/2011 08:11 AM, Thomas Meyer wrote: > > > # HG changeset patch > > > # User Thomas Meyer > > > # Date 1323522372 -3600 > > > # Node ID 2b69ce95feb38023b2be8bec3bc87f2219d0c80b > > > # Parent 3674bf4ef962a752a05bf7bfa5aee19a817c4834 > > > > > > /usr/include/xulrunner-sdk-2/npfunctions.h defines "const char* > > > NP_GetMIMEDescription(void);" > > > make icedtea-web version also return a const char* > > > This fix is needed to make icedtea-web compile on Fedora 16. > > > > > > > Thanks for the patch. This patch is already included in Fedora [1]. > > We > > are aware of the issue [2], but there is so simple fix. If we apply > > this > > patch, it breaks icedtea-web builds on distributions using an older > > version of xulrunner :( > > > > Cheers, > > Omair > > > > [1] > > http://pkgs.fedoraproject.org/gitweb/?p=icedtea-web.git;a=blob;f=icedtea-web-1.1.4-npapi-fix.patch;h=79ca0a6c009d310de5eb082d9ae5291da46e7dde;hb=refs/heads/f16 > > > > [2] > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-November/016240.html > > > > Seems to me that if this is a change that is expected to stay in > xulrunner going forward, the preferred approach would be to make the > change in icedtea-web and document the well-known fix for those > building against older xulrunner, rather than the other way around. > Just my $0.02. > > cheers, > jon To me, it would seem appropriate to have this change in a new major release (1.2, which seems to be overdue anyway) and retain the older support in the 1.0 and 1.1 series. On that subject, how long do we intend to support the 1.0 series? -- 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: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111212/049525ad/attachment.bin From ptisnovs at icedtea.classpath.org Tue Dec 13 02:20:05 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 13 Dec 2011 10:20:05 +0000 Subject: /hg/gfx-test: 2011-12-13 Pavel Tisnovsky Message-ID: changeset d55fc8062bd9 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=d55fc8062bd9 author: Pavel Tisnovsky date: Tue Dec 13 11:22:19 2011 +0100 2011-12-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/NormalCubicCurvesAsPaths.java: Added about twenty new tests to this test case. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/NormalCubicCurvesAsPaths.java | 958 +++++++++++--- 2 files changed, 730 insertions(+), 233 deletions(-) diffs (truncated from 1288 to 500 lines): diff -r 2b1aa77d67de -r d55fc8062bd9 ChangeLog --- a/ChangeLog Mon Dec 12 12:31:21 2011 +0100 +++ b/ChangeLog Tue Dec 13 11:22:19 2011 +0100 @@ -1,3 +1,8 @@ +2011-12-13 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/NormalCubicCurvesAsPaths.java: + Added about twenty new tests to this test case. + 2011-12-12 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java: diff -r 2b1aa77d67de -r d55fc8062bd9 src/org/gfxtest/testsuites/NormalCubicCurvesAsPaths.java --- a/src/org/gfxtest/testsuites/NormalCubicCurvesAsPaths.java Mon Dec 12 12:31:21 2011 +0100 +++ b/src/org/gfxtest/testsuites/NormalCubicCurvesAsPaths.java Tue Dec 13 11:22:19 2011 +0100 @@ -63,10 +63,11 @@ @Zoom(1) public class NormalCubicCurvesAsPaths extends GfxTest { + /** - * Default Y offset of curve end points. + * Default Y offset of cubic curve end points. */ - private static final int DEFAULT_Y_OFFSET = -20; + private static final int DEFAULT_Y_OFFSET_FOR_CUBIC_CURVES = -20; /** * Step between curves drawn by different colors onto the same image. @@ -179,7 +180,7 @@ * @param graphics * graphics canvas */ - private void drawCurveWithVariousColors(TestImage image, Graphics2D graphics) + private void drawCurveWithVariousColorsFloat(TestImage image, Graphics2D graphics) { // construct point set which consists of all four curve control points CubicCurvePointSet pointSet = new CubicCurvePointSet(image); @@ -192,13 +193,54 @@ Color[] colors = ColorPalette.getColors(); // offset counter - int offset = DEFAULT_Y_OFFSET; + int offset = DEFAULT_Y_OFFSET_FOR_CUBIC_CURVES; // Draw each curve with different color. for (Color color : colors) { // create new path - Path2D path = createPathFloat(image, xarray, yarray, new int[] {1,2,3,4}, offset); + Path2D path = CommonPathsGenerator.createCubicPathFloat(image, xarray, yarray, new int[] {1,2,3,4}, offset); + + // set the specified color + graphics.setColor(color); + + // draw QuadCurve2D + graphics.draw(path); + + // move next curve down + offset += OFFSET_STEP; + } + } + + /** + * Draw set of cubic curves onto canvas specified by Graphics2D class. + * Curves are drawn using various colors. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics canvas + */ + private void drawCurveWithVariousColorsDouble(TestImage image, Graphics2D graphics) + { + // construct point set which consists of all four curve control points + CubicCurvePointSet pointSet = new CubicCurvePointSet(image); + + // fill in arrays containing coordinates for all cubic curve control points + int[] xarray = pointSet.getXPointArray(); + int[] yarray = pointSet.getYPointArray(); + + // curve colors + Color[] colors = ColorPalette.getColors(); + + // offset counter + int offset = DEFAULT_Y_OFFSET_FOR_CUBIC_CURVES; + + // Draw each curve with different color. + for (Color color : colors) + { + // create new path + Path2D path = CommonPathsGenerator.createCubicPathDouble(image, xarray, yarray, new int[] {1,2,3,4}, offset); // set the specified color graphics.setColor(color); @@ -220,7 +262,7 @@ * @param graphics * graphics canvas */ - private void drawCurveWithVariousTransparency(TestImage image, Graphics2D graphics) + private void drawCurveWithVariousTransparencyFloat(TestImage image, Graphics2D graphics) { // construct point set which consists of all four curve control points CubicCurvePointSet pointSet = new CubicCurvePointSet(image); @@ -230,13 +272,13 @@ int[] yarray = pointSet.getYPointArray(); // offset counter - int offset = DEFAULT_Y_OFFSET; + int offset = DEFAULT_Y_OFFSET_FOR_CUBIC_CURVES; // Draw each curve with transparency for (int transparency = 0; transparency < 16; transparency++) { // create new path - Path2D path = createPathFloat(image, xarray, yarray, new int[] {1,2,3,4}, offset); + Path2D path = CommonPathsGenerator.createCubicPathFloat(image, xarray, yarray, new int[] {1,2,3,4}, offset); // set the specified color graphics.setColor(new Color(0f, 0f, 0f, transparency / 16f)); @@ -250,183 +292,77 @@ } /** - * Create new path using Path2D.Float() which contains just one cubic curve. + * Draw set of cubic curves onto canvas specified by Graphics2D class. + * Curves are drawn using various transparency. * * @param image * image to which two dimensional shape is to be rendered - * @param xarray - * array containing x coordinates of all four control points of - * cubic curve - * @param yarray - * array containing y coordinates of all four control points of - * cubic curve - * @param pointIndexes - * indexes of control point to use to draw the curve (default - * value should be {1,2,3,4}) - * @param yoffset - * offset for all y-coordinates - * @return + * @param graphics + * graphics canvas */ - private Path2D createPathFloat(TestImage image, int[] xarray, int[] yarray, int[] pointIndexes, int yoffset) - { - // construct path containing cubic curve - Path2D path = new Path2D.Float(); - path.moveTo(xarray[pointIndexes[0]-1], yarray[pointIndexes[0]-1] + yoffset); - path.curveTo(xarray[pointIndexes[1]-1], yarray[pointIndexes[1]-1] + yoffset, - xarray[pointIndexes[2]-1], yarray[pointIndexes[2]-1] + yoffset, - xarray[pointIndexes[3]-1], yarray[pointIndexes[3]-1] + yoffset); - return path; - } - - /** - * Create new path using Path2D.Float() which contains just one cubic - * curve. - * - * @param image - * image to which two dimensional shape is to be rendered - * @param xarray - * array containing x coordinates of all four control points of - * cubic curve - * @param yarray - * array containing y coordinates of all four control points of - * cubic curve - * @param pointIndexes - * indexes of control point to use to draw the curve (default - * value should be {1,2,3,4}) - * @return - */ - private Path2D createPathFloat(TestImage image, int[] xarray, int[] yarray, int[] pointIndexes) - { - // construct path containing cubic curve - return createPathFloat(image, xarray, yarray, pointIndexes, 0); - } - - /** - * Create new path using Path2D.Float() which contains just one cubic - * curve. - * - * @param image - * image to which two dimensional shape is to be rendered - * @param pointIndexes - * indexes of control point to use to draw the curve (default - * value should be {1,2,3,4}) - * @return created path - */ - private Path2D createPathFloat(TestImage image, int[] pointIndexes) + private void drawCurveWithVariousTransparencyDouble(TestImage image, Graphics2D graphics) { // construct point set which consists of all four curve control points CubicCurvePointSet pointSet = new CubicCurvePointSet(image); // fill in arrays containing coordinates for all cubic curve control points - int[] x = pointSet.getXPointArray(); - int[] y = pointSet.getYPointArray(); + int[] xarray = pointSet.getXPointArray(); + int[] yarray = pointSet.getYPointArray(); - // construct path containing cubic curve - return createPathFloat(image, x, y, pointIndexes); + // offset counter + int offset = DEFAULT_Y_OFFSET_FOR_CUBIC_CURVES; + + // Draw each curve with transparency + for (int transparency = 0; transparency < 16; transparency++) + { + // create new path + Path2D path = CommonPathsGenerator.createCubicPathDouble(image, xarray, yarray, new int[] {1,2,3,4}, offset); + + // set the specified color + graphics.setColor(new Color(0f, 0f, 0f, transparency / 16f)); + + // draw QuadCurve2D + graphics.draw(path); + + // move next curve down + offset += OFFSET_STEP; + } } /** - * Create new path using Path2D.Float() which contains just one cubic - * curve. + * Create cubic cube and draw it. * * @param image * image to which two dimensional shape is to be rendered - * @return created path + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR */ - private Path2D createPathFloat(TestImage image) + private TestResult createAndDrawPathFloat(TestImage image, Graphics2D graphics) { - // construct path containing cubic curve - return createPathFloat(image, new int[] {1,2,3,4}); + // create new path + Path2D path = CommonPathsGenerator.createCubicPathFloat(image); + + // draw path + return drawPath(image, graphics, path); } /** - * Create new path using Path2D.Double() which contains just one cubic - * curve. + * Create cubic cube and draw it. * * @param image * image to which two dimensional shape is to be rendered - * @param xarray - * array containing x coordinates of all four control points of - * cubic curve - * @param yarray - * array containing y coordinates of all four control points of - * cubic curve - * @param pointIndexes - * indexes of control point to use to draw the curve (default - * value should be {1,2,3,4}) - * @param yoffset - * offset for all y-coordinates - * @return + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR */ - private Path2D createPathDouble(TestImage image, int[] xarray, int[] yarray, int[] pointIndexes, int yoffset) + private TestResult createAndDrawPathDouble(TestImage image, Graphics2D graphics) { - // construct path containing cubic curve - Path2D path = new Path2D.Double(); - path.moveTo(xarray[pointIndexes[0]-1], yarray[pointIndexes[0]-1] + yoffset); - path.curveTo(xarray[pointIndexes[1]-1], yarray[pointIndexes[1]-1] + yoffset, - xarray[pointIndexes[2]-1], yarray[pointIndexes[2]-1] + yoffset, - xarray[pointIndexes[3]-1], yarray[pointIndexes[3]-1] + yoffset); - return path; - } + // create new path + Path2D path = CommonPathsGenerator.createCubicPathDouble(image); - /** - * Create new path using Path2D.Double() which contains just one cubic - * curve. - * - * @param image - * image to which two dimensional shape is to be rendered - * @param xarray - * array containing x coordinates of all four control points of - * cubic curve - * @param yarray - * array containing y coordinates of all four control points of - * cubic curve - * @param pointIndexes - * indexes of control point to use to draw the curve (default - * value should be {1,2,3,4}) - * @return - */ - private Path2D createPathDouble(TestImage image, int[] xarray, int[] yarray, int[] pointIndexes) - { - return createPathDouble(image, xarray, yarray, pointIndexes, 0); - } - - /** - * Create new path using Path2D.Double() which contains just one cubic - * curve. - * - * @param image - * image to which two dimensional shape is to be rendered - * @param pointIndexes - * indexes of control point to use to draw the curve (default - * value should be {1,2,3,4}) - * @return created path - */ - private Path2D createPathDouble(TestImage image, int[] pointIndexes) - { - // construct point set which consists of all four curve control points - CubicCurvePointSet pointSet = new CubicCurvePointSet(image); - - // fill in arrays containing coordinates for all cubic curve control points - int[] x = pointSet.getXPointArray(); - int[] y = pointSet.getYPointArray(); - - // construct path containing cubic curve - return createPathDouble(image, x, y, pointIndexes); - } - - /** - * Create new path using Path2D.Double() which contains just one cubic - * curve. - * - * @param image - * image to which two dimensional shape is to be rendered - * @return created path - */ - private Path2D createPathDouble(TestImage image) - { - // construct path containing cubic curve - return createPathDouble(image, new int[] {1,2,3,4}); + // draw path + return drawPath(image, graphics, path); } /** @@ -441,7 +377,7 @@ public TestResult testBasicCubicCurveFloat(TestImage image, Graphics2D graphics) { // create cubic curve and draw it - Path2D path = createPathFloat(image); + Path2D path = CommonPathsGenerator.createCubicPathFloat(image); return drawPath(image, graphics, path); } @@ -457,7 +393,7 @@ public TestResult testBasicCubicCurveDouble(TestImage image, Graphics2D graphics) { // create cubic curve and draw it - Path2D path = createPathDouble(image); + Path2D path = CommonPathsGenerator.createCubicPathDouble(image); return drawPath(image, graphics, path); } @@ -472,14 +408,153 @@ * graphics context for image * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testZeroStroke(TestImage image, Graphics2D graphics) + public TestResult testZeroStrokeFloat(TestImage image, Graphics2D graphics) { // set zero pixels wide stroke CommonRenderingStyles.setStrokeZeroThick(graphics); // create cubic curve and draw it - Path2D path = createPathFloat(image); - return drawPath(image, graphics, path); + return createAndDrawPathFloat(image, graphics); + } + + /** + * Test if cubic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and default + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeDouble(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics); + + // create cubic curve and draw it + return createAndDrawPathDouble(image, graphics); + } + + /** + * Test if cubic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and butt + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeCapsButtFloat(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics, BasicStroke.CAP_BUTT); + + // create cubic path and draw it + return createAndDrawPathFloat(image, graphics); + } + + /** + * Test if cubic curve created by Path2D.Double() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and butt + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeCapsButtDouble(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics, BasicStroke.CAP_BUTT); + + // create cubic path and draw it + return createAndDrawPathDouble(image, graphics); + } + + /** + * Test if cubic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and round + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeCapsRoundFloat(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics, BasicStroke.CAP_ROUND); + + // create cubic path and draw it + return createAndDrawPathFloat(image, graphics); + } + + /** + * Test if cubic curve created by Path2D.Double() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and default + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeCapsRoundDouble(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics, BasicStroke.CAP_ROUND); + + // create cubic path and draw it + return createAndDrawPathDouble(image, graphics); + } + + /** + * Test if cubic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and square + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeCapsSquareFloat(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics, BasicStroke.CAP_SQUARE); + + // create cubic path and draw it + return createAndDrawPathFloat(image, graphics); From thomas at m3y3r.de Tue Dec 13 03:50:10 2011 From: thomas at m3y3r.de (Thomas Meyer) Date: Tue, 13 Dec 2011 12:50:10 +0100 Subject: [PATCH] getMember: Fix returned object type - v2 In-Reply-To: <4EE61E2B.3090303@redhat.com> References: <20111209132757.10622chctlouo5al@webmail.your-server.de> <1323454222.1508.17.camel@localhost.localdomain> <4EE61E2B.3090303@redhat.com> Message-ID: <1323777010.1412.8.camel@localhost.localdomain> Am Montag, den 12.12.2011, 10:30 -0500 schrieb Omair Majid: > On 12/09/2011 01:10 PM, Thomas Meyer wrote: > > Use createJavaObjectFromVariant() on NPVariant returned by > > NPN_GetProperty() to > > create the Java object. This should create the correct object return type. > > See also bug report: https://bugzilla.redhat.com/show_bug.cgi?id=586194 > > > > Thanks for the patch! > > The change makes sense to me - and I am rather surprised it was not > already done that way. I would like Deepak (our plugin guru) to take a > look before we accept it, though. Let's see what he has to say about this. Here is another fix on top of this patch: # HG changeset patch # User Thomas Meyer # Date 1323776736 -3600 # Node ID 7d090bfa381924100c0f8446dda2a615a75637d9 # Parent 2b69ce95feb38023b2be8bec3bc87f2219d0c80b getMember: Fix response message diff -r 2b69ce95feb3 -r 7d090bfa3819 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Sat Dec 10 14:06:12 2011 +0100 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Tue Dec 13 12:45:36 2011 +0100 @@ -556,11 +556,11 @@ createJavaObjectFromVariant(instance, *member_ptr, &result_id); IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response); - if (*(message_parts->at(2)) == "GetSlot") + if (*(message_parts->at(4)) == "GetSlot") { + response.append(" JavaScriptGetSlot "); + } else { response.append(" JavaScriptGetMember "); - } else { - response.append(" JavaScriptGetSlot "); } response.append(result_id.c_str()); plugin_to_java_bus->post(response.c_str()); -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 490 bytes Desc: This is a digitally signed message part Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111213/c79f44ce/attachment.bin From bugzilla-daemon at icedtea.classpath.org Tue Dec 13 04:31:23 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Dec 2011 12:31:23 +0000 Subject: [Bug 832] New: Connecting to the java applet "bubbleupnp" via android app causes the java applet on the arm plattform to crash! Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=832 Bug #: 832 Summary: Connecting to the java applet "bubbleupnp" via android app causes the java applet on the arm plattform to crash! Classification: Unclassified Product: IcedTea Version: 6-1.8 Platform: arm OS/Version: Linux Status: NEW Severity: blocker Priority: P3 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: viktor.hofer at gmail.com Created attachment 623 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=623 Bugreport Java-applet: http://forum.xda-developers.com/showthread.php?t=1118891&page=39 Java version: 6.0.18b18 -- 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 Dec 13 06:49:18 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Dec 2011 14:49:18 +0000 Subject: [Bug 833] New: Netx is not starting when uts cache is corrupted Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=833 Bug #: 833 Summary: Netx is not starting when uts cache is corrupted Classification: Unclassified Product: IcedTea-Web Version: hg Platform: all OS/Version: Linux Status: NEW Severity: minor Priority: P3 Component: NetX AssignedTo: omajid at redhat.com ReportedBy: jvanek at redhat.com CC: unassigned at icedtea.classpath.org When cache, is somehow corrupted, then it fails with error similar to this one: Exception in thread "Thread-4" java.lang.InternalError: Corrupt LRU file entries > at net.sourceforge.jnlp.cache.CacheLRUWrapper$1.compare(CacheLRUWrapper.java:184) > at net.sourceforge.jnlp.cache.CacheLRUWrapper$1.compare(CacheLRUWrapper.java:172) > at java.util.Arrays.mergeSort(Arrays.java:1283) > at java.util.Arrays.mergeSort(Arrays.java:1294) > at java.util.Arrays.mergeSort(Arrays.java:1294) > at java.util.Arrays.mergeSort(Arrays.java:1295) > at java.util.Arrays.mergeSort(Arrays.java:1295) > at java.util.Arrays.sort(Arrays.java:1223) > at java.util.Collections.sort(Collections.java:176) > at net.sourceforge.jnlp.cache.CacheLRUWrapper.getLRUSortedEntries(CacheLRUWrapper.java:172) > at net.sourceforge.jnlp.cache.CacheUtil.getCacheFileIfExist(CacheUtil.java:325) > at net.sourceforge.jnlp.cache.CacheUtil.getCacheFile(CacheUtil.java:306) > at net.sourceforge.jnlp.cache.CacheEntry.(CacheEntry.java:56) > at net.sourceforge.jnlp.cache.ResourceTracker.initializeResource(ResourceTracker.java:769) > at net.sourceforge.jnlp.cache.ResourceTracker.processResource(ResourceTracker.java:611) > at net.sourceforge.jnlp.cache.ResourceTracker.access$500(ResourceTracker.java:72) > at net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1115) > at net.sourceforge.jnlp.cache.ResourceTracker$Downloader$1.run(ResourceTracker.java:1113) > at java.security.AccessController.doPrivileged(Native Method) > at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1113) > at java.lang.Thread.run(Thread.java:679) > Exception in thread "Thread-8" java.lang.InternalError: Corrupt LRU file entries > at net.sourceforge.jnlp.cache.CacheLRUWrapper$1.compare(CacheLRUWrapper.java:184) ... > at net.sourceforge.jnlp.cache.ResourceTracker$Downloader.run(ResourceTracker.java:1113) > at java.lang.Thread.run(Thread.java:679) -- 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 Dec 13 06:52:21 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Dec 2011 14:52:21 +0000 Subject: [Bug 833] Netx is not starting when uts cache is corrupted In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=833 JiriVanek changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED AssignedTo|omajid at redhat.com |jvanek at redhat.com --- Comment #1 from JiriVanek 2011-12-13 14:52:21 UTC --- This happens, when some previous instance ow javaws is corrupted. Then ~/.icedtea/cache/recently_used file contains some badly written informations about its own cache, and is unable to start until javaws -Xclearcache is called. I think that javaws should clear itself instead of fail, and at least inform user what happend. And with good luck to continue running:) Patch is on the way. -- 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 jvanek at redhat.com Tue Dec 13 08:36:17 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 13 Dec 2011 17:36:17 +0100 Subject: [RFC][icedtea-web] PR833 - icedtea-web is failing when cache is corupted. Message-ID: <4EE77F01.8060803@redhat.com> 2011-12-13 Jiri Vanek Fix for PR844 * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: (getLRUSortedEntries) instead of error throwing own LRU exception. Also catches more then NumberFormatException (clearLRUSortedEntries) new method - making soft clearing of cache public (clearCache) now return true if cache was cleared, false otherwise (or exception) * netx/net/sourceforge/jnlp/cache/CacheUtil.java: (getCacheFileIfExist) does three tires to load cache. If ifrst fails, then recently_used file is emptied both in memory and on disc. When second attemmpt fails, then LRU cache is forcibly cleared. if clearing fails, then error is thrown. If it pass, then one more try to load entries is allowed. When third attempt fails, then error is thrown. * /netx/net/sourceforge/jnlp/cache/LruCacheException.java: new file, for purpose of catching this particular exception * netx/net/sourceforge/jnlp/util/PropertiesFile.java: (store) tries to mkdirs to its path. It is better then to fail when no cache directory exists. * tests/jnlp_tests/signed/CacheReproducer: new reproducr trying severals way of corupted cache on several types of jnlp files. Is signed because of reflection used. * tests/jnlp_tests/signed/SimpletestSigned1: signed hello world to be used in CacheReproducer tests. * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java: timeout for processes doubled, as clear cache methods sometimes took more then original allowed. When badly formated recently_used file is saved (or better not-save-correctly eg because of kill -9 signal) then netx is not starting, but is throwing out error. Solution to this is caal netx with -Xclearcache. From my point of view, it should at least warn user and suggest this option, but better can be to clear cache and (recommend) restart iself/toUser. I also beive, that it can simply just continue running. *warn user and terminate, can be done in any time *forcibly clear cache during runtime can be dangerous, as some jars already correctly loaded from cache can depend on this local copy (and what about another instances of netx!)and though netx will much more mysteriously fail later - I was unable to reproduce this behaviour (see testAlreadyLoadedCached1,2,11 and 21 - I was trying to do this, but not sure if successfully) - to try to clear cache (will not be successful in if another netx instance is running), recommend run javaws -Xclearcache and restart and terminate can be the best fix *to fake cache - is what I do now. It clear cache metadata in memory and on disc (recently-used). Then continue loading. -if this will not help, clear cache is tried, but I was unable to reproduce this possibility - "soft" clearing of cache solved all problems. -it is not affecting already running javawss, but can cause problems when two javaws are trying to start simultaneously-but I was unable to reproduce this behaviour too (see startParalelInstancesUponBrokenCache test)\ Any hints welcomed! Best Regards J. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: LRUcachePatch.diff2 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111213/29e85ce6/LRUcachePatch.diff2 From bugzilla-daemon at icedtea.classpath.org Tue Dec 13 08:35:35 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 13 Dec 2011 16:35:35 +0000 Subject: [Bug 833] Netx is not starting when uts cache is corrupted In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=833 --- Comment #2 from JiriVanek 2011-12-13 16:35:35 UTC --- http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-December/016469.html patch posted for review -- 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 Tue Dec 13 14:10:56 2011 From: omajid at redhat.com (Omair Majid) Date: Tue, 13 Dec 2011 17:10:56 -0500 Subject: icedtea7 releases (was Re: RFC: backport S7104625 to icedtea7 forest) In-Reply-To: <20111212231155.GC31950@rivendell.middle-earth.co.uk> References: <201112082329.31173.drazzib@drazzib.com> <4EE67705.5030400@redhat.com> <20111212231155.GC31950@rivendell.middle-earth.co.uk> Message-ID: <4EE7CD70.10209@redhat.com> On 12/12/2011 06:11 PM, Dr Andrew John Hughes wrote: >> If you need this fix earlier, I can add this to icedtea7 as well. Though >> I would rather avoid the extra work and just wait until the next sync :) >> > > I think this is something we need to discuss. I've not had much luck finding > out the schedule for these updates from Oracle. From > > http://openjdk.java.net/projects/jdk7/builds/ > > it seems that u2 is supposed to be released tomorrow, but I see little discussion > about this on the jdk7u mailing list. There are no dates on that calendar for > future releases. > > We should look at pulling u2 into IcedTea7 and doing a 2.1 release. I'll post a > list of changesets to see what this equates to. > > We also need to discuss how we are going to handle such updates generally. > As we don't even know when u4 is going to appear, it may be judicious to backport > this particular changeset ourselves to IcedTea7. > I would like to add my thoughts to this discussion. First, I think it would be beneficial to keep version numbers as close to openjdk/proprietary jdk as possible. It was quite strange in the openjdk6 time-frame where the openjdk (6bXX) releases were not related to proprietary jdk6 (6uYY) at all. I recall a number of users saying that because YY was greater than XX, openjdk was lagging behind the proprietary jdk. I imagine it will be hard for users to figure out that icedtea2.1 is approximately openjdk7u2, and not openjdk7u1. Perhaps we can even utilize this to our advantage and keep odd minor numbers (2.1, 2.3, 2.5 and so on) reserved for our own releases which may contain important non-openjdk stuff (I am thinking of things like ports, architecture support, a number of important bug fixes. and so on). Second, it might be nice to have releases as close to openjdk as possible. That way we ensure that when people go looking for the latest openjdk7 update version, they find icedtea7 and don't use the closed source jdk instead. This will also minimize the period in which known bugs are fixed in the (proprietary) openjdk7 update release but the fixes are not available in icedtea7. I know the lack of an explicit openjdk7 release schedule does not help right now, but perhaps this will be addressed soon? What do others think? Cheers, Omair From ahughes at redhat.com Tue Dec 13 16:10:12 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 14 Dec 2011 00:10:12 +0000 Subject: icedtea7 releases (was Re: RFC: backport S7104625 to icedtea7 forest) In-Reply-To: <4EE7CD70.10209@redhat.com> References: <201112082329.31173.drazzib@drazzib.com> <4EE67705.5030400@redhat.com> <20111212231155.GC31950@rivendell.middle-earth.co.uk> <4EE7CD70.10209@redhat.com> Message-ID: <20111214001012.GB25730@rivendell.middle-earth.co.uk> On 17:10 Tue 13 Dec , Omair Majid wrote: > On 12/12/2011 06:11 PM, Dr Andrew John Hughes wrote: > >> If you need this fix earlier, I can add this to icedtea7 as well. Though > >> I would rather avoid the extra work and just wait until the next sync :) > >> > > > > I think this is something we need to discuss. I've not had much luck finding > > out the schedule for these updates from Oracle. From > > > > http://openjdk.java.net/projects/jdk7/builds/ > > > > it seems that u2 is supposed to be released tomorrow, but I see little discussion > > about this on the jdk7u mailing list. There are no dates on that calendar for > > future releases. > > > > We should look at pulling u2 into IcedTea7 and doing a 2.1 release. I'll post a > > list of changesets to see what this equates to. > > > > We also need to discuss how we are going to handle such updates generally. > > As we don't even know when u4 is going to appear, it may be judicious to backport > > this particular changeset ourselves to IcedTea7. > > > > I would like to add my thoughts to this discussion. > > First, I think it would be beneficial to keep version numbers as close > to openjdk/proprietary jdk as possible. It was quite strange in the > openjdk6 time-frame where the openjdk (6bXX) releases were not related > to proprietary jdk6 (6uYY) at all. I recall a number of users saying > that because YY was greater than XX, openjdk was lagging behind the > proprietary jdk. Well yes, that's true and Oracle acknowledge it too. But this couldn't be helped; due to the genealogy of OpenJDK6 the two are completely unrelated and incomparable, coming from completely different code repositories. Thankfully, this period is mostly behind us now. I imagine it will be hard for users to figure out that > icedtea2.1 is approximately openjdk7u2, and not openjdk7u1. Perhaps we > can even utilize this to our advantage and keep odd minor numbers (2.1, > 2.3, 2.5 and so on) reserved for our own releases which may contain > important non-openjdk stuff (I am thinking of things like ports, > architecture support, a number of important bug fixes. and so on). > I think that would be difficult to make work because it puts hard constraints on what we can do; it would be more confusing if we skip version numbers because there are e.g. no ARM support changes to make a 2.3 release, so we end up going 2.0, 2.2, 2.4, 2.5 or something. We also have a tradition of following the more usual FOSS pattern of applying security updates to supported releases rather than doing a whole new release for a security update as Oracle does for Java and Mozilla do for Firefox. I believe distros find this better, but speak up if this isn't the case. I don't think the end users see the IcedTea version that much anyway (especially based on how bugs are reported). The confusion was between b22 of OpenJDK6 not being the same as b22 of the proprietary JDK. I envisage 7u2's version output being something like: java version "1.7.0_02" OpenJDK Runtime Environment (IcedTea7 2.1) (Gentoo build 1.7.0_02-b21) which I believe is close to the proprietary VM (it would be good if someone could include the output of that for comparison). The IcedTea version is clearly separate. This is based on: http://hg.openjdk.java.net/jdk7u/jdk7u2/rev/50b5ada8ca3e the latest commit to the jdk7u2 repo. > Second, it might be nice to have releases as close to openjdk as > possible. That way we ensure that when people go looking for the latest > openjdk7 update version, they find icedtea7 and don't use the closed > source jdk instead. I agree strongly with the former, as far as is possible (we don't know what Oracle actually ship and still ~4% is proprietary, not including plugin/javaws/javafx). I don't think the latter follows from this. People will go looking on Oracle's website and find proprietary blobs. It's not obvious from Oracle's site that there are FOSS versions and I don't see any way we can change this unfortunately. Users need to be strongly encouraged to update from their distro, not random websites, in general. > This will also minimize the period in which known > bugs are fixed in the (proprietary) openjdk7 update release but the > fixes are not available in icedtea7. I know the lack of an explicit > openjdk7 release schedule does not help right now, but perhaps this will > be addressed soon? > Well u2 coming out today has caught us by a bit of a surprise. It doesn't help that pretty much no-one seems to be working on 7, despite all these claims that we want to switch to it. The changesets are there in the u2 repository, yet no-one has made any attempt to start pulling them into IcedTea over the last several months. Why? It's about time we started looking at 7 as the main working repository and 6 as something to backport fixes too. I know the TCK situation doesn't yet makes this realistic for enterprise use, but I see Fedora, Ubuntu and Gentoo all shipping 1.7 packages, which suggests it isn't a blocker there. > What do others think? > > Cheers, > 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: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111214/6287476a/attachment.bin From ahughes at redhat.com Tue Dec 13 16:31:36 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 14 Dec 2011 00:31:36 +0000 Subject: JDK 7u2 is now GA In-Reply-To: <8B0AF6D4-30CC-4D06-9315-41C1E9A830F3@oracle.com> References: <8B0AF6D4-30CC-4D06-9315-41C1E9A830F3@oracle.com> Message-ID: <20111214003136.GD25730@rivendell.middle-earth.co.uk> On 21:56 Tue 13 Dec , Edvard Wendelin wrote: > Hi, > > I'd like to announce that JDK 7u2 is now generally available [1]. More notice would be useful in future so people can release packages around the same time, rather than trailing it by weeks as will now be the case. This is the first mention I've heard of u2 on this list in weeks, if not months. > We would like to thank all of you for the contributions you've made! The final build number of OpenJDK 7u2 is b13. OpenJDK source code is available on the Mercurial server [2] and we will also publish source drops in the near future. Once they are available I will send out a link. > According to: http://hg.openjdk.java.net/jdk7u/jdk7u2/rev/50b5ada8ca3e it's just jumped from b13 to b21. Why is this? What happened to the interim builds? > If you're packaging this release, please let us know on this list, and please consider contributing fixes back into 7u4 [3], which is open for fixes. I imagine most GNU/Linux distros will package via IcedTea rather than directly, hence why I was asking about which is the best tree to update IcedTea from. In future, it would be helpful if process issues like this and deadlines were made much clearer to those outside Oracle. > > Cheers, > Edvard > > [1] http://www.oracle.com/technetwork/java/javase/downloads/index.html > [2] http://hg.openjdk.java.net/jdk7u/jdk7u2/ > [3] http://openjdk.java.net/projects/jdk7u/ > -- 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: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111214/bbb588ed/attachment.bin From dalibor.topic at oracle.com Tue Dec 13 16:49:41 2011 From: dalibor.topic at oracle.com (Dalibor Topic) Date: Wed, 14 Dec 2011 01:49:41 +0100 Subject: JDK 7u2 is now GA In-Reply-To: <20111214003136.GD25730@rivendell.middle-earth.co.uk> References: <8B0AF6D4-30CC-4D06-9315-41C1E9A830F3@oracle.com> <20111214003136.GD25730@rivendell.middle-earth.co.uk> Message-ID: <4EE7F2A5.8080803@oracle.com> On 12/14/11 1:31 AM, Dr Andrew John Hughes wrote: > it's just jumped from b13 to b21. Why is this? Good question. I believe this has to do with the way the Oracle internal builds work - since they are based off OpenJDK (a great thing), when we do an internal build it gets tagged in the OpenJDK forests now, too, even if there are no changes. The actual build Oracle JDK 7u2 is based off is b13, as the release notes say: http://www.oracle.com/technetwork/java/javase/7u2-relnotes-1394228.html > What happened to the interim builds? Nothing, really, as there were no interim builds. > I imagine most GNU/Linux distros will package via IcedTea rather than > directly, hence why I was asking about which is the best tree to > update IcedTea from. Go with jdk7u/jdk7u2. 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 Gesch?ftsf?hrer: J?rgen Kunz Komplement?rin: ORACLE Deutschland Verwaltung B.V. Hertogswetering 163/167, 3543 AS Utrecht, Niederlande Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697 Gesch?ftsf?hrer: Alexander van der Ven, Astrid Kepper, Val Maher Green Oracle Oracle is committed to developing practices and products that help protect the environment From edvard.wendelin at oracle.com Tue Dec 13 12:56:17 2011 From: edvard.wendelin at oracle.com (Edvard Wendelin) Date: Tue, 13 Dec 2011 21:56:17 +0100 Subject: JDK 7u2 is now GA Message-ID: <8B0AF6D4-30CC-4D06-9315-41C1E9A830F3@oracle.com> Hi, I'd like to announce that JDK 7u2 is now generally available [1]. We would like to thank all of you for the contributions you've made! The final build number of OpenJDK 7u2 is b13. OpenJDK source code is available on the Mercurial server [2] and we will also publish source drops in the near future. Once they are available I will send out a link. If you're packaging this release, please let us know on this list, and please consider contributing fixes back into 7u4 [3], which is open for fixes. Cheers, Edvard [1] http://www.oracle.com/technetwork/java/javase/downloads/index.html [2] http://hg.openjdk.java.net/jdk7u/jdk7u2/ [3] http://openjdk.java.net/projects/jdk7u/ -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111213/bd5532f7/attachment.html From bugzilla-daemon at icedtea.classpath.org Wed Dec 14 00:53:12 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 14 Dec 2011 08:53:12 +0000 Subject: [Bug 834] New: When starting Eclipse this error happens Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=834 Bug #: 834 Summary: When starting Eclipse this error happens Classification: Unclassified Product: IcedTea Version: unspecified Platform: x86_64 OS/Version: Linux Status: NEW Severity: critical Priority: P3 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: klausk at hih.au.dk Created attachment 624 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=624 error report from eclipse # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x000000388ee186d0, pid=11058, tid=140447024305920 # # 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.4 # Distribution: Fedora release 16 (Verne), package fedora-61.1.10.4.fc16-x86_64 # Problematic frame: # C [libgobject-2.0.so.0+0x186d0] g_object_get_qdata+0x20 # # 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. -- 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 Wed Dec 14 01:46:02 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 14 Dec 2011 09:46:02 +0000 Subject: /hg/gfx-test: 2011-12-14 Pavel Tisnovsky Message-ID: changeset a156e47c8368 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=a156e47c8368 author: Pavel Tisnovsky date: Wed Dec 14 10:48:19 2011 +0100 2011-12-14 Pavel Tisnovsky * src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java: Refactoring, added about twenty new tests to this test case, improved Javadoc. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java | 843 +++++++++- 2 files changed, 698 insertions(+), 151 deletions(-) diffs (truncated from 1173 to 500 lines): diff -r d55fc8062bd9 -r a156e47c8368 ChangeLog --- a/ChangeLog Tue Dec 13 11:22:19 2011 +0100 +++ b/ChangeLog Wed Dec 14 10:48:19 2011 +0100 @@ -1,3 +1,9 @@ +2011-12-14 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java: + Refactoring, added about twenty new tests to this test case, improved + Javadoc. + 2011-12-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/NormalCubicCurvesAsPaths.java: diff -r d55fc8062bd9 -r a156e47c8368 src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java --- a/src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java Tue Dec 13 11:22:19 2011 +0100 +++ b/src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java Wed Dec 14 10:48:19 2011 +0100 @@ -63,10 +63,6 @@ @Zoom(1) public class NormalQuadraticCurvesAsPaths extends GfxTest { - /** - * Default Y offset of curve end points. - */ - private static final int DEFAULT_Y_OFFSET = 40; /** * Step between curves drawn by different colors onto the same image. @@ -111,12 +107,12 @@ private void drawCrossesAtControlPoints(Graphics2D graphics, int width, int height) { // get curve coordinates - int x1 = computeX1(width); - int y1 = computeY1(); - int x2 = computeX2(width); - int y2 = computeY2(height); - int x3 = computeX3(width); - int y3 = computeY3(); + int x1 = CommonPathsGenerator.computeQuadraticPathX1(width); + int y1 = CommonPathsGenerator.computeQuadraticPathY1(); + int x2 = CommonPathsGenerator.computeQuadraticPathX2(width); + int y2 = CommonPathsGenerator.computeQuadraticPathY2(height); + int x3 = CommonPathsGenerator.computeQuadraticPathX3(width); + int y3 = CommonPathsGenerator.computeQuadraticPathY3(); drawCrossesAtControlPoints(graphics, x1, y1, x2, y2, x3, y3); } @@ -179,7 +175,7 @@ * @param graphics * graphics canvas */ - private void drawPathWithVariousColors(TestImage image, Graphics2D graphics) + private void drawPathWithVariousColorsFloat(TestImage image, Graphics2D graphics) { // calculate image dimensions int width = image.getWidth(); @@ -195,9 +191,45 @@ for (Color color : colors) { // create new path - Path2D path = new Path2D.Float(); - path.moveTo(computeX1(width), computeY1() + offset); - path.quadTo(computeX2(width), computeY2(height) + offset, computeX3(width), computeY3() + offset); + Path2D path = CommonPathsGenerator.createQuadraticPathFloat(width, height, offset); + + // set the specified color + graphics.setColor(color); + + // draw QuadCurve2D + graphics.draw(path); + + // move next curve down + offset += OFFSET_STEP; + } + } + + /** + * Draw set of quadratic curves onto canvas specified by Graphics2D class. + * Curves are drawn using various colors. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics canvas + */ + private void drawPathWithVariousColorsDouble(TestImage image, Graphics2D graphics) + { + // calculate image dimensions + int width = image.getWidth(); + int height = image.getHeight(); + + // curve colors + Color[] colors = ColorPalette.getColors(); + + // offset counter + int offset = 0; + + // Draw each curve with different color. + for (Color color : colors) + { + // create new path + Path2D path = CommonPathsGenerator.createQuadraticPathDouble(width, height, offset); // set the specified color graphics.setColor(color); @@ -219,7 +251,7 @@ * @param graphics * graphics canvas */ - private void drawPathWithVariousTransparency(TestImage image, Graphics2D graphics) + private void drawPathWithVariousTransparencyFloat(TestImage image, Graphics2D graphics) { // calculate image dimensions int width = image.getWidth(); @@ -232,9 +264,7 @@ for (int transparency = 0; transparency < 16; transparency++) { // create new path - Path2D path = new Path2D.Float(); - path.moveTo(computeX1(width), computeY1() + offset); - path.quadTo(computeX2(width), computeY2(height) + offset, computeX3(width), computeY3() + offset); + Path2D path = CommonPathsGenerator.createQuadraticPathFloat(width, height, offset); // set the specified color graphics.setColor(new Color(0f, 0f, 0f, transparency / 16f)); @@ -248,39 +278,38 @@ } /** - * Create new path using Path2D.Float() which contains just one quadratic - * curve. + * Draw set of quadratic curves onto canvas specified by Graphics2D class. + * Curves are drawn using various transparency. * - * @param width - * canvas width - * @param height - * canvas height - * @return created path + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics canvas */ - private Path2D createPathFloat(int width, int height) + private void drawPathWithVariousTransparencyDouble(TestImage image, Graphics2D graphics) { - Path2D path = new Path2D.Float(); - path.moveTo(computeX1(width), computeY1()); - path.quadTo(computeX2(width), computeY2(height), computeX3(width), computeY3()); - return path; - } + // calculate image dimensions + int width = image.getWidth(); + int height = image.getHeight(); + + // offset counter + int offset = 0; - /** - * Create new path using Path2D.Double() which contains just one quadratic - * curve. - * - * @param width - * canvas width - * @param height - * canvas height - * @return created path - */ - private Path2D createPathDouble(int width, int height) - { - Path2D path = new Path2D.Double(); - path.moveTo(computeX1(width), computeY1()); - path.quadTo(computeX2(width), computeY2(height), computeX3(width), computeY3()); - return path; + // Draw each curve with transparency + for (int transparency = 0; transparency < 16; transparency++) + { + // create new path + Path2D path = CommonPathsGenerator.createQuadraticPathDouble(width, height, offset); + + // set the specified color + graphics.setColor(new Color(0f, 0f, 0f, transparency / 16f)); + + // draw QuadCurve2D + graphics.draw(path); + + // move next curve down + offset += OFFSET_STEP; + } } /** @@ -292,14 +321,36 @@ * graphics context for image * @return test result status - PASSED, FAILED or ERROR */ - private TestResult createAndDrawPath(TestImage image, Graphics2D graphics) + private TestResult createAndDrawPathFloat(TestImage image, Graphics2D graphics) { // calculate image dimensions int width = image.getWidth(); int height = image.getHeight(); // create new path - Path2D path = createPathFloat(width, height); + Path2D path = CommonPathsGenerator.createQuadraticPathFloat(width, height); + + // draw path + return drawPath(graphics, width, height, path); + } + + /** + * Create quadratic cube and draw it. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + private TestResult createAndDrawPathDouble(TestImage image, Graphics2D graphics) + { + // calculate image dimensions + int width = image.getWidth(); + int height = image.getHeight(); + + // create new path + Path2D path = CommonPathsGenerator.createQuadraticPathDouble(width, height); // draw path return drawPath(graphics, width, height, path); @@ -321,7 +372,7 @@ int height = image.getHeight(); // create new path - Path2D path = createPathFloat(width, height); + Path2D path = CommonPathsGenerator.createQuadraticPathFloat(width, height); // draw path return drawPath(graphics, width, height, path); @@ -343,7 +394,7 @@ int height = image.getHeight(); // create new path - Path2D path = createPathDouble(width, height); + Path2D path = CommonPathsGenerator.createQuadraticPathDouble(width, height); // draw path return drawPath(graphics, width, height, path); @@ -360,13 +411,153 @@ * graphics context for image * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testZeroStroke(TestImage image, Graphics2D graphics) + public TestResult testZeroStrokeFloat(TestImage image, Graphics2D graphics) { // set zero pixels wide stroke CommonRenderingStyles.setStrokeZeroThick(graphics); // create quadratic path and draw it - return createAndDrawPath(image, graphics); + return createAndDrawPathFloat(image, graphics); + } + + /** + * Test if quadratic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and default + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeDouble(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics); + + // create quadratic path and draw it + return createAndDrawPathDouble(image, graphics); + } + + /** + * Test if quadratic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and butt + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeCapsButtFloat(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics, BasicStroke.CAP_BUTT); + + // create quadratic path and draw it + return createAndDrawPathFloat(image, graphics); + } + + /** + * Test if quadratic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and butt + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeCapsButtDouble(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics, BasicStroke.CAP_BUTT); + + // create quadratic path and draw it + return createAndDrawPathDouble(image, graphics); + } + + /** + * Test if quadratic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and round + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeCapsRoundFloat(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics, BasicStroke.CAP_ROUND); + + // create quadratic path and draw it + return createAndDrawPathFloat(image, graphics); + } + + /** + * Test if quadratic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and default + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeCapsRoundDouble(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics, BasicStroke.CAP_ROUND); + + // create quadratic path and draw it + return createAndDrawPathDouble(image, graphics); + } + + /** + * Test if quadratic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and square + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeCapsSquareFloat(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics, BasicStroke.CAP_SQUARE); + + // create quadratic path and draw it + return createAndDrawPathFloat(image, graphics); + } + + /** + * Test if quadratic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with zero pixels wide stroke and square + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testZeroStrokeCapsSquareDouble(TestImage image, Graphics2D graphics) + { + // set zero pixels wide stroke + CommonRenderingStyles.setStrokeZeroThick(graphics, BasicStroke.CAP_SQUARE); + + // create quadratic path and draw it + return createAndDrawPathDouble(image, graphics); } /** @@ -380,13 +571,33 @@ * graphics context for image * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testThickStroke(TestImage image, Graphics2D graphics) + public TestResult testThickStrokeFloat(TestImage image, Graphics2D graphics) { // set 10 pixels wide stroke CommonRenderingStyles.setStrokeThickWidth(graphics); // create quadratic path and draw it - return createAndDrawPath(image, graphics); + return createAndDrawPathFloat(image, graphics); + } + + /** + * Test if quadratic curve created by Path2D.Float() is rendered + * correctly. Curve is to be drawn with 10 pixels wide stroke and default + * caps. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testThickStrokeDouble(TestImage image, Graphics2D graphics) + { + // set 10 pixels wide stroke + CommonRenderingStyles.setStrokeThickWidth(graphics); + + // create quadratic path and draw it + return createAndDrawPathDouble(image, graphics); } /** @@ -400,13 +611,33 @@ * graphics context for image * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testThickStrokeCapsButt(TestImage image, Graphics2D graphics) + public TestResult testThickStrokeCapsButtFloat(TestImage image, Graphics2D graphics) { // set 10 pixels wide stroke CommonRenderingStyles.setStrokeThickWidth(graphics, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL); // create quadratic path and draw it - return createAndDrawPath(image, graphics); + return createAndDrawPathFloat(image, graphics); + } + + /** + * Test if quadratic curve created by Path2D.Float() is rendered correctly. + * Curve is to be drawn with 10 pixels wide stroke and the curve caps is set + * to CAP_BUTT. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics + * graphics context for image + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testThickStrokeCapsButtDouble(TestImage image, Graphics2D graphics) + { + // set 10 pixels wide stroke + CommonRenderingStyles.setStrokeThickWidth(graphics, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL); + + // create quadratic path and draw it + return createAndDrawPathDouble(image, graphics); } /** @@ -420,13 +651,33 @@ * graphics context for image * @return test result status - PASSED, FAILED or ERROR */ - public TestResult testThickStrokeCapsRound(TestImage image, Graphics2D graphics) + public TestResult testThickStrokeCapsRoundFloat(TestImage image, Graphics2D graphics) { // set 10 pixels wide stroke CommonRenderingStyles.setStrokeThickWidth(graphics, BasicStroke.CAP_ROUND, BasicStroke.JOIN_BEVEL); // create quadratic path and draw it - return createAndDrawPath(image, graphics); + return createAndDrawPathFloat(image, graphics); + } + + /** + * Test if quadratic curve created by Path2D.Float() is rendered correctly. + * Curve is to be drawn with 10 pixels wide stroke and the curve caps is set + * to CAP_ROUND. + * + * @param image + * image to which two dimensional shape is to be rendered + * @param graphics From mark at mark.mielke.cc Tue Dec 13 21:37:06 2011 From: mark at mark.mielke.cc (Mark Mielke) Date: Wed, 14 Dec 2011 00:37:06 -0500 Subject: JDK 7u2 is now GA In-Reply-To: <20111214003136.GD25730@rivendell.middle-earth.co.uk> References: <8B0AF6D4-30CC-4D06-9315-41C1E9A830F3@oracle.com> <20111214003136.GD25730@rivendell.middle-earth.co.uk> Message-ID: <4EE83602.9000408@mark.mielke.cc> On 12/13/2011 07:31 PM, Dr Andrew John Hughes wrote: > More notice would be useful in future so people can release packages > around the same time, rather than trailing it by weeks as will now be > the case. This is the first mention I've heard of u2 on this list in > weeks, if not months. Just to echo this a bit... I've been monitoring this list precisely to be more aware of what is happening, and I have to say that although I expected a jdk7u2 within the next week, it was only through sleuthing *outside* this list that I had any awareness. Even as late as yesterday evening, I was telling people "wait until 7u2 which might be this week". Is there some reason the dates are hidden? Is this Oracle release policy? It seems Oracle releases actually quite regular - and some dates (security patch dates?) are published well in advance. I think 7u2 expected release date could have been published... or maybe I'm just naive... -- Mark Mielke From jvanek at icedtea.classpath.org Wed Dec 14 02:05:57 2011 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 14 Dec 2011 10:05:57 +0000 Subject: /hg/visualvm: 2 new changesets Message-ID: changeset 12ceb49d3907 in /hg/visualvm details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=12ceb49d3907 author: Jiri Vanek date: Wed Dec 14 11:02:29 2011 +0100 Added tag visualvm-1.3-branchpoint for changeset bc76c6cb587c changeset 8e2e7372d10f in /hg/visualvm details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=8e2e7372d10f author: Jiri Vanek date: Wed Dec 14 11:06:20 2011 +0100 Updated to next 1.4pre version diffstat: .hgtags | 1 + configure.ac | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (17 lines): diff -r bc76c6cb587c -r 8e2e7372d10f .hgtags --- a/.hgtags Wed Nov 09 17:23:22 2011 -0500 +++ b/.hgtags Wed Dec 14 11:06:20 2011 +0100 @@ -1,3 +1,4 @@ 8b1172973c70ab07f27468f719b6b34c96586779 1.0 a9687562ffccc1dc97fd7dd0a8d3ad718f765ed3 1.1 f598f323099e5524bd8c44f8c0eca675f7e721a7 visualvm-1.2-branchpoint +bc76c6cb587cf9b7a1b9708c8d51eb10253900a9 visualvm-1.3-branchpoint diff -r bc76c6cb587c -r 8e2e7372d10f configure.ac --- a/configure.ac Wed Nov 09 17:23:22 2011 -0500 +++ b/configure.ac Wed Dec 14 11:06:20 2011 +0100 @@ -1,4 +1,4 @@ -AC_INIT([visualvm_harness], [1.3], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([visualvm_harness], [1.4pre], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile visualvm.desktop]) From jvanek at icedtea.classpath.org Wed Dec 14 02:09:20 2011 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 14 Dec 2011 10:09:20 +0000 Subject: /hg/visualvm: aded chagelog and updated news Message-ID: changeset 15c584d48dc0 in /hg/visualvm details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=15c584d48dc0 author: Jiri Vanek date: Wed Dec 14 11:10:15 2011 +0100 aded chagelog and updated news HGEnter commit message. Lines beginning with 'HG:' are removed. diffstat: ChangeLog | 5 +++++ NEWS | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r 8e2e7372d10f -r 15c584d48dc0 ChangeLog --- a/ChangeLog Wed Dec 14 11:06:20 2011 +0100 +++ b/ChangeLog Wed Dec 14 11:10:15 2011 +0100 @@ -1,3 +1,8 @@ +2011-12-14 Jiri Vanek + + * configure.ac: Bump to 1.4pre + * NEWS: Updated + 2011-11-09 Omair Majid * NEWS: Update. diff -r 8e2e7372d10f -r 15c584d48dc0 NEWS --- a/NEWS Wed Dec 14 11:06:20 2011 +0100 +++ b/NEWS Wed Dec 14 11:10:15 2011 +0100 @@ -8,7 +8,7 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.3 (2011-XX-XX): +New in release 1.3 (2011-12-14): * Support for VisualVM 1.3.3 New in release 1.2 (2011-03-09): From jvanek at icedtea.classpath.org Wed Dec 14 02:14:13 2011 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 14 Dec 2011 10:14:13 +0000 Subject: /hg/release/visualvm-1.3: changelog and news Message-ID: changeset 0b6c43ee6ae7 in /hg/release/visualvm-1.3 details: http://icedtea.classpath.org/hg/release/visualvm-1.3?cmd=changeset;node=0b6c43ee6ae7 author: Jiri Vanek date: Wed Dec 14 11:13:39 2011 +0100 changelog and news diffstat: ChangeLog | 5 +++++ NEWS | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r bc76c6cb587c -r 0b6c43ee6ae7 ChangeLog --- a/ChangeLog Wed Nov 09 17:23:22 2011 -0500 +++ b/ChangeLog Wed Dec 14 11:13:39 2011 +0100 @@ -1,3 +1,8 @@ +2011-12-14 Jiri Vanek + + branch 1.3 released + * NEWS: updated + 2011-11-09 Omair Majid * NEWS: Update. diff -r bc76c6cb587c -r 0b6c43ee6ae7 NEWS --- a/NEWS Wed Nov 09 17:23:22 2011 -0500 +++ b/NEWS Wed Dec 14 11:13:39 2011 +0100 @@ -8,7 +8,7 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.3 (2011-XX-XX): +New in release 1.3 (2011-12-14): * Support for VisualVM 1.3.3 New in release 1.2 (2011-03-09): From jvanek at icedtea.classpath.org Wed Dec 14 02:17:56 2011 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Wed, 14 Dec 2011 10:17:56 +0000 Subject: /hg/release/visualvm-1.3: Added tag visualvm-1.3-branch for chan... Message-ID: changeset 7011a922e3f0 in /hg/release/visualvm-1.3 details: http://icedtea.classpath.org/hg/release/visualvm-1.3?cmd=changeset;node=7011a922e3f0 author: Jiri Vanek date: Wed Dec 14 11:18:51 2011 +0100 Added tag visualvm-1.3-branch for changeset 0b6c43ee6ae7 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 0b6c43ee6ae7 -r 7011a922e3f0 .hgtags --- a/.hgtags Wed Dec 14 11:13:39 2011 +0100 +++ b/.hgtags Wed Dec 14 11:18:51 2011 +0100 @@ -1,3 +1,4 @@ 8b1172973c70ab07f27468f719b6b34c96586779 1.0 a9687562ffccc1dc97fd7dd0a8d3ad718f765ed3 1.1 f598f323099e5524bd8c44f8c0eca675f7e721a7 visualvm-1.2-branchpoint +0b6c43ee6ae701dd32e16a8bb97ac3095be818fb visualvm-1.3-branch From bugzilla-daemon at icedtea.classpath.org Wed Dec 14 02:53:31 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 14 Dec 2011 10:53:31 +0000 Subject: [Bug 834] When starting Eclipse this error happens In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=834 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |xerxes at zafena.se --- Comment #1 from Xerxes R?nby 2011-12-14 10:53:31 UTC --- Hi I have looked through your bug-report. The crash happened in GNOME libgobject code # Problematic frame: # C [libgobject-2.0.so.0+0x186d0] g_object_get_qdata+0x20 when you clicked on the Choose Workspace Dialog's OK button. Something went wrong while the eclipse SWT code de-constructed the "ChooseWorkspaceDialog" and removed the widgets from the GNOME dialog-window. Stack: [0x00007fbc5eee5000,0x00007fbc5efe6000], sp=0x00007fbc5efe29b0, free space=1014k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [libgobject-2.0.so.0+0x186d0] g_object_get_qdata+0x20 Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j org.eclipse.swt.internal.gtk.OS._g_object_get_qdata(JI)J+0 j org.eclipse.swt.internal.gtk.OS.g_object_get_qdata(JI)J+9 j org.eclipse.swt.widgets.Display.removeWidget(J)Lorg/eclipse/swt/widgets/Widget;+19 j org.eclipse.swt.widgets.Combo.deregister()V+21 j org.eclipse.swt.widgets.Widget.releaseWidget()V+1 ... j org.eclipse.jface.window.Window.close()Z+65 j org.eclipse.jface.dialogs.Dialog.close()Z+26 .. j org.eclipse.ui.internal.ide.ChooseWorkspaceDialog.okPressed()V+15 Since the crash happened outside OpenJDK/Icedtea code I will suggest you to forward this bug to: 1. Fedora, since this are the community who packaged your eclipse/libswt and gnome versions. 2. Eclipse, if the bug are found to be caused with libswt being incompatible with the latest gnome 3.x api. (Eclipse can fix the upstream libswt code to be compatible with the latest gnome 3.x API) 3. GNOME, if the bug are found to be caused by libgobject even when the gnome 3.x API are used as intended. -- 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 dalibor.topic at oracle.com Wed Dec 14 04:38:42 2011 From: dalibor.topic at oracle.com (Dalibor Topic) Date: Wed, 14 Dec 2011 13:38:42 +0100 Subject: icedtea7 releases (was Re: RFC: backport S7104625 to icedtea7 forest) In-Reply-To: <20111214001012.GB25730@rivendell.middle-earth.co.uk> References: <201112082329.31173.drazzib@drazzib.com> <4EE67705.5030400@redhat.com> <20111212231155.GC31950@rivendell.middle-earth.co.uk> <4EE7CD70.10209@redhat.com> <20111214001012.GB25730@rivendell.middle-earth.co.uk> Message-ID: <4EE898D2.90904@oracle.com> On 12/14/11 1:10 AM, Dr Andrew John Hughes wrote: > The changesets are there in the u2 repository, yet no-one has made any > attempt to start pulling them into IcedTea over the last several months. > Why? I have to admit that this has taken me a bit by surprise, as well. I have assumed that the ongoing IcedTea 2 work was tracking 7 releases, but your statement here suggests that hasn't been the case. Can you give me a short introduction of where IcedTea2 is right now? I have been trying to figure that out from http://icedtea.classpath.org/wiki/Main_Page but I have been defeated by that wiki's resistance to search terms I've thrown at it. 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 Gesch?ftsf?hrer: J?rgen Kunz Komplement?rin: ORACLE Deutschland Verwaltung B.V. Hertogswetering 163/167, 3543 AS Utrecht, Niederlande Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697 Gesch?ftsf?hrer: Alexander van der Ven, Astrid Kepper, Val Maher Green Oracle Oracle is committed to developing practices and products that help protect the environment From bugzilla-daemon at icedtea.classpath.org Wed Dec 14 04:42:14 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 14 Dec 2011 12:42:14 +0000 Subject: [Bug 832] Crash in ARM assembler interpreter when connecting bubbleupnp client to the running bubbleupnp-server on armel Debian Lenny In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=832 Xerxes R?nby changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |xerxes at zafena.se Component|IcedTea6 |Thumb2 JIT AssignedTo|unassigned at icedtea.classpat |aph at redhat.com |h.org | Summary|Connecting to the java |Crash in ARM assembler |applet "bubbleupnp" via |interpreter when connecting |android app causes the java |bubbleupnp client to the |applet on the arm plattform |running bubbleupnp-server |to crash! |on armel Debian Lenny --- Comment #1 from Xerxes R?nby 2011-12-14 12:42:14 UTC --- Hi I have examined your bug-report. Debian Lenny have upgraded your openjdk installation in one of their security updates, this new version includes of course all the security fixes and also pused out the thumb2-jit and assembler interpreter for ARM for armel Debian Lenny users. Unfortunately you have discovered a bug in the assembler interpreter that triggers when running the BubbleUPnPServer. workaround: you can start the server with: java -XX:+PrintCommandLineFlags -jar BubbleUPnPServer.jar The -XX:+PrintCommandLineFlags will disable the assembler interperter and make the code run using the c++ zero interpreter. http://gbenson.net/?p=239#comments If possible build and try the latest Icedtea6 1.10.4 release on your ARM server, it includes a more bug-fixed hotspot and also some alternative JVM's like cacao and JamVM that you can use. -- 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 Dec 14 09:11:14 2011 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 14 Dec 2011 17:11:14 +0000 Subject: JDK 7u2 is now GA In-Reply-To: <4EE83602.9000408@mark.mielke.cc> References: <8B0AF6D4-30CC-4D06-9315-41C1E9A830F3@oracle.com> <20111214003136.GD25730@rivendell.middle-earth.co.uk> <4EE83602.9000408@mark.mielke.cc> Message-ID: <20111214171114.GB7162@rivendell.middle-earth.co.uk> On 00:37 Wed 14 Dec , Mark Mielke wrote: > On 12/13/2011 07:31 PM, Dr Andrew John Hughes wrote: > > More notice would be useful in future so people can release packages > > around the same time, rather than trailing it by weeks as will now be > > the case. This is the first mention I've heard of u2 on this list in > > weeks, if not months. > > Just to echo this a bit... I've been monitoring this list precisely to > be more aware of what is happening, and I have to say that although I > expected a jdk7u2 within the next week, it was only through sleuthing > *outside* this list that I had any awareness. Even as late as yesterday > evening, I was telling people "wait until 7u2 which might be this week". > Similar story here; I found out about 7u2 via Twitter. > Is there some reason the dates are hidden? Is this Oracle release > policy? It seems Oracle releases actually quite regular - and some dates > (security patch dates?) are published well in advance. I think 7u2 > expected release date could have been published... or maybe I'm just > naive... Really, for OpenJDK to be a proper community-driven project, such dates should be discussed and decided in public, so everyone involved is on the same page. I mentioned in another e-mail about IcedTea lagging behind with such updates. There's not much alternative to that if release dates are going to be handed down from on high, having being decided somewhere within Oracle. For example, the status on http://openjdk.java.net/projects/jdk7u/ should have estimated dates as to the various stages the releases are at. http://gcc.gnu.org/ status is a good template for what I'd like to see. > > -- > Mark Mielke > -- 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: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111214/e3d9a016/attachment.bin From bugzilla-daemon at icedtea.classpath.org Wed Dec 14 13:18:43 2011 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 14 Dec 2011 21:18:43 +0000 Subject: [Bug 835] New: javaws findBestUrl collects open connections Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=835 Bug #: 835 Summary: javaws findBestUrl collects open connections Classification: Unclassified Product: IcedTea-Web Version: unspecified Platform: x86_64 OS/Version: Linux Status: NEW Severity: normal Priority: P3 Component: NetX AssignedTo: omajid at redhat.com ReportedBy: bldewolf at csupomona.edu CC: unassigned at icedtea.classpath.org In icedtea-web-1.1.4, javaws doesn't close connections in the findBestUrl method in ResourceTracker.java. Normally this just means there's a couple extra connections floating around (until gc?), but for mediocre webservers (such as those on embedded devices) this can be crippling. In my case, I believe that it is specifically the act of connecting and only reading the response code causes the awful webserver to hang up responding to anyone. Once this is changed to disconnect after reading the code, the webserver no longer hangs up. Anyway, it's still just a good idea to clean up connections that are no longer needed. Here's a diff that does just that: diff -ur icedtea-web-1.1.4.orig/netx/net/sourceforge/jnlp/cache/ResourceTracker.java icedtea-web-1.1.4/netx/net/sourceforge/jnlp/cache/ResourceTracker.java --- icedtea-web-1.1.4.orig/netx/net/sourceforge/jnlp/cache/ResourceTracker.java 2011-08-31 11:17:30.000000000 -0700 +++ icedtea-web-1.1.4/netx/net/sourceforge/jnlp/cache/ResourceTracker.java 2011-12-14 12:30:28.000000000 -0800 @@ -859,6 +859,7 @@ if (connection instanceof HttpURLConnection) { HttpURLConnection con = (HttpURLConnection)connection; int responseCode = con.getResponseCode(); + ((HttpURLConnection) connection).disconnect(); if (responseCode == -1 || responseCode < 200 || responseCode >= 300) { continue; } -- 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 jvanek at redhat.com Thu Dec 15 02:42:54 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 15 Dec 2011 11:42:54 +0100 Subject: [RFC][icedtea-web] Patch to enable compilation of icedtea-web on both xulrunners apis Message-ID: <4EE9CF2E.5090608@redhat.com> 2011-12-15 Jiri Vanek * acinclude.m4: added definition of IT_CHECK_XULLRUNNER_API_VERSION, which tryes to compile small program against new xulrunner api * configure.ac: added call of IT_CHECK_XULLRUNNER_API_VERSION * plugin/icedteanp/IcedTeaNPPlugin.cc: (NP_GetMIMEDescription) return type set-up by dependecy on defined LEGACY_XULRUNNERAPI. This one is seted by IT_CHECK_XULLRUNNER_API_VERSION during configure. if defined, then old char* is used. New const char* is used otherwise. cc: O:) regards, J. -------------- next part -------------- A non-text attachment was scrubbed... Name: compilabeleWithBothXullrunnersAapi.patch Type: text/x-patch Size: 2324 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111215/560aa64e/compilabeleWithBothXullrunnersAapi.patch From jvanek at redhat.com Thu Dec 15 03:07:11 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 15 Dec 2011 12:07:11 +0100 Subject: visualvm harness 1.3 released In-Reply-To: <4ED86F58.2000807@redhat.com> References: <4ED7AB8D.8090902@redhat.com> <20111202010228.GA8239@rivendell.middle-earth.co.uk> <4ED86F58.2000807@redhat.com> Message-ID: <4EE9D4DF.6010700@redhat.com> c9d7f0e9ad54785cd122b78b1c712742 visualvm_133-src.tar.gz http://icedtea.classpath.org/download/visualvm/visualvm_harness-1.3.tar.gz rawhide build: https://koji.fedoraproject.org/koji/taskinfo?taskID=3586640 Regards, J. On 12/02/2011 07:25 AM, Jiri Vanek wrote: > On 12/02/2011 02:02 AM, Dr Andrew John Hughes wrote: >> On 17:30 Thu 01 Dec , Jiri Vanek wrote: >>> I would like to release visualvm harness 1.3 in 8.12.2012. It will be determined for F17. >>> >>> This release contains: >>> * update to visualvm 1.3.3 >>> * compatible with platform13 (packed as 7.0.1-x) >>> >>> In case that netbeans platform will be update, the it probably comes out with platform14, so also update of visualvm harness will be necessary. >>> >>> >>> Ok with this? >>> >>> >>> Best regards >>> J. >> >> Are there still changes to be done or is everything ready for release? > If there will be no changes in packages we depend on (especially nb platform), then everything is prepared. > > J. > From aph at redhat.com Thu Dec 15 04:57:20 2011 From: aph at redhat.com (Andrew Haley) Date: Thu, 15 Dec 2011 12:57:20 +0000 Subject: ping: Re: /hg/icedtea6: Fix running jamvm jdk tests when configured with a... Message-ID: <4EE9EEB0.5030702@redhat.com> -------------- next part -------------- An embedded message was scrubbed... From: Andrew Haley Subject: Re: /hg/icedtea6: Fix running jamvm jdk tests when configured with a... Date: Mon, 12 Dec 2011 18:12:47 +0000 Size: 5446 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111215/e6910d7e/Fixrunningjamvmjdktestswhenconfiguredwitha___.eml From ptisnovs at icedtea.classpath.org Thu Dec 15 06:30:51 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 15 Dec 2011 14:30:51 +0000 Subject: /hg/gfx-test: 2011-12-15 Pavel Tisnovsky Message-ID: changeset 6b0ebad52d2f in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=6b0ebad52d2f author: Pavel Tisnovsky date: Thu Dec 15 15:33:09 2011 +0100 2011-12-15 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingPathByArbitraryShape.java: * src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java: * src/org/gfxtest/testsuites/ClippingPathByPolygonalShape.java: * src/org/gfxtest/testsuites/ClippingPathByRoundRectangleShape.java: Created stubs for new test suites. * Makefile: updated diffstat: ChangeLog | 9 + Makefile | 12 +- src/org/gfxtest/testsuites/ClippingPathByArbitraryShape.java | 58 +++++++ src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java | 78 ++++++++++ src/org/gfxtest/testsuites/ClippingPathByPolygonalShape.java | 78 ++++++++++ src/org/gfxtest/testsuites/ClippingPathByRoundRectangleShape.java | 78 ++++++++++ 6 files changed, 311 insertions(+), 2 deletions(-) diffs (353 lines): diff -r a156e47c8368 -r 6b0ebad52d2f ChangeLog --- a/ChangeLog Wed Dec 14 10:48:19 2011 +0100 +++ b/ChangeLog Thu Dec 15 15:33:09 2011 +0100 @@ -1,3 +1,12 @@ +2011-12-15 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingPathByArbitraryShape.java: + * src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java: + * src/org/gfxtest/testsuites/ClippingPathByPolygonalShape.java: + * src/org/gfxtest/testsuites/ClippingPathByRoundRectangleShape.java: + Created stubs for new test suites. + * Makefile: updated + 2011-12-14 Pavel Tisnovsky * src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java: diff -r a156e47c8368 -r 6b0ebad52d2f Makefile --- a/Makefile Wed Dec 14 10:48:19 2011 +0100 +++ b/Makefile Thu Dec 15 15:33:09 2011 +0100 @@ -154,7 +154,11 @@ $(CLASSES)/$(TESTSUITE_DIR)/ClippingCircleByPolygonalShape.class \ $(CLASSES)/$(TESTSUITE_DIR)/ClippingCircleByRectangleShape.class \ $(CLASSES)/$(TESTSUITE_DIR)/ClippingCircleByRoundRectangleShape.class \ - $(CLASSES)/$(TESTSUITE_DIR)/ClippingPathByRectangleArea.class + $(CLASSES)/$(TESTSUITE_DIR)/ClippingPathByRectangleArea.class \ + $(CLASSES)/$(TESTSUITE_DIR)/ClippingPathByArbitraryShape.class \ + $(CLASSES)/$(TESTSUITE_DIR)/ClippingPathByEllipseShape.class \ + $(CLASSES)/$(TESTSUITE_DIR)/ClippingPathByPolygonalShape.class \ + $(CLASSES)/$(TESTSUITE_DIR)/ClippingPathByRoundRectangleShape.class COMPARE_RESULTS = \ $(RESULTS)/Areas \ @@ -210,7 +214,11 @@ $(RESULTS)/ClippingCircleByPolygonalShape \ $(RESULTS)/ClippingCircleByRectangleShape \ $(RESULTS)/ClippingCircleByRoundRectangleShape \ - $(RESULTS)/ClippingPathByRectangleArea + $(RESULTS)/ClippingPathByRectangleArea \ + $(RESULTS)/ClippingPathByArbitraryShape \ + $(RESULTS)/ClippingPathByEllipseShape \ + $(RESULTS)/ClippingPathByPolygonalShape \ + $(RESULTS)/ClippingPathByRoundRectangleShape # targets for all test suites TESTSUITES = $(shell ls -1 src/org/gfxtest/testsuites | sed -n -e 's/$[A-Za-z0-9]*$\.java/\1/p') diff -r a156e47c8368 -r 6b0ebad52d2f src/org/gfxtest/testsuites/ClippingPathByArbitraryShape.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/ClippingPathByArbitraryShape.java Thu Dec 15 15:33:09 2011 +0100 @@ -0,0 +1,58 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. + */ + +package org.gfxtest.testsuites; + +import org.gfxtest.framework.GfxTest; + +public class ClippingPathByArbitraryShape extends GfxTest +{ + + /** + * Entry point to the test suite. + * + * @param args + * graphics test configuration + */ + public static void main(String[] args) + { + new ClippingPathByArbitraryShape().runTestSuite(args); + } +} diff -r a156e47c8368 -r 6b0ebad52d2f src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java Thu Dec 15 15:33:09 2011 +0100 @@ -0,0 +1,78 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. + */ + +package org.gfxtest.testsuites; + +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + +/** + * This test check if clipping is working correctly for a path which is clipped + * by an ellipse shape. Various path and various rendering styles are used for + * rendering. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at Transformation(Transformations.NONE) + at GraphicsPrimitive(GraphicsPrimitives.PATH) + at Zoom(1) +public class ClippingPathByEllipseShape extends GfxTest +{ + + /** + * Entry point to the test suite. + * + * @param args + * graphics test configuration + */ + public static void main(String[] args) + { + new ClippingPathByEllipseShape().runTestSuite(args); + } +} diff -r a156e47c8368 -r 6b0ebad52d2f src/org/gfxtest/testsuites/ClippingPathByPolygonalShape.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/ClippingPathByPolygonalShape.java Thu Dec 15 15:33:09 2011 +0100 @@ -0,0 +1,78 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. + */ + +package org.gfxtest.testsuites; + +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + +/** + * This test check if clipping is working correctly for a path which is clipped + * by a polygonal shape. Various path and various rendering styles are used for + * rendering. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at Transformation(Transformations.NONE) + at GraphicsPrimitive(GraphicsPrimitives.PATH) + at Zoom(1) +public class ClippingPathByPolygonalShape extends GfxTest +{ + + /** + * Entry point to the test suite. + * + * @param args + * graphics test configuration + */ + public static void main(String[] args) + { + new ClippingPathByPolygonalShape().runTestSuite(args); + } +} diff -r a156e47c8368 -r 6b0ebad52d2f src/org/gfxtest/testsuites/ClippingPathByRoundRectangleShape.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/ClippingPathByRoundRectangleShape.java Thu Dec 15 15:33:09 2011 +0100 @@ -0,0 +1,78 @@ +/* + Java gfx-test framework + + Copyright (C) 2010, 2011 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. + */ + +package org.gfxtest.testsuites; + +import org.gfxtest.framework.GfxTest; +import org.gfxtest.framework.annotations.GraphicsPrimitive; +import org.gfxtest.framework.annotations.GraphicsPrimitives; +import org.gfxtest.framework.annotations.TestType; +import org.gfxtest.framework.annotations.TestTypes; +import org.gfxtest.framework.annotations.Transformation; +import org.gfxtest.framework.annotations.Transformations; +import org.gfxtest.framework.annotations.Zoom; + + + +/** + * This test check if clipping is working correctly for a path which is clipped + * by a round rectangle shape. Various path and various rendering styles are used for + * rendering. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at Transformation(Transformations.NONE) + at GraphicsPrimitive(GraphicsPrimitives.PATH) + at Zoom(1) +public class ClippingPathByRoundRectangleShape extends GfxTest +{ + + /** + * Entry point to the test suite. + * + * @param args + * graphics test configuration + */ + public static void main(String[] args) + { + new ClippingPathByRoundRectangleShape().runTestSuite(args); + } +} From jvanek at redhat.com Thu Dec 15 07:52:40 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 15 Dec 2011 16:52:40 +0100 Subject: [RFC][icedtea-web] made xsltproc to be checked mandatory tool, instead of ignore its failure Message-ID: <4EEA17C8.8060905@redhat.com> 2011-12-15 Jiri Vanek * configure.ac: added search for xsltproc program and setting WITH_CSLTPROC variable * makefile.am: xsltproc result is no longer ignored, command itself is in conditional block cc? :) Best regards, J -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: xsltProc-diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111215/8015cc69/xsltProc-diff.ksh From doko at ubuntu.com Fri Dec 16 05:26:35 2011 From: doko at ubuntu.com (Matthias Klose) Date: Fri, 16 Dec 2011 14:26:35 +0100 Subject: /hg/icedtea6: Fix running jamvm jdk tests when configured with a... In-Reply-To: <4EE6441F.9000802@redhat.com> References: <4EE6441F.9000802@redhat.com> Message-ID: <4EEB470B.6070703@ubuntu.com> On 12/12/2011 07:12 PM, Andrew Haley wrote: > On 12/08/2011 02:49 PM, doko at icedtea.classpath.org wrote: >> changeset 96ea1d0f5dc4 in /hg/icedtea6 >> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=96ea1d0f5dc4 >> author: doko at ubuntu.com >> date: Thu Dec 08 15:39:55 2011 +0100 >> >> Fix running jamvm jdk tests when configured with a separate relative >> build dir >> >> 2011-12-08 Matthias Klose >> >> * Makefile.am (JTREG_SRCS): Use abs_top_srcdir. > > This patch breaks "make dist": > > cp: cannot stat `.//home/aph/iced-arm/icedtea6/jtreg': No such file or directory > make: *** [distdir] Error 1 currently testing the attached patch, not including any relative or absolute paths in EXTRA_DIST. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: dist.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111216/2526f605/dist.diff From xranby at icedtea.classpath.org Fri Dec 16 06:56:06 2011 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Fri, 16 Dec 2011 14:56:06 +0000 Subject: /hg/icedtea6: cppInterpreter_arm.S (.fast_native_return_dw): Add... Message-ID: changeset f10d5790993d in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f10d5790993d author: Xerxes Ranby date: Fri Dec 16 16:25:26 2011 +0100 cppInterpreter_arm.S (.fast_native_return_dw): Add a missing PR484 return 0. 2011-12-16 Xerxes Ranby * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (.fast_native_return_dw): Add a missing PR484 return 0. diffstat: ChangeLog | 5 +++++ arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diffs (23 lines): diff -r 67df573b0734 -r f10d5790993d ChangeLog --- a/ChangeLog Mon Dec 12 18:01:38 2011 -0500 +++ b/ChangeLog Fri Dec 16 16:25:26 2011 +0100 @@ -1,3 +1,8 @@ +2011-12-16 Xerxes R??nby + + * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S + (.fast_native_return_dw): Add a missing PR484 return 0. + 2011-12-12 Omair Majid S7102369, S7094468: remove java.rmi.server.codebase property parsing from diff -r 67df573b0734 -r f10d5790993d arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Dec 12 18:01:38 2011 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Fri Dec 16 16:25:26 2011 +0100 @@ -1318,6 +1318,7 @@ str tmp1, [ip, #JNIHANDLEBLOCK_TOP] str r1, [r5, #4] str r5, [r9, #THREAD_JAVA_SP] + mov r0, #0 @ deoptimized_frames = 0 ldmfd arm_sp!, {fast_regset, pc} .fast_native_return_byte: mov r0, r0, lsl #24 From doko at icedtea.classpath.org Fri Dec 16 07:53:52 2011 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Fri, 16 Dec 2011 15:53:52 +0000 Subject: /hg/icedtea6: Fix make dist, not using any prefixes in EXTRA_DIST Message-ID: changeset 967b9b186931 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=967b9b186931 author: doko at ubuntu.com date: Fri Dec 16 16:44:20 2011 +0100 Fix make dist, not using any prefixes in EXTRA_DIST 2011-12-16 Matthias Klose * Makefile.am (JTREG_SRCS, REWRITER_SRCS, EXTRA_DIST): Don't use any prefixes. (stamps/jtreg.stamp, check-jdk): Use JTREG_SRCS with srcdir prefix. (stamps/rewriter.stamp): Use REWRITER_SRCS with srcdir prefix. diffstat: ChangeLog | 7 +++++++ Makefile.am | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diffs (66 lines): diff -r f10d5790993d -r 967b9b186931 ChangeLog --- a/ChangeLog Fri Dec 16 16:25:26 2011 +0100 +++ b/ChangeLog Fri Dec 16 16:44:20 2011 +0100 @@ -1,3 +1,10 @@ +2011-12-16 Matthias Klose + + * Makefile.am (JTREG_SRCS, REWRITER_SRCS, EXTRA_DIST): Don't use any + prefixes. + (stamps/jtreg.stamp, check-jdk): Use JTREG_SRCS with srcdir prefix. + (stamps/rewriter.stamp): Use REWRITER_SRCS with srcdir prefix. + 2011-12-16 Xerxes R??nby * arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S diff -r f10d5790993d -r 967b9b186931 Makefile.am --- a/Makefile.am Fri Dec 16 16:25:26 2011 +0100 +++ b/Makefile.am Fri Dec 16 16:44:20 2011 +0100 @@ -192,8 +192,8 @@ # Sources list -REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java -JTREG_SRCS = $(abs_top_srcdir)/jtreg +REWRITER_SRCS = rewriter/com/redhat/rewriter/ClassRewriter.java +JTREG_SRCS = jtreg # Patch list @@ -613,7 +613,7 @@ # FIXME (distclean): Add pulseaudio sources EXTRA_DIST = generated \ - $(top_srcdir)/patches/* \ + patches/* \ contrib arm_port \ overlays \ jconsole.desktop policytool.desktop \ @@ -1805,7 +1805,7 @@ if WITH_RHINO mkdir -p $(REWRITER_BUILD_DIR) $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \ - -d $(REWRITER_BUILD_DIR) $(REWRITER_SRCS) + -d $(REWRITER_BUILD_DIR) $(top_srcdir)/$(REWRITER_SRCS) endif mkdir -p stamps touch stamps/rewriter.stamp @@ -2121,8 +2121,8 @@ rm -rf test/jtreg/classes mkdir -p test/jtreg/classes $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d test/jtreg/classes \ - -encoding iso-8859-1 `find $(JTREG_SRCS) -name '*.java'` - (cd $(JTREG_SRCS); \ + -encoding iso-8859-1 `find $(top_srcdir)/$(JTREG_SRCS) -name '*.java'` + (cd $(top_srcdir)/$(JTREG_SRCS); \ $(BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/test/jtreg.jar \ META-INF/MANIFEST.MF \ legal README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \ @@ -2174,7 +2174,7 @@ -w:test/jdk/JTwork -r:test/jdk/JTreport \ $${ICEDTEA_JTREG_OTHERVM:--samevm} \ -jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \ - -exclude:$(JTREG_SRCS)/excludelist.jdk.jtx \ + -exclude:$(abs_top_srcdir)/$(JTREG_SRCS)/excludelist.jdk.jtx \ $(ICEDTEA_JTREG_OPTIONS) \ `pwd`/openjdk/jdk/test \ | tee test/$@.log From dbhole at icedtea.classpath.org Fri Dec 16 09:12:22 2011 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Fri, 16 Dec 2011 17:12:22 +0000 Subject: /hg/icedtea-web: Fixed function name in comment for sendMember. Message-ID: changeset 331a58713544 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=331a58713544 author: Deepak Bhole date: Fri Dec 16 12:12:18 2011 -0500 Fixed function name in comment for sendMember. Patch from Thomas Meyer diffstat: ChangeLog | 6 ++++++ plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diffs (25 lines): diff -r fb5e54f2b97e -r 331a58713544 ChangeLog --- a/ChangeLog Thu Dec 08 16:01:06 2011 -0500 +++ b/ChangeLog Fri Dec 16 12:12:18 2011 -0500 @@ -1,3 +1,9 @@ +2011-12-16 Deepak Bhole + + Patch from Thomas Meyer + * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Fixed function name + in comment for sendMember. + 2011-12-08 Omair Majid * netx/net/sourceforge/jnlp/Launcher.java diff -r fb5e54f2b97e -r 331a58713544 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Dec 08 16:01:06 2011 -0500 +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri Dec 16 12:12:18 2011 -0500 @@ -477,7 +477,7 @@ * This is a static function, called in another thread. Since certain data * can only be requested from the main thread in Mozilla, this function * does whatever it can seperately, and then makes an internal request that - * causes _sendMember to do the rest of the work. + * causes _getMember to do the rest of the work. * * @param message_parts The request message */ From dbhole at redhat.com Fri Dec 16 09:12:35 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 16 Dec 2011 12:12:35 -0500 Subject: [PATCH] getMember: Fix comment In-Reply-To: <20111209132717.99454o6axj91emjp@webmail.your-server.de> References: <20111209132717.99454o6axj91emjp@webmail.your-server.de> Message-ID: <20111216171235.GA13147@redhat.com> * Thomas Meyer [2011-12-09 07:33]: > Actual method is called _getMember not _sendMember > > Signed-off-by: Thomas Meyer > > diff -r df87375f72cd -r 3fdb4c8ea881 > plugin/icedteanp/IcedTeaPluginRequestProcessor.cc > --- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Mon Dec 05 > 13:15:32 2011 -0500 > +++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Dec 08 > 10:44:36 2011 +0100 > @@ -477,7 +477,7 @@ > * This is a static function, called in another thread. Since certain data > * can only be requested from the main thread in Mozilla, this function > * does whatever it can seperately, and then makes an internal request that > - * causes _sendMember to do the rest of the work. > + * causes _getMember to do the rest of the work. > * > * @param message_parts The request message > */ > Thanks for the patch! Pushed to head. Cheers, Deepak From dbhole at redhat.com Fri Dec 16 12:41:42 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 16 Dec 2011 15:41:42 -0500 Subject: [PATCH] NP_GetMIMEDescription() returns const char* In-Reply-To: <20111212235339.GG31950@rivendell.middle-earth.co.uk> References: <4EE61D1A.1080207@redhat.com> <48f1f49e-d14b-45b0-ab7b-9e677159fa25@zmail13.collab.prod.int.phx2.redhat.com> <20111212235339.GG31950@rivendell.middle-earth.co.uk> Message-ID: <20111216204141.GF13147@redhat.com> * Dr Andrew John Hughes [2011-12-12 18:55]: > On 11:09 Mon 12 Dec , Jon VanAlten wrote: > > Hi all, > > > > ----- Original Message ----- > > > From: "Omair Majid" > > > To: "Thomas Meyer" > > > Cc: "distro-pkg-dev" > > > Sent: Monday, December 12, 2011 10:26:18 AM > > > Subject: Re: [PATCH] NP_GetMIMEDescription() returns const char* > > > > > > Hi Thomas, > > > > > > On 12/10/2011 08:11 AM, Thomas Meyer wrote: > > > > # HG changeset patch > > > > # User Thomas Meyer > > > > # Date 1323522372 -3600 > > > > # Node ID 2b69ce95feb38023b2be8bec3bc87f2219d0c80b > > > > # Parent 3674bf4ef962a752a05bf7bfa5aee19a817c4834 > > > > > > > > /usr/include/xulrunner-sdk-2/npfunctions.h defines "const char* > > > > NP_GetMIMEDescription(void);" > > > > make icedtea-web version also return a const char* > > > > This fix is needed to make icedtea-web compile on Fedora 16. > > > > > > > > > > Thanks for the patch. This patch is already included in Fedora [1]. > > > We > > > are aware of the issue [2], but there is so simple fix. If we apply > > > this > > > patch, it breaks icedtea-web builds on distributions using an older > > > version of xulrunner :( > > > > > > Cheers, > > > Omair > > > > > > [1] > > > http://pkgs.fedoraproject.org/gitweb/?p=icedtea-web.git;a=blob;f=icedtea-web-1.1.4-npapi-fix.patch;h=79ca0a6c009d310de5eb082d9ae5291da46e7dde;hb=refs/heads/f16 > > > > > > [2] > > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-November/016240.html > > > > > > > Seems to me that if this is a change that is expected to stay in > > xulrunner going forward, the preferred approach would be to make the > > change in icedtea-web and document the well-known fix for those > > building against older xulrunner, rather than the other way around. > > Just my $0.02. > > > > cheers, > > jon > > To me, it would seem appropriate to have this change in a new major release > (1.2, which seems to be overdue anyway) and retain the older support in the > 1.0 and 1.1 series. > > On that subject, how long do we intend to support the 1.0 series? I was thinking of stopping once 1.2 is out. 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: 248BDC07 (https://keys.indymedia.org/) > Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From ptisnovs at icedtea.classpath.org Mon Dec 19 02:17:24 2011 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 19 Dec 2011 10:17:24 +0000 Subject: /hg/gfx-test: 2011-12-19 Pavel Tisnovsky Message-ID: changeset 0f1e43066268 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=0f1e43066268 author: Pavel Tisnovsky date: Mon Dec 19 11:19:45 2011 +0100 2011-12-19 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java: Added 15 new tests to this test case. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java | 340 ++++++++++++ 2 files changed, 345 insertions(+), 0 deletions(-) diffs (362 lines): diff -r 6b0ebad52d2f -r 0f1e43066268 ChangeLog --- a/ChangeLog Thu Dec 15 15:33:09 2011 +0100 +++ b/ChangeLog Mon Dec 19 11:19:45 2011 +0100 @@ -1,3 +1,8 @@ +2011-12-19 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java: + Added 15 new tests to this test case. + 2011-12-15 Pavel Tisnovsky * src/org/gfxtest/testsuites/ClippingPathByArbitraryShape.java: diff -r 6b0ebad52d2f -r 0f1e43066268 src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java --- a/src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java Thu Dec 15 15:33:09 2011 +0100 +++ b/src/org/gfxtest/testsuites/ClippingPathByRectangleArea.java Mon Dec 19 11:19:45 2011 +0100 @@ -278,6 +278,346 @@ } /** + * Check if line path could be clipped by a rectangle area. Path is + * rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipLinePathByRectangleAreaZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set clip region and draw the path + drawLinePathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if quadratic path could be clipped by a rectangle area. Path is + * rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipQuadraticPathByRectangleAreaZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set clip region and draw the path + drawQuadraticPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if cubic path could be clipped by a rectangle area. Path is + * rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCubicPathByRectangleAreaZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set clip region and draw the path + drawCubicPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by a rectangle area. Path is + * rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByRectangleAreaZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set clip region and draw the path + drawClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by a rectangle area. Path is + * rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCrossedClosedPathByRectangleAreaZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set clip region and draw the path + drawCrossedClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if line path could be clipped by a rectangle area. Path is + * rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipLinePathByRectangleAreaThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawLinePathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if quadratic path could be clipped by a rectangle area. Path is + * rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipQuadraticPathByRectangleAreaThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawQuadraticPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if cubic path could be clipped by a rectangle area. Path is + * rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCubicPathByRectangleAreaThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawCubicPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by a rectangle area. Path is + * rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByRectangleAreaThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by a rectangle area. Path is + * rendered using stroke paint with thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCrossedClosedPathByRectangleAreaThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeThickWidth(graphics2d); + // set clip region and draw the path + drawCrossedClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if line path could be clipped by a rectangle area. Path is + * rendered using stroke paint with extra thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipLinePathByRectangleAreaExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawLinePathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if quadratic path could be clipped by a rectangle area. Path is + * rendered using stroke paint with extra thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipQuadraticPathByRectangleAreaExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawQuadraticPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if cubic path could be clipped by a rectangle area. Path is + * rendered using stroke paint with extra thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCubicPathByRectangleAreaExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawCubicPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by a rectangle area. Path is + * rendered using stroke paint with extra thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipClosedPathByRectangleAreaExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by a rectangle area. Path is + * rendered using stroke paint with extra thick stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClipCrossedClosedPathByRectangleAreaExtraThickStrokePaint(TestImage image, Graphics2D graphics2d) + { + // render clip rectangle + CommonClippingOperations.renderClipRectangle(image, graphics2d); + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeExtraThickWidth(graphics2d); + // set clip region and draw the path + drawCrossedClosedPathClippedByRectangleArea(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** * Entry point to the test suite. * * @param args From jvanek at redhat.com Mon Dec 19 05:53:20 2011 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 19 Dec 2011 14:53:20 +0100 Subject: two more tests for icedtea web Message-ID: <4EEF41D0.5030001@redhat.com> 2011-12-19 Jiri Vanek * tests/jnlp_tests/simple/AppletTest/ : test for loading applets by jnlp file 2011-12-19 Jiri Vanek Added test for -Xnofork option * tests/jnlp_tests/simple/deadlocktest/resources/deadlocktest_1.jnlp: new file By specifying new max heap size, should invoke jvm to fork when launched * tests/jnlp_tests/simple/deadlocktest/srcs/DeadlockTest.java: improved indentation, added debug output that main method was lunched * tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java: small refactoring, add lunching of deadlocktest_1.jnlp with and without -Xnofork, and counting java instances during runtime * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java (ThreadedProcess.run) fixed situation, when process ended, but not all the output was read by its stdout/stderr readers (ContentReader.run) enabled exception printing to stderr. Regards J. -------------- next part -------------- A non-text attachment was scrubbed... Name: xforkTests.diff Type: text/x-patch Size: 11943 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111219/4222d3da/xforkTests.diff -------------- next part -------------- A non-text attachment was scrubbed... Name: appletTest.diff Type: text/x-patch Size: 9486 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111219/4222d3da/appletTest.diff From dbhole at redhat.com Mon Dec 19 07:41:05 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 19 Dec 2011 10:41:05 -0500 Subject: [RFC][icedtea-web] PR833 - icedtea-web is failing when cache is corupted. In-Reply-To: <4EE77F01.8060803@redhat.com> References: <4EE77F01.8060803@redhat.com> Message-ID: <20111219154104.GB31743@redhat.com> * Jiri Vanek [2011-12-13 11:36]: > 2011-12-13 Jiri Vanek > > Fix for PR844 > * netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java: (getLRUSortedEntries) > instead of error throwing own LRU exception. Also catches more then NumberFormatException > (clearLRUSortedEntries) new method - making soft clearing of cache public > (clearCache) now return true if cache was cleared, false otherwise (or exception) > * netx/net/sourceforge/jnlp/cache/CacheUtil.java: (getCacheFileIfExist) does three tires to load cache. > If ifrst fails, then recently_used file is emptied both in memory and on disc. > When second attemmpt fails, then LRU cache is forcibly cleared. if clearing fails, then error is thrown. > If it pass, then one more try to load entries is allowed. When third attempt fails, then error is thrown. > * /netx/net/sourceforge/jnlp/cache/LruCacheException.java: > new file, for purpose of catching this particular exception > * netx/net/sourceforge/jnlp/util/PropertiesFile.java: (store) tries to mkdirs to its path. > It is better then to fail when no cache directory exists. > * tests/jnlp_tests/signed/CacheReproducer: new reproducr trying severals way of corupted cache > on several types of jnlp files. Is signed because of reflection used. > * tests/jnlp_tests/signed/SimpletestSigned1: signed hello world to be used in CacheReproducer tests. > * tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java: timeout for processes doubled, > as clear cache methods sometimes took more then original allowed. > > When badly formated recently_used file is saved (or better not-save-correctly eg because of kill -9 signal) then netx is not starting, but is throwing out error. > Solution to this is caal netx with -Xclearcache. From my point of view, it should at least warn user and suggest this option, but better can be to clear cache and (recommend) restart iself/toUser. > I also beive, that it can simply just continue running. > *warn user and terminate, can be done in any time > *forcibly clear cache during runtime can be dangerous, as some jars already correctly loaded from cache can depend on this local copy (and what about another instances of netx!)and though netx will much more mysteriously fail later > - I was unable to reproduce this behaviour (see testAlreadyLoadedCached1,2,11 and 21 - I was trying to do this, but not sure if successfully) > - to try to clear cache (will not be successful in if another netx instance is running), recommend run javaws -Xclearcache and restart and terminate can be the best fix > *to fake cache - is what I do now. It clear cache metadata in memory and on disc (recently-used). Then continue loading. > -if this will not help, clear cache is tried, but I was unable to reproduce this possibility - "soft" clearing of cache solved all problems. > -it is not affecting already running javawss, but can cause problems when two javaws are trying to start simultaneously-but I was unable to reproduce this behaviour too (see startParalelInstancesUponBrokenCache test)\ > > Hi Jiri, The indentation seems to be all messed up. Can you please repost using the style guidelines here? http://icedtea.classpath.org/wiki/IcedTea-Web#Code_style Thanks! Deepak > Any hints welcomed! > Best Regards > J. > diff -r 71f338e881d2 netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java > --- a/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Tue Nov 29 17:13:03 2011 +0100 > +++ b/netx/net/sourceforge/jnlp/cache/CacheLRUWrapper.java Tue Dec 13 17:35:08 2011 +0100 > @@ -178,10 +178,8 @@ > > int c = t1.compareTo(t2); > return c < 0 ? 1 : (c > 0 ? -1 : 0); > - } catch (NumberFormatException e) { > - // Perhaps an error is too harsh. Maybe just somehow turn > - // caching off if this is the case. > - throw new InternalError("Corrupt LRU file entries"); > + } catch (Exception e) { > + throw new LruCacheException("Corrupt LRU file entries"); > } > } > }); > @@ -249,4 +247,8 @@ > public String generateKey(String path) { > return System.currentTimeMillis() + "," + getIdForCacheFolder(path); > } > + > + void clearLRUSortedEntries() { > + cacheOrder.clear(); > + } > } > diff -r 71f338e881d2 netx/net/sourceforge/jnlp/cache/CacheUtil.java > --- a/netx/net/sourceforge/jnlp/cache/CacheUtil.java Tue Nov 29 17:13:03 2011 +0100 > +++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.java Tue Dec 13 17:35:08 2011 +0100 > @@ -144,16 +144,16 @@ > * process is using them can be quite disasterous. Hence why Launcher creates lock files > * and we check for those by calling {@link #okToClearCache()} > */ > - public static void clearCache() { > + public static boolean clearCache() { > > if (!okToClearCache()) { > System.err.println(R("CCannotClearCache")); > - return; > + return false; > } > > File cacheDir = new File(CacheUtil.cacheDir); > if (!(cacheDir.isDirectory())) { > - return; > + return false; > } > > if (JNLPRuntime.isDebug()) { > @@ -165,6 +165,7 @@ > } catch (IOException e) { > throw new RuntimeException(e); > } > + return true; > } > > /** > @@ -322,7 +323,37 @@ > private static File getCacheFileIfExist(File urlPath) { > synchronized (lruHandler) { > File cacheFile = null; > - List> entries = lruHandler.getLRUSortedEntries(); > + int tries=0; > + List> entries=null; > + do{ > + try{ > + tries++; > + entries = lruHandler.getLRUSortedEntries(); > + }catch(LruCacheException ex){ > + if (tries==1){ > + ex.printStackTrace(); > + System.out.println("Cache is corupted, will be faked now"); > + lruHandler.clearLRUSortedEntries(); > + lruHandler.store(); > + System.out.println("Faked, continuing. It is strongly recomanded to run javaws -Xclearcache and rerun your application as soon as possible."); > + }else if (tries==2){ > + ex.printStackTrace(); > + System.out.println("Cache is still corupted, will be cleared now"); > + boolean clearingresult=CacheUtil.clearCache(); > + if (!clearingresult){ > + throw new InternalError("Clearing was not sucessfull, probably due to another javaws instance runnin.. Try to shut down all instances of javaws, run javaws -Xclearcache and rerun yout jnlp file"); > + } > + System.out.println("Cleared, reloading"); > + lruHandler.clearLRUSortedEntries(); > + lruHandler.store(); > + System.out.println("Reload, restarting, it is strongly recomanded to run javaws -Xclearcache and rerun your application as soon as possible."); > + > + }else{ > + throw new InternalError("LRU cache was corrupted. Was cleared, but still is corrupted. Try to shut down all instances of javaws, run javaws -Xclearcache and rerun yout jnlp file"); > + } > + > + } > + }while(entries==null); > // Start searching from the most recent to least recent. > for (Entry e : entries) { > final String key = e.getKey(); > diff -r 71f338e881d2 netx/net/sourceforge/jnlp/cache/LruCacheException.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/netx/net/sourceforge/jnlp/cache/LruCacheException.java Tue Dec 13 17:35:08 2011 +0100 > @@ -0,0 +1,23 @@ > +/* > + * To change this template, choose Tools | Templates > + * and open the template in the editor. > + */ > + > +package net.sourceforge.jnlp.cache; > + > +/** > + * > + * @author jvanek > + */ > +class LruCacheException extends RuntimeException{ > + > + public LruCacheException() { > + super(); > + } > + > + > + public LruCacheException(String string) { > + super(string); > + } > + > +} > diff -r 71f338e881d2 netx/net/sourceforge/jnlp/util/PropertiesFile.java > --- a/netx/net/sourceforge/jnlp/util/PropertiesFile.java Tue Nov 29 17:13:03 2011 +0100 > +++ b/netx/net/sourceforge/jnlp/util/PropertiesFile.java Tue Dec 13 17:35:08 2011 +0100 > @@ -134,6 +134,7 @@ > OutputStream s = null; > try { > try { > + file.getParentFile().mkdirs(); > s = new FileOutputStream(file); > store(s, header); > } finally { > diff -r 71f338e881d2 tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1.jnlp Tue Dec 13 17:35:08 2011 +0100 > @@ -0,0 +1,16 @@ > + > + + codebase="./" > + href="CacheReproducer1.jnlp"> > + > + read properties using System.getenv() > + > + > + > + > + > + > + > + > + > + > diff -r 71f338e881d2 tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1_1.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer1_1.jnlp Tue Dec 13 17:35:08 2011 +0100 > @@ -0,0 +1,16 @@ > + > + + codebase="./" > + href="CacheReproducer1_1.jnlp"> > + > + read properties using System.getenv() > + > + > + > + > + > + > + > + > + > + > diff -r 71f338e881d2 tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer2.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer2.jnlp Tue Dec 13 17:35:08 2011 +0100 > @@ -0,0 +1,16 @@ > + > + + codebase="./" > + href="CacheReproducer2.jnlp"> > + > + read properties using System.getenv() > + > + > + > + > + > + > + > + > + > + > diff -r 71f338e881d2 tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer2_1.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/signed/CacheReproducer/resources/CacheReproducer2_1.jnlp Tue Dec 13 17:35:08 2011 +0100 > @@ -0,0 +1,16 @@ > + > + + codebase="./" > + href="CacheReproducer2_1.jnlp"> > + > + read properties using System.getenv() > + > + > + > + > + > + > + > + > + > + > diff -r 71f338e881d2 tests/jnlp_tests/signed/CacheReproducer/srcs/CacheReproducer.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/signed/CacheReproducer/srcs/CacheReproducer.java Tue Dec 13 17:35:08 2011 +0100 > @@ -0,0 +1,47 @@ > +/* CacheReproducer.java > +Copyright (C) 2011 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as published by > +the Free Software Foundation, version 2. > + > +IcedTea is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +import java.lang.reflect.*; > + > +public class CacheReproducer{ > + > + public static void main(String[] args) throws Exception{ > + Class c1= Class.forName("SimpletestSigned1"); > + Method m1=c1.getDeclaredMethod("main",args.getClass()); > + m1.invoke((Object) null, (Object)args); > + } > +} > diff -r 71f338e881d2 tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.java Tue Dec 13 17:35:08 2011 +0100 > @@ -0,0 +1,438 @@ > +/* CacheReproducerTest.java > +Copyright (C) 2011 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as published by > +the Free Software Foundation, version 2. > + > +IcedTea is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +import java.io.BufferedReader; > +import java.io.File; > +import java.io.FileInputStream; > +import java.io.FileNotFoundException; > +import java.io.IOException; > +import java.io.InputStreamReader; > +import java.io.UnsupportedEncodingException; > +import java.util.Arrays; > +import java.util.List; > +import java.util.regex.Matcher; > +import java.util.regex.Pattern; > +import net.sourceforge.jnlp.ServerAccess; > +import net.sourceforge.jnlp.ServerAccess.ProcessResult; > +import org.junit.AfterClass; > +import org.junit.Assert; > + > +import org.junit.Test; > + > +public class CacheReproducerTest { > + > + private static final ServerAccess server = new ServerAccess(); > + private static final List clear = Arrays.asList(new String[]{server.getJavawsLocation(), "-Xclearcache"}); > + private static final List trusted = Arrays.asList(new String[]{"-Xtrustall", ServerAccess.HEADLES_OPTION}); > + private static final String home = System.getProperty("user.home"); > + private static final String name = System.getProperty("user.name"); > + private static final String tmp = System.getProperty("java.io.tmpdir"); > + private static final File icedteaDir = new File(home + "/" + ".icedtea"); > + private static final File icedteaCache = new File(icedteaDir, "cache"); > + private static final File icedteaCacheFile = new File(icedteaCache, "recently_used"); > + private static final File netxLock = new File(tmp + "/" + name + "/netx/locks/netx_running"); > + private static final String lre = "LruCacheException"; > + private static final String corruptRegex = "\\d{13}"; > + private static final Pattern corruptPatern = Pattern.compile(corruptRegex); > + private static final String corruptString = "156dsf1562kd5"; > + > + @Test > + public void cacheIsWorkingTest() throws Exception { > + clearAndEvaluateCache(); > + evaluateSimpleTest1OkCache(runSimpleTest1()); > + assertCacheIsNotEmpty(); > + > + } > + > + @Test > + public void cacheIsWorkingTestSigned() throws Exception { > + clearAndEvaluateCache(); > + evaluateSimpleTest1OkCache(runSimpleTest1Signed()); > + assertCacheIsNotEmpty(); > + > + } > + private class ParalelSimpleTestRunner extends Thread { > + public boolean b=false; > + @Override > + public void run() { > + try { > + > + ServerAccess.ProcessResult pr = runSimpleTest1(); > + evaluateSimpleTest1OkCache(pr); > + b=true; > + } catch (Exception ex) { > + throw new RuntimeException(ex); > + } > + } > + }; > + @Test > + public void startParalelInstancesUponBrokenCache() throws Exception { > + > + clearAndEvaluateCache(); > + evaluateSimpleTest1OkCache(runSimpleTest1()); > + assertCacheIsNotEmpty(); > + breakCache1(); > + ParalelSimpleTestRunner t1=new ParalelSimpleTestRunner(); > + ParalelSimpleTestRunner t2=new ParalelSimpleTestRunner(); > + ParalelSimpleTestRunner t3=new ParalelSimpleTestRunner(); > + t1.start(); > + t2.start(); > + t3.start(); > + int c=0; > + while(true){ > + c++; > + Thread.sleep(100); > + if (c>600) throw new Error("threads have not died in time"); > + if (!t1.isAlive() && !t2.isAlive() && !t3.isAlive()) break; > + } > + Thread.sleep(1000); > + Assert.assertTrue(t1.b); > + Assert.assertTrue(t2.b); > + Assert.assertTrue(t3.b); > + > + } > + > + > + private void assertCacheIsNotEmpty() { > + Assert.assertTrue("icedtea cache " + icedteaCache.getAbsolutePath() + " should exists some any run", icedteaCache.exists()); > + Assert.assertTrue("icedtea cache file " + icedteaCacheFile.getAbsolutePath() + " should exists some any run", icedteaCacheFile.exists()); > + Assert.assertTrue("icedtea cache file " + icedteaCacheFile.getAbsolutePath() + " should not be empty", icedteaCacheFile.length() > 0); > + } > + > + @Test > + public void coruptAndRunCache1() throws Exception { > + clearAndEvaluateCache(); > + evaluateSimpleTest1OkCache(runSimpleTest1()); > + assertCacheIsNotEmpty(); > + breakCache1(); > + ProcessResult pr = runSimpleTest1(); > + assertLruExceptionAppeared(pr); > + evaluateSimpleTest1OkCache(pr); > + clearAndEvaluateCache(); > + ProcessResult pr2 = runSimpleTest1(); > + evaluateSimpleTest1OkCache(pr2); > + assertLruExceptionNOTappeared(pr2); > + > + } > + > + @Test > + public void coruptAndRunCache2() throws Exception { > + clearAndEvaluateCache(); > + evaluateSimpleTest1OkCache(runSimpleTest1()); > + assertCacheIsNotEmpty(); > + breakCache1(); > + ProcessResult pr = runSimpleTest1(); > + assertLruExceptionAppeared(pr); > + evaluateSimpleTest1OkCache(pr); > + ProcessResult pr3 = runSimpleTest1(); > + evaluateSimpleTest1OkCache(pr3); > + assertLruExceptionNOTappeared(pr3); > + clearAndEvaluateCache(); > + ProcessResult pr2 = runSimpleTest1(); > + evaluateSimpleTest1OkCache(pr2); > + assertLruExceptionNOTappeared(pr2); > + > + } > + > + private void assertLruExceptionNOTappeared(ProcessResult pr2) { > + Assert.assertFalse("serr should NOT contains " + lre, pr2.stderr.contains(lre)); > + } > + > + private void assertLruExceptionAppeared(ProcessResult pr) { > + Assert.assertTrue("serr should contains " + lre, pr.stderr.contains(lre)); > + } > + > + @Test > + public void coruptAndRunCache1Signed() throws Exception { > + clearAndEvaluateCache(); > + evaluateSimpleTest1OkCache(runSimpleTest1()); > + assertCacheIsNotEmpty(); > + breakCache1(); > + ProcessResult pr = runSimpleTest1Signed(); > + assertLruExceptionAppeared(pr); > + evaluateSimpleTest1OkCache(pr); > + clearAndEvaluateCache(); > + ProcessResult pr2 = runSimpleTest1Signed(); > + evaluateSimpleTest1OkCache(pr2); > + assertLruExceptionNOTappeared(pr2); > + > + } > + > + @Test > + public void coruptAndRunCache2Signed() throws Exception { > + clearAndEvaluateCache(); > + evaluateSimpleTest1OkCache(runSimpleTest1()); > + assertCacheIsNotEmpty(); > + breakCache1(); > + ProcessResult pr = runSimpleTest1Signed(); > + assertLruExceptionAppeared(pr); > + evaluateSimpleTest1OkCache(pr); > + ProcessResult pr3 = runSimpleTest1Signed(); > + evaluateSimpleTest1OkCache(pr3); > + assertLruExceptionNOTappeared(pr3); > + clearAndEvaluateCache(); > + ProcessResult pr2 = runSimpleTest1Signed(); > + evaluateSimpleTest1OkCache(pr2); > + assertLruExceptionNOTappeared(pr2); > + > + } > + > + @Test > + public void clearCacheUnsucessfully() throws Exception { > + evaluateSimpleTest1OkCache(runSimpleTest1()); > + assertCacheIsNotEmpty(); > + ProcessResult pr; > + Thread t = new Thread(new Runnable() { > + > + @Override > + public void run() { > + try { > + System.out.println("connecting deadlocktest request"); > + System.err.println("connecting deadlocktest request"); > + ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/deadlocktest.jnlp"); > + System.out.println(pr.stdout); > + System.err.println(pr.stderr); > + } catch (Exception ex) { > + throw new RuntimeException(ex); > + } > + } > + }); > + t.start(); > + Thread.sleep(1000); > + pr = tryToClearcache(); > + System.out.println(pr.stdout); > + System.err.println(pr.stderr); > + String q = "Can not clear cache at this time"; > + Assert.assertTrue("Stderr should contains " + q + ", but did not.", pr.stderr.contains(q)); > + assertCacheIsNotEmpty(); > + > + } > + > + > + //next four tests are designed to ensure, that corupted cache wil not break already loaded cached files > + public static final String CR1 = "CacheReproducer1"; > + public static final String CR2 = "CacheReproducer2"; > + public static final String CR11 = "CacheReproducer1_1"; > + public static final String CR21 = "CacheReproducer2_1"; > + > + public void testsBody(String id, int breaker) throws Exception { > + clearAndEvaluateCache(); > + ProcessResult pr1 = runSimpleTestSigned(id); > + assertLruExceptionNOTappeared(pr1); > + evaluateSimpleTest1OkCache(pr1); > + if (breaker < 0) { > + breakCache1(); > + } else { > + breakCache2(breaker); > + } > + ProcessResult pr2 = runSimpleTestSigned(id); > + assertLruExceptionAppeared(pr2); > + evaluateSimpleTest1OkCache(pr2); > + } > + > + @Test > + public void testAlreadyLoadedCached1() throws Exception { > + testsBody(CR1, 1); > + testsBody(CR1, 2); > + testsBody(CR1, -1); > + } > + > + @Test > + public void testAlreadyLoadedCached2() throws Exception { > + testsBody(CR2, 1); > + testsBody(CR2, 2); > + testsBody(CR2, -1); > + } > + > + @Test > + public void testAlreadyLoadedCached11() throws Exception { > + testsBody(CR11, 1); > + testsBody(CR11, 2); > + testsBody(CR11, -1); > + } > + > + @Test > + public void testAlreadyLoadedCached21() throws Exception { > + testsBody(CR21, 1); > + testsBody(CR21, 2); > + testsBody(CR21, -1); > + } > + > + @AfterClass > + public static void clearCache() throws Exception { > + clearAndEvaluateCache(); > + } > + > + private static void clearAndEvaluateCache() throws Exception { > + clearAndEvaluateCache(true); > + } > + > + private static void clearAndEvaluateCache(boolean force) throws Exception { > + System.out.println("clearing cache"); > + System.err.println("clearing cache"); > + if (force) { > + if (netxLock.isFile()) { > + boolean b = netxLock.delete(); > + junit.framework.Assert.assertTrue(b); > + } > + > + } > + tryToClearcache(); > + Assert.assertFalse("icedtea cache " + icedteaCache.getAbsolutePath() + " should not exists after clearing", icedteaCache.exists()); > + } > + > + private static String loadFile(File f) throws FileNotFoundException, UnsupportedEncodingException, IOException { > + BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(icedteaCacheFile), "UTF-8")); > + StringBuilder sb = new StringBuilder(); > + while (true) { > + String s = r.readLine(); > + if (s == null) { > + break; > + } > + sb.append(s).append("\n"); > + > + } > + return sb.toString(); > + } > + > + private static String loadCacheFile() throws IOException { > + return loadFile(icedteaCacheFile); > + } > + > + @Test > + public void assertBreakersAreWorking() { > + String s = "#netx file\n" > + + "#Mon Dec 12 16:20:46 CET 2011\n" > + + "1323703236508,0=/home/jvanek/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n" > + + "1323703243086,2=/home/jvanek/.icedtea/cache/2/http/localhost/ReadProperties.jar\n" > + + "1323703243082,1=/home/jvanek/.icedtea/cache/1/http/localhost/ReadPropertiesBySignedHack.jar"; > + String sp[] = s.split("\n"); > + > + String ss[] = breakAll(s).split("\n"); > + for (int i = 0; i < 2; i++) { > + Assert.assertEquals(sp[i], ss[i]); > + > + } > + for (int i = 2; i < ss.length; i++) { > + Assert.assertNotSame(sp[i], ss[i]); > + > + } > + String sb = breakOne(s, 0); > + junit.framework.Assert.assertEquals(s, sb); > + for (int x = 1; x <= 3; x++) { > + String[] sx = breakOne(s, x).split("\n"); > + for (int i = 0; i < sx.length; i++) { > + if (i == x + 1) { > + Assert.assertNotSame(sp[i], sx[i]); > + } else { > + Assert.assertEquals(sp[i], sx[i]); > + } > + > + } > + } > + String sbb = breakOne(s, 4); > + junit.framework.Assert.assertEquals(s, sbb); > + > + > + } > + > + private static String breakAll(String s) { > + return s.replaceAll(corruptRegex, corruptString); > + } > + > + private static String breakOne(String s, int i) { > + Matcher m1 = corruptPatern.matcher(s); > + int x = 0; > + while (m1.find()) { > + x++; > + String r = (m1.group(0)); > + if (x == i) { > + return s.replace(r, corruptString); > + } > + } > + return s; > + } > + > + private static void breakCache1() throws IOException { > + String s = loadCacheFile(); > + s = breakAll(s); > + ServerAccess.saveFile(s, icedteaCacheFile); > + } > + > + private static void breakCache2(int i) throws FileNotFoundException, UnsupportedEncodingException, IOException { > + String s = loadCacheFile(); > + s = breakOne(s, i); > + ServerAccess.saveFile(s, icedteaCacheFile); > + > + > + } > + > + private static ServerAccess.ProcessResult runSimpleTest1() throws Exception { > + return runSimpleTest1(null, "simpletest1"); > + } > + > + private static ServerAccess.ProcessResult runSimpleTest1(List args, String s) throws Exception { > + System.out.println("connecting " + s + " request"); > + System.err.println("connecting " + s + " request"); > + ServerAccess.ProcessResult pr2 = server.executeJavawsHeadless(args, "/" + s + ".jnlp"); > + System.out.println(pr2.stdout); > + System.err.println(pr2.stderr); > + return pr2; > + } > + > + private static ServerAccess.ProcessResult runSimpleTest1Signed() throws Exception { > + return runSimpleTestSigned("SimpletestSigned1"); > + } > + > + private static ServerAccess.ProcessResult runSimpleTestSigned(String id) throws Exception { > + return runSimpleTest1(trusted, id); > + } > + > + private static void evaluateSimpleTest1OkCache(ServerAccess.ProcessResult pr2) throws Exception { > + String s = "Good simple javaws exapmle"; > + Assert.assertTrue("test stdout should contains " + s + " bud didn't", pr2.stdout.contains(s)); > + Assert.assertFalse(pr2.wasTerminated); > + Assert.assertEquals((Integer) 0, pr2.returnValue); > + } > + > + private static ProcessResult tryToClearcache() throws Exception { > + ServerAccess.ProcessResult pr1 = ServerAccess.executeProcess(clear); > + System.out.println(pr1.stdout); > + System.err.println(pr1.stderr); > + return pr1; > + } > +} > diff -r 71f338e881d2 tests/jnlp_tests/signed/SimpletestSigned1/resources/SimpletestSigned1.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/signed/SimpletestSigned1/resources/SimpletestSigned1.jnlp Tue Dec 13 17:35:08 2011 +0100 > @@ -0,0 +1,53 @@ > + > + > + > + > + simpletest1 > + NetX > + > + simpletest1 > + > + > + > + > + > + > + > + > + > diff -r 71f338e881d2 tests/jnlp_tests/signed/SimpletestSigned1/srcs/SimpletestSigned1.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/jnlp_tests/signed/SimpletestSigned1/srcs/SimpletestSigned1.java Tue Dec 13 17:35:08 2011 +0100 > @@ -0,0 +1,43 @@ > +/* SimpletestSigned1.java > +Copyright (C) 2011 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as published by > +the Free Software Foundation, version 2. > + > +IcedTea is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +public class SimpletestSigned1{ > + > + public static void main(String[] args){ > + System.out.println("Good simple javaws exapmle"); > + } > +} > diff -r 71f338e881d2 tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java > --- a/tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java Tue Nov 29 17:13:03 2011 +0100 > +++ b/tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java Tue Dec 13 17:35:08 2011 +0100 > @@ -108,7 +108,7 @@ > * timeout in ms to let process to finish, before assasin wil kill it. > * This can be changed in runtime, but will affect all following tasks > */ > - public static long PROCESS_TIMEOUT = 10 * 1000;//ms > + public static long PROCESS_TIMEOUT = 20 * 1000;//ms > /** > * all terminated processes are stored here. As wee need to 'wait' to termination to be finished. > */ From aph at redhat.com Mon Dec 19 08:02:44 2011 From: aph at redhat.com (Andrew Haley) Date: Mon, 19 Dec 2011 16:02:44 +0000 Subject: ARM: Safepoints for JIT-compiled code Message-ID: <4EEF6024.5080706@redhat.com> I was fixing something entirely unrelated when I came across a nasty surprised: there is no support for handling safepoints in JIT-compiled code. Fixed thusly. Andrew. 2011-12-16 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp (H_SAFEPOINT): New. (Thumb2_Safepoint): New. (Thumb2_Branch): Call Thumb2_Safepoint. (Thumb2_Goto): Likewise. (Thumb2_Return): Likewise. (Thumb2_Initialize): Add handler for H_SAFEPOINT. diff -r d6cf8b242032 -r 8fa75d2623a2 arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp --- a/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Dec 12 12:46:59 2011 -0500 +++ b/arm_port/hotspot/src/cpu/zero/vm/thumb2.cpp Mon Dec 19 10:56:30 2011 -0500 @@ -392,7 +392,11 @@ #define H_HANDLE_EXCEPTION_NO_REGS 60 -unsigned handlers[61]; +#define H_SAFEPOINT 61 + +#define H_LAST 62 // Not used + +unsigned handlers[H_LAST]; #define LEAF_STACK_SIZE 200 #define STACK_SPARE 40 @@ -651,6 +655,9 @@ #define IS_INT_SIZE_BASE_TYPE(c) (c=='B' || c=='C' || c=='F' || c=='I' || c=='S' || c=='Z') #define IS_INT_SIZE_TYPE(c) (IS_INT_SIZE_BASE_TYPE(c) || c == 'L' || c == '[') +void Thumb2_save_locals(Thumb2_Info *jinfo, unsigned stackdepth); +void Thumb2_restore_locals(Thumb2_Info *jinfo, unsigned stackdepth); + static int method_stackchange(jbyte *base) { jbyte c; @@ -4314,7 +4321,24 @@ void Thumb2_codegen(Thumb2_Info *jinfo, unsigned start); -int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond) +// Insert code to poll the SafepointSynchronize state and call +// Helper_SafePoint. +void Thumb2_Safepoint(Thumb2_Info *jinfo, int stackdepth) +{ + int r_tmp = Thumb2_Tmp(jinfo, 0); + mov_imm(jinfo->codebuf, r_tmp, (u32)SafepointSynchronize::address_of_state()); + ldr_imm(jinfo->codebuf, r_tmp, r_tmp, 0, 0, 0); + cmp_imm(jinfo->codebuf, r_tmp, SafepointSynchronize::_synchronizing); + { + unsigned loc = forward_16(jinfo->codebuf); + thumb2_save_locals(jinfo, stackdepth); + bl(jinfo->codebuf, handlers[H_SAFEPOINT]); + Thumb2_restore_locals(jinfo, stackdepth); + bcc_patch(jinfo->codebuf, COND_NE, loc); + } +} + +int Thumb2_Branch(Thumb2_Info *jinfo, unsigned bci, unsigned cond, int stackdepth) { int offset = GET_JAVA_S2(jinfo->code_base + bci + 1); unsigned dest_taken = bci + offset; @@ -4322,7 +4346,10 @@ unsigned loc; if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { - branch(jinfo->codebuf, cond, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); + loc = forward_16(jinfo->codebuf); + Thumb2_Safepoint(jinfo, stackdepth); + branch_uncond(jinfo->codebuf, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); + bcc_patch(jinfo->codebuf, NEG_COND(cond), loc); return dest_not_taken; } loc = forward_32(jinfo->codebuf); @@ -4332,13 +4359,14 @@ return -1; } -int Thumb2_Goto(Thumb2_Info *jinfo, unsigned bci, int offset, int len) +int Thumb2_Goto(Thumb2_Info *jinfo, unsigned bci, int offset, int len, int stackdepth) { unsigned dest_taken = bci + offset; unsigned dest_not_taken = bci + len; unsigned loc; if (jinfo->bc_stackinfo[dest_taken] & BC_COMPILED) { + Thumb2_Safepoint(jinfo, stackdepth); branch_uncond(jinfo->codebuf, jinfo->bc_stackinfo[dest_taken] & ~BC_FLAGS_MASK); return dest_not_taken; } @@ -4450,6 +4478,8 @@ Thumb2_Debug(jinfo, H_DEBUG_METHODEXIT); // enter_leave(jinfo->codebuf, 0); + Thumb2_Safepoint(jinfo, 0); + // deoptimized_frames = 0 // FIXME: This should be done in the slow entry, but only three // words are allocated there for the instructions. @@ -6176,7 +6206,7 @@ case opc_goto: { int offset = GET_JAVA_S2(jinfo->code_base + bci + 1); Thumb2_Flush(jinfo); - bci = Thumb2_Goto(jinfo, bci, offset, len); + bci = Thumb2_Goto(jinfo, bci, offset, len, stackdepth); len = 0; break; } @@ -6184,7 +6214,7 @@ case opc_goto_w: { int offset = GET_JAVA_U4(jinfo->code_base + bci + 1); Thumb2_Flush(jinfo); - bci = Thumb2_Goto(jinfo, bci, offset, len); + bci = Thumb2_Goto(jinfo, bci, offset, len, stackdepth); len = 0; break; } @@ -6204,7 +6234,7 @@ r = POP(jstack); Thumb2_Flush(jinfo); cmp_imm(jinfo->codebuf, r, 0); - bci = Thumb2_Branch(jinfo, bci, cond); + bci = Thumb2_Branch(jinfo, bci, cond, stackdepth-1); len = 0; break; } @@ -6225,7 +6255,7 @@ r_lho = POP(jstack); Thumb2_Flush(jinfo); cmp_reg(jinfo->codebuf, r_lho, r_rho); - bci = Thumb2_Branch(jinfo, bci, cond); + bci = Thumb2_Branch(jinfo, bci, cond, stackdepth-2); len = 0; break; } @@ -7150,6 +7180,7 @@ extern "C" void Helper_aputfield(void); extern "C" void Helper_synchronized_enter(void); extern "C" void Helper_synchronized_exit(void); +extern "C" void Helper_SafePoint(void); extern "C" void _ZN13SharedRuntime3f2iEf(void); extern "C" void _ZN13SharedRuntime3f2lEf(void); @@ -7620,6 +7651,22 @@ mov_imm(&codebuf, ARM_R3, (u32)Thumb2_Exit_To_Interpreter); mov_reg(&codebuf, ARM_PC, ARM_R3); +// H_SAFEPOINT + handlers[H_SAFEPOINT] = out_pos(&codebuf); + stm(&codebuf, (1<hp, cb->hp + codebuf.idx * 2); cb->hp += codebuf.idx * 2; From dbhole at redhat.com Mon Dec 19 08:43:10 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 19 Dec 2011 11:43:10 -0500 Subject: [RFC][icedtea-web] Patch to enable compilation of icedtea-web on both xulrunners apis In-Reply-To: <4EE9CF2E.5090608@redhat.com> References: <4EE9CF2E.5090608@redhat.com> Message-ID: <20111219164310.GC752@redhat.com> * Jiri Vanek [2011-12-15 05:43]: > 2011-12-15 Jiri Vanek > > * acinclude.m4: added definition of IT_CHECK_XULLRUNNER_API_VERSION, > which tryes to compile small program against new xulrunner api > * configure.ac: added call of IT_CHECK_XULLRUNNER_API_VERSION > * plugin/icedteanp/IcedTeaNPPlugin.cc: (NP_GetMIMEDescription) > return type set-up by dependecy on defined LEGACY_XULRUNNERAPI. > This one is seted by IT_CHECK_XULLRUNNER_API_VERSION during configure. > if defined, then old char* is used. New const char* is used otherwise. > > > cc: O:) > > Hi Jiri, Indentation looks all weird to me. Can you please re-indent and repost? Code itself looks fine to me. Thanks, Deepak > regards, J. > diff -r fb5e54f2b97e ChangeLog > --- a/ChangeLog Thu Dec 08 16:01:06 2011 -0500 > +++ b/ChangeLog Thu Dec 15 11:37:31 2011 +0100 > @@ -1,3 +1,13 @@ > +2011-12-15 Jiri Vanek > + > + * acinclude.m4: added definition of IT_CHECK_XULLRUNNER_API_VERSION, > + which tryes to compile small program against new xulrunner api > + * configure.ac: added call of IT_CHECK_XULLRUNNER_API_VERSION > + * plugin/icedteanp/IcedTeaNPPlugin.cc: (NP_GetMIMEDescription) > + return type set-up by dependecy on defined LEGACY_XULRUNNERAPI. > + This one is seted by IT_CHECK_XULLRUNNER_API_VERSION during configure. > + id fefined, then old char* is used. New const char* is used otherwise. > + > 2011-12-08 Omair Majid > > * netx/net/sourceforge/jnlp/Launcher.java > diff -r fb5e54f2b97e acinclude.m4 > --- a/acinclude.m4 Thu Dec 08 16:01:06 2011 -0500 > +++ b/acinclude.m4 Thu Dec 15 11:37:31 2011 +0100 > @@ -495,6 +495,26 @@ > PKG_CHECK_MODULES([GLIB2_V_216],[glib-2.0 >= 2.16],[],[AC_DEFINE([LEGACY_GLIB])]) > ]) > > +AC_DEFUN_ONCE([IT_CHECK_XULRUNNER_API_VERSION], > +[ > +AC_MSG_CHECKING([for legacy xulrunner api]) > +AC_LANG_PUSH(C++) > +CXXFLAGS_BACKUP=$CXXFLAGS > +CXXFLAGS=$CXXFLAGS" "$MOZILLA_CFLAGS > +AC_TRY_COMPILE([ > +#include > +const char* NP_GetMIMEDescription () > +{return (char*) "yap!";} > +],[],[ > +AC_MSG_RESULT(no) > +],[ > +AC_MSG_RESULT(yes) > +AC_DEFINE([LEGACY_XULRUNNERAPI]) > +]) > +CXXFLAGS=$CXXFLAGS_BACKUP > +AC_LANG_POP(C++) > +]) > + > AC_DEFUN([IT_CHECK_WITH_GCJ], > [ > AC_MSG_CHECKING([whether to compile ecj natively]) > diff -r fb5e54f2b97e configure.ac > --- a/configure.ac Thu Dec 08 16:01:06 2011 -0500 > +++ b/configure.ac Thu Dec 15 11:37:31 2011 +0100 > @@ -81,6 +81,7 @@ > IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef]) > IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE > IT_CHECK_GLIB_VERSION > +IT_CHECK_XULRUNNER_API_VERSION > > # > # Find optional depedencies > diff -r fb5e54f2b97e plugin/icedteanp/IcedTeaNPPlugin.cc > --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Dec 08 16:01:06 2011 -0500 > +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Dec 15 11:37:31 2011 +0100 > @@ -2291,7 +2291,11 @@ > > // Returns a string describing the MIME type that this plugin > // handles. > +#ifdef LEGACY_XULRUNNERAPI > char* > +#else > +const char* > +#endif > NP_GetMIMEDescription () > { > PLUGIN_DEBUG ("NP_GetMIMEDescription\n"); From dbhole at redhat.com Mon Dec 19 08:47:25 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 19 Dec 2011 11:47:25 -0500 Subject: [RFC][icedtea-web] made xsltproc to be checked mandatory tool, instead of ignore its failure In-Reply-To: <4EEA17C8.8060905@redhat.com> References: <4EEA17C8.8060905@redhat.com> Message-ID: <20111219164724.GD752@redhat.com> * Jiri Vanek [2011-12-15 11:02]: > 2011-12-15 Jiri Vanek > > * configure.ac: added search for xsltproc program and setting > WITH_CSLTPROC variable > * makefile.am: xsltproc result is no longer ignored, command > itself is in conditional block > > cc? :) > > Missing a changelog entry. After adding, OK for HEAD. Cheers, Deepak > Best regards, > J > diff -r fb5e54f2b97e Makefile.am > --- a/Makefile.am Thu Dec 08 16:01:06 2011 -0500 > +++ b/Makefile.am Thu Dec 15 16:45:38 2011 +0100 > @@ -564,7 +564,9 @@ > > stdout.log 2> stderr.log ; \ > cat stdout.log ; \ > cat stderr.log >&2 > - -xsltproc $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml > $(TESTS_DIR)/index_reproducers.html > +if WITH_XSLTPROC > + $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml > $(TESTS_DIR)/index_reproducers.html > +endif > touch $@ > > netx-unit-tests-source-files.txt: > @@ -609,8 +611,10 @@ > $(BOOT_DIR)/bin/java -Xbootclasspath:$(RUNTIME) CommandLine $$class_names \ > > stdout.log 2> stderr.log ; \ > cat stdout.log ; \ > - cat stderr.log >&2 ; > - -xsltproc $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html > + cat stderr.log >&2 > +if WITH_XSLTPROC > + $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml > $(TESTS_DIR)/index_unit.html > +endif > touch $@ > > #warning, during this target tests.build/netx/unit/tests-output.xml is backup and rewriten (but not coresponding html file) > diff -r fb5e54f2b97e configure.ac > --- a/configure.ac Thu Dec 08 16:01:06 2011 -0500 > +++ b/configure.ac Thu Dec 15 16:45:38 2011 +0100 > @@ -86,6 +86,8 @@ > # Find optional depedencies > # > > +AC_CHECK_PROGS([XSLTPROC],[xsltproc],[], []) > +AM_CONDITIONAL([WITH_XSLTPROC], [test x"$XSLTPROC" != x ]) > IT_FIND_OPTIONAL_JAR([rhino], RHINO, > [/usr/share/java/js.jar /usr/share/rhino-1.6/lib/js.jar]) > IT_FIND_OPTIONAL_JAR([junit], JUNIT, From ddadacha at redhat.com Mon Dec 19 08:51:42 2011 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Mon, 19 Dec 2011 11:51:42 -0500 Subject: [RFC][icedtea-web] BasicService code does not work if used in applet constructors Message-ID: <4EEF6B9E.2090806@redhat.com> Hi, When looking up BasicService, ServiceManager uses JNLPClassLoader's app var. This is setup when the application/applet is created. However, if BasicService code is used in the applet's constructor, it will produce an incomplete basic service var (i.e most vars are set to null). I've move the applet initialization code after the loader's app variable is set. However, in order to set the app, I've modified the initialization of AppletInstance to take a null parameter in place of the applet. I went through the code but found no use of this applet var until after the call to createApplet (i.e. after the var has been set). It is possible for another thread to access the AppletInstnace's applet var before it is actually set but there is no code in icedtea-web doing that so far. ChangeLog: +2011-12-19 Danesh Dadachanji + + Fix for BasicService being used in applet constructors but not + having access to ApplicationInstance variable. + * netx/net/sourceforge/jnlp/Launcher.java: + (createApplet): Moved applet initialization below loader.setApplication, + appletInstance is now initialized with applet param as null. + * netx/net/sourceforge/jnlp/runtime/AppletInstance.java: + (setApplet): New method, allows setting of AppletInstance's applet + only once. + Regards, Danesh -------------- next part -------------- A non-text attachment was scrubbed... Name: jnlp_href-01.patch Type: text/x-patch Size: 2288 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111219/ee27f3f7/jnlp_href-01.patch From dbhole at redhat.com Mon Dec 19 09:02:22 2011 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 19 Dec 2011 12:02:22 -0500 Subject: [RFC][icedtea-web] BasicService code does not work if used in applet constructors In-Reply-To: <4EEF6B9E.2090806@redhat.com> References: <4EEF6B9E.2090806@redhat.com> Message-ID: <20111219170222.GF752@redhat.com> * Danesh Dadachanji [2011-12-19 11:57]: > Hi, > > When looking up BasicService, ServiceManager uses JNLPClassLoader's > app var. This is setup when the application/applet is created. > However, if BasicService code is used in the applet's constructor, > it will produce an incomplete basic service var (i.e most vars are > set to null). > > I've move the applet initialization code after the loader's app > variable is set. However, in order to set the app, I've modified the > initialization of AppletInstance to take a null parameter in place > of the applet. I went through the code but found no use of this > applet var until after the call to createApplet (i.e. after the var > has been set). It is possible for another thread to access the > AppletInstnace's applet var before it is actually set but there is > no code in icedtea-web doing that so far. > ChangeLog indentation looks a bit off. After fixing, OK for head. Cheers, Deepak > ChangeLog: > +2011-12-19 Danesh Dadachanji > + > + Fix for BasicService being used in applet constructors but not > + having access to ApplicationInstance variable. > + * netx/net/sourceforge/jnlp/Launcher.java: > + (createApplet): Moved applet initialization below loader.setApplication, > + appletInstance is now initialized with applet param as null. > + * netx/net/sourceforge/jnlp/runtime/AppletInstance.java: > + (setApplet): New method, allows setting of AppletInstance's applet > + only once. > + > > Regards, > Danesh > diff -r 331a58713544 netx/net/sourceforge/jnlp/Launcher.java > --- a/netx/net/sourceforge/jnlp/Launcher.java Fri Dec 16 12:12:18 2011 -0500 > +++ b/netx/net/sourceforge/jnlp/Launcher.java Mon Dec 19 11:31:40 2011 -0500 > @@ -708,18 +708,19 @@ public class Launcher { > > ThreadGroup group = Thread.currentThread().getThreadGroup(); > > + AppletInstance appletInstance; > + if (cont == null) > + appletInstance = new AppletInstance(file, group, loader, null); > + else > + appletInstance = new AppletInstance(file, group, loader, null, cont); > + > + loader.setApplication(appletInstance); > + > String appletName = file.getApplet().getMainClass(); > Class appletClass = loader.loadClass(appletName); > Applet applet = (Applet) appletClass.newInstance(); > - > - AppletInstance appletInstance; > - if (cont == null) > - appletInstance = new AppletInstance(file, group, loader, applet); > - else > - appletInstance = new AppletInstance(file, group, loader, applet, cont); > - > - loader.setApplication(appletInstance); > - > + appletInstance.setApplet(applet); > + > setContextClassLoaderForAllThreads(appletInstance.getThreadGroup(), appletInstance.getClassLoader()); > > return appletInstance; > diff -r 331a58713544 netx/net/sourceforge/jnlp/runtime/AppletInstance.java > --- a/netx/net/sourceforge/jnlp/runtime/AppletInstance.java Fri Dec 16 12:12:18 2011 -0500 > +++ b/netx/net/sourceforge/jnlp/runtime/AppletInstance.java Mon Dec 19 11:31:40 2011 -0500 > @@ -52,6 +52,20 @@ public class AppletInstance extends Appl > } > > /** > + * Set the applet of this launched application; can only be called once. > + */ > + public void setApplet(Applet applet) { > + if (this.applet != null) { > + if (JNLPRuntime.isDebug()) { > + Exception ex = new IllegalStateException("Applet can only be set once."); > + ex.printStackTrace(); > + } > + return; > + } > + this.applet = applet; > + } > + > + /** > * > */ > public AppletInstance(JNLPFile file, ThreadGroup group, ClassLoader loader, Applet applet, Container cont) { From aph at redhat.com Mon Dec 19 10:15:55 2011 From: aph at redhat.com (Andrew Haley) Date: Mon, 19 Dec 2011 18:15:55 +0000 Subject: Add atomic sequences using ldrexd/strexd Message-ID: <4EEF7F5B.7060105@redhat.com> Stefan Ring pointed out that we really need special atomic sequences for volatile longs. Implemented thusly, for ARMv7. ldrexd/strexd are supposed to be supported on ARMv6K as well, but I don't really know what an ARMv6K is, and I certainly haven't got one. We really should have atomic sequences for older ARMs as well; there is a fairly nice way to do it, but I'm not sure if I'll get time to implement it. I'll do JIT-compiled volatile longs tomorrow if I get time. Andrew. 2011-12-19 Andrew Haley * arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def (lgetfield, lputfield): Add atomic sequences using ldrexd/strexd. * openjdk-ecj/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S (getstatic_volatile_dw, putstatic_volatile_dw): Likewise. diff -r 0c874e429552 -r fd44d23e1368 arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def --- a/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Dec 19 16:04:36 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/bytecodes_arm.def Mon Dec 19 13:05:45 2011 -0500 @@ -1710,11 +1710,19 @@ 3: VOLATILE_VERSION ldr tmp2, [tmp2, #CP_OFFSET+8] - DISPATCH_NEXT add tmp2, tmp1, tmp2 - DISPATCH_NEXT +#ifndef __ARM_ARCH_7A__ .abortentry82_v: ldmia tmp2, {tmp2, tmp1} +#else + mov ip, tmp2 +.abortentry82_v: + ldrexd tmp2, tmp1 , [ip] + strexd r2 , tmp2, tmp1, [ip] + teq r2, #0 + bne .abortentry82_v +#endif + DISPATCH_NEXT FullBarrier DISPATCH_NEXT PUSH tmp2, tmp1 @@ -1858,13 +1866,23 @@ 3: VOLATILE_VERSION ldr tmp2, [tmp2, #CP_OFFSET+8] - DISPATCH_NEXT add tmp2, lr, tmp2 - DISPATCH_NEXT - DISPATCH_NEXT StoreStoreBarrier +#ifndef __ARM_ARCH_7A__ .abortentry86_v: stm tmp2, {r3, tmp1} +#else + mov ip, tmp2 + mov tmp2, r3 + // Data in tmp1 & tmp2, address in ip, r2 & r3 scratch +.abortentry86_v: + ldrexd r2, r3, [ip] + strexd r2, tmp2, tmp1, [ip] + teq r2, #0 + bne .abortentry86_v +#endif + DISPATCH_NEXT + DISPATCH_NEXT StoreLoadBarrier DISPATCH_FINISH } diff -r 0c874e429552 -r fd44d23e1368 arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S --- a/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Dec 19 16:04:36 2011 +0000 +++ b/arm_port/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S Mon Dec 19 13:05:45 2011 -0500 @@ -1318,7 +1318,7 @@ str tmp1, [ip, #JNIHANDLEBLOCK_TOP] str r1, [r5, #4] str r5, [r9, #THREAD_JAVA_SP] - mov r0, #0 @ deoptimized_frames = 0 + mov r0, #0 @ deoptimized_frames = 0 ldmfd arm_sp!, {fast_regset, pc} .fast_native_return_byte: mov r0, r0, lsl #24 @@ -2084,10 +2084,20 @@ getstatic_volatile_dw: DISPATCH_START 3 add r3, r3, lr +#ifndef __ARM_ARCH_7A__ ldm r3, {r2, tmp2} FullBarrier DISPATCH_NEXT PUSH r2, tmp2 +#else +0: ldrexd tmp2, tmp1 , [r3] + strexd r2 , tmp2, tmp1, [r3] + teq r2, #0 + bne 0b + FullBarrier + DISPATCH_NEXT + PUSH tmp2, tmp1 +#endif DISPATCH_FINISH getstatic_volatile_w: DISPATCH_START 3 @@ -2126,11 +2136,20 @@ DISPATCH_FINISH putstatic_volatile_dw: DISPATCH_START 3 - add r2, r2, r3 - POP r3, tmp2 + add ip, r2, r3 + POP tmp1, tmp2 DISPATCH_NEXT StoreStoreBarrier - stm r2, {r3, tmp2} +#ifndef __ARM_ARCH_7A__ + stm ip, {tmp1, tmp2} +#else + // Data in tmp1 & tmp2, address in ip, r2 & r3 scratch +0: ldrexd r2, r3, [ip] + strexd r2, tmp2, tmp1, [ip] + teq r2, #0 + bne 0b +#endif + DISPATCH_NEXT StoreLoadBarrier DISPATCH_FINISH putstatic_volatile_a: From ddadacha at redhat.com Mon Dec 19 10:48:35 2011 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Mon, 19 Dec 2011 13:48:35 -0500 Subject: [RFC][icedtea-web] Patch to enable compilation of icedtea-web on both xulrunners apis In-Reply-To: <4EE9CF2E.5090608@redhat.com> References: <4EE9CF2E.5090608@redhat.com> Message-ID: <4EEF8703.8060605@redhat.com> Hi Jiri, Been a bit too busy last week to review :/ On 15/12/11 05:42 AM, Jiri Vanek wrote: > 2011-12-15 Jiri Vanek > > * acinclude.m4: added definition of IT_CHECK_XULLRUNNER_API_VERSION, > which tryes to compile small program against new xulrunner api > * configure.ac: added call of IT_CHECK_XULLRUNNER_API_VERSION > * plugin/icedteanp/IcedTeaNPPlugin.cc: (NP_GetMIMEDescription) > return type set-up by dependecy on defined LEGACY_XULRUNNERAPI. > This one is seted by IT_CHECK_XULLRUNNER_API_VERSION during configure. > if defined, then old char* is used. New const char* is used otherwise. Some minor typos =) s/XULLRUNNER/XULRUNNER s/tryes/tries s/seted/set Apart from that and the indenting Deepak mentioned, everything looks good. Nice work! Regards, Danesh From ddadacha at redhat.com Mon Dec 19 11:39:26 2011 From: ddadacha at redhat.com (Danesh Dadachanji) Date: Mon, 19 Dec 2011 14:39:26 -0500 Subject: [RFC][icedtea-web] made xsltproc to be checked mandatory tool, instead of ignore its failure In-Reply-To: <20111219164724.GD752@redhat.com> References: <4EEA17C8.8060905@redhat.com> <20111219164724.GD752@redhat.com> Message-ID: <4EEF92EE.5000602@redhat.com> Deepak: Changelog in the email? =) Jiri: Comments inline. On 19/12/11 11:47 AM, Deepak Bhole wrote: > * Jiri Vanek [2011-12-15 11:02]: >> 2011-12-15 Jiri Vanek >> >> * configure.ac: added search for xsltproc program and setting >> WITH_CSLTPROC variable >> * makefile.am: xsltproc result is no longer ignored, command >> itself is in conditional block >> ChangeLog indenting looks incorrect. Some (more) typos: s/WITH_CSLTPROC/WITH_XSLTPROC s/makefile.am/Makefile.am >> cat stderr.log>&2 >> - -xsltproc $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml> $(TESTS_DIR)/index_reproducers.html >> +if WITH_XSLTPROC >> + $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(JNLP_TESTS_ENGINE_DIR)/tests-output.xml> $(TESTS_DIR)/index_reproducers.html >> +endif Perhaps for consistency's sake, there should be a ' ; \ ' at the end of the cat and $(XSLTPROC) lines (similar to the 'cat stdout...' line). I'm pretty sure that building won't make a difference but I've had experience where everything with the buildbot complaining and failing because of minor syntax. I doubt it will because it did not for the -xsltproc line but I don't see the harm in being more precise. =) >> - cat stderr.log>&2 ; >> - -xsltproc $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml> $(TESTS_DIR)/index_unit.html >> + cat stderr.log>&2 >> +if WITH_XSLTPROC >> + $(XSLTPROC) $(TESTS_SRCDIR)/$(REPORT_STYLES_DIRNAME)/jreport.xsl $(NETX_UNIT_TEST_DIR)/tests-output.xml> $(TESTS_DIR)/index_unit.html >> +endif Same as above. Regards, Danesh From ddadacha at icedtea.classpath.org Mon Dec 19 12:01:10 2011 From: ddadacha at icedtea.classpath.org (ddadacha at icedtea.classpath.org) Date: Mon, 19 Dec 2011 20:01:10 +0000 Subject: /hg/icedtea-web: BasicService code does not work when placed in ... Message-ID: changeset 221174bcd4ec in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=221174bcd4ec author: Danesh Dadachanji date: Mon Dec 19 15:00:03 2011 -0500 BasicService code does not work when placed in the applet constructor. diffstat: ChangeLog | 11 +++++++++++ netx/net/sourceforge/jnlp/Launcher.java | 19 ++++++++++--------- netx/net/sourceforge/jnlp/runtime/AppletInstance.java | 14 ++++++++++++++ 3 files changed, 35 insertions(+), 9 deletions(-) diffs (74 lines): diff -r 331a58713544 -r 221174bcd4ec ChangeLog --- a/ChangeLog Fri Dec 16 12:12:18 2011 -0500 +++ b/ChangeLog Mon Dec 19 15:00:03 2011 -0500 @@ -1,3 +1,14 @@ +2011-12-19 Danesh Dadachanji + + Fix for BasicService being used in applet constructors but not + having access to ApplicationInstance variable. + * netx/net/sourceforge/jnlp/Launcher.java: + (createApplet): Moved applet initialization below loader.setApplication, + appletInstance is now initialized with applet param as null. + * netx/net/sourceforge/jnlp/runtime/AppletInstance.java: + (setApplet): New method, allows setting of AppletInstance's applet + only once. + 2011-12-16 Deepak Bhole Patch from Thomas Meyer