hg: jdk9/hs/hotspot: 5 new changesets

[jon.masamitsu at oracle.com]

Changeset: 8886a4bcaeaa
Author:    jwilhelm
Date:      2014-04-29 22:57 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/8886a4bcaeaa

8027643: Merge GenCollectorPolicy and TwoGenerationCollectorPolicy
Summary: Merged the two calsses GenCollectorPolicy and TwoGenerationCollectorPolicy
Reviewed-by: sjohanss, jcoomes

! src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/parallelScavenge/generationSizer.cpp
! src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp
! src/share/vm/memory/collectorPolicy.cpp
! src/share/vm/memory/collectorPolicy.hpp
! src/share/vm/memory/genCollectedHeap.cpp
! src/share/vm/memory/genCollectedHeap.hpp
! src/share/vm/services/memoryService.cpp

Changeset: 5549b26a0660
Author:    jwilhelm
Date:      2014-05-02 21:10 +0000
URL:       http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/5549b26a0660

Merge


Changeset: 83dc9a7abcce
Author:    tschatzl
Date:      2014-05-06 09:41 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/83dc9a7abcce

8026784: Error message in AdaptiveFreeList<Chunk>::verify_stats is wrong
Summary: Changed faulty error message in the verification code
Reviewed-by: stefank, tschatzl
Contributed-by: Andreas Sjoberg <andreas.sjoberg at oracle.com>

! src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp

Changeset: a5730e3dee96
Author:    ehelin
Date:      2014-03-19 17:04 +0100
URL:       http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/a5730e3dee96

8034094: SA agent can't compile when jni_x86.h is used
Reviewed-by: dsamersoff, erikj

! src/cpu/x86/vm/jni_x86.h

Changeset: 957ed38326bd
Author:    jmasa
Date:      2014-05-08 18:22 -0700
URL:       http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/957ed38326bd

Merge

! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp