Mercurial > hg > truffle
diff src/share/vm/gc_implementation/g1/concurrentMark.hpp @ 6197:d2a62e0f25eb
6995781: Native Memory Tracking (Phase 1)
7151532: DCmd for hotspot native memory tracking
Summary: Implementation of native memory tracking phase 1, which tracks VM native memory usage, and related DCmd
Reviewed-by: acorn, coleenp, fparain
author | zgu |
---|---|
date | Thu, 28 Jun 2012 17:03:16 -0400 |
parents | 720b6a76dd9d |
children | 988bf00cc564 |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp Wed Jun 27 15:23:36 2012 +0200 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp Thu Jun 28 17:03:16 2012 -0400 @@ -30,8 +30,8 @@ class G1CollectedHeap; class CMTask; -typedef GenericTaskQueue<oop> CMTaskQueue; -typedef GenericTaskQueueSet<CMTaskQueue> CMTaskQueueSet; +typedef GenericTaskQueue<oop, mtGC> CMTaskQueue; +typedef GenericTaskQueueSet<CMTaskQueue, mtGC> CMTaskQueueSet; // Closure used by CM during concurrent reference discovery // and reference processing (during remarking) to determine @@ -343,7 +343,7 @@ class ConcurrentMarkThread; -class ConcurrentMark : public CHeapObj { +class ConcurrentMark: public CHeapObj<mtGC> { friend class ConcurrentMarkThread; friend class CMTask; friend class CMBitMapClosure;