comparison src/share/vm/runtime/thread.hpp @ 14392:b5c8a61d7fa0

Merge
author kvn
date Fri, 21 Jun 2013 15:56:24 -0700
parents f2110083203d
children 836a62f43af9 dbc0b5dc08f5 58be756e7595
comparison
equal deleted inserted replaced
14391:d2907f74462e 14392:b5c8a61d7fa0
45 45
46 #if INCLUDE_NMT 46 #if INCLUDE_NMT
47 #include "services/memRecorder.hpp" 47 #include "services/memRecorder.hpp"
48 #endif // INCLUDE_NMT 48 #endif // INCLUDE_NMT
49 49
50 #include "trace/tracing.hpp" 50 #include "trace/traceBackend.hpp"
51 #include "trace/traceMacros.hpp"
51 #include "utilities/exceptions.hpp" 52 #include "utilities/exceptions.hpp"
52 #include "utilities/top.hpp" 53 #include "utilities/top.hpp"
53 #if INCLUDE_ALL_GCS 54 #if INCLUDE_ALL_GCS
54 #include "gc_implementation/g1/dirtyCardQueue.hpp" 55 #include "gc_implementation/g1/dirtyCardQueue.hpp"
55 #include "gc_implementation/g1/satbQueue.hpp" 56 #include "gc_implementation/g1/satbQueue.hpp"
256 257
257 ThreadLocalAllocBuffer _tlab; // Thread-local eden 258 ThreadLocalAllocBuffer _tlab; // Thread-local eden
258 jlong _allocated_bytes; // Cumulative number of bytes allocated on 259 jlong _allocated_bytes; // Cumulative number of bytes allocated on
259 // the Java heap 260 // the Java heap
260 261
261 TRACE_BUFFER _trace_buffer; // Thread-local buffer for tracing 262 TRACE_DATA _trace_data; // Thread-local data for tracing
262 263
263 int _vm_operation_started_count; // VM_Operation support 264 int _vm_operation_started_count; // VM_Operation support
264 int _vm_operation_completed_count; // VM_Operation support 265 int _vm_operation_completed_count; // VM_Operation support
265 266
266 ObjectMonitor* _current_pending_monitor; // ObjectMonitor this thread 267 ObjectMonitor* _current_pending_monitor; // ObjectMonitor this thread
447 } 448 }
448 } 449 }
449 return allocated_bytes; 450 return allocated_bytes;
450 } 451 }
451 452
452 TRACE_BUFFER trace_buffer() { return _trace_buffer; } 453 TRACE_DATA* trace_data() { return &_trace_data; }
453 void set_trace_buffer(TRACE_BUFFER buf) { _trace_buffer = buf; }
454 454
455 // VM operation support 455 // VM operation support
456 int vm_operation_ticket() { return ++_vm_operation_started_count; } 456 int vm_operation_ticket() { return ++_vm_operation_started_count; }
457 int vm_operation_completed_count() { return _vm_operation_completed_count; } 457 int vm_operation_completed_count() { return _vm_operation_completed_count; }
458 void increment_vm_operation_completed_count() { _vm_operation_completed_count++; } 458 void increment_vm_operation_completed_count() { _vm_operation_completed_count++; }
636 jint _hashStateX ; // thread-specific hashCode generator state 636 jint _hashStateX ; // thread-specific hashCode generator state
637 jint _hashStateY ; 637 jint _hashStateY ;
638 jint _hashStateZ ; 638 jint _hashStateZ ;
639 void * _schedctl ; 639 void * _schedctl ;
640 640
641 intptr_t _ScratchA, _ScratchB ; // Scratch locations for fast-path sync code
642 static ByteSize ScratchA_offset() { return byte_offset_of(Thread, _ScratchA ); }
643 static ByteSize ScratchB_offset() { return byte_offset_of(Thread, _ScratchB ); }
644 641
645 volatile jint rng [4] ; // RNG for spin loop 642 volatile jint rng [4] ; // RNG for spin loop
646 643
647 // Low-level leaf-lock primitives used to implement synchronization 644 // Low-level leaf-lock primitives used to implement synchronization
648 // and native monitor-mutex infrastructure. 645 // and native monitor-mutex infrastructure.