August 2008 - hotspot-gc-dev

Problem with the "optimized" build
by Jon Masamitsu 29 Aug '08

29 Aug '08

The "optimized" target does not currently build due to the error "/net/karachi/scratch/jmasa/hg_gc_baseline_ref/src/share/vm/gc_implementation/shared/spaceDecorator.cpp", line 36: Error: value is not a member of HeapWord. I'll be fixing this shortly. I would normally push through hotspot-gc/hotspot (aka gc_baseline) but hotspot-gc/hotspot currently has the initial G1 push and we were planning on letting it cook there until early next week before pushing it up. If this is causing anyone a problem right now, I can push through a different baseline to alleviate that pain. Just let me know. Thanks to John C. for finding this bug.

1 0

hg: jdk7/hotspot-gc/hotspot: 19 new changesets
by y.s.ramakrishna＠sun.com 27 Aug '08

27 Aug '08

Changeset: 37f87013dfd8 Author: ysr Date: 2008-06-05 15:57 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/37f87013dfd8 6711316: Open source the Garbage-First garbage collector Summary: First mercurial integration of the code for the Garbage-First garbage collector. Reviewed-by: apetrusenko, iveresov, jmasa, sgoldman, tonyp, ysr ! make/linux/makefiles/top.make ! make/solaris/makefiles/top.make ! make/windows/makefiles/generated.make ! make/windows/makefiles/makedeps.make ! make/windows/makefiles/vm.make ! src/cpu/sparc/vm/assembler_sparc.cpp ! src/cpu/sparc/vm/assembler_sparc.hpp ! src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp ! src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp ! src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp ! src/cpu/sparc/vm/c1_Runtime1_sparc.cpp ! src/cpu/sparc/vm/sharedRuntime_sparc.cpp ! src/cpu/sparc/vm/stubGenerator_sparc.cpp ! src/cpu/sparc/vm/templateTable_sparc.cpp ! src/cpu/x86/vm/assembler_x86_32.cpp ! src/cpu/x86/vm/assembler_x86_32.hpp ! src/cpu/x86/vm/assembler_x86_64.cpp ! src/cpu/x86/vm/assembler_x86_64.hpp ! src/cpu/x86/vm/c1_CodeStubs_x86.cpp ! src/cpu/x86/vm/c1_LIRGenerator_x86.cpp ! src/cpu/x86/vm/c1_Runtime1_x86.cpp ! src/cpu/x86/vm/interp_masm_x86_64.cpp ! src/cpu/x86/vm/stubGenerator_x86_32.cpp ! src/cpu/x86/vm/stubGenerator_x86_64.cpp ! src/cpu/x86/vm/templateTable_x86_32.cpp ! src/cpu/x86/vm/templateTable_x86_64.cpp ! src/os/linux/vm/os_linux.cpp ! src/os/solaris/vm/os_solaris.cpp ! src/os/windows/vm/os_windows.cpp ! src/share/vm/adlc/formssel.cpp ! src/share/vm/c1/c1_CodeStubs.hpp ! src/share/vm/c1/c1_LIRAssembler.cpp ! src/share/vm/c1/c1_LIRAssembler.hpp ! src/share/vm/c1/c1_LIRGenerator.cpp ! src/share/vm/c1/c1_LIRGenerator.hpp ! src/share/vm/c1/c1_Runtime1.cpp ! src/share/vm/c1/c1_Runtime1.hpp ! src/share/vm/c1/c1_globals.hpp ! src/share/vm/compiler/methodLiveness.cpp ! src/share/vm/compiler/methodLiveness.hpp ! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp + src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp + src/share/vm/gc_implementation/g1/collectionSetChooser.cpp + src/share/vm/gc_implementation/g1/collectionSetChooser.hpp + src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp + src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp + src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp + src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp + src/share/vm/gc_implementation/g1/concurrentMark.cpp + src/share/vm/gc_implementation/g1/concurrentMark.hpp + src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp + src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp + src/share/vm/gc_implementation/g1/concurrentMarkThread.inline.hpp + src/share/vm/gc_implementation/g1/concurrentZFThread.cpp + src/share/vm/gc_implementation/g1/concurrentZFThread.hpp + src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp + src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp + src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp + src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp + src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp + src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp + src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp + src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp + src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp + src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp + src/share/vm/gc_implementation/g1/g1MMUTracker.cpp + src/share/vm/gc_implementation/g1/g1MMUTracker.hpp + src/share/vm/gc_implementation/g1/g1MarkSweep.cpp + src/share/vm/gc_implementation/g1/g1MarkSweep.hpp + src/share/vm/gc_implementation/g1/g1OopClosures.hpp + src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp + src/share/vm/gc_implementation/g1/g1RemSet.cpp + src/share/vm/gc_implementation/g1/g1RemSet.hpp + src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp + src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp + src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp + src/share/vm/gc_implementation/g1/g1_globals.cpp + src/share/vm/gc_implementation/g1/g1_globals.hpp + src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp + src/share/vm/gc_implementation/g1/heapRegion.cpp + src/share/vm/gc_implementation/g1/heapRegion.hpp + src/share/vm/gc_implementation/g1/heapRegion.inline.hpp + src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp + src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp + src/share/vm/gc_implementation/g1/heapRegionSeq.cpp + src/share/vm/gc_implementation/g1/heapRegionSeq.hpp + src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp + src/share/vm/gc_implementation/g1/ptrQueue.cpp + src/share/vm/gc_implementation/g1/ptrQueue.hpp + src/share/vm/gc_implementation/g1/ptrQueue.inline.hpp + src/share/vm/gc_implementation/g1/satbQueue.cpp + src/share/vm/gc_implementation/g1/satbQueue.hpp + src/share/vm/gc_implementation/g1/sparsePRT.cpp + src/share/vm/gc_implementation/g1/sparsePRT.hpp + src/share/vm/gc_implementation/g1/survRateGroup.cpp + src/share/vm/gc_implementation/g1/survRateGroup.hpp + src/share/vm/gc_implementation/g1/vm_operations_g1.cpp + src/share/vm/gc_implementation/g1/vm_operations_g1.hpp ! src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep + src/share/vm/gc_implementation/includeDB_gc_g1 ! src/share/vm/gc_implementation/includeDB_gc_parallelScavenge ! src/share/vm/gc_implementation/includeDB_gc_shared ! src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp ! src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp + src/share/vm/gc_implementation/shared/coTracker.cpp + src/share/vm/gc_implementation/shared/coTracker.hpp + src/share/vm/gc_implementation/shared/concurrentGCThread.cpp + src/share/vm/gc_implementation/shared/concurrentGCThread.hpp + src/share/vm/gc_implementation/shared/gcOverheadReporter.cpp + src/share/vm/gc_implementation/shared/gcOverheadReporter.hpp ! src/share/vm/gc_implementation/shared/vmGCOperations.cpp ! src/share/vm/gc_interface/collectedHeap.cpp ! src/share/vm/gc_interface/collectedHeap.hpp ! src/share/vm/gc_interface/collectedHeap.inline.hpp ! src/share/vm/gc_interface/gcCause.hpp ! src/share/vm/includeDB_compiler1 ! src/share/vm/includeDB_compiler2 ! src/share/vm/includeDB_core ! src/share/vm/includeDB_gc_parallel ! src/share/vm/includeDB_jvmti ! src/share/vm/interpreter/templateTable.cpp ! src/share/vm/interpreter/templateTable.hpp ! src/share/vm/memory/allocation.hpp + src/share/vm/memory/barrierSet.cpp ! src/share/vm/memory/barrierSet.hpp ! src/share/vm/memory/barrierSet.inline.hpp ! src/share/vm/memory/blockOffsetTable.cpp ! src/share/vm/memory/blockOffsetTable.hpp ! src/share/vm/memory/cardTableModRefBS.cpp ! src/share/vm/memory/cardTableModRefBS.hpp ! src/share/vm/memory/cardTableRS.cpp ! src/share/vm/memory/cardTableRS.hpp ! src/share/vm/memory/collectorPolicy.cpp ! src/share/vm/memory/collectorPolicy.hpp ! src/share/vm/memory/defNewGeneration.cpp ! src/share/vm/memory/genCollectedHeap.hpp ! src/share/vm/memory/genMarkSweep.hpp ! src/share/vm/memory/genOopClosures.hpp ! src/share/vm/memory/genOopClosures.inline.hpp ! src/share/vm/memory/genRemSet.hpp ! src/share/vm/memory/heapInspection.cpp ! src/share/vm/memory/iterator.hpp ! src/share/vm/memory/modRefBarrierSet.hpp ! src/share/vm/memory/referenceProcessor.cpp ! src/share/vm/memory/referenceProcessor.hpp ! src/share/vm/memory/sharedHeap.cpp ! src/share/vm/memory/sharedHeap.hpp ! src/share/vm/memory/space.cpp ! src/share/vm/memory/space.hpp ! src/share/vm/memory/space.inline.hpp ! src/share/vm/memory/specialized_oop_closures.hpp ! src/share/vm/memory/universe.cpp ! src/share/vm/oops/generateOopMap.cpp ! src/share/vm/oops/generateOopMap.hpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/oops/instanceRefKlass.cpp ! src/share/vm/oops/instanceRefKlass.hpp ! src/share/vm/oops/klass.hpp ! src/share/vm/oops/markOop.hpp ! src/share/vm/oops/markOop.inline.hpp ! src/share/vm/oops/objArrayKlass.cpp ! src/share/vm/oops/objArrayKlass.hpp ! src/share/vm/oops/objArrayOop.cpp ! src/share/vm/oops/objArrayOop.hpp ! src/share/vm/oops/oop.hpp ! src/share/vm/oops/oop.inline.hpp ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/graphKit.hpp ! src/share/vm/opto/lcm.cpp ! src/share/vm/opto/macro.cpp ! src/share/vm/opto/runtime.cpp ! src/share/vm/opto/runtime.hpp ! src/share/vm/prims/jvm.cpp ! src/share/vm/prims/jvmtiExport.cpp ! src/share/vm/prims/jvmtiTagMap.cpp ! src/share/vm/prims/unsafe.cpp ! src/share/vm/runtime/aprofiler.hpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/arguments.hpp ! src/share/vm/runtime/globals.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/globals_extension.hpp ! src/share/vm/runtime/mutexLocker.cpp ! src/share/vm/runtime/mutexLocker.hpp ! src/share/vm/runtime/os.hpp ! src/share/vm/runtime/sharedRuntime.cpp ! src/share/vm/runtime/sharedRuntime.hpp ! src/share/vm/runtime/task.cpp ! src/share/vm/runtime/thread.cpp ! src/share/vm/runtime/thread.hpp ! src/share/vm/runtime/virtualspace.cpp ! src/share/vm/runtime/vmStructs.cpp ! src/share/vm/runtime/vm_operations.hpp ! src/share/vm/services/heapDumper.cpp ! src/share/vm/services/memoryService.cpp ! src/share/vm/utilities/bitMap.cpp ! src/share/vm/utilities/bitMap.hpp ! src/share/vm/utilities/bitMap.inline.hpp ! src/share/vm/utilities/debug.cpp + src/share/vm/utilities/intHisto.cpp + src/share/vm/utilities/intHisto.hpp + src/share/vm/utilities/numberSeq.cpp + src/share/vm/utilities/numberSeq.hpp ! src/share/vm/utilities/ostream.cpp ! src/share/vm/utilities/ostream.hpp ! src/share/vm/utilities/taskqueue.cpp ! src/share/vm/utilities/taskqueue.hpp ! src/share/vm/utilities/workgroup.cpp ! src/share/vm/utilities/workgroup.hpp ! src/share/vm/utilities/yieldingWorkgroup.cpp ! src/share/vm/utilities/yieldingWorkgroup.hpp Changeset: afc1ce1efe66 Author: iveresov Date: 2008-06-11 05:12 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/afc1ce1efe66 6710665: G1: guarantee(_cm->out_of_regions() && _cm->region_stack_empty() && _task_queue->size() == 0, ...) Summary: Remove the incorrect assumptions from guarantee()s. Reviewed-by: ysr, tonyp ! src/share/vm/gc_implementation/g1/concurrentMark.cpp Changeset: 6aae2f9d0294 Author: ysr Date: 2008-06-12 13:50 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/6aae2f9d0294 Merge ! src/cpu/sparc/vm/assembler_sparc.cpp ! src/cpu/sparc/vm/assembler_sparc.hpp ! src/cpu/sparc/vm/sharedRuntime_sparc.cpp ! src/cpu/sparc/vm/templateTable_sparc.cpp ! src/cpu/x86/vm/assembler_x86_32.hpp ! src/cpu/x86/vm/assembler_x86_64.cpp ! src/cpu/x86/vm/assembler_x86_64.hpp ! src/cpu/x86/vm/interp_masm_x86_64.cpp ! src/cpu/x86/vm/templateTable_x86_64.cpp ! src/share/vm/adlc/formssel.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp ! src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep ! src/share/vm/gc_implementation/includeDB_gc_shared ! src/share/vm/gc_interface/collectedHeap.inline.hpp ! src/share/vm/includeDB_core ! src/share/vm/memory/space.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/oops/markOop.hpp ! src/share/vm/oops/oop.hpp ! src/share/vm/oops/oop.inline.hpp ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/lcm.cpp ! src/share/vm/opto/macro.cpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/vmStructs.cpp Changeset: 33e001c095fe Author: ysr Date: 2008-06-12 14:02 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/33e001c095fe Merge Changeset: bb254e57d2f4 Author: ysr Date: 2008-06-17 08:40 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/bb254e57d2f4 Merge ! src/share/vm/memory/cardTableModRefBS.cpp Changeset: 60fb9c4db4e6 Author: ysr Date: 2008-06-23 16:49 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/60fb9c4db4e6 6718086: CMS assert: _concurrent_iteration_safe_limit update missed Summary: Initialize the field correctly in ContiguousSpace's constructor and initialize() methods, using the latter for the survivor spaces upon initial construction or a subsequent resizing of the young generation. Add some missing Space sub-class constructors. Reviewed-by: apetrusenko ! src/share/vm/memory/defNewGeneration.cpp ! src/share/vm/memory/space.cpp ! src/share/vm/memory/space.hpp Changeset: 69fefd031e6c Author: ysr Date: 2008-06-24 13:20 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/69fefd031e6c Merge ! src/os/linux/vm/os_linux.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/thread.cpp Changeset: 73278b62f36c Author: ysr Date: 2008-06-26 11:43 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/73278b62f36c 6718811: Mismerge of 6680469:macro.cpp Summary: Fixed the mismerge by deleting the lines that were inadvertently left in place. Reviewed-by: iveresov ! src/share/vm/opto/macro.cpp Changeset: d28aa69f0959 Author: ysr Date: 2008-06-30 17:04 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/d28aa69f0959 6618726: Introduce -XX:+UnlockExperimentalVMOptions flag Summary: experimental() flags will protect features of an experimental nature that are not supported in the regular product build. Made UseG1GC an experimental flag. Reviewed-by: jmasa, kamg, coleenp ! src/share/vm/gc_implementation/g1/g1_globals.cpp ! src/share/vm/gc_implementation/g1/g1_globals.hpp ! src/share/vm/runtime/globals.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/globals_extension.hpp ! src/share/vm/services/management.cpp Changeset: fab5f738c515 Author: ysr Date: 2008-07-01 11:59 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/fab5f738c515 Merge ! src/share/vm/adlc/formssel.cpp ! src/share/vm/includeDB_compiler2 ! src/share/vm/opto/macro.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/utilities/ostream.cpp ! src/share/vm/utilities/ostream.hpp Changeset: e0c09f7ec5c4 Author: iveresov Date: 2008-07-03 03:17 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/e0c09f7ec5c4 6702387: G1: assertion failure: assert(p == current_top || oop(p)->is_oop(),"p is not a block start") Summary: Do not coalesce dead and moved objects when removing self-forwarding pointers during the evacuation failure. Also fixed a issue in a BOT refinement code for TLABs. Reviewed-by: tonyp, jcoomes ! src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Changeset: 9bb2c10ac07b Author: iveresov Date: 2008-07-10 09:29 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/9bb2c10ac07b 6723570: G1: assertion failure: p == current_top or oop(p)->is_oop(),"p is not a block start" (revisited!) Summary: Fixed the incorrect assigment to G1OffsetTableContigSpace::_gc_time_stamp. Also added a little more paranoia to operations on a global timestamp. Reviewed-by: tonyp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp ! src/share/vm/gc_implementation/g1/heapRegion.cpp Changeset: c0f8f7790199 Author: iveresov Date: 2008-07-30 10:45 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/c0f8f7790199 6652160: G1: assert(cur_used_bytes == _g1->recalculate_used(),"It should!") at g1CollectorPolicy.cpp:1425 Summary: In attempt_allocation_slow() wait for the concurrent cleanup to complete before modifying _summary_bytes_used. Reviewed-by: jmasa, apetrusenko ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp Changeset: 0edda524b58c Author: tonyp Date: 2008-08-06 11:57 -0400 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/0edda524b58c 6722565: G1: assert !r->is_on_unclean_list() fires Summary: Under certain circumstances, two cleanup threads can claim and process the same region. Reviewed-by: apetrusenko, ysr ! src/share/vm/gc_implementation/g1/concurrentMark.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp ! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp ! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp ! src/share/vm/gc_implementation/g1/heapRegion.cpp ! src/share/vm/gc_implementation/g1/heapRegion.hpp Changeset: 1ee8caae33af Author: tonyp Date: 2008-08-21 23:36 -0400 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/1ee8caae33af Merge - agent/src/share/lib/jlfgr-1_0.jar - agent/src/share/lib/maf-1_0.jar - make/linux/Queens.class ! make/linux/makefiles/top.make - make/solaris/Queens.class ! make/solaris/makefiles/top.make ! make/windows/makefiles/generated.make ! make/windows/makefiles/makedeps.make ! make/windows/makefiles/vm.make ! src/cpu/sparc/vm/assembler_sparc.cpp ! src/cpu/sparc/vm/assembler_sparc.hpp ! src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp ! src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp ! src/cpu/sparc/vm/sharedRuntime_sparc.cpp ! src/cpu/sparc/vm/stubGenerator_sparc.cpp ! src/cpu/sparc/vm/templateTable_sparc.cpp ! src/cpu/x86/vm/assembler_x86_32.cpp ! src/cpu/x86/vm/assembler_x86_32.hpp ! src/cpu/x86/vm/assembler_x86_64.cpp ! src/cpu/x86/vm/assembler_x86_64.hpp ! src/cpu/x86/vm/c1_LIRGenerator_x86.cpp ! src/cpu/x86/vm/interp_masm_x86_64.cpp ! src/cpu/x86/vm/stubGenerator_x86_32.cpp ! src/cpu/x86/vm/stubGenerator_x86_64.cpp ! src/cpu/x86/vm/templateTable_x86_32.cpp ! src/cpu/x86/vm/templateTable_x86_64.cpp ! src/os/linux/vm/os_linux.cpp ! src/os/solaris/vm/os_solaris.cpp ! src/os/windows/vm/os_windows.cpp ! src/share/vm/adlc/formssel.cpp ! src/share/vm/c1/c1_Runtime1.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp ! src/share/vm/gc_implementation/g1/heapRegion.cpp ! src/share/vm/gc_implementation/g1/heapRegion.hpp ! src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep ! src/share/vm/gc_implementation/includeDB_gc_g1 ! src/share/vm/gc_implementation/includeDB_gc_parallelScavenge ! src/share/vm/gc_implementation/includeDB_gc_shared ! src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp ! src/share/vm/gc_implementation/shared/vmGCOperations.cpp ! src/share/vm/gc_interface/collectedHeap.cpp ! src/share/vm/gc_interface/collectedHeap.hpp ! src/share/vm/gc_interface/collectedHeap.inline.hpp ! src/share/vm/includeDB_compiler1 ! src/share/vm/includeDB_compiler2 ! src/share/vm/includeDB_core ! src/share/vm/memory/barrierSet.hpp ! src/share/vm/memory/barrierSet.inline.hpp ! src/share/vm/memory/cardTableModRefBS.cpp ! src/share/vm/memory/cardTableModRefBS.hpp ! src/share/vm/memory/cardTableRS.cpp ! src/share/vm/memory/cardTableRS.hpp ! src/share/vm/memory/collectorPolicy.cpp ! src/share/vm/memory/collectorPolicy.hpp ! src/share/vm/memory/defNewGeneration.cpp ! src/share/vm/memory/genCollectedHeap.hpp ! src/share/vm/memory/genMarkSweep.cpp ! src/share/vm/memory/genOopClosures.hpp ! src/share/vm/memory/genOopClosures.inline.hpp ! src/share/vm/memory/genRemSet.hpp ! src/share/vm/memory/heapInspection.cpp ! src/share/vm/memory/iterator.hpp ! src/share/vm/memory/modRefBarrierSet.hpp ! src/share/vm/memory/referenceProcessor.cpp ! src/share/vm/memory/referenceProcessor.hpp ! src/share/vm/memory/sharedHeap.cpp ! src/share/vm/memory/space.cpp ! src/share/vm/memory/space.hpp ! src/share/vm/memory/universe.cpp ! src/share/vm/oops/instanceKlass.cpp ! src/share/vm/oops/instanceKlass.hpp ! src/share/vm/oops/instanceRefKlass.cpp ! src/share/vm/oops/klass.hpp ! src/share/vm/oops/markOop.hpp ! src/share/vm/oops/objArrayKlass.cpp ! src/share/vm/oops/objArrayKlass.hpp ! src/share/vm/oops/objArrayOop.cpp ! src/share/vm/oops/objArrayOop.hpp ! src/share/vm/oops/oop.hpp ! src/share/vm/oops/oop.inline.hpp ! src/share/vm/opto/graphKit.cpp ! src/share/vm/opto/lcm.cpp ! src/share/vm/opto/macro.cpp ! src/share/vm/prims/jvm.cpp ! src/share/vm/prims/jvmtiTagMap.cpp ! src/share/vm/prims/unsafe.cpp ! src/share/vm/runtime/arguments.cpp ! src/share/vm/runtime/arguments.hpp ! src/share/vm/runtime/globals.cpp ! src/share/vm/runtime/globals.hpp ! src/share/vm/runtime/globals_extension.hpp ! src/share/vm/runtime/mutexLocker.cpp ! src/share/vm/runtime/mutexLocker.hpp ! src/share/vm/runtime/os.hpp ! src/share/vm/runtime/sharedRuntime.cpp ! src/share/vm/runtime/sharedRuntime.hpp ! src/share/vm/runtime/task.cpp ! src/share/vm/runtime/thread.cpp ! src/share/vm/runtime/virtualspace.cpp ! src/share/vm/runtime/vmStructs.cpp ! src/share/vm/runtime/vm_operations.hpp ! src/share/vm/services/heapDumper.cpp ! src/share/vm/utilities/debug.cpp ! src/share/vm/utilities/ostream.cpp ! src/share/vm/utilities/ostream.hpp ! src/share/vm/utilities/taskqueue.hpp Changeset: 2564c620fa42 Author: tonyp Date: 2008-08-21 23:38 -0400 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/2564c620fa42 Merge ! src/share/vm/memory/blockOffsetTable.hpp ! src/share/vm/runtime/globals.hpp Changeset: 8651a65ac4b4 Author: iveresov Date: 2008-08-22 11:48 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/8651a65ac4b4 6735416: G1: runThese javasoft.sqe.tests.lang.thrd011.thrd01101.thrd01101 fails 6622418: G1: assert(false,"Non-balanced monitor enter/exit!") fails Summary: The mark-sweep compact (which we use for full gc) wrapper did not save the mark words for biased locked objects. The fix is to trivially call the appropriate methods. Reviewed-by: tonyp, ysr ! src/share/vm/gc_implementation/g1/g1MarkSweep.cpp ! src/share/vm/gc_implementation/includeDB_gc_g1 Changeset: d515536da189 Author: tonyp Date: 2008-08-26 00:46 -0400 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/d515536da189 6740930: G1: compilation failure with latest gcc Summary: Include DB fix to resolve a compilation issue with the latest gcc. Reviewed-by: iveresov, ysr ! src/share/vm/gc_implementation/includeDB_gc_g1 Changeset: 5d254928c888 Author: ysr Date: 2008-08-27 11:20 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/5d254928c888 Merge ! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp ! src/share/vm/runtime/thread.cpp

