/[packages]/cauldron/java-1.8.0-openjdk/current/SOURCES/java-1.8.0-openjdk-size_t.patch
ViewVC logotype

Diff of /cauldron/java-1.8.0-openjdk/current/SOURCES/java-1.8.0-openjdk-size_t.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 659707 by dmorgan, Sun Aug 4 21:32:45 2013 UTC revision 659708 by luigiwalser, Mon Aug 4 21:58:20 2014 UTC
# Line 1  Line 1 
1  diff -up jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
2  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.size_t 2013-04-23 12:27:07.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.size_t 2014-03-11 16:02:13.000000000 -0400
3  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp        2013-04-30 11:16:52.049921392 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp        2014-05-16 13:09:21.350132543 -0400
4  @@ -2667,7 +2667,7 @@ void CFLS_LAB::get_from_global_pool(size  @@ -2660,7 +2660,7 @@ void CFLS_LAB::get_from_global_pool(size
5     if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {     if (ResizeOldPLAB && CMSOldPLABResizeQuicker) {
6       size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);       size_t multiple = _num_blocks[word_sz]/(CMSOldPLABToleranceFactor*CMSOldPLABNumRefills*n_blks);
7       n_blks +=  CMSOldPLABReactivityFactor*multiple*n_blks;       n_blks +=  CMSOldPLABReactivityFactor*multiple*n_blks;
# Line 11  diff -up jdk8/hotspot/src/share/vm/gc_im Line 11  diff -up jdk8/hotspot/src/share/vm/gc_im
11     assert(n_blks > 0, "Error");     assert(n_blks > 0, "Error");
12     _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);     _cfls->par_get_chunk_of_blocks(word_sz, n_blks, fl);
13  diff -up jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
14  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.size_t    2013-05-03 10:55:50.185800229 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.size_t    2014-03-11 16:02:13.000000000 -0400
15  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp   2013-05-03 10:58:09.035801583 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp   2014-05-16 13:09:21.350132543 -0400
16  @@ -950,7 +950,7 @@ void ConcurrentMarkSweepGeneration::comp  @@ -949,7 +949,7 @@ void ConcurrentMarkSweepGeneration::comp
17     if (free_percentage < desired_free_percentage) {     if (free_percentage < desired_free_percentage) {
18       size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));       size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
19       assert(desired_capacity >= capacity(), "invalid expansion size");       assert(desired_capacity >= capacity(), "invalid expansion size");
# Line 22  diff -up jdk8/hotspot/src/share/vm/gc_im Line 22  diff -up jdk8/hotspot/src/share/vm/gc_im
22       if (PrintGCDetails && Verbose) {       if (PrintGCDetails && Verbose) {
23         size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));         size_t desired_capacity = (size_t)(used() / ((double) 1 - desired_free_percentage));
24         gclog_or_tty->print_cr("\nFrom compute_new_size: ");         gclog_or_tty->print_cr("\nFrom compute_new_size: ");
25  @@ -6334,7 +6334,7 @@ void CMSCollector::reset(bool asynch) {  @@ -6555,7 +6555,7 @@ void CMSCollector::reset(bool asynch) {
26       HeapWord* curAddr = _markBitMap.startWord();       HeapWord* curAddr = _markBitMap.startWord();
27       while (curAddr < _markBitMap.endWord()) {       while (curAddr < _markBitMap.endWord()) {
28         size_t remaining  = pointer_delta(_markBitMap.endWord(), curAddr);         size_t remaining  = pointer_delta(_markBitMap.endWord(), curAddr);
# Line 31  diff -up jdk8/hotspot/src/share/vm/gc_im Line 31  diff -up jdk8/hotspot/src/share/vm/gc_im
31         _markBitMap.clear_large_range(chunk);         _markBitMap.clear_large_range(chunk);
32         if (ConcurrentMarkSweepThread::should_yield() &&         if (ConcurrentMarkSweepThread::should_yield() &&
33             !foregroundGCIsActive() &&             !foregroundGCIsActive() &&
34  @@ -6631,7 +6631,7 @@ void CMSMarkStack::expand() {  @@ -6854,7 +6854,7 @@ void CMSMarkStack::expand() {
35       return;       return;
36     }     }
37     // Double capacity if possible     // Double capacity if possible
# Line 41  diff -up jdk8/hotspot/src/share/vm/gc_im Line 41  diff -up jdk8/hotspot/src/share/vm/gc_im
41     // get the double capacity that we desired.     // get the double capacity that we desired.
42     ReservedSpace rs(ReservedSpace::allocation_align_size_up(     ReservedSpace rs(ReservedSpace::allocation_align_size_up(
43  diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
44  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.size_t    2013-04-23 12:27:07.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.size_t    2014-03-11 16:02:13.000000000 -0400
45  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp   2013-04-30 11:16:52.049921392 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp   2014-05-16 13:09:21.350132543 -0400
46  @@ -3735,7 +3735,7 @@ void CMTask::drain_local_queue(bool part  @@ -3745,7 +3745,7 @@ void CMTask::drain_local_queue(bool part
47     // of things to do) or totally (at the very end).     // of things to do) or totally (at the very end).
48     size_t target_size;     size_t target_size;
49     if (partially) {     if (partially) {
# Line 52  diff -up jdk8/hotspot/src/share/vm/gc_im Line 52  diff -up jdk8/hotspot/src/share/vm/gc_im
52     } else {     } else {
53       target_size = 0;       target_size = 0;
54     }     }
55  @@ -4566,7 +4566,7 @@ size_t G1PrintRegionLivenessInfoClosure:  @@ -4583,7 +4583,7 @@ size_t G1PrintRegionLivenessInfoClosure:
56     // The > 0 check is to deal with the prev and next live bytes which     // The > 0 check is to deal with the prev and next live bytes which
57     // could be 0.     // could be 0.
58     if (*hum_bytes > 0) {     if (*hum_bytes > 0) {
# Line 62  diff -up jdk8/hotspot/src/share/vm/gc_im Line 62  diff -up jdk8/hotspot/src/share/vm/gc_im
62     }     }
63     return bytes;     return bytes;
64  diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
65  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.size_t   2013-04-23 12:27:07.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.size_t   2014-03-11 16:02:13.000000000 -0400
66  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp  2013-04-30 11:16:52.059921393 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp  2014-05-16 13:09:21.360132543 -0400
67  @@ -1735,7 +1735,7 @@ HeapWord* G1CollectedHeap::expand_and_al  @@ -1742,7 +1742,7 @@ HeapWord* G1CollectedHeap::expand_and_al
68    
69     verify_region_sets_optional();     verify_region_sets_optional();
70    
# Line 73  diff -up jdk8/hotspot/src/share/vm/gc_im Line 73  diff -up jdk8/hotspot/src/share/vm/gc_im
73     ergo_verbose1(ErgoHeapSizing,     ergo_verbose1(ErgoHeapSizing,
74                   "attempt heap expansion",                   "attempt heap expansion",
75                   ergo_format_reason("allocation request failed")                   ergo_format_reason("allocation request failed")
76    diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
77    --- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.size_t        2014-05-16 13:35:15.150132543 -0400
78    +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp       2014-05-16 13:35:48.090132543 -0400
79    @@ -158,7 +158,7 @@ void HeapRegion::setup_heap_region_size(
80       if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
81         size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;
82         region_size = MAX2(average_heap_size / TARGET_REGION_NUMBER,
83    -                       (uintx) MIN_REGION_SIZE);
84    +                       (size_t) MIN_REGION_SIZE);
85       }
86    
87       int region_size_log = log2_long((jlong) region_size);
88  diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
89  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.size_t  2013-04-23 12:27:07.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.size_t  2014-03-11 16:02:13.000000000 -0400
90  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2013-04-30 11:16:52.059921393 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2014-05-16 13:09:21.360132543 -0400
91  @@ -840,7 +840,7 @@ OtherRegionsTable::do_cleanup_work(HRRSC  @@ -845,7 +845,7 @@ OtherRegionsTable::do_cleanup_work(HRRSC
92   // This can be done by either mutator threads together with the   // This can be done by either mutator threads together with the
93   // concurrent refinement threads or GC threads.   // concurrent refinement threads or GC threads.
94   int HeapRegionRemSet::num_par_rem_sets() {   int HeapRegionRemSet::num_par_rem_sets() {
# Line 86  diff -up jdk8/hotspot/src/share/vm/gc_im Line 98  diff -up jdk8/hotspot/src/share/vm/gc_im
98    
99   HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,   HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
100  diff -up jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
101  --- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.size_t       2013-04-23 12:27:07.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.size_t       2014-03-11 16:02:13.000000000 -0400
102  +++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp      2013-04-30 11:16:52.069921394 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp      2014-05-16 13:09:21.360132543 -0400
103  @@ -69,7 +69,7 @@ ParMarkBitMap::initialize(MemRegion cove  @@ -68,7 +68,7 @@ ParMarkBitMap::initialize(MemRegion cove
104     if (_virtual_space != NULL && _virtual_space->expand_by(bytes)) {     if (_virtual_space != NULL && _virtual_space->expand_by(_reserved_byte_size)) {
105       _region_start = covered_region.start();       _region_start = covered_region.start();
106       _region_size = covered_region.word_size();       _region_size = covered_region.word_size();
107  -    idx_t* map = (idx_t*)_virtual_space->reserved_low_addr();  -    idx_t* map = (idx_t*)_virtual_space->reserved_low_addr();
# Line 98  diff -up jdk8/hotspot/src/share/vm/gc_im Line 110  diff -up jdk8/hotspot/src/share/vm/gc_im
110       _beg_bits.set_size(bits / 2);       _beg_bits.set_size(bits / 2);
111       _end_bits.set_map(map + words / 2);       _end_bits.set_map(map + words / 2);
112  diff -up jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
113  --- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.size_t   2013-05-03 11:19:28.625892027 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.size_t   2014-03-11 16:02:13.000000000 -0400
114  +++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp  2013-05-03 11:20:15.915892352 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp  2014-05-16 13:09:21.360132543 -0400
115  @@ -874,8 +874,8 @@ void PSParallelCompact::initialize_space  @@ -909,8 +909,8 @@ void PSParallelCompact::initialize_space
116   void PSParallelCompact::initialize_dead_wood_limiter()   void PSParallelCompact::initialize_dead_wood_limiter()
117   {   {
118     const size_t max = 100;     const size_t max = 100;
# Line 112  diff -up jdk8/hotspot/src/share/vm/gc_im Line 124  diff -up jdk8/hotspot/src/share/vm/gc_im
124     DEBUG_ONLY(_dwl_initialized = true;)     DEBUG_ONLY(_dwl_initialized = true;)
125     _dwl_adjustment = normal_distribution(1.0);     _dwl_adjustment = normal_distribution(1.0);
126  diff -up jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.size_t jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
127  --- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.size_t      2013-04-23 12:27:07.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.size_t      2014-03-11 16:02:13.000000000 -0400
128  +++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp     2013-04-30 11:16:52.069921394 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp     2014-05-16 13:09:21.360132543 -0400
129  @@ -188,7 +188,7 @@ bool ParScanThreadState::take_from_overf  @@ -192,7 +192,7 @@ bool ParScanThreadState::take_from_overf
130     const size_t num_overflow_elems = of_stack->size();     const size_t num_overflow_elems = of_stack->size();
131     const size_t space_available = queue->max_elems() - queue->size();     const size_t space_available = queue->max_elems() - queue->size();
132     const size_t num_take_elems = MIN3(space_available / 4,     const size_t num_take_elems = MIN3(space_available / 4,
# Line 124  diff -up jdk8/hotspot/src/share/vm/gc_im Line 136  diff -up jdk8/hotspot/src/share/vm/gc_im
136     // Transfer the most recent num_take_elems from the overflow     // Transfer the most recent num_take_elems from the overflow
137     // stack to our work queue.     // stack to our work queue.
138  diff -up jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.size_t jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp  diff -up jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.size_t jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp
139  --- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.size_t 2013-04-23 12:27:07.000000000 -0400  --- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.size_t 2014-03-11 16:02:13.000000000 -0400
140  +++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp        2013-05-03 10:53:48.105793292 -0400  +++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp        2014-05-16 13:31:55.620132543 -0400
141  @@ -313,7 +313,7 @@ void GenCollectorPolicy::initialize_size  @@ -386,7 +386,7 @@ void TwoGenerationCollectorPolicy::initi
142           uintx calculated_size = NewSize + OldSize;
143           double shrink_factor = (double) MaxHeapSize / calculated_size;
144           uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment);
145    -      FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), smaller_new_size));
146    +      FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), (size_t)smaller_new_size));
147           _initial_gen0_size = NewSize;
148    
149           // OldSize is already aligned because above we aligned MaxHeapSize to
150    @@ -434,7 +434,7 @@ void GenCollectorPolicy::initialize_size
151       // yield a size that is too small) and bound it by MaxNewSize above.       // yield a size that is too small) and bound it by MaxNewSize above.
152       // Ergonomics plays here by previously calculating the desired       // Ergonomics plays here by previously calculating the desired
153       // NewSize and MaxNewSize.       // NewSize and MaxNewSize.
# Line 135  diff -up jdk8/hotspot/src/share/vm/memor Line 156  diff -up jdk8/hotspot/src/share/vm/memor
156     }     }
157     assert(max_new_size > 0, "All paths should set max_new_size");     assert(max_new_size > 0, "All paths should set max_new_size");
158    
159  @@ -340,7 +340,7 @@ void GenCollectorPolicy::initialize_size  @@ -461,16 +461,16 @@ void GenCollectorPolicy::initialize_size
160         // generally small compared to the NewRatio calculation.         // generally small compared to the NewRatio calculation.
161         _min_gen0_size = NewSize;         _min_gen0_size = NewSize;
162         desired_new_size = NewSize;         desired_new_size = NewSize;
# Line 144  diff -up jdk8/hotspot/src/share/vm/memor Line 165  diff -up jdk8/hotspot/src/share/vm/memor
165       } else {       } else {
166         // For the case where NewSize is the default, use NewRatio         // For the case where NewSize is the default, use NewRatio
167         // to size the minimum and initial generation sizes.         // to size the minimum and initial generation sizes.
168  @@ -348,10 +348,10 @@ void GenCollectorPolicy::initialize_size         // Use the default NewSize as the floor for these values.  If
169         // NewRatio is overly large, the resulting sizes can be too         // NewRatio is overly large, the resulting sizes can be too
170         // small.         // small.
171         _min_gen0_size = MAX2(scale_by_NewRatio_aligned(min_heap_byte_size()),  -      _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), NewSize);
172  -                          NewSize);  +      _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), (size_t)NewSize);
 +                          (size_t)NewSize);  
173         desired_new_size =         desired_new_size =
174           MAX2(scale_by_NewRatio_aligned(initial_heap_byte_size()),  -        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
175  -             NewSize);  +        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize);
 +             (size_t)NewSize);  
176       }       }
177    
178       assert(_min_gen0_size > 0, "Sanity check");       assert(_min_gen0_size > 0, "Sanity check");
179  @@ -407,14 +407,14 @@ bool TwoGenerationCollectorPolicy::adjus  @@ -572,7 +572,7 @@ void TwoGenerationCollectorPolicy::initi
        // Adjust gen0 down to accommodate min_gen1_size  
        *gen0_size_ptr = heap_size - min_gen1_size;  
        *gen0_size_ptr =  
 -        MAX2((uintx)align_size_down(*gen0_size_ptr, min_alignment()),  
 +        MAX2((size_t)align_size_down(*gen0_size_ptr, min_alignment()),  
               min_alignment());  
        assert(*gen0_size_ptr > 0, "Min gen0 is too large");  
        result = true;  
      } else {  
        *gen1_size_ptr = heap_size - *gen0_size_ptr;  
        *gen1_size_ptr =  
 -        MAX2((uintx)align_size_down(*gen1_size_ptr, min_alignment()),  
 +        MAX2((size_t)align_size_down(*gen1_size_ptr, min_alignment()),  
                         min_alignment());  
      }  
    }  
 @@ -438,7 +438,7 @@ void TwoGenerationCollectorPolicy::initi  
    // for setting the gen1 maximum.  
    _max_gen1_size = max_heap_byte_size() - _max_gen0_size;  
    _max_gen1_size =  
 -    MAX2((uintx)align_size_down(_max_gen1_size, min_alignment()),  
 +    MAX2((size_t)align_size_down(_max_gen1_size, min_alignment()),  
           min_alignment());  
    // If no explicit command line flag has been set for the  
    // gen1 size, use what is left for gen1.  
 @@ -452,11 +452,11 @@ void TwoGenerationCollectorPolicy::initi  
        "gen0 has an unexpected minimum size");  
      set_min_gen1_size(min_heap_byte_size() - min_gen0_size());  
      set_min_gen1_size(  
 -      MAX2((uintx)align_size_down(_min_gen1_size, min_alignment()),  
 +      MAX2((size_t)align_size_down(_min_gen1_size, min_alignment()),  
             min_alignment()));  
      set_initial_gen1_size(initial_heap_byte_size() - initial_gen0_size());  
      set_initial_gen1_size(  
 -      MAX2((uintx)align_size_down(_initial_gen1_size, min_alignment()),  
 +      MAX2((size_t)align_size_down(_initial_gen1_size, min_alignment()),  
             min_alignment()));  
   
180     } else {     } else {
181         // It's been explicitly set on the command line.  Use the
182         // OldSize and then determine the consequences.
183    -    _min_gen1_size = MIN2(OldSize, _min_heap_byte_size - _min_gen0_size);
184    +    _min_gen1_size = MIN2((size_t)OldSize, _min_heap_byte_size - _min_gen0_size);
185         _initial_gen1_size = OldSize;
186    
187         // If the user has explicitly set an OldSize that is inconsistent
188  diff -up jdk8/hotspot/src/share/vm/memory/metaspace.cpp.size_t jdk8/hotspot/src/share/vm/memory/metaspace.cpp  diff -up jdk8/hotspot/src/share/vm/memory/metaspace.cpp.size_t jdk8/hotspot/src/share/vm/memory/metaspace.cpp
189  --- jdk8/hotspot/src/share/vm/memory/metaspace.cpp.size_t       2013-05-03 11:11:20.095867337 -0400  --- jdk8/hotspot/src/share/vm/memory/metaspace.cpp.size_t       2014-05-16 13:40:21.870132543 -0400
190  +++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp      2013-05-03 11:13:54.945868245 -0400  +++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp      2014-05-16 13:44:26.930132543 -0400
191  @@ -1164,7 +1164,7 @@ void MetaspaceGC::compute_new_size() {  @@ -1424,7 +1424,7 @@ void MetaspaceGC::compute_new_size() {
192       (size_t)MIN2(min_tmp, double(max_uintx));       (size_t)MIN2(min_tmp, double(max_uintx));
193     // Don't shrink less than the initial generation size     // Don't shrink less than the initial generation size
194     minimum_desired_capacity = MAX2(minimum_desired_capacity,     minimum_desired_capacity = MAX2(minimum_desired_capacity,
# Line 208  diff -up jdk8/hotspot/src/share/vm/memor Line 196  diff -up jdk8/hotspot/src/share/vm/memor
196  +                                  (size_t)MetaspaceSize);  +                                  (size_t)MetaspaceSize);
197    
198     if (PrintGCDetails && Verbose) {     if (PrintGCDetails && Verbose) {
199       const double free_percentage = ((double)free_after_gc) / capacity_until_GC;       gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");
200  @@ -1228,7 +1228,7 @@ void MetaspaceGC::compute_new_size() {  @@ -1477,7 +1477,7 @@ void MetaspaceGC::compute_new_size() {
201       const double max_tmp = used_after_gc / minimum_used_percentage;       const double max_tmp = used_after_gc / minimum_used_percentage;
202       size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx));       size_t maximum_desired_capacity = (size_t)MIN2(max_tmp, double(max_uintx));
203       maximum_desired_capacity = MAX2(maximum_desired_capacity,       maximum_desired_capacity = MAX2(maximum_desired_capacity,
204  -                                    MetaspaceSize);  -                                    MetaspaceSize);
205  +                                    (size_t)MetaspaceSize);  +                                    (size_t)MetaspaceSize);
206       if (PrintGC && Verbose) {       if (PrintGCDetails && Verbose) {
207         gclog_or_tty->print_cr("  "         gclog_or_tty->print_cr("  "
208                                "  maximum_free_percentage: %6.2f"                                "  maximum_free_percentage: %6.2f"
209  @@ -2557,7 +2557,7 @@ void Metaspace::global_initialize() {  @@ -3110,7 +3110,7 @@ void Metaspace::global_initialize() {
210       // on the medium chunk list.   The next chunk will be small and progress       // on the medium chunk list.   The next chunk will be small and progress
211       // from there.  This size calculated by -version.       // from there.  This size calculated by -version.
212       _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6,       _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6,
213  -                                       (ClassMetaspaceSize/BytesPerWord)*2);  -                                       (CompressedClassSpaceSize/BytesPerWord)*2);
214  +                                       (size_t)(ClassMetaspaceSize/BytesPerWord)*2);  +                                       (size_t)(CompressedClassSpaceSize/BytesPerWord)*2);
215       _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size);       _first_class_chunk_word_size = align_word_size_up(_first_class_chunk_word_size);
216       // Arbitrarily set the initial virtual space to a multiple       // Arbitrarily set the initial virtual space to a multiple
217       // of the boot class loader size.       // of the boot class loader size.
218  diff -up jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp.size_t jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp  diff -up jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp.size_t jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
219  --- jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp.size_t  2013-05-03 11:25:27.655916636 -0400  --- jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp.size_t  2014-03-11 16:02:13.000000000 -0400
220  +++ jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2013-05-03 11:26:02.815916940 -0400  +++ jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2014-05-16 13:09:21.360132543 -0400
221  @@ -232,7 +232,7 @@ size_t ThreadLocalAllocBuffer::initial_d  @@ -232,7 +232,7 @@ size_t ThreadLocalAllocBuffer::initial_d
222     size_t init_sz;     size_t init_sz;
223    
# Line 240  diff -up jdk8/hotspot/src/share/vm/memor Line 228  diff -up jdk8/hotspot/src/share/vm/memor
228       // Startup issue - main thread initialized before heap initialized.       // Startup issue - main thread initialized before heap initialized.
229       init_sz = min_size();       init_sz = min_size();
230  diff -up jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.size_t jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp  diff -up jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.size_t jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
231  --- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.size_t      2013-04-23 12:27:07.000000000 -0400  --- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.size_t      2014-03-11 16:02:13.000000000 -0400
232  +++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp     2013-04-30 11:16:52.069921394 -0400  +++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp     2014-05-16 13:09:21.360132543 -0400
233  @@ -48,7 +48,7 @@ void ObjArrayKlass::objarray_follow_cont  @@ -48,7 +48,7 @@ void ObjArrayKlass::objarray_follow_cont
234     const size_t beg_index = size_t(index);     const size_t beg_index = size_t(index);
235     assert(beg_index < len || len == 0, "index too large");     assert(beg_index < len || len == 0, "index too large");
# Line 261  diff -up jdk8/hotspot/src/share/vm/oops/ Line 249  diff -up jdk8/hotspot/src/share/vm/oops/
249     T* const base = (T*)a->base();     T* const base = (T*)a->base();
250     T* const beg = base + beg_index;     T* const beg = base + beg_index;
251  diff -up jdk8/hotspot/src/share/vm/runtime/arguments.cpp.size_t jdk8/hotspot/src/share/vm/runtime/arguments.cpp  diff -up jdk8/hotspot/src/share/vm/runtime/arguments.cpp.size_t jdk8/hotspot/src/share/vm/runtime/arguments.cpp
252  --- jdk8/hotspot/src/share/vm/runtime/arguments.cpp.size_t      2013-04-23 12:27:07.000000000 -0400  --- jdk8/hotspot/src/share/vm/runtime/arguments.cpp.size_t      2014-03-11 16:02:13.000000000 -0400
253  +++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp     2013-05-03 10:46:37.745763150 -0400  +++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp     2014-05-16 13:26:32.310132543 -0400
254  @@ -1197,7 +1197,7 @@ void Arguments::set_cms_and_parnew_gc_fl  @@ -1240,7 +1240,7 @@ void Arguments::set_cms_and_parnew_gc_fl
255       // NewSize was set on the command line and it is larger than       // NewSize was set on the command line and it is larger than
256       // preferred_max_new_size.       // preferred_max_new_size.
257       if (!FLAG_IS_DEFAULT(NewSize)) {   // NewSize explicitly set at command-line       if (!FLAG_IS_DEFAULT(NewSize)) {   // NewSize explicitly set at command-line
# Line 272  diff -up jdk8/hotspot/src/share/vm/runti Line 260  diff -up jdk8/hotspot/src/share/vm/runti
260       } else {       } else {
261         FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);         FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);
262       }       }
263  @@ -1222,8 +1222,8 @@ void Arguments::set_cms_and_parnew_gc_fl  @@ -1265,8 +1265,8 @@ void Arguments::set_cms_and_parnew_gc_fl
264         // Unless explicitly requested otherwise, make young gen         // Unless explicitly requested otherwise, make young gen
265         // at least min_new, and at most preferred_max_new_size.         // at least min_new, and at most preferred_max_new_size.
266         if (FLAG_IS_DEFAULT(NewSize)) {         if (FLAG_IS_DEFAULT(NewSize)) {
# Line 283  diff -up jdk8/hotspot/src/share/vm/runti Line 271  diff -up jdk8/hotspot/src/share/vm/runti
271           if (PrintGCDetails && Verbose) {           if (PrintGCDetails && Verbose) {
272             // Too early to use gclog_or_tty             // Too early to use gclog_or_tty
273             tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);             tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);
274  @@ -1233,7 +1233,7 @@ void Arguments::set_cms_and_parnew_gc_fl  @@ -1276,7 +1276,7 @@ void Arguments::set_cms_and_parnew_gc_fl
275         // so it's NewRatio x of NewSize.         // so it's NewRatio x of NewSize.
276         if (FLAG_IS_DEFAULT(OldSize)) {         if (FLAG_IS_DEFAULT(OldSize)) {
277           if (max_heap > NewSize) {           if (max_heap > NewSize) {
# Line 292  diff -up jdk8/hotspot/src/share/vm/runti Line 280  diff -up jdk8/hotspot/src/share/vm/runti
280             if (PrintGCDetails && Verbose) {             if (PrintGCDetails && Verbose) {
281               // Too early to use gclog_or_tty               // Too early to use gclog_or_tty
282               tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);               tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
283    @@ -1397,7 +1397,7 @@ bool verify_object_alignment() {
284       return true;
285     }
286    
287    -uintx Arguments::max_heap_for_compressed_oops() {
288    +size_t Arguments::max_heap_for_compressed_oops() {
289       // Avoid sign flip.
290       assert(OopEncodingHeapMax > (uint64_t)os::vm_page_size(), "Unusual page size");
291       // We need to fit both the NULL page and the heap into the memory budget, while
Legend:
Removed from v.659707  
changed lines
  Added in v.659708
  ViewVC Help
Powered by ViewVC 1.1.30