comparison src/share/vm/runtime/vmThread.cpp @ 7182:c24f778e9401

Merge
author johnc
date Thu, 29 Nov 2012 11:23:15 -0800
parents f34d701e952e
children 5ce621176715
comparison
equal deleted inserted replaced
7176:59c790074993 7182:c24f778e9401
29 #include "oops/method.hpp" 29 #include "oops/method.hpp"
30 #include "oops/oop.inline.hpp" 30 #include "oops/oop.inline.hpp"
31 #include "runtime/interfaceSupport.hpp" 31 #include "runtime/interfaceSupport.hpp"
32 #include "runtime/mutexLocker.hpp" 32 #include "runtime/mutexLocker.hpp"
33 #include "runtime/os.hpp" 33 #include "runtime/os.hpp"
34 #include "runtime/thread.inline.hpp"
34 #include "runtime/vmThread.hpp" 35 #include "runtime/vmThread.hpp"
35 #include "runtime/vm_operations.hpp" 36 #include "runtime/vm_operations.hpp"
36 #include "services/runtimeService.hpp" 37 #include "services/runtimeService.hpp"
37 #include "utilities/dtrace.hpp" 38 #include "utilities/dtrace.hpp"
38 #include "utilities/events.hpp" 39 #include "utilities/events.hpp"
39 #include "utilities/xmlstream.hpp" 40 #include "utilities/xmlstream.hpp"
40 #ifdef TARGET_OS_FAMILY_linux
41 # include "thread_linux.inline.hpp"
42 #endif
43 #ifdef TARGET_OS_FAMILY_solaris
44 # include "thread_solaris.inline.hpp"
45 #endif
46 #ifdef TARGET_OS_FAMILY_windows
47 # include "thread_windows.inline.hpp"
48 #endif
49 #ifdef TARGET_OS_FAMILY_bsd
50 # include "thread_bsd.inline.hpp"
51 #endif
52 41
53 #ifndef USDT2 42 #ifndef USDT2
54 HS_DTRACE_PROBE_DECL3(hotspot, vmops__request, char *, uintptr_t, int); 43 HS_DTRACE_PROBE_DECL3(hotspot, vmops__request, char *, uintptr_t, int);
55 HS_DTRACE_PROBE_DECL3(hotspot, vmops__begin, char *, uintptr_t, int); 44 HS_DTRACE_PROBE_DECL3(hotspot, vmops__begin, char *, uintptr_t, int);
56 HS_DTRACE_PROBE_DECL3(hotspot, vmops__end, char *, uintptr_t, int); 45 HS_DTRACE_PROBE_DECL3(hotspot, vmops__end, char *, uintptr_t, int);
666 _cur_vm_operation = prev_vm_operation; 655 _cur_vm_operation = prev_vm_operation;
667 } 656 }
668 } 657 }
669 658
670 659
671 void VMThread::oops_do(OopClosure* f, CodeBlobClosure* cf) { 660 void VMThread::oops_do(OopClosure* f, CLDToOopClosure* cld_f, CodeBlobClosure* cf) {
672 Thread::oops_do(f, cf); 661 Thread::oops_do(f, cld_f, cf);
673 _vm_queue->oops_do(f); 662 _vm_queue->oops_do(f);
674 } 663 }
675 664
676 //------------------------------------------------------------------------------------------------------------------ 665 //------------------------------------------------------------------------------------------------------------------
677 #ifndef PRODUCT 666 #ifndef PRODUCT
699 } 688 }
700 689
701 #endif 690 #endif
702 691
703 void VMThread::verify() { 692 void VMThread::verify() {
704 oops_do(&VerifyOopClosure::verify_oop, NULL); 693 oops_do(&VerifyOopClosure::verify_oop, NULL, NULL);
705 } 694 }