1 0

hg: jdk7/hotspot-gc/hotspot: 14 new changesets
by y.s.ramakrishna＠sun.com 27 Aug '08

27 Aug '08

Changeset: 51ae48d8072f Author: kamg Date: 2008-08-13 08:56 -0400 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/51ae48d8072f 6736718: more copyright headers wrong Summary: Changed license headers to GPL Reviewed-by: tonyp, rasbold ! make/hotspot_distro ! test/compiler/6646019/Test.java ! test/compiler/6689060/Test.java ! test/compiler/6695810/Test.java Changeset: 3529d0e8d09c Author: xlu Date: 2008-08-15 10:08 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/3529d0e8d09c 6608862: segv in JvmtiEnvBase::check_for_periodic_clean_up() Reviewed-by: dholmes, dcubed, jcoomes ! src/share/vm/runtime/thread.cpp Changeset: 6e76352f1f62 Author: xlu Date: 2008-08-18 14:53 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/6e76352f1f62 6459085: naked pointer subtractions in class data sharing code Reviewed-by: jcoomes ! make/linux/makefiles/vm.make ! src/share/vm/memory/dump.cpp Changeset: 70c4fb9cf899 Author: apangin Date: 2008-08-19 06:02 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/70c4fb9cf899 Merge - agent/src/share/lib/jlfgr-1_0.jar - agent/src/share/lib/maf-1_0.jar ! src/share/vm/memory/dump.cpp ! test/compiler/6646019/Test.java ! test/compiler/6689060/Test.java ! test/compiler/6695810/Test.java Changeset: d7bb383033d6 Author: apangin Date: 2008-08-20 12:24 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/d7bb383033d6 Merge Changeset: 5b3b8a69f10f Author: xdono Date: 2008-08-14 09:26 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/5b3b8a69f10f Added tag jdk7-b33 for changeset 585535ec8a14 ! .hgtags Changeset: 9f7cf8db35b8 Author: trims Date: 2008-08-20 20:24 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/9f7cf8db35b8 Merge Changeset: c3e045194476 Author: kvn Date: 2008-08-01 10:06 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/c3e045194476 6731641: assert(m->adr_type() == mach->adr_type(),"matcher should not change adr type") Summary: fixed few addP node type and narrow oop type problems. Reviewed-by: rasbold, never ! src/share/vm/adlc/output_h.cpp ! src/share/vm/opto/addnode.cpp ! src/share/vm/opto/callGenerator.cpp ! src/share/vm/opto/compile.cpp ! src/share/vm/opto/escape.cpp ! src/share/vm/opto/escape.hpp ! src/share/vm/opto/loopnode.cpp ! src/share/vm/opto/loopopts.cpp ! src/share/vm/opto/memnode.cpp ! src/share/vm/opto/subnode.cpp ! src/share/vm/opto/type.cpp Changeset: 616a07a75c3c Author: rasbold Date: 2008-08-14 10:15 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/616a07a75c3c 6732154: REG: Printing an Image using image/gif doc flavor crashes the VM, Solsparc Summary: delay transform call until uses of t2 are constructed Reviewed-by: never ! src/share/vm/opto/divnode.cpp Changeset: ea18057223c4 Author: never Date: 2008-08-18 23:17 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/ea18057223c4 6732194: Data corruption dependent on -server/-client/-Xbatch Summary: rematerializing nodes results in incorrect inputs Reviewed-by: rasbold ! src/share/vm/opto/chaitin.cpp ! src/share/vm/opto/chaitin.hpp ! src/share/vm/opto/coalesce.cpp ! src/share/vm/opto/ifg.cpp ! src/share/vm/opto/reg_split.cpp Changeset: ce93a51457ae Author: rasbold Date: 2008-08-19 07:25 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/ce93a51457ae 6730716: nulls from two unrelated classes compare not equal Summary: check for not-nullness after proving that types are unrelated Reviewed-by: kvn, never ! src/share/vm/opto/subnode.cpp Changeset: f8068895c22d Author: rasbold Date: 2008-08-21 05:49 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/f8068895c22d Merge Changeset: 58eb97387b90 Author: ysr Date: 2008-08-25 12:16 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/58eb97387b90 Merge Changeset: d60e4e6d7f72 Author: ysr Date: 2008-08-27 10:56 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/d60e4e6d7f72 Merge

