Mercurial > hg > graal-compiler

comparison src/share/vm/gc_implementation/shared/vmGCOperations.cpp @ 4006:436b4a3231bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7098194: integrate macosx-port changes Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29. Reviewed-by: kvn, dholmes, never, phh Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
author dcubed
date Thu, 13 Oct 2011 09:35:42 -0700
parents c798c277ddd1
children da91efe96a93
comparison
equal deleted inserted replaced
4005:2ef3386478e6 4006:436b4a3231bf
38 #include "utilities/preserveException.hpp" 38 #include "utilities/preserveException.hpp"
39 #ifndef SERIALGC 39 #ifndef SERIALGC
40 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 40 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
41 #endif 41 #endif
42 42
43 #ifndef USDT2
43 HS_DTRACE_PROBE_DECL1(hotspot, gc__begin, bool); 44 HS_DTRACE_PROBE_DECL1(hotspot, gc__begin, bool);
44 HS_DTRACE_PROBE_DECL(hotspot, gc__end); 45 HS_DTRACE_PROBE_DECL(hotspot, gc__end);
46 #endif /* !USDT2 */
45 47
46 // The same dtrace probe can't be inserted in two different files, so we 48 // The same dtrace probe can't be inserted in two different files, so we
47 // have to call it here, so it's only in one file. Can't create new probes 49 // have to call it here, so it's only in one file. Can't create new probes
48 // for the other file anymore. The dtrace probes have to remain stable. 50 // for the other file anymore. The dtrace probes have to remain stable.
49 void VM_GC_Operation::notify_gc_begin(bool full) { 51 void VM_GC_Operation::notify_gc_begin(bool full) {
52 #ifndef USDT2
50 HS_DTRACE_PROBE1(hotspot, gc__begin, full); 53 HS_DTRACE_PROBE1(hotspot, gc__begin, full);
51 HS_DTRACE_WORKAROUND_TAIL_CALL_BUG(); 54 HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
55 #else /* USDT2 */
56 HOTSPOT_GC_BEGIN(
57 full);
58 #endif /* USDT2 */
52 } 59 }
53 60
54 void VM_GC_Operation::notify_gc_end() { 61 void VM_GC_Operation::notify_gc_end() {
62 #ifndef USDT2
55 HS_DTRACE_PROBE(hotspot, gc__end); 63 HS_DTRACE_PROBE(hotspot, gc__end);
56 HS_DTRACE_WORKAROUND_TAIL_CALL_BUG(); 64 HS_DTRACE_WORKAROUND_TAIL_CALL_BUG();
65 #else /* USDT2 */
66 HOTSPOT_GC_END(
67 );
68 #endif /* USDT2 */
57 } 69 }
58 70
59 void VM_GC_Operation::acquire_pending_list_lock() { 71 void VM_GC_Operation::acquire_pending_list_lock() {
60 // we may enter this with pending exception set 72 // we may enter this with pending exception set
61 instanceRefKlass::acquire_pending_list_lock(&_pending_list_basic_lock); 73 instanceRefKlass::acquire_pending_list_lock(&_pending_list_basic_lock);