diff -r 000000000000 -r a61af66fc99e src/share/vm/services/memoryManager.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/vm/services/memoryManager.cpp	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+# include "incls/_precompiled.incl"
+# include "incls/_memoryManager.cpp.incl"
+
+HS_DTRACE_PROBE_DECL8(hotspot, mem__pool__gc__begin, char*, int, char*, int,
+  size_t, size_t, size_t, size_t);
+HS_DTRACE_PROBE_DECL8(hotspot, mem__pool__gc__end, char*, int, char*, int,
+  size_t, size_t, size_t, size_t);
+
+MemoryManager::MemoryManager() {
+  _num_pools = 0;
+  _memory_mgr_obj = NULL;
+}
+
+void MemoryManager::add_pool(MemoryPool* pool) {
+  assert(_num_pools < MemoryManager::max_num_pools, "_num_pools exceeds the max");
+  if (_num_pools < MemoryManager::max_num_pools) {
+    _pools[_num_pools] = pool;
+    _num_pools++;
+  }
+  pool->add_manager(this);
+}
+
+MemoryManager* MemoryManager::get_code_cache_memory_manager() {
+  return (MemoryManager*) new CodeCacheMemoryManager();
+}
+
+GCMemoryManager* MemoryManager::get_copy_memory_manager() {
+  return (GCMemoryManager*) new CopyMemoryManager();
+}
+
+GCMemoryManager* MemoryManager::get_msc_memory_manager() {
+  return (GCMemoryManager*) new MSCMemoryManager();
+}
+
+GCMemoryManager* MemoryManager::get_parnew_memory_manager() {
+  return (GCMemoryManager*) new ParNewMemoryManager();
+}
+
+GCMemoryManager* MemoryManager::get_cms_memory_manager() {
+  return (GCMemoryManager*) new CMSMemoryManager();
+}
+
+GCMemoryManager* MemoryManager::get_psScavenge_memory_manager() {
+  return (GCMemoryManager*) new PSScavengeMemoryManager();
+}
+
+GCMemoryManager* MemoryManager::get_psMarkSweep_memory_manager() {
+  return (GCMemoryManager*) new PSMarkSweepMemoryManager();
+}
+
+instanceOop MemoryManager::get_memory_manager_instance(TRAPS) {
+  // Must do an acquire so as to force ordering of subsequent
+  // loads from anything _memory_mgr_obj points to or implies.
+  instanceOop mgr_obj = (instanceOop)OrderAccess::load_ptr_acquire(&_memory_mgr_obj);
+  if (mgr_obj == NULL) {
+    // It's ok for more than one thread to execute the code up to the locked region.
+    // Extra manager instances will just be gc'ed.
+    klassOop k = Management::sun_management_ManagementFactory_klass(CHECK_0);
+    instanceKlassHandle ik(THREAD, k);
+
+    Handle mgr_name = java_lang_String::create_from_str(name(), CHECK_0);
+
+    JavaValue result(T_OBJECT);
+    JavaCallArguments args;
+    args.push_oop(mgr_name);    // Argument 1
+
+    symbolHandle method_name;
+    symbolHandle signature;
+    if (is_gc_memory_manager()) {
+      method_name = vmSymbolHandles::createGarbageCollector_name();
+      signature = vmSymbolHandles::createGarbageCollector_signature();
+      args.push_oop(Handle());      // Argument 2 (for future extension)
+    } else {
+      method_name = vmSymbolHandles::createMemoryManager_name();
+      signature = vmSymbolHandles::createMemoryManager_signature();
+    }
+
+    JavaCalls::call_static(&result,
+                           ik,
+                           method_name,
+                           signature,
+                           &args,
+                           CHECK_0);
+
+    instanceOop m = (instanceOop) result.get_jobject();
+    instanceHandle mgr(THREAD, m);
+
+    {
+      // Get lock before setting _memory_mgr_obj
+      // since another thread may have created the instance
+      MutexLocker ml(Management_lock);
+
+      // Check if another thread has created the management object.  We reload
+      // _memory_mgr_obj here because some other thread may have initialized
+      // it while we were executing the code before the lock.
+      //
+      // The lock has done an acquire, so the load can't float above it, but
+      // we need to do a load_acquire as above.
+      mgr_obj = (instanceOop)OrderAccess::load_ptr_acquire(&_memory_mgr_obj);
+      if (mgr_obj != NULL) {
+         return mgr_obj;
+      }
+
+      // Get the address of the object we created via call_special.
+      mgr_obj = mgr();
+
+      // Use store barrier to make sure the memory accesses associated
+      // with creating the management object are visible before publishing
+      // its address.  The unlock will publish the store to _memory_mgr_obj
+      // because it does a release first.
+      OrderAccess::release_store_ptr(&_memory_mgr_obj, mgr_obj);
+    }
+  }
+
+  return mgr_obj;
+}
+
+void MemoryManager::oops_do(OopClosure* f) {
+  f->do_oop((oop*) &_memory_mgr_obj);
+}
+
+GCStatInfo::GCStatInfo(int num_pools) {
+  // initialize the arrays for memory usage
+  _before_gc_usage_array = (MemoryUsage*) NEW_C_HEAP_ARRAY(MemoryUsage, num_pools);
+  _after_gc_usage_array  = (MemoryUsage*) NEW_C_HEAP_ARRAY(MemoryUsage, num_pools);
+  size_t len = num_pools * sizeof(MemoryUsage);
+  memset(_before_gc_usage_array, 0, len);
+  memset(_after_gc_usage_array, 0, len);
+  _usage_array_size = num_pools;
+}
+
+GCStatInfo::~GCStatInfo() {
+  FREE_C_HEAP_ARRAY(MemoryUsage*, _before_gc_usage_array);
+  FREE_C_HEAP_ARRAY(MemoryUsage*, _after_gc_usage_array);
+}
+
+void GCStatInfo::copy_stat(GCStatInfo* stat) {
+  set_index(stat->gc_index());
+  set_start_time(stat->start_time());
+  set_end_time(stat->end_time());
+  assert(_usage_array_size == stat->usage_array_size(), "Must have same array size");
+  for (int i = 0; i < _usage_array_size; i++) {
+    set_before_gc_usage(i, stat->before_gc_usage_for_pool(i));
+    set_after_gc_usage(i, stat->after_gc_usage_for_pool(i));
+  }
+}
+
+void GCStatInfo::set_gc_usage(int pool_index, MemoryUsage usage, bool before_gc) {
+  MemoryUsage* gc_usage_array;
+  if (before_gc) {
+    gc_usage_array = _before_gc_usage_array;
+  } else {
+    gc_usage_array = _after_gc_usage_array;
+  }
+  gc_usage_array[pool_index] = usage;
+}
+
+GCMemoryManager::GCMemoryManager() : MemoryManager() {
+  _num_collections = 0;
+  _last_gc_stat = NULL;
+  _num_gc_threads = 1;
+}
+
+GCMemoryManager::~GCMemoryManager() {
+  delete _last_gc_stat;
+}
+
+void GCMemoryManager::initialize_gc_stat_info() {
+  assert(MemoryService::num_memory_pools() > 0, "should have one or more memory pools");
+  _last_gc_stat = new GCStatInfo(MemoryService::num_memory_pools());
+}
+
+void GCMemoryManager::gc_begin() {
+  assert(_last_gc_stat != NULL, "Just checking");
+  _accumulated_timer.start();
+  _num_collections++;
+  _last_gc_stat->set_index(_num_collections);
+  _last_gc_stat->set_start_time(Management::timestamp());
+
+  // Keep memory usage of all memory pools
+  for (int i = 0; i < MemoryService::num_memory_pools(); i++) {
+    MemoryPool* pool = MemoryService::get_memory_pool(i);
+    MemoryUsage usage = pool->get_memory_usage();
+    _last_gc_stat->set_before_gc_usage(i, usage);
+    HS_DTRACE_PROBE8(hotspot, mem__pool__gc__begin,
+      name(), strlen(name()),
+      pool->name(), strlen(pool->name()),
+      usage.init_size(), usage.used(),
+      usage.committed(), usage.max_size());
+  }
+}
+
+void GCMemoryManager::gc_end() {
+  _accumulated_timer.stop();
+  _last_gc_stat->set_end_time(Management::timestamp());
+
+  int i;
+  // keep the last gc statistics for all memory pools
+  for (i = 0; i < MemoryService::num_memory_pools(); i++) {
+    MemoryPool* pool = MemoryService::get_memory_pool(i);
+    MemoryUsage usage = pool->get_memory_usage();
+
+    HS_DTRACE_PROBE8(hotspot, mem__pool__gc__end,
+      name(), strlen(name()),
+      pool->name(), strlen(pool->name()),
+      usage.init_size(), usage.used(),
+      usage.committed(), usage.max_size());
+
+    _last_gc_stat->set_after_gc_usage(i, usage);
+  }
+
+  // Set last collection usage of the memory pools managed by this collector
+  for (i = 0; i < num_memory_pools(); i++) {
+    MemoryPool* pool = get_memory_pool(i);
+    MemoryUsage usage = pool->get_memory_usage();
+
+    // Compare with GC usage threshold
+    pool->set_last_collection_usage(usage);
+    LowMemoryDetector::detect_after_gc_memory(pool);
+  }
+}