1.1 --- a/src/share/vm/runtime/thread.hpp Wed Aug 27 09:36:55 2014 +0200
1.2 +++ b/src/share/vm/runtime/thread.hpp Wed Aug 27 08:19:12 2014 -0400
1.3 @@ -43,10 +43,6 @@
1.4 #include "runtime/unhandledOops.hpp"
1.5 #include "utilities/macros.hpp"
1.6
1.7 -#if INCLUDE_NMT
1.8 -#include "services/memRecorder.hpp"
1.9 -#endif // INCLUDE_NMT
1.10 -
1.11 #include "trace/traceBackend.hpp"
1.12 #include "trace/traceMacros.hpp"
1.13 #include "utilities/exceptions.hpp"
1.14 @@ -1059,16 +1055,6 @@
1.15 bool do_not_unlock_if_synchronized() { return _do_not_unlock_if_synchronized; }
1.16 void set_do_not_unlock_if_synchronized(bool val) { _do_not_unlock_if_synchronized = val; }
1.17
1.18 -#if INCLUDE_NMT
1.19 - // native memory tracking
1.20 - inline MemRecorder* get_recorder() const { return (MemRecorder*)_recorder; }
1.21 - inline void set_recorder(MemRecorder* rc) { _recorder = rc; }
1.22 -
1.23 - private:
1.24 - // per-thread memory recorder
1.25 - MemRecorder* volatile _recorder;
1.26 -#endif // INCLUDE_NMT
1.27 -
1.28 // Suspend/resume support for JavaThread
1.29 private:
1.30 void set_ext_suspended() { set_suspend_flag (_ext_suspended); }
1.31 @@ -1511,19 +1497,6 @@
1.32 return result;
1.33 }
1.34
1.35 - // NMT (Native memory tracking) support.
1.36 - // This flag helps NMT to determine if this JavaThread will be blocked
1.37 - // at safepoint. If not, ThreadCritical is needed for writing memory records.
1.38 - // JavaThread is only safepoint visible when it is in Threads' thread list,
1.39 - // it is not visible until it is added to the list and becomes invisible
1.40 - // once it is removed from the list.
1.41 - public:
1.42 - bool is_safepoint_visible() const { return _safepoint_visible; }
1.43 - void set_safepoint_visible(bool visible) { _safepoint_visible = visible; }
1.44 - private:
1.45 - bool _safepoint_visible;
1.46 -
1.47 - // Static operations
1.48 public:
1.49 // Returns the running thread as a JavaThread
1.50 static inline JavaThread* current();
