Mercurial > hg > truffle
comparison src/share/vm/runtime/thread.hpp @ 4840:0a10d80352d5
Merge
author | brutisso |
---|---|
date | Fri, 27 Jan 2012 09:04:57 +0100 |
parents | 94ec88ca68e2 |
children | 1a2723f7ad8e |
comparison
equal
deleted
inserted
replaced
4839:b4ebad3520bb | 4840:0a10d80352d5 |
---|---|
39 #include "runtime/park.hpp" | 39 #include "runtime/park.hpp" |
40 #include "runtime/safepoint.hpp" | 40 #include "runtime/safepoint.hpp" |
41 #include "runtime/stubRoutines.hpp" | 41 #include "runtime/stubRoutines.hpp" |
42 #include "runtime/threadLocalStorage.hpp" | 42 #include "runtime/threadLocalStorage.hpp" |
43 #include "runtime/unhandledOops.hpp" | 43 #include "runtime/unhandledOops.hpp" |
44 #include "trace/tracing.hpp" | |
44 #include "utilities/exceptions.hpp" | 45 #include "utilities/exceptions.hpp" |
45 #include "utilities/top.hpp" | 46 #include "utilities/top.hpp" |
46 #ifndef SERIALGC | 47 #ifndef SERIALGC |
47 #include "gc_implementation/g1/dirtyCardQueue.hpp" | 48 #include "gc_implementation/g1/dirtyCardQueue.hpp" |
48 #include "gc_implementation/g1/satbQueue.hpp" | 49 #include "gc_implementation/g1/satbQueue.hpp" |
244 | 245 |
245 ThreadLocalAllocBuffer _tlab; // Thread-local eden | 246 ThreadLocalAllocBuffer _tlab; // Thread-local eden |
246 jlong _allocated_bytes; // Cumulative number of bytes allocated on | 247 jlong _allocated_bytes; // Cumulative number of bytes allocated on |
247 // the Java heap | 248 // the Java heap |
248 | 249 |
250 TRACE_BUFFER _trace_buffer; // Thread-local buffer for tracing | |
251 | |
249 int _vm_operation_started_count; // VM_Operation support | 252 int _vm_operation_started_count; // VM_Operation support |
250 int _vm_operation_completed_count; // VM_Operation support | 253 int _vm_operation_completed_count; // VM_Operation support |
251 | 254 |
252 ObjectMonitor* _current_pending_monitor; // ObjectMonitor this thread | 255 ObjectMonitor* _current_pending_monitor; // ObjectMonitor this thread |
253 // is waiting to lock | 256 // is waiting to lock |
411 return allocated_bytes + used_bytes; | 414 return allocated_bytes + used_bytes; |
412 } | 415 } |
413 } | 416 } |
414 return allocated_bytes; | 417 return allocated_bytes; |
415 } | 418 } |
419 | |
420 TRACE_BUFFER trace_buffer() { return _trace_buffer; } | |
421 void set_trace_buffer(TRACE_BUFFER buf) { _trace_buffer = buf; } | |
416 | 422 |
417 // VM operation support | 423 // VM operation support |
418 int vm_operation_ticket() { return ++_vm_operation_started_count; } | 424 int vm_operation_ticket() { return ++_vm_operation_started_count; } |
419 int vm_operation_completed_count() { return _vm_operation_completed_count; } | 425 int vm_operation_completed_count() { return _vm_operation_completed_count; } |
420 void increment_vm_operation_completed_count() { _vm_operation_completed_count++; } | 426 void increment_vm_operation_completed_count() { _vm_operation_completed_count++; } |