• file
• revisions
• annotate
• diff
• comparison
• raw

src/share/vm/memory/resourceArea.cpp@60fb9c4db4e6 (annotated)

src/share/vm/memory/resourceArea.cpp

Mon, 23 Jun 2008 16:49:37 -0700

author

ysr

date

Mon, 23 Jun 2008 16:49:37 -0700

changeset 782

60fb9c4db4e6

parent 435

a61af66fc99e

child 1907

c18cbe5936b8

permissions

-rw-r--r--

6718086: CMS assert: _concurrent_iteration_safe_limit update missed
Summary: Initialize the field correctly in ContiguousSpace's constructor and initialize() methods, using the latter for the survivor spaces upon initial construction or a subsequent resizing of the young generation. Add some missing Space sub-class constructors.
Reviewed-by: apetrusenko

duke@435	1	/*
duke@435	2	* Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
duke@435	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
duke@435	4	*
duke@435	5	* This code is free software; you can redistribute it and/or modify it
duke@435	6	* under the terms of the GNU General Public License version 2 only, as
duke@435	7	* published by the Free Software Foundation.
duke@435	8	*
duke@435	9	* This code is distributed in the hope that it will be useful, but WITHOUT
duke@435	10	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
duke@435	11	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
duke@435	12	* version 2 for more details (a copy is included in the LICENSE file that
duke@435	13	* accompanied this code).
duke@435	14	*
duke@435	15	* You should have received a copy of the GNU General Public License version
duke@435	16	* 2 along with this work; if not, write to the Free Software Foundation,
duke@435	17	* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
duke@435	18	*
duke@435	19	* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
duke@435	20	* CA 95054 USA or visit www.sun.com if you need additional information or
duke@435	21	* have any questions.
duke@435	22	*
duke@435	23	*/
duke@435	24
duke@435	25	# include "incls/_precompiled.incl"
duke@435	26	# include "incls/_resourceArea.cpp.incl"
duke@435	27
duke@435	28	//------------------------------ResourceMark-----------------------------------
duke@435	29	debug_only(int ResourceArea::_warned;) // to suppress multiple warnings
duke@435	30
duke@435	31	// The following routines are declared in allocation.hpp and used everywhere:
duke@435	32
duke@435	33	// Allocation in thread-local resource area
duke@435	34	extern char* resource_allocate_bytes(size_t size) {
duke@435	35	return Thread::current()->resource_area()->allocate_bytes(size);
duke@435	36	}
duke@435	37	extern char* resource_allocate_bytes(Thread* thread, size_t size) {
duke@435	38	return thread->resource_area()->allocate_bytes(size);
duke@435	39	}
duke@435	40
duke@435	41	extern char* resource_reallocate_bytes( char *old, size_t old_size, size_t new_size){
duke@435	42	return (char*)Thread::current()->resource_area()->Arealloc(old, old_size, new_size);
duke@435	43	}
duke@435	44
duke@435	45	extern void resource_free_bytes( char *old, size_t size ) {
duke@435	46	Thread::current()->resource_area()->Afree(old, size);
duke@435	47	}
duke@435	48
duke@435	49	#ifdef ASSERT
duke@435	50	ResourceMark::ResourceMark(Thread *thread) {
duke@435	51	assert(thread == Thread::current(), "not the current thread");
duke@435	52	initialize(thread);
duke@435	53	}
duke@435	54
duke@435	55	DeoptResourceMark::DeoptResourceMark(Thread *thread) {
duke@435	56	assert(thread == Thread::current(), "not the current thread");
duke@435	57	initialize(thread);
duke@435	58	}
duke@435	59	#endif
duke@435	60
duke@435	61
duke@435	62	//-------------------------------------------------------------------------------
duke@435	63	// Non-product code
duke@435	64	#ifndef PRODUCT
duke@435	65
duke@435	66	void ResourceMark::free_malloced_objects() {
duke@435	67	Arena::free_malloced_objects(_chunk, _hwm, _max, _area->_hwm);
duke@435	68	}
duke@435	69
duke@435	70	void DeoptResourceMark::free_malloced_objects() {
duke@435	71	Arena::free_malloced_objects(_chunk, _hwm, _max, _area->_hwm);
duke@435	72	}
duke@435	73
duke@435	74	#endif