1 0

hg: jdk7/hotspot-gc/hotspot: 6722116: CMS: Incorrect overflow handling when using parallel concurrent marking
by y.s.ramakrishna＠sun.com 26 Aug '08

26 Aug '08

Changeset: ebeb6490b814 Author: ysr Date: 2008-08-26 14:54 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/ebeb6490b814 6722116: CMS: Incorrect overflow handling when using parallel concurrent marking Summary: Fixed CMSConcMarkingTask::reset() to store the restart address upon a marking stack overflow and to use it as the base, suitably aligned, for restarting the scan in CMSConcMarkingTask::do_scan_and_mark(). Reviewed-by: jcoomes, tonyp ! src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp ! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp

1 0

Ergonomics resizes young generation too small
by Raman Gupta 25 Aug '08

25 Aug '08

I am using GC ergonomics on JDK 1.5.0_12 32-bit on Sun Solaris Sparc, command line: -server -Xms1g -Xmx1g -XX:+DisableExplicitGC -XX:NewRatio=2 -XX:+UseParallelGC -XX:MaxGCPauseMillis=35 -XX:+PrintGCTimeStamps -XX:+PrintGCDetails -XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCApplicationStoppedTime It appears that over time the JVM is making the young generation smaller and smaller, to the point where the JVM is doing almost continuous garbage collections. Here is a snippet from my GC output, skipping the application initialization phase: 134.522: [GC [PSYoungGen: 131536K->320K(130496K)] 159347K->28363K(829568K), 0.0126834 secs] Total time for which application threads were stopped: 0.0138235 seconds Application time: 1.9330309 seconds 137.474: [GC [PSYoungGen: 130496K->318K(138688K)] 158539K->28594K(837760K), 0.0123787 secs] Total time for which application threads were stopped: 0.0135995 seconds Application time: 0.8795206 seconds 140.401: [GC [PSYoungGen: 129534K->256K(128512K)] 157810K->28790K(827584K), 0.0133409 secs] Total time for which application threads were stopped: 0.0145290 seconds Application time: 3.3926780 seconds 143.808: [GC [PSYoungGen: 128512K->320K(135360K)] 157046K->29058K(834432K), 0.0117748 secs] Total time for which application threads were stopped: 0.0130701 seconds Application time: 1.3970241 seconds 147.254: [GC [PSYoungGen: 127616K->304K(126656K)] 156354K->29274K(825728K), 0.0116910 secs] Total time for which application threads were stopped: 0.0128008 seconds Application time: 2.9351317 seconds 150.203: [GC [PSYoungGen: 126640K->288K(132352K)] 155610K->29490K(831424K), 0.0114801 secs] Total time for which application threads were stopped: 0.0126512 seconds Application time: 3.5357540 seconds 153.751: [GC [PSYoungGen: 125664K->320K(124800K)] 154866K->29762K(823872K), 0.0117090 secs] Total time for which application threads were stopped: 0.0128397 seconds Application time: 1.1165393 seconds 157.088: [GC [PSYoungGen: 124800K->304K(129472K)] 154242K->29978K(828544K), 0.0251655 secs] Total time for which application threads were stopped: 0.0262839 seconds Application time: 0.0840740 seconds 160.448: [GC [PSYoungGen: 123888K->384K(123072K)] 153562K->30282K(822144K), 0.0117038 secs] So far so good, the system still has a reasonable eden size and is easily meeting the MAX GC pause time goal. But for some reason, from this point forward, the system continues to make the young generation smaller and smaller, finally resulting in: 12392.994: [GC [PSYoungGen: 1552K->181K(1728K)] 365538K->364388K(700800K), 0.0271502 secs] Total time for which application threads were stopped: 0.0278218 seconds Application time: 0.1166776 seconds 12393.139: [GC [PSYoungGen: 1525K->16K(1728K)] 365732K->364376K(700800K), 0.0281370 secs] Total time for which application threads were stopped: 0.0287963 seconds Application time: 0.1309121 seconds 12393.300: [GC [PSYoungGen: 1360K->16K(1728K)] 365720K->364376K(700800K), 0.0503697 secs] Total time for which application threads were stopped: 0.0527805 seconds Application time: 0.2960570 seconds 12393.648: [GC [PSYoungGen: 1360K->64K(1728K)] 365720K->364424K(700800K), 0.0336176 secs] Total time for which application threads were stopped: 0.0350546 seconds Application time: 0.3747399 seconds 12394.059: [GC [PSYoungGen: 1408K->80K(1728K)] 365768K->364452K(700800K), 0.0318642 secs] Total time for which application threads were stopped: 0.0346854 seconds Application time: 0.4696706 seconds 12394.564: [GC [PSYoungGen: 1424K->112K(1728K)] 365796K->364508K(700800K), 0.0288190 secs] Total time for which application threads were stopped: 0.0315647 seconds Application time: 0.0420326 seconds 12394.636: [GC [PSYoungGen: 1456K->304K(1728K)] 365852K->364740K(700800K), 0.0347478 secs] Total time for which application threads were stopped: 0.0365562 seconds Application time: 0.0330247 seconds 12394.706: [GC [PSYoungGen: 1648K->304K(1792K)] 366084K->364893K(700864K), 0.0251325 secs] Total time for which application threads were stopped: 0.0263055 seconds Application time: 0.1094829 seconds Ok, the pause time goal is still being met but application time is much lower AND pause times are much higher than they were initially), so this is pretty sub-optimal end-state for the JVM. Do I need to set a higher throughput goal than the default (perhaps 200?) to avoid this pathological behavior? Cheers, Raman Gupta

