comparison src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c 78bbf4d43a14
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
1 1
2 /* 2 /*
3 * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. 3 * Copyright (c) 2002, 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.
31 #include "memory/resourceArea.hpp" 31 #include "memory/resourceArea.hpp"
32 #include "runtime/handles.hpp" 32 #include "runtime/handles.hpp"
33 #include "runtime/handles.inline.hpp" 33 #include "runtime/handles.inline.hpp"
34 #include "runtime/os.hpp" 34 #include "runtime/os.hpp"
35 #include "runtime/thread.hpp" 35 #include "runtime/thread.hpp"
36
37 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
36 38
37 GCTaskThread::GCTaskThread(GCTaskManager* manager, 39 GCTaskThread::GCTaskThread(GCTaskManager* manager,
38 uint which, 40 uint which,
39 uint processor_id) : 41 uint processor_id) :
40 _manager(manager), 42 _manager(manager),