* src/vm/javaobjects.cpp (java_lang_management_MemoryUsage): Added new

[cacao.git] / src / native / vm / gnuclasspath / gnu_java_lang_management_VMClassLoadingMXBeanImpl.cpp

diff --git a/src/native/vm/gnuclasspath/gnu_java_lang_management_VMClassLoadingMXBeanImpl.cpp b/src/native/vm/gnuclasspath/gnu_java_lang_management_VMClassLoadingMXBeanImpl.cpp
index dc70fe7ad16dd37171a5498964e0d10449b18e55..edf439da894b15bf71518e41a7f46850f72738e5 100644 (file)
--- a/src/native/vm/gnuclasspath/gnu_java_lang_management_VMClassLoadingMXBeanImpl.cpp
+++ b/src/native/vm/gnuclasspath/gnu_java_lang_management_VMClassLoadingMXBeanImpl.cpp
@@ -29,20 +29,20 @@
 
 #include "mm/gc.hpp"
 
-#include "native/jni.h"
-#include "native/native.h"
+#include "native/jni.hpp"
+#include "native/native.hpp"
 
 #if defined(ENABLE_JNI_HEADERS)
 # include "native/vm/include/gnu_java_lang_management_VMClassLoadingMXBeanImpl.h"
 #endif
 
-#include "toolbox/logging.h"
+#include "toolbox/logging.hpp"
 
+#include "vm/classcache.hpp"
+#include "vm/options.h"
+#include "vm/utf8.h"
 #include "vm/vm.hpp"
 
-#include "vmcore/classcache.h"
-#include "vmcore/utf8.h"
-
 
 // Native functions are exported as C functions.
 extern "C" {
@@ -69,9 +69,12 @@ JNIEXPORT jint JNICALL Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_ge
  */
 JNIEXPORT jlong JNICALL Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_getUnloadedClassCount(JNIEnv *env, jclass clazz)
 {
-       log_println("Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_getUnloadedClassCount: IMPLEMENT ME!");
+       int32_t count;
 
-       return 0;
+       // XXX Fix this once we support class unloading!
+       count = 0;
+
+       return count;
 }
 
 
@@ -82,9 +85,7 @@ JNIEXPORT jlong JNICALL Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_g
  */
 JNIEXPORT jboolean JNICALL Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_isVerbose(JNIEnv *env, jclass clazz)
 {
-/*     return _Jv_jvm->Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_verbose; */
-#warning Move to C++
-       log_println("Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_isVerbose: MOVE TO C++!");
+       return opt_verboseclass;
 }
 
 
@@ -95,9 +96,7 @@ JNIEXPORT jboolean JNICALL Java_gnu_java_lang_management_VMClassLoadingMXBeanImp
  */
 JNIEXPORT void JNICALL Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_setVerbose(JNIEnv *env, jclass clazz, jboolean verbose)
 {
-/*     _Jv_jvm->Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_verbose = verbose; */
-#warning Move to C++
-       log_println("Java_gnu_java_lang_management_VMClassLoadingMXBeanImpl_setVerbose: MOVE TO C++!");
+       opt_verboseclass = verbose;
 }
 
 } // extern "C"
@@ -119,16 +118,12 @@ static JNINativeMethod methods[] = {
 
 *******************************************************************************/
 
-// FIXME
-extern "C" {
 void _Jv_gnu_java_lang_management_VMClassLoadingMXBeanImpl_init(void)
 {
-       utf *u;
-
-       u = utf_new_char("gnu/java/lang/management/VMClassLoadingMXBeanImpl");
+       utf* u = utf_new_char("gnu/java/lang/management/VMClassLoadingMXBeanImpl");
 
-       native_method_register(u, methods, NATIVE_METHODS_COUNT);
-}
+       NativeMethods& nm = VM::get_current()->get_nativemethods();
+       nm.register_methods(u, methods, NATIVE_METHODS_COUNT);
 }