--- old/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp 2015-05-12 11:41:37.177622367 +0200 +++ /dev/null 2015-03-18 17:10:38.111854831 +0100 @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#include "precompiled.hpp" -#include "utilities/macros.hpp" -#if INCLUDE_ALL_GCS -#include "gc_implementation/shared/gSpaceCounters.hpp" -#include "memory/generation.hpp" -#include "memory/resourceArea.hpp" -#endif // INCLUDE_ALL_GCS - -GSpaceCounters::GSpaceCounters(const char* name, int ordinal, size_t max_size, - Generation* g, GenerationCounters* gc, - bool sampled) : - _gen(g) { - - if (UsePerfData) { - EXCEPTION_MARK; - ResourceMark rm; - - const char* cns = PerfDataManager::name_space(gc->name_space(), "space", - ordinal); - - _name_space = NEW_C_HEAP_ARRAY(char, strlen(cns)+1, mtGC); - strcpy(_name_space, cns); - - const char* cname = PerfDataManager::counter_name(_name_space, "name"); - PerfDataManager::create_string_constant(SUN_GC, cname, name, CHECK); - - cname = PerfDataManager::counter_name(_name_space, "maxCapacity"); - PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes, - (jlong)max_size, CHECK); - - cname = PerfDataManager::counter_name(_name_space, "capacity"); - _capacity = PerfDataManager::create_variable(SUN_GC, cname, - PerfData::U_Bytes, - _gen->capacity(), CHECK); - - cname = PerfDataManager::counter_name(_name_space, "used"); - if (sampled) { - _used = PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, - new GenerationUsedHelper(_gen), - CHECK); - } - else { - _used = PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, - (jlong)0, CHECK); - } - - cname = PerfDataManager::counter_name(_name_space, "initCapacity"); - PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes, - _gen->capacity(), CHECK); - } -} --- /dev/null 2015-03-18 17:10:38.111854831 +0100 +++ new/src/share/vm/gc/shared/gSpaceCounters.cpp 2015-05-12 11:41:36.999614953 +0200 @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#include "precompiled.hpp" +#include "utilities/macros.hpp" +#if INCLUDE_ALL_GCS +#include "gc/shared/gSpaceCounters.hpp" +#include "gc/shared/generation.hpp" +#include "memory/resourceArea.hpp" +#endif // INCLUDE_ALL_GCS + +GSpaceCounters::GSpaceCounters(const char* name, int ordinal, size_t max_size, + Generation* g, GenerationCounters* gc, + bool sampled) : + _gen(g) { + + if (UsePerfData) { + EXCEPTION_MARK; + ResourceMark rm; + + const char* cns = PerfDataManager::name_space(gc->name_space(), "space", + ordinal); + + _name_space = NEW_C_HEAP_ARRAY(char, strlen(cns)+1, mtGC); + strcpy(_name_space, cns); + + const char* cname = PerfDataManager::counter_name(_name_space, "name"); + PerfDataManager::create_string_constant(SUN_GC, cname, name, CHECK); + + cname = PerfDataManager::counter_name(_name_space, "maxCapacity"); + PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes, + (jlong)max_size, CHECK); + + cname = PerfDataManager::counter_name(_name_space, "capacity"); + _capacity = PerfDataManager::create_variable(SUN_GC, cname, + PerfData::U_Bytes, + _gen->capacity(), CHECK); + + cname = PerfDataManager::counter_name(_name_space, "used"); + if (sampled) { + _used = PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, + new GenerationUsedHelper(_gen), + CHECK); + } + else { + _used = PerfDataManager::create_variable(SUN_GC, cname, PerfData::U_Bytes, + (jlong)0, CHECK); + } + + cname = PerfDataManager::counter_name(_name_space, "initCapacity"); + PerfDataManager::create_constant(SUN_GC, cname, PerfData::U_Bytes, + _gen->capacity(), CHECK); + } +}