Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/init.cpp @ 1930:2d26b0046e0d
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Tue, 30 Nov 2010 14:53:30 +0100 |
parents | f55c4f82ab9d |
children | 9eecf81a02fb |
comparison
equal
deleted
inserted
replaced
1484:6b7001391c97 | 1930:2d26b0046e0d |
---|---|
1 /* | 1 /* |
2 * Copyright 1997-2010 Sun Microsystems, Inc. All Rights Reserved. | 2 * Copyright (c) 1997, 2010, 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. |
14 * | 14 * |
15 * You should have received a copy of the GNU General Public License version | 15 * You should have received a copy of the GNU General Public License version |
16 * 2 along with this work; if not, write to the Free Software Foundation, | 16 * 2 along with this work; if not, write to the Free Software Foundation, |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
18 * | 18 * |
19 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
20 * CA 95054 USA or visit www.sun.com if you need additional information or | 20 * or visit www.oracle.com if you need additional information or have any |
21 * have any questions. | 21 * questions. |
22 * | 22 * |
23 */ | 23 */ |
24 | 24 |
25 # include "incls/_precompiled.incl" | 25 # include "incls/_precompiled.incl" |
26 # include "incls/_init.cpp.incl" | 26 # include "incls/_init.cpp.incl" |
32 void chunkpool_init(); | 32 void chunkpool_init(); |
33 void perfMemory_init(); | 33 void perfMemory_init(); |
34 | 34 |
35 // Initialization done by Java thread in init_globals() | 35 // Initialization done by Java thread in init_globals() |
36 void management_init(); | 36 void management_init(); |
37 void vtune_init(); | |
38 void bytecodes_init(); | 37 void bytecodes_init(); |
39 void classLoader_init(); | 38 void classLoader_init(); |
40 void codeCache_init(); | 39 void codeCache_init(); |
41 void VM_Version_init(); | 40 void VM_Version_init(); |
42 void stubRoutines_init1(); | 41 void stubRoutines_init1(); |
80 | 79 |
81 | 80 |
82 jint init_globals() { | 81 jint init_globals() { |
83 HandleMark hm; | 82 HandleMark hm; |
84 management_init(); | 83 management_init(); |
85 vtune_init(); | |
86 bytecodes_init(); | 84 bytecodes_init(); |
87 classLoader_init(); | 85 classLoader_init(); |
88 codeCache_init(); | 86 codeCache_init(); |
89 VM_Version_init(); | 87 VM_Version_init(); |
90 stubRoutines_init1(); | 88 stubRoutines_init1(); |
128 Universe::heap()->total_collections() >= VerifyGCStartAt) { | 126 Universe::heap()->total_collections() >= VerifyGCStartAt) { |
129 Universe::heap()->prepare_for_verify(); | 127 Universe::heap()->prepare_for_verify(); |
130 Universe::verify(); // make sure we're starting with a clean slate | 128 Universe::verify(); // make sure we're starting with a clean slate |
131 } | 129 } |
132 | 130 |
131 // All the flags that get adjusted by VM_Version_init and os::init_2 | |
132 // have been set so dump the flags now. | |
133 if (PrintFlagsFinal) { | |
134 CommandLineFlags::printFlags(); | |
135 } | |
136 | |
133 return JNI_OK; | 137 return JNI_OK; |
134 } | 138 } |
135 | 139 |
136 | 140 |
137 void exit_globals() { | 141 void exit_globals() { |