2 2

request for review (small): 6722116: CMS: Incorrect overflow handling when using parallel concurrent marking
by Y Srinivas Ramakrishna 25 Aug '08

25 Aug '08

Fixed: 6722116: CMS: Incorrect overflow handling when using parallel concurrent marking webrev: http://analemma.sfbay/net/neeraja/export/ysr/cms_cmt/webrev (for patch file, see attachment) When we do CMS' concurrent marking phase in multiple worker threads, these workers maintain their own private (stealable) work queues, but these can overflow during marking. When that happens we use the "central" marking stack to buffer the overflown oops. However, it's possible that this overflow buffer might itself overflow. In that case, we were doing a "restart" of the marking from the least overflown oop address. The problem was that the code to do the restart was incorrect in that although the number of marking tasks was being correctly computed, the CMSConcMarkingTask::do_scan_and_mark() which does the work was not restarting the marking/scan from the "restart address" but instead from the start of the generation. This can result in the grey oops in the upper reaches of the generation not being blackened, and thus cause some reachable objects to incorrectly be cosnidered white. The fix was to fix the ::do_scan_and_mark() method to use the correct address to starts its work from. Testing also revealed a few assertions that were a tad too strict, and these were suitably weakened. A few documentation comments were elaborated as well. Testing: jprt, refworkload to be done: gc test suite Fix Verified: yes Verification test: Without the fix specjvm98 or gcbasher when run with +CMSMarkStackOverflowAlot on a 32-core or high crashes; heap verification reveal a marking that missed reachable objects. The tests pass with the fix.

