archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6718086: CMS assert: _concurrent_iteration_safe_limit update missed

Browse source 
Initialize the field correctly in ContiguousSpace's constructor and initialize() methods, using the latter for the survivor spaces upon initial construction or a subsequent resizing of the young generation. Add some missing Space sub-class constructors.

Reviewed-by: apetrusenko
This commit is contained in:
Y. Srinivas Ramakrishna 2008-06-23 16:49:37 -07:00
parent c201c739e4
commit b6c292d65d
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/src/share/vm/memory/defNewGeneration.cpp
View file

@ -227,8 +227,8 @@ void DefNewGeneration::compute_space_boundaries(uintx minimum_eden_size) {
eden()->mangle_unused_area(); eden()->mangle_unused_area();
} }
} }
from()->set_bounds(fromMR); from()->clear(); from()->initialize(fromMR, true /* clear */);
to()->set_bounds(toMR); to()->clear(); to()->initialize( toMR, true /* clear */);
// Make sure we compact eden, then from. // Make sure we compact eden, then from.
// The to-space is normally empty before a compaction so need // The to-space is normally empty before a compaction so need
// not be considered. The exception is during promotion // not be considered. The exception is during promotion

1
hotspot/src/share/vm/memory/space.cpp
View file

@ -276,6 +276,7 @@ void ContiguousSpace::initialize(MemRegion mr, bool clear_space) {
set_top(bottom()); set_top(bottom());
set_saved_mark(); set_saved_mark();
if (clear_space) clear(); if (clear_space) clear();
set_concurrent_iteration_safe_limit(top());
} }
void ContiguousSpace::clear() { void ContiguousSpace::clear() {

10
hotspot/src/share/vm/memory/space.hpp
View file

@ -373,6 +373,9 @@ private:
CompactibleSpace* _next_compaction_space; CompactibleSpace* _next_compaction_space;
public: public:
CompactibleSpace() :
_compaction_top(NULL), _next_compaction_space(NULL) {}
virtual void initialize(MemRegion mr, bool clear_space); virtual void initialize(MemRegion mr, bool clear_space);
virtual void clear(); virtual void clear();
@ -766,6 +769,10 @@ class ContiguousSpace: public CompactibleSpace {
inline HeapWord* par_allocate_impl(size_t word_size, HeapWord* end_value); inline HeapWord* par_allocate_impl(size_t word_size, HeapWord* end_value);
public: public:
ContiguousSpace() :
_top(NULL),
_concurrent_iteration_safe_limit(NULL) {}
virtual void initialize(MemRegion mr, bool clear_space); virtual void initialize(MemRegion mr, bool clear_space);
// Accessors // Accessors
@ -970,7 +977,8 @@ class EdenSpace : public ContiguousSpace {
HeapWord* _soft_end; HeapWord* _soft_end;
public: public:
EdenSpace(DefNewGeneration* gen) : _gen(gen) { _soft_end = NULL; } EdenSpace(DefNewGeneration* gen) :
_gen(gen), _soft_end(NULL) {}
// Get/set just the 'soft' limit. // Get/set just the 'soft' limit.
HeapWord* soft_end() { return _soft_end; } HeapWord* soft_end() { return _soft_end; }