comparison src/share/vm/runtime/perfData.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 4ca6dc0799b6 78bbf4d43a14
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
1 /* 1 /*
2 * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2001, 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.
31 #include "runtime/mutexLocker.hpp" 31 #include "runtime/mutexLocker.hpp"
32 #include "runtime/os.hpp" 32 #include "runtime/os.hpp"
33 #include "runtime/perfData.hpp" 33 #include "runtime/perfData.hpp"
34 #include "utilities/exceptions.hpp" 34 #include "utilities/exceptions.hpp"
35 #include "utilities/globalDefinitions.hpp" 35 #include "utilities/globalDefinitions.hpp"
36
37 PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
36 38
37 PerfDataList* PerfDataManager::_all = NULL; 39 PerfDataList* PerfDataManager::_all = NULL;
38 PerfDataList* PerfDataManager::_sampled = NULL; 40 PerfDataList* PerfDataManager::_sampled = NULL;
39 PerfDataList* PerfDataManager::_constants = NULL; 41 PerfDataList* PerfDataManager::_constants = NULL;
40 42