/hg/release/icedtea7-2.2: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Mar 12 12:33:38 PDT 2013
changeset b7e507e31613 in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=b7e507e31613
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 f6cbaa56daa3 in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=f6cbaa56daa3
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 f431ba3ea9d4 in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=f431ba3ea9d4
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Mar 11 18:51:56 2013 +0000
Prepare for 2.2.7 release.
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* configure.ac: Bump to 2.2.7 proper.
* NEWS: Set release date for 2.2.7.
changeset e022668f7165 in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=e022668f7165
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Mar 12 19:32:51 2013 +0000
Added tag icedtea-2.2.7 for changeset f431ba3ea9d4
changeset 4549f9fbf989 in /hg/release/icedtea7-2.2
details: http://icedtea.classpath.org/hg/release/icedtea7-2.2?cmd=changeset;node=4549f9fbf989
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Mar 12 19:33:16 2013 +0000
Start 2.2.8 release cycle.
2013-03-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
* configure.ac: Bump to 2.2.8pre.
* NEWS: Add section for 2.2.8.
diffstat:
.hgtags | 1 +
ChangeLog | 27 ++++
Makefile.am | 3 +-
NEWS | 6 +-
configure.ac | 2 +-
patches/revert-7017193.patch | 138 ++++++++++++++++++++++++
rewriter/com/redhat/rewriter/ClassRewriter.java | 6 +-
7 files changed, 177 insertions(+), 6 deletions(-)
diffs (250 lines):
diff -r 03aaabc8b71c -r 4549f9fbf989 .hgtags
--- a/.hgtags Mon Mar 11 11:39:51 2013 +0000
+++ b/.hgtags Tue Mar 12 19:33:16 2013 +0000
@@ -40,3 +40,4 @@
a4e92bc2183a7a0e4a1a5f23d8d1f013ed267fe7 icedtea-2.2.4
bb62d64bd4ea1d79d0a3772dbbac6c219289c558 icedtea-2.2.5
af9f6b25365c6b6f906ca5386649912945bc596f icedtea-2.2.6
+f431ba3ea9d46d6c7758c8d1e97c818b43e46b8d icedtea-2.2.7
diff -r 03aaabc8b71c -r 4549f9fbf989 ChangeLog
--- a/ChangeLog Mon Mar 11 11:39:51 2013 +0000
+++ b/ChangeLog Tue Mar 12 19:33:16 2013 +0000
@@ -1,3 +1,30 @@
+2013-03-12 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * configure.ac: Bump to 2.2.8pre.
+ * NEWS: Add section for 2.2.8.
+
+2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * configure.ac: Bump to 2.2.7 proper.
+ * NEWS: Set release date for 2.2.7.
+
+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>
+
+ PR1340: Simplify the rewriter, avoiding concurrency.
+ * NEWS: Mention fix.
+ * rewriter/com/redhat/rewriter/ClassRewriter.java:
+ Always use the single threaded executor.
+
2013-03-11 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r 03aaabc8b71c -r 4549f9fbf989 Makefile.am
--- a/Makefile.am Mon Mar 11 11:39:51 2013 +0000
+++ b/Makefile.am Tue Mar 12 19:33:16 2013 +0000
@@ -240,7 +240,8 @@
patches/8004344-toolkiterrorhandler.patch \
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 03aaabc8b71c -r 4549f9fbf989 NEWS
--- a/NEWS Mon Mar 11 11:39:51 2013 +0000
+++ b/NEWS Tue Mar 12 19:33:16 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.2.7 (2013-04-XX):
+New in release 2.2.8 (2013-04-XX):
+
+New in release 2.2.7 (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.2.6 (2013-02-20):
diff -r 03aaabc8b71c -r 4549f9fbf989 configure.ac
--- a/configure.ac Mon Mar 11 11:39:51 2013 +0000
+++ b/configure.ac Tue Mar 12 19:33:16 2013 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.2.7pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.2.8pre], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r 03aaabc8b71c -r 4549f9fbf989 patches/revert-7017193.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/revert-7017193.patch Tue Mar 12 19:33:16 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 03aaabc8b71c -r 4549f9fbf989 rewriter/com/redhat/rewriter/ClassRewriter.java
--- a/rewriter/com/redhat/rewriter/ClassRewriter.java Mon Mar 11 11:39:51 2013 +0000
+++ b/rewriter/com/redhat/rewriter/ClassRewriter.java Tue Mar 12 19:33:16 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