hg: hsx/hsx16/baseline: 3 new changesets
Andrew John Hughes
gnu_andrew at member.fsf.org
Mon Feb 22 12:02:25 PST 2010
On 22 February 2010 18:44, Erik Trimble <Erik.Trimble at sun.com> wrote:
> Andrew John Hughes wrote:
>>
>> On 21 February 2010 22:46, Andrew John Hughes <gnu_andrew at member.fsf.org>
>> wrote:
>>
>>>
>>> On 21 February 2010 21:59, <daniel.daugherty at sun.com> wrote:
>>>
>>>>
>>>> Changeset: 9127aa69352e
>>>> Author: dcubed
>>>> Date: 2009-12-14 09:51 -0700
>>>> URL:
>>>> http://hg.openjdk.java.net/hsx/hsx16/baseline/rev/9127aa69352e
>>>>
>>>> 6648438: 4/4 src/share/vm/prims/jvmtiEnv.cpp:457 assert(phase ==
>>>> JVMTI_PHASE_LIVE,"sanity check")
>>>> Summary: Return error on invalid JVMTI_PHASE instead of asserting.
>>>> Reviewed-by: dholmes, ohair
>>>>
>>>> ! src/share/vm/prims/jvmtiEnv.cpp
>>>>
>>>> Changeset: 98cd9901c161
>>>> Author: dcubed
>>>> Date: 2009-12-14 10:05 -0700
>>>> URL:
>>>> http://hg.openjdk.java.net/hsx/hsx16/baseline/rev/98cd9901c161
>>>>
>>>> 6849968: 3/2 JVMTI tests fails on jdk5.0 with hs14
>>>> Summary: If a JVMTI agent asks for version 1.0, then it should get
>>>> version 1.0 semantics.
>>>> Reviewed-by: dholmes, ohair
>>>>
>>>> ! src/share/vm/prims/jvmtiEnv.cpp
>>>> ! src/share/vm/prims/jvmtiEnvBase.cpp
>>>> ! src/share/vm/prims/jvmtiEnvBase.hpp
>>>> ! src/share/vm/prims/jvmtiExport.cpp
>>>> ! src/share/vm/prims/jvmtiExport.hpp
>>>> ! src/share/vm/prims/jvmtiHpp.xsl
>>>>
>>>> Changeset: c9740f5ed5b4
>>>> Author: dcubed
>>>> Date: 2010-02-19 11:18 -0700
>>>> URL:
>>>> http://hg.openjdk.java.net/hsx/hsx16/baseline/rev/c9740f5ed5b4
>>>>
>>>> Merge
>>>>
>>>> ! src/share/vm/prims/jvmtiEnv.cpp
>>>> ! src/share/vm/prims/jvmtiEnvBase.cpp
>>>> ! src/share/vm/prims/jvmtiEnvBase.hpp
>>>> ! src/share/vm/prims/jvmtiExport.cpp
>>>>
>>>>
>>>>
>>>
>>> Thanks. What's the migration process for these to master?
>>> --
>>> Andrew :-)
>>>
>>> Free Java Software Engineer
>>> Red Hat, Inc. (http://www.redhat.com)
>>>
>>> Support Free Java!
>>> Contribute to GNU Classpath and the OpenJDK
>>> http://www.gnu.org/software/classpath
>>> http://openjdk.java.net
>>>
>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
>>> Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
>>>
>>>
>>
>> I think http://hg.openjdk.java.net/hsx/hsx16/baseline/rev/c9740f5ed5b4
>> may be the missing piece of the puzzle that's causing the build
>> failure as it seems to synchronize the cpp file with the header.
>>
>
> I can do a rebuild and push from baseline to master whenever we think that a
> new build is appropriate. I'd bump the build number and then push to master
> (after a PIT cycle).
>
>
>
>
>
> --
> Erik Trimble
> Java System Support
> Mailstop: usca22-123
> Phone: x17195
> Santa Clara, CA
>
>
Well now would seem appropriate so that we can have a known build
integrated into OpenJDK6. If I bring in:
searching for changes
changeset: 1126:c9740f5ed5b4
tag: tip
parent: 1124:b9408ac1b596
parent: 629:98cd9901c161
user: dcubed
date: Fri Feb 19 11:18:38 2010 -0700
summary: Merge
from baseline, in addition to the changesets I merged from master,
this provides the fix:
diff -r 0d4f291060f7 src/share/vm/prims/jvmtiEnvBase.cpp
--- a/src/share/vm/prims/jvmtiEnvBase.cpp Mon Feb 22 17:32:37 2010 +0000
+++ b/src/share/vm/prims/jvmtiEnvBase.cpp Mon Feb 22 19:53:27 2010 +0000
@@ -123,7 +123,26 @@
}
-JvmtiEnvBase::JvmtiEnvBase() : _env_event_enable() {
+bool
+JvmtiEnvBase::use_version_1_0_semantics() {
+ int major, minor, micro;
+
+ JvmtiExport::decode_version_values(_version, &major, &minor, µ);
+ return major == 1 && minor == 0; // micro version doesn't matter here
+}
+
+
+bool
+JvmtiEnvBase::use_version_1_1_semantics() {
+ int major, minor, micro;
+
+ JvmtiExport::decode_version_values(_version, &major, &minor, µ);
+ return major == 1 && minor == 1; // micro version doesn't matter here
+}
+
+
+JvmtiEnvBase::JvmtiEnvBase(jint version) : _env_event_enable() {
+ _version = version;
_env_local_storage = NULL;
_tag_map = NULL;
_native_method_prefix_count = 0;
which makes the build get further. If I also revert the erroneous
change made in:
changeset: 734:dbbe28fc66b5
user: twisti
date: Fri Feb 27 03:35:40 2009 -0800
summary: 6778669: Patch from Red Hat -- fixes compilation errors
diff -r ed6404fac86b -r dbbe28fc66b5 src/share/vm/utilities/vmError.cpp
--- a/src/share/vm/utilities/vmError.cpp Thu Feb 26 16:57:21 2009 -0800
+++ b/src/share/vm/utilities/vmError.cpp Fri Feb 27 03:35:40 2009 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -306,7 +306,7 @@
strncpy(buf, file, buflen);
if (len + 10 < buflen) {
- sprintf(buf + len, ":" SIZE_FORMAT, _lineno);
+ sprintf(buf + len, ":%d", _lineno);
the build completes:
$ /mnt/builder/jdk6/j2sdk-image/bin/java -version
openjdk version "1.6.0-internal"
OpenJDK Runtime Environment (build 1.6.0-internal-andrew_22_feb_2010_19_12-b00)
OpenJDK 64-Bit Server VM (build 16.0-b13, mixed mode)
--
Andrew :-)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
More information about the hotspot-dev
mailing list