equal
deleted
inserted
replaced
26 #include "code/nmethod.hpp" |
26 #include "code/nmethod.hpp" |
27 #include "gc/g1/g1BlockOffsetTable.inline.hpp" |
27 #include "gc/g1/g1BlockOffsetTable.inline.hpp" |
28 #include "gc/g1/g1CollectedHeap.inline.hpp" |
28 #include "gc/g1/g1CollectedHeap.inline.hpp" |
29 #include "gc/g1/g1CollectionSet.hpp" |
29 #include "gc/g1/g1CollectionSet.hpp" |
30 #include "gc/g1/g1HeapRegionTraceType.hpp" |
30 #include "gc/g1/g1HeapRegionTraceType.hpp" |
|
31 #include "gc/g1/g1NUMA.hpp" |
31 #include "gc/g1/g1OopClosures.inline.hpp" |
32 #include "gc/g1/g1OopClosures.inline.hpp" |
32 #include "gc/g1/heapRegion.inline.hpp" |
33 #include "gc/g1/heapRegion.inline.hpp" |
33 #include "gc/g1/heapRegionBounds.inline.hpp" |
34 #include "gc/g1/heapRegionBounds.inline.hpp" |
34 #include "gc/g1/heapRegionManager.inline.hpp" |
35 #include "gc/g1/heapRegionManager.inline.hpp" |
35 #include "gc/g1/heapRegionRemSet.hpp" |
36 #include "gc/g1/heapRegionRemSet.hpp" |
250 #endif |
251 #endif |
251 _prev_marked_bytes(0), _next_marked_bytes(0), _gc_efficiency(0.0), |
252 _prev_marked_bytes(0), _next_marked_bytes(0), _gc_efficiency(0.0), |
252 _index_in_opt_cset(InvalidCSetIndex), _young_index_in_cset(-1), |
253 _index_in_opt_cset(InvalidCSetIndex), _young_index_in_cset(-1), |
253 _surv_rate_group(NULL), _age_index(-1), |
254 _surv_rate_group(NULL), _age_index(-1), |
254 _prev_top_at_mark_start(NULL), _next_top_at_mark_start(NULL), |
255 _prev_top_at_mark_start(NULL), _next_top_at_mark_start(NULL), |
255 _recorded_rs_length(0), _predicted_elapsed_time_ms(0) |
256 _recorded_rs_length(0), _predicted_elapsed_time_ms(0), |
|
257 _node_index(G1NUMA::UnknownNodeIndex) |
256 { |
258 { |
257 _rem_set = new HeapRegionRemSet(bot, this); |
259 _rem_set = new HeapRegionRemSet(bot, this); |
258 |
260 |
259 initialize(mr); |
261 initialize(mr); |
260 } |
262 } |
468 if (in_collection_set()) { |
470 if (in_collection_set()) { |
469 st->print("|CS"); |
471 st->print("|CS"); |
470 } else { |
472 } else { |
471 st->print("| "); |
473 st->print("| "); |
472 } |
474 } |
473 st->print_cr("|TAMS " PTR_FORMAT ", " PTR_FORMAT "| %s ", |
475 st->print("|TAMS " PTR_FORMAT ", " PTR_FORMAT "| %s ", |
474 p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()), rem_set()->get_state_str()); |
476 p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()), rem_set()->get_state_str()); |
|
477 if (UseNUMA) { |
|
478 G1NUMA* numa = G1NUMA::numa(); |
|
479 if (node_index() < numa->num_active_nodes()) { |
|
480 st->print("|%02d", numa->numa_id(node_index())); |
|
481 } else { |
|
482 st->print("|--"); |
|
483 } |
|
484 } |
|
485 st->print_cr(""); |
475 } |
486 } |
476 |
487 |
477 class G1VerificationClosure : public BasicOopIterateClosure { |
488 class G1VerificationClosure : public BasicOopIterateClosure { |
478 protected: |
489 protected: |
479 G1CollectedHeap* _g1h; |
490 G1CollectedHeap* _g1h; |