/[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 811815 by luigiwalser, Wed Oct 15 20:45:24 2014 UTC revision 811816 by luigiwalser, Wed Jan 21 22:12:29 2015 UTC
# Line 1  Line 1 
1  diff -ruN jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
2  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp        2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.s390   2014-10-23 18:32:14.000000000 -0400
3  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp        2014-09-04 22:47:14.059845388 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp        2015-01-09 15:57:32.423809100 -0500
4  @@ -2686,7 +2686,7 @@  @@ -2659,7 +2659,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 10  diff -ruN jdk8/hotspot/src/share/vm/gc_i Line 10  diff -ruN jdk8/hotspot/src/share/vm/gc_i
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 -ruN jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
14  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp   2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.s390      2014-10-23 18:32:14.000000000 -0400
15  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp   2014-09-04 22:47:14.061845394 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp   2015-01-09 15:57:32.423809100 -0500
16  @@ -950,7 +950,7 @@  @@ -951,7 +951,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 -ruN jdk8/hotspot/src/share/vm/gc_i Line 22  diff -ruN jdk8/hotspot/src/share/vm/gc_i
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  @@ -6559,7 +6559,7 @@  @@ -6569,7 +6569,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 -ruN jdk8/hotspot/src/share/vm/gc_i Line 31  diff -ruN jdk8/hotspot/src/share/vm/gc_i
31         _markBitMap.clear_large_range(chunk);         _markBitMap.clear_large_range(chunk);
32         if (ConcurrentMarkSweepThread::should_yield() &&         if (ConcurrentMarkSweepThread::should_yield() &&
33             !foregroundGCIsActive() &&             !foregroundGCIsActive() &&
34  @@ -6858,7 +6858,7 @@  @@ -6868,7 +6868,7 @@ void CMSMarkStack::expand() {
35       return;       return;
36     }     }
37     // Double capacity if possible     // Double capacity if possible
# Line 40  diff -ruN jdk8/hotspot/src/share/vm/gc_i Line 40  diff -ruN jdk8/hotspot/src/share/vm/gc_i
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 -ruN jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
44  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp   2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp.s390      2014-10-23 18:32:14.000000000 -0400
45  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp   2014-09-04 22:47:14.063845410 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp   2015-01-09 15:57:32.423809100 -0500
46  @@ -3767,7 +3767,7 @@  @@ -3891,7 +3891,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 -ruN jdk8/hotspot/src/share/vm/gc_i Line 52  diff -ruN jdk8/hotspot/src/share/vm/gc_i
52     } else {     } else {
53       target_size = 0;       target_size = 0;
54     }     }
55  @@ -4605,7 +4605,7 @@  @@ -4717,7 +4717,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 61  diff -ruN jdk8/hotspot/src/share/vm/gc_i Line 61  diff -ruN jdk8/hotspot/src/share/vm/gc_i
61       *hum_bytes -= bytes;       *hum_bytes -= bytes;
62     }     }
63     return bytes;     return bytes;
64  diff -ruN jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
65  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp  2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.s390     2014-10-23 18:32:14.000000000 -0400
66  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp  2014-09-04 22:47:14.065845427 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp  2015-01-09 15:57:32.423809100 -0500
67  @@ -1730,7 +1730,7 @@  @@ -1737,7 +1737,7 @@ HeapWord* G1CollectedHeap::expand_and_al
68    
69     verify_region_sets_optional();     verify_region_sets_optional();
70    
# Line 73  diff -ruN jdk8/hotspot/src/share/vm/gc_i Line 73  diff -ruN jdk8/hotspot/src/share/vm/gc_i
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 -ruN jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp
77  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp       2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp.s390  2015-01-09 16:12:23.063809100 -0500
78  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp       2014-09-04 22:47:14.065845427 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp       2015-01-09 16:13:02.213809100 -0500
79  @@ -160,7 +160,7 @@  @@ -38,7 +38,7 @@ G1StringDedupQueue::G1StringDedupQueue()
80       _cancel(false),
81       _empty(true),
82       _dropped(0) {
83    -  _nqueues = MAX2(ParallelGCThreads, (size_t)1);
84    +  _nqueues = MAX2(ParallelGCThreads, (uintx)1);
85       _queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC);
86       for (size_t i = 0; i < _nqueues; i++) {
87         new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size);
88    diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
89    --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp.s390  2015-01-09 16:13:29.713809100 -0500
90    +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp       2015-01-09 16:13:57.713809100 -0500
91    @@ -110,7 +110,7 @@ public:
92     };
93    
94     G1StringDedupEntryCache::G1StringDedupEntryCache() {
95    -  _nlists = MAX2(ParallelGCThreads, (size_t)1);
96    +  _nlists = MAX2(ParallelGCThreads, (uintx)1);
97       _lists = PaddedArray<G1StringDedupEntryFreeList, mtGC>::create_unfreeable((uint)_nlists);
98     }
99    
100    diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
101    --- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp.s390  2015-01-09 16:14:57.193809100 -0500
102    +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp       2015-01-09 16:15:41.163809100 -0500
103    @@ -147,7 +147,7 @@ void HeapRegion::setup_heap_region_size(
104     if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {     if (FLAG_IS_DEFAULT(G1HeapRegionSize)) {
105       size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;       size_t average_heap_size = (initial_heap_size + max_heap_size) / 2;
106       region_size = MAX2(average_heap_size / TARGET_REGION_NUMBER,       region_size = MAX2(average_heap_size / HeapRegionBounds::target_number(),
107  -                       (uintx) MIN_REGION_SIZE);  -                       (uintx) HeapRegionBounds::min_size());
108  +                       (size_t) MIN_REGION_SIZE);  +                       HeapRegionBounds::min_size());
109     }     }
110    
111     int region_size_log = log2_long((jlong) region_size);     int region_size_log = log2_long((jlong) region_size);
112  diff -ruN jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
113  --- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp      2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.s390    2014-10-23 18:32:14.000000000 -0400
114  +++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp      2014-09-04 22:47:14.067845443 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2015-01-09 16:16:27.533809100 -0500
115  @@ -71,7 +71,7 @@  @@ -833,7 +833,7 @@ OtherRegionsTable::do_cleanup_work(HRRSC
116     if (_virtual_space != NULL && _virtual_space->expand_by(_reserved_byte_size)) {   // This can be done by either mutator threads together with the
117       _region_start = covered_region.start();   // concurrent refinement threads or GC threads.
118       _region_size = covered_region.word_size();   uint HeapRegionRemSet::num_par_rem_sets() {
119  -    idx_t* map = (idx_t*)_virtual_space->reserved_low_addr();  -  return MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), (uint)ParallelGCThreads);
120  +    BitMap::bm_word_t* map = (BitMap::bm_word_t*)_virtual_space->reserved_low_addr();  +  return MAX2(DirtyCardQueueSet::num_par_ids() + ConcurrentG1Refine::thread_num(), ParallelGCThreads);
121       _beg_bits.set_map(map);   }
122       _beg_bits.set_size(bits / 2);  
123       _end_bits.set_map(map + words / 2);   HeapRegionRemSet::HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
124  diff -ruN jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
125  --- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp  2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.s390     2014-10-23 18:32:14.000000000 -0400
126  +++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp  2014-09-04 22:47:14.068845451 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp  2015-01-09 15:57:32.423809100 -0500
127  @@ -910,8 +910,8 @@  @@ -910,8 +910,8 @@ void PSParallelCompact::initialize_space
128   void PSParallelCompact::initialize_dead_wood_limiter()   void PSParallelCompact::initialize_dead_wood_limiter()
129   {   {
130     const size_t max = 100;     const size_t max = 100;
# Line 111  diff -ruN jdk8/hotspot/src/share/vm/gc_i Line 135  diff -ruN jdk8/hotspot/src/share/vm/gc_i
135     _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);
136     DEBUG_ONLY(_dwl_initialized = true;)     DEBUG_ONLY(_dwl_initialized = true;)
137     _dwl_adjustment = normal_distribution(1.0);     _dwl_adjustment = normal_distribution(1.0);
138  diff -ruN jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp  diff -up jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.s390 jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
139  --- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp     2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.s390        2014-10-23 18:32:14.000000000 -0400
140  +++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp     2014-09-04 22:47:14.068845451 -0400  +++ jdk8/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp     2015-01-09 15:57:32.423809100 -0500
141  @@ -194,7 +194,7 @@  @@ -194,7 +194,7 @@ bool ParScanThreadState::take_from_overf
142     const size_t num_overflow_elems = of_stack->size();     const size_t num_overflow_elems = of_stack->size();
143     const size_t space_available = queue->max_elems() - queue->size();     const size_t space_available = queue->max_elems() - queue->size();
144     const size_t num_take_elems = MIN3(space_available / 4,     const size_t num_take_elems = MIN3(space_available / 4,
# Line 123  diff -ruN jdk8/hotspot/src/share/vm/gc_i Line 147  diff -ruN jdk8/hotspot/src/share/vm/gc_i
147                                        num_overflow_elems);                                        num_overflow_elems);
148     // Transfer the most recent num_take_elems from the overflow     // Transfer the most recent num_take_elems from the overflow
149     // stack to our work queue.     // stack to our work queue.
150  diff -ruN jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp  diff -up jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.s390 jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp
151  --- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp        2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp.s390   2014-10-23 18:32:14.000000000 -0400
152  +++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp        2014-09-04 22:55:49.271922585 -0400  +++ jdk8/hotspot/src/share/vm/memory/collectorPolicy.cpp        2015-01-09 16:05:36.093809100 -0500
153  @@ -389,7 +389,7 @@  @@ -389,7 +389,7 @@ void TwoGenerationCollectorPolicy::initi
154         uintx calculated_size = NewSize + OldSize;         uintx calculated_size = NewSize + OldSize;
155         double shrink_factor = (double) MaxHeapSize / calculated_size;         double shrink_factor = (double) MaxHeapSize / calculated_size;
156         uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment);         uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment);
# Line 135  diff -ruN jdk8/hotspot/src/share/vm/memo Line 159  diff -ruN jdk8/hotspot/src/share/vm/memo
159         _initial_gen0_size = NewSize;         _initial_gen0_size = NewSize;
160    
161         // OldSize is already aligned because above we aligned MaxHeapSize to         // OldSize is already aligned because above we aligned MaxHeapSize to
162  @@ -437,7 +437,7 @@  @@ -437,7 +437,7 @@ void GenCollectorPolicy::initialize_size
163       // 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.
164       // Ergonomics plays here by previously calculating the desired       // Ergonomics plays here by previously calculating the desired
165       // NewSize and MaxNewSize.       // NewSize and MaxNewSize.
# Line 144  diff -ruN jdk8/hotspot/src/share/vm/memo Line 168  diff -ruN jdk8/hotspot/src/share/vm/memo
168     }     }
169     assert(max_new_size > 0, "All paths should set max_new_size");     assert(max_new_size > 0, "All paths should set max_new_size");
170    
171  @@ -459,23 +459,23 @@  @@ -459,24 +459,23 @@ void GenCollectorPolicy::initialize_size
172         // lower limit.         // lower limit.
173         _min_gen0_size = NewSize;         _min_gen0_size = NewSize;
174         desired_new_size = NewSize;         desired_new_size = NewSize;
# Line 169  diff -ruN jdk8/hotspot/src/share/vm/memo Line 193  diff -ruN jdk8/hotspot/src/share/vm/memo
193  +      _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);
194         desired_new_size =         desired_new_size =
195  -        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);  -        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize);
196  +        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize);  -    }
197       }  +        MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize);    }
198    
199       assert(_min_gen0_size > 0, "Sanity check");       assert(_min_gen0_size > 0, "Sanity check");
200  @@ -577,7 +577,7 @@       _initial_gen0_size = desired_new_size;
201    @@ -577,7 +576,7 @@ void TwoGenerationCollectorPolicy::initi
202     } else {     } else {
203       // It's been explicitly set on the command line.  Use the       // It's been explicitly set on the command line.  Use the
204       // OldSize and then determine the consequences.       // OldSize and then determine the consequences.
# Line 182  diff -ruN jdk8/hotspot/src/share/vm/memo Line 207  diff -ruN jdk8/hotspot/src/share/vm/memo
207       _initial_gen1_size = OldSize;       _initial_gen1_size = OldSize;
208    
209       // If the user has explicitly set an OldSize that is inconsistent       // If the user has explicitly set an OldSize that is inconsistent
210  diff -ruN jdk8/hotspot/src/share/vm/memory/metaspace.cpp jdk8/hotspot/src/share/vm/memory/metaspace.cpp  diff -up jdk8/hotspot/src/share/vm/memory/metaspace.cpp.s390 jdk8/hotspot/src/share/vm/memory/metaspace.cpp
211  --- jdk8/hotspot/src/share/vm/memory/metaspace.cpp      2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/memory/metaspace.cpp.s390 2014-10-23 18:32:14.000000000 -0400
212  +++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp      2014-09-04 22:47:14.071845475 -0400  +++ jdk8/hotspot/src/share/vm/memory/metaspace.cpp      2015-01-09 16:18:54.233809100 -0500
213  @@ -1431,7 +1431,7 @@  @@ -1455,7 +1455,7 @@ void MetaspaceGC::initialize() {
214    
215   void MetaspaceGC::post_initialize() {   void MetaspaceGC::post_initialize() {
216     // Reset the high-water mark once the VM initialization is done.     // Reset the high-water mark once the VM initialization is done.
# Line 194  diff -ruN jdk8/hotspot/src/share/vm/memo Line 219  diff -ruN jdk8/hotspot/src/share/vm/memo
219   }   }
220    
221   bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {   bool MetaspaceGC::can_expand(size_t word_size, bool is_class) {
222  @@ -1491,7 +1491,7 @@  @@ -1515,7 +1515,7 @@ void MetaspaceGC::compute_new_size() {
223       (size_t)MIN2(min_tmp, double(max_uintx));       (size_t)MIN2(min_tmp, double(max_uintx));
224     // Don't shrink less than the initial generation size     // Don't shrink less than the initial generation size
225     minimum_desired_capacity = MAX2(minimum_desired_capacity,     minimum_desired_capacity = MAX2(minimum_desired_capacity,
# Line 203  diff -ruN jdk8/hotspot/src/share/vm/memo Line 228  diff -ruN jdk8/hotspot/src/share/vm/memo
228    
229     if (PrintGCDetails && Verbose) {     if (PrintGCDetails && Verbose) {
230       gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");       gclog_or_tty->print_cr("\nMetaspaceGC::compute_new_size: ");
231  @@ -1546,7 +1546,7 @@  @@ -1573,7 +1573,7 @@ void MetaspaceGC::compute_new_size() {
232       const double max_tmp = used_after_gc / minimum_used_percentage;       const double max_tmp = used_after_gc / minimum_used_percentage;
233       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));
234       maximum_desired_capacity = MAX2(maximum_desired_capacity,       maximum_desired_capacity = MAX2(maximum_desired_capacity,
# Line 212  diff -ruN jdk8/hotspot/src/share/vm/memo Line 237  diff -ruN jdk8/hotspot/src/share/vm/memo
237       if (PrintGCDetails && Verbose) {       if (PrintGCDetails && Verbose) {
238         gclog_or_tty->print_cr("  "         gclog_or_tty->print_cr("  "
239                                "  maximum_free_percentage: %6.2f"                                "  maximum_free_percentage: %6.2f"
240  @@ -3197,7 +3197,7 @@  @@ -3235,7 +3235,7 @@ void Metaspace::global_initialize() {
241       // 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
242       // from there.  This size calculated by -version.       // from there.  This size calculated by -version.
243       _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6,       _first_class_chunk_word_size = MIN2((size_t)MediumChunk*6,
# Line 221  diff -ruN jdk8/hotspot/src/share/vm/memo Line 246  diff -ruN jdk8/hotspot/src/share/vm/memo
246       _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);
247       // Arbitrarily set the initial virtual space to a multiple       // Arbitrarily set the initial virtual space to a multiple
248       // of the boot class loader size.       // of the boot class loader size.
249  diff -ruN jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp  diff -up jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp.s390 jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
250  --- jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp.s390    2014-10-23 18:32:14.000000000 -0400
251  +++ jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2014-09-04 22:47:14.071845475 -0400  +++ jdk8/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2015-01-09 15:57:32.423809100 -0500
252  @@ -238,7 +238,7 @@  @@ -238,7 +238,7 @@ size_t ThreadLocalAllocBuffer::initial_d
253     size_t init_sz;     size_t init_sz;
254    
255     if (TLABSize > 0) {     if (TLABSize > 0) {
# Line 233  diff -ruN jdk8/hotspot/src/share/vm/memo Line 258  diff -ruN jdk8/hotspot/src/share/vm/memo
258     } else if (global_stats() == NULL) {     } else if (global_stats() == NULL) {
259       // Startup issue - main thread initialized before heap initialized.       // Startup issue - main thread initialized before heap initialized.
260       init_sz = min_size();       init_sz = min_size();
261  diff -ruN jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp  diff -up jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.s390 jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp
262  --- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp     2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp.s390        2014-10-23 18:32:14.000000000 -0400
263  +++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp     2014-09-04 22:47:14.071845475 -0400  +++ jdk8/hotspot/src/share/vm/oops/objArrayKlass.inline.hpp     2015-01-09 15:57:32.423809100 -0500
264  @@ -48,7 +48,7 @@  @@ -48,7 +48,7 @@ void ObjArrayKlass::objarray_follow_cont
265     const size_t beg_index = size_t(index);     const size_t beg_index = size_t(index);
266     assert(beg_index < len || len == 0, "index too large");     assert(beg_index < len || len == 0, "index too large");
267    
# Line 245  diff -ruN jdk8/hotspot/src/share/vm/oops Line 270  diff -ruN jdk8/hotspot/src/share/vm/oops
270     const size_t end_index = beg_index + stride;     const size_t end_index = beg_index + stride;
271     T* const base = (T*)a->base();     T* const base = (T*)a->base();
272     T* const beg = base + beg_index;     T* const beg = base + beg_index;
273  @@ -82,7 +82,7 @@  @@ -82,7 +82,7 @@ void ObjArrayKlass::objarray_follow_cont
274     const size_t beg_index = size_t(index);     const size_t beg_index = size_t(index);
275     assert(beg_index < len || len == 0, "index too large");     assert(beg_index < len || len == 0, "index too large");
276    
# Line 254  diff -ruN jdk8/hotspot/src/share/vm/oops Line 279  diff -ruN jdk8/hotspot/src/share/vm/oops
279     const size_t end_index = beg_index + stride;     const size_t end_index = beg_index + stride;
280     T* const base = (T*)a->base();     T* const base = (T*)a->base();
281     T* const beg = base + beg_index;     T* const beg = base + beg_index;
282  diff -ruN jdk8/hotspot/src/share/vm/runtime/arguments.cpp jdk8/hotspot/src/share/vm/runtime/arguments.cpp  diff -up jdk8/hotspot/src/share/vm/runtime/arguments.cpp.s390 jdk8/hotspot/src/share/vm/runtime/arguments.cpp
283  --- jdk8/hotspot/src/share/vm/runtime/arguments.cpp     2014-07-30 06:51:43.000000000 -0400  --- jdk8/hotspot/src/share/vm/runtime/arguments.cpp.s390        2014-10-23 18:32:14.000000000 -0400
284  +++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp     2014-09-04 22:47:14.072845483 -0400  +++ jdk8/hotspot/src/share/vm/runtime/arguments.cpp     2015-01-09 15:57:32.423809100 -0500
285  @@ -1244,7 +1244,7 @@  @@ -1250,7 +1250,7 @@ void Arguments::set_cms_and_parnew_gc_fl
286       // NewSize was set on the command line and it is larger than       // NewSize was set on the command line and it is larger than
287       // preferred_max_new_size.       // preferred_max_new_size.
288       if (!FLAG_IS_DEFAULT(NewSize)) {   // NewSize explicitly set at command-line       if (!FLAG_IS_DEFAULT(NewSize)) {   // NewSize explicitly set at command-line
# Line 266  diff -ruN jdk8/hotspot/src/share/vm/runt Line 291  diff -ruN jdk8/hotspot/src/share/vm/runt
291       } else {       } else {
292         FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);         FLAG_SET_ERGO(uintx, MaxNewSize, preferred_max_new_size);
293       }       }
294  @@ -1269,8 +1269,8 @@  @@ -1275,8 +1275,8 @@ void Arguments::set_cms_and_parnew_gc_fl
295         // Unless explicitly requested otherwise, make young gen         // Unless explicitly requested otherwise, make young gen
296         // at least min_new, and at most preferred_max_new_size.         // at least min_new, and at most preferred_max_new_size.
297         if (FLAG_IS_DEFAULT(NewSize)) {         if (FLAG_IS_DEFAULT(NewSize)) {
# Line 277  diff -ruN jdk8/hotspot/src/share/vm/runt Line 302  diff -ruN jdk8/hotspot/src/share/vm/runt
302           if (PrintGCDetails && Verbose) {           if (PrintGCDetails && Verbose) {
303             // Too early to use gclog_or_tty             // Too early to use gclog_or_tty
304             tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);             tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);
305  @@ -1280,7 +1280,7 @@  @@ -1286,7 +1286,7 @@ void Arguments::set_cms_and_parnew_gc_fl
306         // so it's NewRatio x of NewSize.         // so it's NewRatio x of NewSize.
307         if (FLAG_IS_DEFAULT(OldSize)) {         if (FLAG_IS_DEFAULT(OldSize)) {
308           if (max_heap > NewSize) {           if (max_heap > NewSize) {
# Line 286  diff -ruN jdk8/hotspot/src/share/vm/runt Line 311  diff -ruN jdk8/hotspot/src/share/vm/runt
311             if (PrintGCDetails && Verbose) {             if (PrintGCDetails && Verbose) {
312               // Too early to use gclog_or_tty               // Too early to use gclog_or_tty
313               tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);               tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
 @@ -1401,7 +1401,7 @@  
    return true;  
  }  
   
 -uintx Arguments::max_heap_for_compressed_oops() {  
 +size_t Arguments::max_heap_for_compressed_oops() {  
    // Avoid sign flip.  
    assert(OopEncodingHeapMax > (uint64_t)os::vm_page_size(), "Unusual page size");  
    // We need to fit both the NULL page and the heap into the memory budget, while  
 --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp      2014-06-12 03:58:35.000000000 -0400  
 +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupQueue.cpp      2014-06-12 03:58:35.000000000 -0400  
 @@ -38,7 +38,7 @@  
    _cancel(false),  
    _empty(true),  
    _dropped(0) {  
 -  _nqueues = MAX2(ParallelGCThreads, (size_t)1);  
 +  _nqueues = MAX2(ParallelGCThreads, (uintx)1);  
    _queues = NEW_C_HEAP_ARRAY(G1StringDedupWorkerQueue, _nqueues, mtGC);  
    for (size_t i = 0; i < _nqueues; i++) {  
      new (_queues + i) G1StringDedupWorkerQueue(G1StringDedupWorkerQueue::default_segment_size(), _max_cache_size, _max_size);  
 --- jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp      2014-06-12 03:58:35.000000000 -0400  
 +++ jdk8/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp      2014-06-12 03:58:35.000000000 -0400  
 @@ -110,7 +110,7 @@  
  };  
   
  G1StringDedupEntryCache::G1StringDedupEntryCache() {  
 -  _nlists = MAX2(ParallelGCThreads, (size_t)1);  
 +  _nlists = MAX2(ParallelGCThreads, (uintx)1);  
    _lists = PaddedArray<G1StringDedupEntryFreeList, mtGC>::create_unfreeable((uint)_nlists);  
  }  
   
Legend:
Removed from v.811815  
changed lines
  Added in v.811816
  ViewVC Help
Powered by ViewVC 1.1.30