1 0

Exception java.lang.OutOfMemoryError: requested 36616 bytes for Chunk::new. Out of swap space
by Keith Holdaway 21 Aug '08

21 Aug '08

We are running our Portal endurance LoadRunner test and we noted that after 17 hrs we fail with the following error message: Exception java.lang.OutOfMemoryError: requested 36616 bytes for Chunk::new. Out of swap space? Assuming this to be a native heap issue I told them to reduce the Java heap and the perm Gen and cut back on -Xss thread stack size to alleviate the pressure on the native heap: -Xms1000m -Xmx1000m -XX:PermSize=87m -XX:MaxPermSize=87m -Xss96k -XX:-UseTLAB -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:NewSize=128m -XX:MaxNewSize=128m -Dcom.sun.management.jmxremote -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Djava.awt.headless=true -Dsas.svcs.http.max.connections=50 This lasted 24 hrs and then failed with the same error as stated above. I noted CMS was being curtailed the majority of the time, and that most of the short-lived objects were being immediately promoted, so I adjusted again, by adding the following to the above: -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=30 -XX:SurvivorRatio=4 and -XX:MaxTenuringThreshold=4 This lasted 42 hrs, and then the same failure. We have run with JDK 6.0 successfully for longer, but unfortunately, owing to the application servers we have to support such as WebLogic, we cannot support JDK 6.0. Do I keep reducing the CMS initiating occupancy down to something similar to iCMS? - perhaps increase the NewSize to keep the short-lived objects around longer? Does the error message indicate ONLY native heap issues - perhaps a memory leak with some of the third party software such as STRUTS, Spring Framework etc. thanks keith

