/hg/release/icedtea7-2.3: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Mar 12 12:24:09 PDT 2013
changeset 5eb386a89c50 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=5eb386a89c50
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 11 16:31:39 2013 +0000
PR1340: Simplify the rhino class rewriter to avoid use of concurrency
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1340: Simplify the rewriter, avoiding concurrency.
* NEWS: Mention fix.
* rewriter/com/redhat/rewriter/ClassRewriter.java:
Always use the single threaded executor.
changeset 6be63c6e510b in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=6be63c6e510b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 11 16:45:40 2013 +0000
Prepare for 2.3.8 release.
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* configure.ac: Bump to 2.3.8 proper.
* NEWS: Set release date for 2.3.8.
changeset 4b66cc7559e3 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=4b66cc7559e3
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 11 16:51:11 2013 +0000
Sync Zero HotSpot option with changes to IcedTea 2.1.
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* hotspot.map: Sync zero option with updates to
IcedTea 2.1.
changeset eeda7cda31dc in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=eeda7cda31dc
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 11 18:44:23 2013 +0000
Revert 7017193 and add the missing free call on a -1 return, until a better fix is ready.
http://mail.openjdk.java.net/pipermail/hotspot-dev/2013-February/008695.html
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* patches/revert-7017193.patch:
Revert 7017193 due to performance issues,
adding a free call on error, until a better
fix is produced.
* NEWS: Updated.
changeset 72168bcc4eb1 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=72168bcc4eb1
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Mar 12 19:15:01 2013 +0000
Added tag icedtea-2.3.8 for changeset eeda7cda31dc
changeset 18742f5233f6 in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=18742f5233f6
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Mar 12 19:23:19 2013 +0000
Start 2.3.9 release cycle.
2013-03-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
* configure.ac: Bump to 2.3.9pre.
* NEWS: Add section for 2.3.9.
diffstat:
.hgtags | 1 +
ChangeLog | 32 +++++
Makefile.am | 3 +-
NEWS | 6 +-
configure.ac | 2 +-
hotspot.map | 2 +-
patches/revert-7017193.patch | 138 ++++++++++++++++++++++++
rewriter/com/redhat/rewriter/ClassRewriter.java | 6 +-
8 files changed, 183 insertions(+), 7 deletions(-)
diffs (263 lines):
diff -r c1c3a636860f -r 18742f5233f6 .hgtags
--- a/.hgtags Sun Mar 10 18:35:28 2013 +0000
+++ b/.hgtags Tue Mar 12 19:23:19 2013 +0000
@@ -44,3 +44,4 @@
6c1ea875ae648f7b4fac17070a7b108645211808 icedtea-2.3.4
107138d757a75a0b01ff762257e1f754f832e245 icedtea-2.3.6
8e87a16a613cf9f2b6a9496c514fb098eb872f7f icedtea-2.3.7
+eeda7cda31dc55c0faa4d2773cfc4c2f27bb6d7a icedtea-2.3.8
diff -r c1c3a636860f -r 18742f5233f6 ChangeLog
--- a/ChangeLog Sun Mar 10 18:35:28 2013 +0000
+++ b/ChangeLog Tue Mar 12 19:23:19 2013 +0000
@@ -1,3 +1,35 @@
+2013-03-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * configure.ac: Bump to 2.3.9pre.
+ * NEWS: Add section for 2.3.9.
+
+2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * patches/revert-7017193.patch:
+ Revert 7017193 due to performance issues,
+ adding a free call on error, until a better
+ fix is produced.
+ * NEWS: Updated.
+
+2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * hotspot.map: Sync zero option with updates to
+ IcedTea 2.1.
+
+2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * configure.ac: Bump to 2.3.8 proper.
+ * NEWS: Set release date for 2.3.8.
+
+2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1340: Simplify the rewriter, avoiding concurrency.
+ * NEWS: Mention fix.
+ * rewriter/com/redhat/rewriter/ClassRewriter.java:
+ Always use the single threaded executor.
+
2013-03-08 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r c1c3a636860f -r 18742f5233f6 Makefile.am
--- a/Makefile.am Sun Mar 10 18:35:28 2013 +0000
+++ b/Makefile.am Tue Mar 12 19:23:19 2013 +0000
@@ -243,7 +243,8 @@
ICEDTEA_PATCHES = \
patches/8006179-lookup_using_findvirtual.patch \
patches/8006882-sun.proxy.patch \
- patches/pr1303-ifdef_fix.patch
+ patches/pr1303-ifdef_fix.patch \
+ patches/revert-7017193.patch
# Conditional patches
diff -r c1c3a636860f -r 18742f5233f6 NEWS
--- a/NEWS Sun Mar 10 18:35:28 2013 +0000
+++ b/NEWS Tue Mar 12 19:23:19 2013 +0000
@@ -10,7 +10,9 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.3.8 (2013-04-XX):
+New in release 2.3.9 (2013-04-XX):
+
+New in release 2.3.8 (2013-03-11):
* Security fixes
- S8007014, CVE-2013-0809: Improve image handling
@@ -22,6 +24,8 @@
- S8006882: Proxy generated classes in sun.proxy package breaks JMockit
* Bug fixes
- PR1303: Correct #ifdef to #if
+ - PR1340: Simplify the rhino class rewriter to avoid use of concurrency
+ - Revert 7017193 and add the missing free call, until a better fix is ready.
New in release 2.3.7 (2013-02-20):
diff -r c1c3a636860f -r 18742f5233f6 configure.ac
--- a/configure.ac Sun Mar 10 18:35:28 2013 +0000
+++ b/configure.ac Tue Mar 12 19:23:19 2013 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.3.8pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.3.9pre], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r c1c3a636860f -r 18742f5233f6 hotspot.map
--- a/hotspot.map Sun Mar 10 18:35:28 2013 +0000
+++ b/hotspot.map Tue Mar 12 19:23:19 2013 +0000
@@ -1,3 +1,3 @@
# version url changeset sha256sum
default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/hotspot a152dced63a1 eac2313e3012653afa7549257765d56e4348c775363eee0733968d32a7c1eeae
-zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot 32569b4d36f4 455be170dcea6edbc9c74f9d67308bb6a1f39dadda0267e7d73ea6af3043f60c
+zero http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot d8b22e079abe 28883ebefcfff1ba8b356a7fabf8e449c25fe7fffe1d563f1f58f887100063f0
diff -r c1c3a636860f -r 18742f5233f6 patches/revert-7017193.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/revert-7017193.patch Tue Mar 12 19:23:19 2013 +0000
@@ -0,0 +1,138 @@
+diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -2763,39 +2763,47 @@
+ // writing thread stacks don't use growable mappings (i.e. those
+ // creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this
+ // only applies to the main thread.
+-
+-static
+-bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) {
+-
+- char buf[128];
+- int fd, sz;
+-
+- if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) {
++static bool
++get_stack_bounds(uintptr_t *bottom, uintptr_t *top)
++{
++ FILE *f = fopen("/proc/self/maps", "r");
++ if (f == NULL)
+ return false;
+- }
+-
+- const char kw[] = "[stack]";
+- const int kwlen = sizeof(kw)-1;
+-
+- // Address part of /proc/self/maps couldn't be more than 128 bytes
+- while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) {
+- if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) {
+- // Extract addresses
+- if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
+- uintptr_t sp = (uintptr_t) __builtin_frame_address(0);
+- if (sp >= *bottom && sp <= *top) {
+- ::close(fd);
+- return true;
+- }
++
++ while (!feof(f)) {
++ size_t dummy;
++ char *str = NULL;
++ ssize_t len = getline(&str, &dummy, f);
++ if (len == -1) {
++ fclose(f);
++ if (str != NULL)
++ free(str);
++ return false;
++ }
++
++ if (len > 0 && str[len-1] == '\n') {
++ str[len-1] = 0;
++ len--;
++ }
++
++ static const char *stack_str = "[stack]";
++ if (len > (ssize_t)strlen(stack_str)
++ && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) {
++ if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
++ uintptr_t sp = (uintptr_t)__builtin_frame_address(0);
++ if (sp >= *bottom && sp <= *top) {
++ free(str);
++ fclose(f);
++ return true;
+ }
+- }
+- }
+-
+- ::close(fd);
++ }
++ }
++ free(str);
++ }
++ fclose(f);
+ return false;
+ }
+
+-
+ // If the (growable) stack mapping already extends beyond the point
+ // where we're going to put our guard pages, truncate the mapping at
+ // that point by munmap()ping it. This ensures that when we later
+diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp
+--- openjdk/hotspot/src/share/vm/runtime/os.cpp
++++ openjdk/hotspot/src/share/vm/runtime/os.cpp
+@@ -1331,41 +1331,3 @@
+ }
+ return result;
+ }
+-
+-// Read file line by line, if line is longer than bsize,
+-// skip rest of line.
+-int os::get_line_chars(int fd, char* buf, const size_t bsize){
+- size_t sz, i = 0;
+-
+- // read until EOF, EOL or buf is full
+- while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') {
+- ++i;
+- }
+-
+- if (buf[i] == '\n') {
+- // EOL reached so ignore EOL character and return
+-
+- buf[i] = 0;
+- return (int) i;
+- }
+-
+- buf[i+1] = 0;
+-
+- if (sz != 1) {
+- // EOF reached. if we read chars before EOF return them and
+- // return EOF on next call otherwise return EOF
+-
+- return (i == 0) ? -1 : (int) i;
+- }
+-
+- // line is longer than size of buf, skip to EOL
+- char ch;
+- while (read(fd, &ch, 1) == 1 && ch != '\n') {
+- // Do nothing
+- }
+-
+- // return initial part of line that fits in buf.
+- // If we reached EOF, it will be returned on next call.
+-
+- return (int) i;
+-}
+diff --git a/src/share/vm/runtime/os.hpp b/src/share/vm/runtime/os.hpp
+--- openjdk/hotspot/src/share/vm/runtime/os.hpp
++++ openjdk/hotspot/src/share/vm/runtime/os.hpp
+@@ -672,10 +672,6 @@
+ // Hook for os specific jvm options that we don't want to abort on seeing
+ static bool obsolete_option(const JavaVMOption *option);
+
+- // Read file line by line. If line is longer than bsize,
+- // rest of line is skipped. Returns number of bytes read or -1 on EOF
+- static int get_line_chars(int fd, char *buf, const size_t bsize);
+-
+ // Extensions
+ #include "runtime/os_ext.hpp"
+
diff -r c1c3a636860f -r 18742f5233f6 rewriter/com/redhat/rewriter/ClassRewriter.java
--- a/rewriter/com/redhat/rewriter/ClassRewriter.java Sun Mar 10 18:35:28 2013 +0000
+++ b/rewriter/com/redhat/rewriter/ClassRewriter.java Tue Mar 12 19:23:19 2013 +0000
@@ -60,8 +60,8 @@
/**
* The executor for submitting rewriting jobs.
*/
- private static final ExecutorService executor = DEBUG ?
- Executors.newSingleThreadExecutor() : Executors.newCachedThreadPool();
+ private static final ExecutorService executor =
+ Executors.newSingleThreadExecutor();
/**
* The source directory, set once by main.
@@ -290,4 +290,4 @@
return null;
}
-}
\ No newline at end of file
+}
More information about the distro-pkg-dev
mailing list