2006-07-02 Andrew John Hughes <gnu_andrew@member.fsf.org>generics-merge-20060702

	* NEWS:
	Updated to include VMCompilationMXBeanImpl.
	* doc/vmintegration.texinfo:
	Likewise, along with update to VMMemoryMXBeanImpl
	as below.
	* examples/gnu/classpath/examples/management/TestCompilation.java,
	* gnu/java/lang/management/CompilationMXBeanImpl.java,
	* java/lang/management/CompilationMXBeanImpl.java:
	New files.
	* java/lang/management/ManagementFactory.java:
	(getCompilationMXBean()): Implemented.
	* vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java:
	New file.
	* vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java:
	(getHeapMemoryUsage()): Added default implementation.

2 files changed, 75 insertions, 2 deletions

diff --git a/vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java b/vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java
new file mode 100644
index 000000000..b9b5bbcef
--- /dev/null
+++ b/vm/reference/gnu/java/lang/management/VMCompilationMXBeanImpl.java
@@ -0,0 +1,66 @@
+/* VMCompilationMXBeanImpl.java - VM implementation of a compilation bean
+   Copyright (C) 2006 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.java.lang.management;
+
+/**
+ * Provides access to information about the JIT 
+ * compiler of the virtual machine, if one exists.
+ * Instances of this bean are obtained by calling
+ * {@link ManagementFactory#getCompilationMXBean()},
+ * if this is the case.
+ *
+ * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
+ * @since 1.5
+ */
+final class VMCompilationMXBeanImpl
+{
+
+  /**
+   * Returns the number of milliseconds the JIT
+   * compiler has spent compiling Java bytecode
+   * to native machine code.  This is only called
+   * if a JIT compiler exists and the
+   * gnu.java.lang.management.CompilationTimeSupport
+   * property has been set.
+   *
+   * @return the number of milliseconds spent
+   *         compiling.
+   */
+  static native long getTotalCompilationTime();
+
+}
diff --git a/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java b/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
index 7e4f2fbcc..193e33535 100644
--- a/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
+++ b/vm/reference/gnu/java/lang/management/VMMemoryMXBeanImpl.java
@@ -54,12 +54,19 @@ final class VMMemoryMXBeanImpl
   /**
    * Returns an instance of {@link java.lang.management.MemoryUsage}
    * with appropriate initial, used, committed and maximum values
-   * for the heap.
+   * for the heap.  By default, this uses the methods of
+   * {@link java.lang.Runtime} to provide some of the values.
    *
    * @return an {@link java.lang.management.MemoryUsage} instance
    *         for the heap.
    */
-  static native MemoryUsage getHeapMemoryUsage();
+  static MemoryUsage getHeapMemoryUsage()
+  {
+    Runtime runtime = Runtime.getRuntime();
+    long totalMem = runtime.totalMemory();
+    return new MemoryUsage(-1, totalMem - runtime.freeMemory(),
+			   totalMem, runtime.maxMemory());
+  }
 
   /**
    * Returns an instance of {@link java.lang.management.MemoryUsage}