1 0

hg: jdk7/hotspot-gc/hotspot: 6728478: Assertion at parallel promotion from young to old generation
by jon.masamitsu＠sun.com 21 Aug '08

21 Aug '08

Changeset: 387a62b4be60 Author: jmasa Date: 2008-08-20 23:05 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/387a62b4be60 6728478: Assertion at parallel promotion from young to old generation Summary: The fix avoids a call to address_for_index() in this particular situation where it is not known if the passed index is in bounds. Reviewed-by: tonyp ! src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp ! src/share/vm/memory/blockOffsetTable.hpp

1 0

hg: jdk7/hotspot-gc/hotspot: 6739357: CMS: Switch off CMSPrecleanRefLists1 until 6722113 can be fixed
by y.s.ramakrishna＠sun.com 20 Aug '08

20 Aug '08

Changeset: bfcb639d5bca Author: ysr Date: 2008-08-20 15:41 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/bfcb639d5bca 6739357: CMS: Switch off CMSPrecleanRefLists1 until 6722113 can be fixed Summary: Temporarily switch off the precleaning of Reference lists completely until related issues are fixed in 6722113. Reviewed-by: jmasa, poonam, tonyp ! src/share/vm/runtime/globals.hpp

1 0

hg: jdk7/hotspot-gc/hotspot: 7 new changesets
by y.s.ramakrishna＠sun.com 20 Aug '08

