jvmti.h mis-match

[Keith McGuigan]

Actually this is news to me.  I thought that they were identical when  
I checked it into the jdk repo.  Might be that the someone (likely me)  
changed the jvmti.xml file in the hotspot repo sometime afterward and  
forgot to re-sync with the jdk.  Can we just re-copy it over with the  
next putback to the jdk repo?

--
- Keith

On Apr 5, 2011, at 1:04 PM, Daniel D. Daugherty wrote:

> On 4/5/2011 10:03 AM, Kelly O'Hair wrote:
>> Could someone from the serviceability team copy in the latest  
>> generated jvmti.h file from a hotspot build
>> into the jdk repository?  Or was that done already?
>>
>> -kto
>>
>
> Looks like Keith updated it back in Jan...
>
>
> $ hg log src/share/javavm/export/jvmti.h
> changeset:   3298:f5c0b3cbee2f
> parent:      3296:cb3ecb5e4ce5
> user:        kamg
> date:        Wed Jan 12 11:47:35 2011 -0500
> summary:     6436034: Instance filter doesn't filter event if it  
> occurs in native method
>
>
> However, I'm seeing white space diffs, copyright header diffs,
> and some function parameter name diffs:
>
> $ pwd
> /work/shared/mirrors/src_clones/jdk7/tl_jdk_baseline
>
> $ diff -w src/share/javavm/export/jvmti.h /work/local/b
> uild/src_clones/hotspot_express/rt_baseline_clone/ 
> solaris_i486_compiler2/genera
> ted/jvmtifiles/jvmti.h
> 2,23c2,22
> <  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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
> <  * under the terms of the GNU General Public License version 2  
> only, as
> <  * published by the Free Software Foundation.  Oracle designates  
> this
> <  * particular file as subject to the "Classpath" exception as  
> provided
> <  * by Oracle in the LICENSE file that accompanied this code.
> <  *
> <  * This code is distributed in the hope that it will be useful,  
> but WITHOUT
> <  * ANY WARRANTY; without even the implied warranty of  
> MERCHANTABILITY or
> <  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public  
> License
> <  * version 2 for more details (a copy is included in the LICENSE  
> file that
> <  * accompanied this code).
> <  *
> <  * You should have received a copy of the GNU General Public  
> License version
> <  * 2 along with this work; if not, write to the Free Software  
> Foundation,
> <  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
> <  *
> <  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA  
> 94065 USA
> <  * or visit www.oracle.com if you need additional information or  
> have any
> <  * questions.
> ---
> >  Copyright (c) 2002, 2011, Oracle and/or its affiliates. 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
> >  under the terms of the GNU General Public License version 2 only,  
> as
> >  published by the Free Software Foundation.
> >
> >  This code is distributed in the hope that it will be useful, but  
> WITHOUT
> >  ANY WARRANTY; without even the implied warranty of  
> MERCHANTABILITY or
> >  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public  
> License
> >  version 2 for more details (a copy is included in the LICENSE  
> file that
> >  accompanied this code).
> >
> >  You should have received a copy of the GNU General Public License  
> version
> >  2 along with this work; if not, write to the Free Software  
> Foundation,
> >  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
> >
> >  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA  
> 94065 USA
> >  or visit www.oracle.com if you need additional information or  
> have any
> >  questions.
> >  28d26
> <
> 1678c1676
> <     const char* value);
> ---
> >     const char* value_ptr);
> 2487,2488c2485,2486
> <             const char* value) {
> <     return functions->SetSystemProperty(this, property, value);
> ---
> >             const char* value_ptr) {
> >     return functions->SetSystemProperty(this, property, value_ptr);
>
>
> Keith can probably shed some light on why they are different...
>
> Dan
>