comparison src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp @ 18009:f73af4455d7d

Merge
author asaha
date Thu, 29 May 2014 09:56:06 -0700
parents 78bbf4d43a14
children 52b4284cb496
comparison
equal deleted inserted replaced
18008:da65bbf6f89e 18009:f73af4455d7d
1 1
2 /* 2 /*
3 * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. 3 * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
5 * 5 *
6 * This code is free software; you can redistribute it and/or modify it 6 * This code is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License version 2 only, as 7 * under the terms of the GNU General Public License version 2 only, as
8 * published by the Free Software Foundation. 8 * published by the Free Software Foundation.
27 #include "gc_implementation/shared/mutableNUMASpace.hpp" 27 #include "gc_implementation/shared/mutableNUMASpace.hpp"
28 #include "gc_implementation/shared/spaceDecorator.hpp" 28 #include "gc_implementation/shared/spaceDecorator.hpp"
29 #include "memory/sharedHeap.hpp" 29 #include "memory/sharedHeap.hpp"
30 #include "oops/oop.inline.hpp" 30 #include "oops/oop.inline.hpp"
31 #include "runtime/thread.inline.hpp" 31 #include "runtime/thread.inline.hpp"
32
33 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
32 34
33 MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment) { 35 MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment) {
34 _lgrp_spaces = new (ResourceObj::C_HEAP, mtGC) GrowableArray<LGRPSpace*>(0, true); 36 _lgrp_spaces = new (ResourceObj::C_HEAP, mtGC) GrowableArray<LGRPSpace*>(0, true);
35 _page_size = os::vm_page_size(); 37 _page_size = os::vm_page_size();
36 _adaptation_cycles = 0; 38 _adaptation_cycles = 0;