RFR (XL) 8081519 Split globals.hpp to factor out the Flag class

Thomas Stüfe thomas.stuefe at gmail.com
Wed Apr 11 14:14:17 UTC 2018


Hi Gerard,

I attempted to test-build your fix on AIX but it fails to apply (on jdk-hs):

- .../source $ hg qpush
applying webrev.patch
patching file src/hotspot/share/runtime/arguments.cpp
Hunk #24 succeeded at 2749 with fuzz 1 (offset -30 lines).
patching file src/hotspot/share/runtime/globals.cpp
Hunk #2 FAILED at 87
1 out of 2 hunks FAILED -- saving rejects to file
src/hotspot/share/runtime/globals.cpp.rej
patching file src/hotspot/share/runtime/vmStructs.cpp
Hunk #2 FAILED at 232
1 out of 7 hunks FAILED -- saving rejects to file
src/hotspot/share/runtime/vmStructs.cpp.rej
patching file src/hotspot/share/runtime/commandLineFlagConstraintList.cpp
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file
src/hotspot/share/runtime/commandLineFlagConstraintList.cpp.rej
unable to find 'src/hotspot/share/runtime/commandLineFlagConstraintsGC.cpp'
for patching
1 out of 1 hunks FAILED -- saving rejects to file
src/hotspot/share/runtime/commandLineFlagConstraintsGC.cpp.rej
unable to find 'src/hotspot/share/runtime/commandLineFlagConstraintsGC.hpp'
for patching
1 out of 1 hunks FAILED -- saving rejects to file
src/hotspot/share/runtime/commandLineFlagConstraintsGC.hpp.rej
patching file src/hotspot/share/runtime/commandLineFlagRangeList.cpp
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file
src/hotspot/share/runtime/commandLineFlagRangeList.cpp.rej
patching file src/hotspot/share/runtime/commandLineFlagWriteableList.cpp
Hunk #1 FAILED at 0
1 out of 1 hunks FAILED -- saving rejects to file
src/hotspot/share/runtime/commandLineFlagWriteableList.cpp.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh webrev.patch

Could you please provide an updated version? Thank you!

Thomas


On Mon, Apr 9, 2018 at 8:35 PM, Gerard Ziemski <gerard.ziemski at oracle.com>
wrote:

> Hi all,
>
> Here is http://cr.openjdk.java.net/~gziemski/8081519_rev3 with the
> addition requested by Coleen to include jvmFlag.hpp directly anywhere
> jvmFlag is used.
>
> Tested locally with open/closed, debug/product, precompiled header/no
> precompiled header build variations.
>
>
> cheers
>
> > On Apr 5, 2018, at 12:46 PM, Gerard Ziemski <gerard.ziemski at oracle.com>
> wrote:
> >
> > Hi all,
> >
> > Here is webrev 2 with the following additions:
> >
> > #1 Factor FlagSetting class out of "runtime/flags/jvmFlag.hpp" and into
> its own "runtime/flags/flagSetting.hpp", so that FlagSetting class can
> extend from “public StackObj” (thanks Coleen)
> >
> > #2 change the hierarchy from “runtime/jvmFlag/“ to "runtime/flags/“
> (thanks David)
> >
> > #3 Fix the header files, so that both closed and open repository build
> with and without precompiled headers
> >
> > #4 Add “runtime/flags/*.hpp” headers to “precompiled.hpp”
> >
> > The number of touched files got even longer - sorry about that and big
> thank you for taking your time to review!
> >
> > Running final Mach5 hs_tier1-5 tests… (it passed earlier iterations).
> Passes local builds (on Mac OS X) with and without precompiled headers for
> both closed and open repos and both debug and product versions (should I
> try any other build varations?)
> >
> > http://cr.openjdk.java.net/~gziemski/8081519_rev2
> >
> >
> > cheers
> >
> >> On Mar 29, 2018, at 2:01 PM, Gerard Ziemski <gerard.ziemski at oracle.com>
> wrote:
> >>
> >> Hi all,
> >>
> >> Please review this large and tedious (sorry), but simple fix that
> accomplishes the following:
> >>
> >> #1 factor out the command option flag related APIs out of
> globals.hpp/.cpp into its own dedicated files, i.e. jvmFlag.hpp/.cpp
> >> #2 merge Flag (too generic name) and CommandLineFlag classes and rename
> them as JVMFlag
> >> #3 cleanup globals.hpp includes originally added by the JEP-245
> >>
> >> Note: the renamed file retain their history, but one needs to add
> “follow” flag, ex. “hg log -f file”
> >>
> >> https://bugs.openjdk.java.net/browse/JDK-8081519
> >> http://cr.openjdk.java.net/~gziemski/8081519_rev1
> >>
> >> Passes Mach5 hs_tier1-tier5, jtreg/runtime/CommandLine/
> OptionsValidation/TestOptionsWithRanges tests.
> >>
> >>
> >> cheers
> >
>
>


More information about the hotspot-dev mailing list