On 9/20/16 15:21, Daniel D. Daugherty wrote:
On 9/20/16 12:33 PM, serguei.spit...@oracle.com wrote:
Please, review the fix for:
https://bugs.openjdk.java.net/browse/JDK-8147943
Webrev:
http://cr.openjdk.java.net/~sspitsyn/webrevs/2016/hotspot/8147943-jvmti-header.hs1/
src/share/vm/prims/jvmti.xml
No comments.
src/share/vm/prims/jvmtiH.xsl
No comments.
src/share/vm/prims/jvmtiLib.xsl
No comments.
Still can't say that I'm really any good at reviewing XML or XSL.
I had a good practice but still can't say that. :-)
As long as you are happy with the new generated file... :-)
I'm happy as the generated comment is correct and this version
(I wrote two of them) is simpler than previous one.
Thumbs up...
Thank you so much, Dan!
Serguei
Dan
Summary:
The problem is that the
build/*/hotspot/variant-server/gensrc/jvmvtifiles/jvmti.h
is currently generated with the GPL copyright comment.
The JDK version of the header that we ship must havethe GPL +
"Classpath" exception.
So that the file is taken from the version that is checked into the
jdk repository:
jdk/src/java.base/share/native/include/jvmti.h.
Now, the checked-in version of the jvmti.h in the jdk repository is
manually updated
from the jvmvtifiles/jvmti.h with the copyright comment replacement
(very inconvenient).
Replacement of the copyright comment in the jvmvtifiles/jvmti.h was
discussed
Alan and Iris, and they are Ok with the change.
The jvmti.h is generated from the
hotspot/src/share/vm/prims/jvmti.xml with the XSL scripts,
and its copyright comment is inherited from the jvmti.xml.
The fix is to update the XSL scripts to generate the GPL+CP
copyright comment.
The only part that is still taken from the jvmti.xml is the
copyright year line.
There is a separate bug that targets automatic installation of the
generated jvmti.h
and potential removal of the checked-in version from the jdk
repository:
https://bugs.openjdk.java.net/browse/JDK-8063154
Checked in jvmti.h not in sync with generated jvmti.h
Testing:
Checked the copyright comment in the generated
gensrc/jvmvtifiles.jvmti.h.
Thanks,
Serguei
