diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-09-29 13:34:09 +0000 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-09-29 21:53:27 +0200 |
commit | f03d3e5bbb6a096960a781547884015f50be96da (patch) | |
tree | 24cda7f1740cfbafbbb3073e85aedee4cfc3eba0 /recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch | |
parent | 7fce07f9fbdada8ba9c3d1bc65d5bcd9c7a8d1d8 (diff) | |
download | meta-java-f03d3e5bbb6a096960a781547884015f50be96da.tar.gz |
openjdk7: update openjdk7 to version 2.3.12
* notice openjdk7 2.1 and 2.2 will soon get no updates anymore
* openjdk7 2.3 has now arm byte compiler support
* use cacao hg version e215e36be9fc, because a567bcb7f589 is not working
Diffstat (limited to 'recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch')
-rw-r--r-- | recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch b/recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch new file mode 100644 index 0000000..00b9660 --- /dev/null +++ b/recipes-core/openjdk/openjdk-7-25b30/remove-sun.misc.Perf-debug-code.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | Index: openjdk/jdk/src/share/classes/java/net/URLClassLoader.java | ||
2 | =================================================================== | ||
3 | --- openjdk.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-13 16:58:42.000000000 +0200 | ||
4 | +++ openjdk/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-28 18:43:50.114802612 +0200 | ||
5 | @@ -438,14 +438,12 @@ | ||
6 | // Use (direct) ByteBuffer: | ||
7 | CodeSigner[] signers = res.getCodeSigners(); | ||
8 | CodeSource cs = new CodeSource(url, signers); | ||
9 | - sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0); | ||
10 | return defineClass(name, bb, cs); | ||
11 | } else { | ||
12 | byte[] b = res.getBytes(); | ||
13 | // must read certificates AFTER reading bytes. | ||
14 | CodeSigner[] signers = res.getCodeSigners(); | ||
15 | CodeSource cs = new CodeSource(url, signers); | ||
16 | - sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0); | ||
17 | return defineClass(name, b, 0, b.length, cs); | ||
18 | } | ||
19 | } | ||
20 | Index: openjdk/jdk/src/share/classes/java/lang/ClassLoader.java | ||
21 | =================================================================== | ||
22 | --- openjdk.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-13 16:58:42.000000000 +0200 | ||
23 | +++ openjdk/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-28 18:43:50.142802778 +0200 | ||
24 | @@ -422,10 +422,6 @@ | ||
25 | long t1 = System.nanoTime(); | ||
26 | c = findClass(name); | ||
27 | |||
28 | - // this is the defining class loader; record the stats | ||
29 | - sun.misc.PerfCounter.getParentDelegationTime().addTime(t1 - t0); | ||
30 | - sun.misc.PerfCounter.getFindClassTime().addElapsedTimeFrom(t1); | ||
31 | - sun.misc.PerfCounter.getFindClasses().increment(); | ||
32 | } | ||
33 | } | ||
34 | if (resolve) { | ||
35 | Index: openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java | ||
36 | =================================================================== | ||
37 | --- openjdk.orig/jdk/src/share/classes/java/util/zip/ZipFile.java | ||
38 | +++ openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java | ||
39 | @@ -213,8 +213,6 @@ class ZipFile implements ZipConstants, Closeable { | ||
40 | this.zc = ZipCoder.get(charset); | ||
41 | long t0 = System.nanoTime(); | ||
42 | jzfile = open(name, mode, file.lastModified(), usemmap); | ||
43 | - sun.misc.PerfCounter.getZipFileOpenTime().addElapsedTimeFrom(t0); | ||
44 | - sun.misc.PerfCounter.getZipFileCount().increment(); | ||
45 | this.name = name; | ||
46 | this.total = getTotal(jzfile); | ||
47 | this.locsig = startsWithLOC(jzfile); | ||