Mercurial > hg > graal-compiler
comparison src/share/vm/prims/jni.cpp @ 1930:2d26b0046e0d
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Tue, 30 Nov 2010 14:53:30 +0100 |
parents | fe69dec9a1ed 126ea7725993 |
children | 06f017f7daa7 |
comparison
equal
deleted
inserted
replaced
1484:6b7001391c97 | 1930:2d26b0046e0d |
---|---|
1 /* | 1 /* |
2 * Copyright 1997-2009 Sun Microsystems, Inc. All Rights Reserved. | 2 * Copyright (c) 1997, 2009, 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/_jni.cpp.incl" | 26 # include "incls/_jni.cpp.incl" |
3315 // reset vm_created last to avoid race condition. Use OrderAccess to | 3315 // reset vm_created last to avoid race condition. Use OrderAccess to |
3316 // control both compiler and architectural-based reordering. | 3316 // control both compiler and architectural-based reordering. |
3317 OrderAccess::release_store(&vm_created, 0); | 3317 OrderAccess::release_store(&vm_created, 0); |
3318 } | 3318 } |
3319 | 3319 |
3320 NOT_PRODUCT(test_error_handler(ErrorHandlerTest)); | |
3320 return result; | 3321 return result; |
3321 } | 3322 } |
3322 | 3323 |
3323 HS_DTRACE_PROBE_DECL3(hotspot_jni, GetCreatedJavaVMs__entry, \ | 3324 HS_DTRACE_PROBE_DECL3(hotspot_jni, GetCreatedJavaVMs__entry, \ |
3324 JavaVM**, jsize, jsize*); | 3325 JavaVM**, jsize, jsize*); |
3416 } | 3417 } |
3417 // Enable stack overflow checks | 3418 // Enable stack overflow checks |
3418 thread->create_stack_guard_pages(); | 3419 thread->create_stack_guard_pages(); |
3419 | 3420 |
3420 thread->initialize_tlab(); | 3421 thread->initialize_tlab(); |
3422 | |
3423 thread->cache_global_variables(); | |
3421 | 3424 |
3422 // Crucial that we do not have a safepoint check for this thread, since it has | 3425 // Crucial that we do not have a safepoint check for this thread, since it has |
3423 // not been added to the Thread list yet. | 3426 // not been added to the Thread list yet. |
3424 { Threads_lock->lock_without_safepoint_check(); | 3427 { Threads_lock->lock_without_safepoint_check(); |
3425 // This must be inside this lock in order to get FullGCALot to work properly, i.e., to | 3428 // This must be inside this lock in order to get FullGCALot to work properly, i.e., to |