Mercurial > hg > graal-compiler
diff src/share/vm/services/memTrackWorker.hpp @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 10:45:56 +0200 |
parents | b80cc96882f7 |
children | 9758d9f36299 |
line wrap: on
line diff
--- a/src/share/vm/services/memTrackWorker.hpp Tue Jun 18 14:23:29 2013 -0700 +++ b/src/share/vm/services/memTrackWorker.hpp Wed Jun 19 10:45:56 2013 +0200 @@ -32,7 +32,7 @@ // Maximum MAX_GENERATIONS generation data can be tracked. #define MAX_GENERATIONS 512 -class GenerationData : public _ValueObj { +class GenerationData VALUE_OBJ_CLASS_SPEC { private: int _number_of_classes; MemRecorder* _recorder_list; @@ -85,8 +85,10 @@ bool _has_error; + MemSnapshot* _snapshot; + public: - MemTrackWorker(); + MemTrackWorker(MemSnapshot* snapshot); ~MemTrackWorker(); _NOINLINE_ void* operator new(size_t size); _NOINLINE_ void* operator new(size_t size, const std::nothrow_t& nothrow_constant);