/[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 757127 by luigiwalser, Wed Sep 3 21:09:17 2014 UTC revision 757128 by luigiwalser, Wed Oct 15 20:45:24 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 -ruN jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
2  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.size_t 2014-03-11 16:02:13.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp        2014-07-30 06:51:43.000000000 -0400
3  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp        2014-05-16 13:09:21.350132543 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp        2014-09-04 22:47:14.059845388 -0400
4  @@ -2660,7 +2660,7 @@ void CFLS_LAB::get_from_global_pool(size  @@ -2686,7 +2686,7 @@
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 10  diff -up jdk8/hotspot/src/share/vm/gc_im Line 10  diff -up jdk8/hotspot/src/share/vm/gc_im
10     }     }
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 -ruN jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
14  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.size_t    2014-03-11 16:02:13.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp   2014-07-30 06:51:43.000000000 -0400
15  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp   2014-05-16 13:09:21.350132543 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp   2014-09-04 22:47:14.061845394 -0400
16  @@ -949,7 +949,7 @@ void ConcurrentMarkSweepGeneration::comp  @@ -950,7 +950,7 @@
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  @@ -6555,7 +6555,7 @@ void CMSCollector::reset(bool asynch) {  @@ -6559,7 +6559,7 @@
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  @@ -6854,7 +6854,7 @@ void CMSMarkStack::expand() {  @@ -6858,7 +6858,7 @@
35       return;       return;
36     }     }
37     // Double capacity if possible     // Double capacity if possible
# Line 40  diff -up jdk8/hotspot/src/share/vm/gc_im Line 40  diff -up jdk8/hotspot/src/share/vm/gc_im
40     // Do not give up existing stack until we have managed to     // Do not give up existing stack until we have managed to
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 -ruN jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
44  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.size_t    2014-03-11 16:02:13.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp   2014-07-30 06:51:43.000000000 -0400
45  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp   2014-05-16 13:09:21.350132543 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp   2014-09-04 22:47:14.063845410 -0400
46  @@ -3745,7 +3745,7 @@ void CMTask::drain_local_queue(bool part  @@ -3767,7 +3767,7 @@
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  @@ -4583,7 +4583,7 @@ size_t G1PrintRegionLivenessInfoClosure:  @@ -4605,7 +4605,7 @@
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 61  diff -up jdk8/hotspot/src/share/vm/gc_im Line 61  diff -up jdk8/hotspot/src/share/vm/gc_im
61       *hum_bytes -= bytes;       *hum_bytes -= bytes;
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 -ruN jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
65  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.size_t   2014-03-11 16:02:13.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp  2014-07-30 06:51:43.000000000 -0400
66  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp  2014-05-16 13:09:21.360132543 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp  2014-09-04 22:47:14.065845427 -0400
67  @@ -1742,7 +1742,7 @@ HeapWord* G1CollectedHeap::expand_and_al  @@ -1730,7 +1730,7 @@
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  diff -ruN jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 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  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp       2014-07-30 06:51:43.000000000 -0400
78  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp       2014-05-16 13:35:48.090132543 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp       2014-09-04 22:47:14.065845427 -0400
79  @@ -158,7 +158,7 @@ void HeapRegion::setup_heap_region_size(  @@ -160,7 +160,7 @@
80     if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {     if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
81       size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;       size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;
82       region_size = MAX2(average_heap_size / TARGET_REGION_NUMBER,       region_size = MAX2(average_heap_size / TARGET_REGION_NUMBER,
# Line 85  diff -up jdk8/hotspot/src/share/vm/gc_im Line 85  diff -up jdk8/hotspot/src/share/vm/gc_im
85     }     }
86    
87     int region_size_log = log2_long((jlong) region_size);     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 -ruN jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
89  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.size_t  2014-03-11 16:02:13.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp      2014-07-30 06:51:43.000000000 -0400
90  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2014-05-16 13:09:21.360132543 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp      2014-09-04 22:47:14.067845443 -0400
91  @@ -845,7 +845,7 @@ OtherRegionsTable::do_cleanup_work(HRRSC  @@ -71,7 +71,7 @@
92   // This can be done by either mutator threads together with the     if (_virtual_space != NULL && _virtual_space->expand_by(_reserved_byte_size)) {
93   // concurrent refinement threads or GC threads.       _region_start = covered_region.start();
94   uint HeapRegionRemSet::num_par_rem_sets() {       _region_size = covered_region.word_size();
95  -  return MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (uint)ParallelGCThreads);  -    idx_t* map = (idx_t*)_virtual_space->reserved_low_addr();
96  +  return MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (size_t)ParallelGCThreads);  +    BitMap::bm_word_t* map = (BitMap::bm_word_t*)_virtual_space->reserved_low_addr();
97   }       _beg_bits.set_map(map);
98         _beg_bits.set_size(bits / 2);
99   HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,       _end_bits.set_map(map + words / 2);
100  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 -ruN jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
101  --- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.size_t   2014-03-11 16:02:13.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp  2014-07-30 06:51:43.000000000 -0400
102  +++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp  2014-05-16 13:09:21.360132543 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp  2014-09-04 22:47:14.068845451 -0400
103  @@ -909,8 +909,8 @@ void PSParallelCompact::initialize_space  @@ -910,8 +910,8 @@
104   void PSParallelCompact::initialize_dead_wood_limiter()   void PSParallelCompact::initialize_dead_wood_limiter()
105   {   {
106     const size_t max = 100;     const size_t max = 100;
# Line 111  diff -up jdk8/hotspot/src/share/vm/gc_im Line 111  diff -up jdk8/hotspot/src/share/vm/gc_im
111     _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);     _dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
112     DEBUG_ONLY(_dwl_initialized = true;)     DEBUG_ONLY(_dwl_initialized = true;)
113     _dwl_adjustment = normal_distribution(1.0);     _dwl_adjustment = normal_distribution(1.0);
114  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 -ruN jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
115  --- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.size_t      2014-03-11 16:02:13.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp     2014-07-30 06:51:43.000000000 -0400
116  +++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp     2014-05-16 13:09:21.360132543 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp     2014-09-04 22:47:14.068845451 -0400
117  @@ -192,7 +192,7 @@ bool ParScanThreadState::take_from_overf  @@ -194,7 +194,7 @@
118     const size_t num_overflow_elems = of_stack->size();     const size_t num_overflow_elems = of_stack->size();
119     const size_t space_available = queue->max_elems() - queue->size();     const size_t space_available = queue->max_elems() - queue->size();
120     const size_t num_take_elems = MIN3(space_available / 4,     const size_t num_take_elems = MIN3(space_available / 4,
# Line 123  diff -up jdk8/hotspot/src/share/vm/gc_im Line 123  diff -up jdk8/hotspot/src/share/vm/gc_im
123                                        num_overflow_elems);                                        num_overflow_elems);
124     // Transfer the most recent num_take_elems from the overflow     // Transfer the most recent num_take_elems from the overflow
125     // stack to our work queue.     // stack to our work queue.
126  diff -up jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.size_t jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp  diff -ruN jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp
127  --- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.size_t 2014-03-11 16:02:13.000000000 -0400  --- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp        2014-07-30 06:51:43.000000000 -0400
128  +++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp        2014-05-16 13:31:55.620132543 -0400  +++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp        2014-09-04 22:55:49.271922585 -0400
129  @@ -389,7 +389,7 @@  @@ -389,7 +389,7 @@
130         uintx calculated_size = NewSize + OldSize;         uintx calculated_size = NewSize + OldSize;
131         double shrink_factor = (double) MaxHeapSize / calculated_size;         double shrink_factor = (double) MaxHeapSize / calculated_size;
# Line 144  diff -up jdk8/hotspot/src/share/vm/memor Line 144  diff -up jdk8/hotspot/src/share/vm/memor
144     }     }
145     assert(max_new_size > 0, "All paths should set max_new_size");     assert(max_new_size > 0, "All paths should set max_new_size");
146    
147  @@ -459,7 +459,7 @@  @@ -459,23 +459,23 @@
148         // lower limit.         // lower limit.
149         _min_gen0_size = NewSize;         _min_gen0_size = NewSize;
150         desired_new_size = NewSize;         desired_new_size = NewSize;
# Line 153  diff -up jdk8/hotspot/src/share/vm/memor Line 153  diff -up jdk8/hotspot/src/share/vm/memor
153       } else if (FLAG_IS_ERGO(NewSize)) {       } else if (FLAG_IS_ERGO(NewSize)) {
154         // If NewSize is set ergonomically, we should use it as a lower         // If NewSize is set ergonomically, we should use it as a lower
155         // limit, but use NewRatio to calculate the initial size.         // limit, but use NewRatio to calculate the initial size.
156  @@ -473,10 +473,9 @@         _min_gen0_size = NewSize;
157           desired_new_size =
158    -        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
159    -      max_new_size = MAX2(max_new_size, NewSize);
160    +        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize);
161    +      max_new_size = MAX2(max_new_size, (size_t)NewSize);
162         } else {
163           // For the case where NewSize is the default, use NewRatio
164           // to size the minimum and initial generation sizes.
165         // Use the default NewSize as the floor for these values.  If         // Use the default NewSize as the floor for these values.  If
166         // NewRatio is overly large, the resulting sizes can be too         // NewRatio is overly large, the resulting sizes can be too
167         // small.         // small.
# Line 161  diff -up jdk8/hotspot/src/share/vm/memor Line 169  diff -up jdk8/hotspot/src/share/vm/memor
169  +      _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), (size_t)NewSize);  +      _min_gen0_size = MAX2(scale_by_NewRatio_aligned(_min_heap_byte_size), (size_t)NewSize);
170         desired_new_size =         desired_new_size =
171  -        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);  -        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
172  -    }  +        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize);
173  +        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize);    }       }
174    
175       assert(_min_gen0_size > 0, "Sanity check");       assert(_min_gen0_size > 0, "Sanity check");
176       _initial_gen0_size = desired_new_size;  @@ -577,7 +577,7 @@
 @@ -577,7 +576,7 @@  
