RFR: 8078193: BACKOUT: Rename and clean up the ParGCAllocBuffer class

Bengt Rutisson bengt.rutisson at oracle.com
Tue Apr 21 08:09:35 UTC 2015


Hi Kim,

On 2015-04-21 00:14, Kim Barrett wrote:
> Please review this change to back out a changeset.
>
> The intended fix for JDK-8074546 was pushed with a commit message
> containing the wrong bug id. To simplify tracking the changeset
> through repository promotions to release, we're going to hg backout
> the problem changeset and re-push with a corrected commit message.
>
> The hg backout applied cleanly:
> Changeset: hs-gc/hotspot: 8148:dafb0a98e749
>
> CR:
> https://bugs.openjdk.java.net/browse/JDK-8078193
>
> Webrev:
> http://cr.openjdk.java.net/~kbarrett/8078193/webrev.00/
>
> Testing:
> JPRT


Doing hg backout does not apply cleanly for me.

$ hg backout -r 8148
reverting src/share/vm/gc_implementation/g1/g1Allocator.cpp
reverting src/share/vm/gc_implementation/g1/g1Allocator.hpp
reverting src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
reverting src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
reverting src/share/vm/gc_implementation/parNew/parNewGeneration.hpp
adding src/share/vm/gc_implementation/shared/parGCAllocBuffer.cpp
adding src/share/vm/gc_implementation/shared/parGCAllocBuffer.hpp
adding src/share/vm/gc_implementation/shared/parGCAllocBuffer.inline.hpp
removing src/share/vm/gc_implementation/shared/plab.cpp
removing src/share/vm/gc_implementation/shared/plab.hpp
removing src/share/vm/gc_implementation/shared/plab.inline.hpp
reverting src/share/vm/precompiled/precompiled.hpp
reverting src/share/vm/runtime/globals.hpp
merging src/share/vm/runtime/globals.hpp
merging src/share/vm/runtime/globals.hpp failed!
142 files updated, 0 files merged, 1 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges

There is a conflict in globals.hpp. But the patch file provided in the 
webrev:
http://cr.openjdk.java.net/~kbarrett/8078193/webrev.00/hotspot.changeset

applies cleanly for me and does the right thing to globals.hpp.

So, I think the webrev looks fine. Reviewed.

Will you push the fix for "Rename and clean up the ParGCAllocBuffer 
class" with the correct bug number at the same time? Would be nice to 
minimize the window where the repo is in an intermediate state.

Thanks,
Bengt

>



More information about the hotspot-gc-dev mailing list