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

Merge
author asaha
date Thu, 29 May 2014 09:56:06 -0700
parents 78bbf4d43a14
children 52b4284cb496 7426d8d76305
comparison
equal deleted inserted replaced
18008:da65bbf6f89e 18009:f73af4455d7d
1 /* 1 /*
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
29 #include "gc_implementation/shared/markSweep.inline.hpp" 29 #include "gc_implementation/shared/markSweep.inline.hpp"
30 #include "gc_interface/collectedHeap.inline.hpp" 30 #include "gc_interface/collectedHeap.inline.hpp"
31 #include "oops/methodData.hpp" 31 #include "oops/methodData.hpp"
32 #include "oops/objArrayKlass.inline.hpp" 32 #include "oops/objArrayKlass.inline.hpp"
33 #include "oops/oop.inline.hpp" 33 #include "oops/oop.inline.hpp"
34
35 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
34 36
35 uint MarkSweep::_total_invocations = 0; 37 uint MarkSweep::_total_invocations = 0;
36 38
37 Stack<oop, mtGC> MarkSweep::_marking_stack; 39 Stack<oop, mtGC> MarkSweep::_marking_stack;
38 Stack<ObjArrayTask, mtGC> MarkSweep::_objarray_stack; 40 Stack<ObjArrayTask, mtGC> MarkSweep::_objarray_stack;