20 Aug '08

Changeset: 4852f4a82e58 Author: ohair Date: 2008-08-14 11:18 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/4852f4a82e58 6724668: Hotspot: Official change to Sun Studio 12 compilers on Solaris Summary: Moving to SS12. Builds with SS11 still work, the compiler comes from your PATH when building hotspot. Reviewed-by: tbell ! make/jprt.config ! make/solaris/makefiles/sparcWorks.make Changeset: f3a650d8df24 Author: thurka Date: 2008-08-14 21:05 +0200 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/f3a650d8df24 6625846: Export system property java.version via jvmstat Summary: java.version added to property_counters_ss array Reviewed-by: swamyv ! src/share/vm/runtime/statSampler.cpp Changeset: 7f9b895777f8 Author: thurka Date: 2008-08-15 05:55 +0200 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/7f9b895777f8 Merge Changeset: a2de7dfbfcf0 Author: swamyv Date: 2008-08-12 12:44 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/a2de7dfbfcf0 6718125: SA: jmap prints negative size for MaxNewHeap. Summary: Fixed printing of negative value for MaxNewHeap. Reviewed-by: jjh ! agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java Changeset: 44aea0a1e099 Author: swamyv Date: 2008-08-15 12:05 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/44aea0a1e099 Merge Changeset: 92e12124e774 Author: ysr Date: 2008-08-20 01:30 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/92e12124e774 Merge Changeset: 331eaa715e58 Author: ysr Date: 2008-08-20 11:23 -0700 URL: http://hg.openjdk.java.net/jdk7/hotspot-gc/hotspot/rev/331eaa715e58 Merge

1 0