src/share/vm/services/memoryManager.hpp

@@ -61,11 +61,11 @@
     return _pools[index];
   }
 
   void add_pool(MemoryPool* pool);
 
-  bool is_manager(instanceHandle mh)     { return mh() == _memory_mgr_obj; }
+  bool is_manager(instanceHandle mh)     { return oopDesc::bs()->write_barrier(mh()) == oopDesc::bs()->write_barrier(_memory_mgr_obj); }
 
   virtual instanceOop get_memory_manager_instance(TRAPS);
   virtual bool is_gc_memory_manager()    { return false; }
   virtual const char* name() = 0;
 

@@ -81,10 +81,11 @@
   static GCMemoryManager* get_cms_memory_manager();
   static GCMemoryManager* get_psScavenge_memory_manager();
   static GCMemoryManager* get_psMarkSweep_memory_manager();
   static GCMemoryManager* get_g1YoungGen_memory_manager();
   static GCMemoryManager* get_g1OldGen_memory_manager();
+  static GCMemoryManager* get_shenandoah_memory_manager();
 };
 
 class CodeCacheMemoryManager : public MemoryManager {
 private:
 public:

@@ -251,6 +252,15 @@
   G1OldGenMemoryManager() : GCMemoryManager() {}
 
   const char* name() { return "G1 Old Generation"; }
 };
 
+class ShenandoahMemoryManager : public GCMemoryManager {
+private:
+public:
+  ShenandoahMemoryManager() : GCMemoryManager() {}
+
+  const char* name()         { return "Shenandoah";}
+
+};
+
 #endif // SHARE_VM_SERVICES_MEMORYMANAGER_HPP