177     } else {     } else {
178       // It's been explicitly set on the command line.  Use the       // It's been explicitly set on the command line.  Use the
179       // OldSize and then determine the consequences.       // OldSize and then determine the consequences.
# Line 175  diff -up jdk8/hotspot/src/share/vm/memor Line 182  diff -up jdk8/hotspot/src/share/vm/memor
182       _initial_gen1_size = OldSize;       _initial_gen1_size = OldSize;
183    
184       // If the user has explicitly set an OldSize that is inconsistent       // If the user has explicitly set an OldSize that is inconsistent
185  diff -up jdk8/hotspot/src/share/vm/memory/metaspace.cpp.size_t jdk8/hotspot/src/share/vm/memory/metaspace.cpp  diff -ruN jdk8/hotspot/src/share/vm/memory/metaspace.cpp jdk8/hotspot/src/share/vm/memory/metaspace.cpp
186  --- jdk8/hotspot/src/share/vm/memory/metaspace.cpp.size_t       2014-05-16 13:40:21.870132543 -0400  --- jdk8/hotspot/src/share/vm/memory/metaspace.cpp      2014-07-30 06:51:43.000000000 -0400
187  +++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp      2014-05-16 13:44:26.930132543 -0400  +++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp      2014-09-04 22:47:14.071845475 -0400
188  @@ -1424,7 +1424,7 @@ void MetaspaceGC::compute_new_size() {  @@ -1431,7 +1431,7 @@
189    
190     void MetaspaceGC::post_initialize() {
191       // Reset the high-water mark once the VM initialization is done.
192    -  _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), MetaspaceSize);
193    +  _capacity_until_GC = MAX2(MetaspaceAux::committed_bytes(), (size_t)MetaspaceSize);
194     }
195    
196     bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {
197    @@ -1491,7 +1491,7 @@
198       (size_t)MIN2(min_tmp, double(max_uintx));       (size_t)MIN2(min_tmp, double(max_uintx));
199     // Don't shrink less than the initial generation size     // Don't shrink less than the initial generation size
200     minimum_desired_capacity = MAX2(minimum_desired_capacity,     minimum_desired_capacity = MAX2(minimum_desired_capacity,
# Line 187  diff -up jdk8/hotspot/src/share/vm/memor Line 203  diff -up jdk8/hotspot/src/share/vm/memor
203    
204     if (PrintGCDetails && Verbose) {     if (PrintGCDetails && Verbose) {
205       gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");       gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");
206  @@ -1477,7 +1477,7 @@ void MetaspaceGC::compute_new_size() {  @@ -1546,7 +1546,7 @@
207       const double max_tmp = used_after_gc / minimum_used_percentage;       const double max_tmp = used_after_gc / minimum_used_percentage;
208       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));
209       maximum_desired_capacity = MAX2(maximum_desired_capacity,       maximum_desired_capacity = MAX2(maximum_desired_capacity,
# Line 196  diff -up jdk8/hotspot/src/share/vm/memor Line 212  diff -up jdk8/hotspot/src/share/vm/memor
212       if (PrintGCDetails && Verbose) {       if (PrintGCDetails && Verbose) {
213         gclog_or_tty->print_cr("  "         gclog_or_tty->print_cr("  "
214                                "  maximum_free_percentage: %6.2f"                                "  maximum_free_percentage: %6.2f"
215  @@ -3110,7 +3110,7 @@ void Metaspace::global_initialize() {  @@ -3197,7 +3197,7 @@
216       // 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
217       // from there.  This size calculated by -version.       // from there.  This size calculated by -version.
218       _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6,       _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6,
# Line 205  diff -up jdk8/hotspot/src/share/vm/memor Line 221  diff -up jdk8/hotspot/src/share/vm/memor
221       _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);
222       // Arbitrarily set the initial virtual space to a multiple       // Arbitrarily set the initial virtual space to a multiple
223       // of the boot class loader size.       // of the boot class loader size.
224  diff -up jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp.size_t jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp  diff -ruN jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
225  --- jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp.size_t  2014-03-11 16:02:13.000000000 -0400  --- jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2014-07-30 06:51:43.000000000 -0400
226  +++ jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2014-05-16 13:09:21.360132543 -0400  +++ jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2014-09-04 22:47:14.071845475 -0400
227  @@ -232,7 +232,7 @@ size_t ThreadLocalAllocBuffer::initial_d  @@ -238,7 +238,7 @@
228     size_t init_sz;     size_t init_sz;
229    
230     if (TLABSize > 0) {     if (TLABSize > 0) {
# Line 217  diff -up jdk8/hotspot/src/share/vm/memor Line 233  diff -up jdk8/hotspot/src/share/vm/memor
233     } else if (global_stats() == NULL) {     } else if (global_stats() == NULL) {
234       // Startup issue - main thread initialized before heap initialized.       // Startup issue - main thread initialized before heap initialized.
235       init_sz = min_size();       init_sz = min_size();
236  diff -up jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.size_t jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp  diff -ruN jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
237  --- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.size_t      2014-03-11 16:02:13.000000000 -0400  --- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp     2014-07-30 06:51:43.000000000 -0400
238  +++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp     2014-05-16 13:09:21.360132543 -0400  +++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp     2014-09-04 22:47:14.071845475 -0400
239  @@ -48,7 +48,7 @@ void ObjArrayKlass::objarray_follow_cont  @@ -48,7 +48,7 @@
240     const size_t beg_index = size_t(index);     const size_t beg_index = size_t(index);
241     assert(beg_index < len || len == 0, "index too large");     assert(beg_index < len || len == 0, "index too large");
242    
# Line 229  diff -up jdk8/hotspot/src/share/vm/oops/ Line 245  diff -up jdk8/hotspot/src/share/vm/oops/
245     const size_t end_index = beg_index + stride;     const size_t end_index = beg_index + stride;
246     T* const base = (T*)a->base();     T* const base = (T*)a->base();
247     T* const beg = base + beg_index;     T* const beg = base + beg_index;
248  @@ -82,7 +82,7 @@ void ObjArrayKlass::objarray_follow_cont  @@ -82,7 +82,7 @@
249     const size_t beg_index = size_t(index);     const size_t beg_index = size_t(index);
250     assert(beg_index < len || len == 0, "index too large");     assert(beg_index < len || len == 0, "index too large");
251    
# Line 238  diff -up jdk8/hotspot/src/share/vm/oops/ Line 254  diff -up jdk8/hotspot/src/share/vm/oops/
254     const size_t end_index = beg_index + stride;     const size_t end_index = beg_index + stride;
255     T* const base = (T*)a->base();     T* const base = (T*)a->base();
256     T* const beg = base + beg_index;     T* const beg = base + beg_index;
257  diff -up jdk8/hotspot/src/share/vm/runtime/arguments.cpp.size_t jdk8/hotspot/src/share/vm/runtime/arguments.cpp  diff -ruN jdk8/hotspot/src/share/vm/runtime/arguments.cpp jdk8/hotspot/src/share/vm/runtime/arguments.cpp
258  --- jdk8/hotspot/src/share/vm/runtime/arguments.cpp.size_t      2014-03-11 16:02:13.000000000 -0400  --- jdk8/hotspot/src/share/vm/runtime/arguments.cpp     2014-07-30 06:51:43.000000000 -0400
259  +++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp     2014-05-16 13:26:32.310132543 -0400  +++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp     2014-09-04 22:47:14.072845483 -0400
260  @@ -1240,7 +1240,7 @@ void Arguments::set_cms_and_parnew_gc_fl  @@ -1244,7 +1244,7 @@
261       // NewSize was set on the command line and it is larger than       // NewSize was set on the command line and it is larger than
262       // preferred_max_new_size.       // preferred_max_new_size.
263       if (!FLAG_IS_DEFAULT(NewSize)) {   // NewSize explicitly set at command-line       if (!FLAG_IS_DEFAULT(NewSize)) {   // NewSize explicitly set at command-line
# Line 250  diff -up jdk8/hotspot/src/share/vm/runti Line 266  diff -up jdk8/hotspot/src/share/vm/runti
266       } else {       } else {
267         FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);         FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);
268       }       }
269  @@ -1265,8 +1265,8 @@ void Arguments::set_cms_and_parnew_gc_fl  @@ -1269,8 +1269,8 @@
270         // Unless explicitly requested otherwise, make young gen         // Unless explicitly requested otherwise, make young gen
271         // at least min_new, and at most preferred_max_new_size.         // at least min_new, and at most preferred_max_new_size.
272         if (FLAG_IS_DEFAULT(NewSize)) {         if (FLAG_IS_DEFAULT(NewSize)) {
# Line 261  diff -up jdk8/hotspot/src/share/vm/runti Line 277  diff -up jdk8/hotspot/src/share/vm/runti
277           if (PrintGCDetails && Verbose) {           if (PrintGCDetails && Verbose) {
278             // Too early to use gclog_or_tty             // Too early to use gclog_or_tty
279             tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);             tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);
280  @@ -1276,7 +1276,7 @@ void Arguments::set_cms_and_parnew_gc_fl  @@ -1280,7 +1280,7 @@
281         // so it's NewRatio x of NewSize.         // so it's NewRatio x of NewSize.
282         if (FLAG_IS_DEFAULT(OldSize)) {         if (FLAG_IS_DEFAULT(OldSize)) {
283           if (max_heap > NewSize) {           if (max_heap > NewSize) {
# Line 270  diff -up jdk8/hotspot/src/share/vm/runti Line 286  diff -up jdk8/hotspot/src/share/vm/runti
286             if (PrintGCDetails && Verbose) {             if (PrintGCDetails && Verbose) {
287               // Too early to use gclog_or_tty               // Too early to use gclog_or_tty
288               tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);               tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
289    @@ -1401,7 +1401,7 @@
290       return true;
291     }
292    
293    -uintx Arguments::max_heap_for_compressed_oops() {
294    +size_t Arguments::max_heap_for_compressed_oops() {
295       // Avoid sign flip.
296       assert(OopEncodingHeapMax > (uint64_t)os::vm_page_size(), "Unusual page size");
297       // We need to fit both the NULL page and the heap into the memory budget, while
298    --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp      2014-06-12 03:58:35.000000000 -0400
299    +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp      2014-06-12 03:58:35.000000000 -0400
300    @@ -38,7 +38,7 @@
301       _cancel(false),
302       _empty(true),
303       _dropped(0) {
304    -  _nqueues = MAX2(ParallelGCThreads, (size_t)1);
305    +  _nqueues = MAX2(ParallelGCThreads, (uintx)1);
306       _queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC);
307       for (size_t i = 0; i < _nqueues; i++) {
308         new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size);
309    --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp      2014-06-12 03:58:35.000000000 -0400
310    +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp      2014-06-12 03:58:35.000000000 -0400
311    @@ -110,7 +110,7 @@
312     };
313    
314     G1StringDedupEntryCache::G1StringDedupEntryCache() {
315    -  _nlists = MAX2(ParallelGCThreads, (size_t)1);
316    +  _nlists = MAX2(ParallelGCThreads, (uintx)1);
317       _lists = PaddedArray<G1StringDedupEntryFreeList, mtGC>::create_unfreeable((uint)_nlists);
318     }
319    

Legend:
Removed from v.757127  
changed lines
  Added in v.757128

  ViewVC Help
Powered by ViewVC 1.1.30