1.1 --- a/src/share/vm/services/management.hpp Fri Aug 31 16:39:35 2012 -0700 1.2 +++ b/src/share/vm/services/management.hpp Sat Sep 01 13:25:18 2012 -0400 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -42,17 +42,17 @@ 1.11 static TimeStamp _stamp; // Timestamp since vm init done time 1.12 1.13 // Management klasses 1.14 - static klassOop _sensor_klass; 1.15 - static klassOop _threadInfo_klass; 1.16 - static klassOop _memoryUsage_klass; 1.17 - static klassOop _memoryPoolMXBean_klass; 1.18 - static klassOop _memoryManagerMXBean_klass; 1.19 - static klassOop _garbageCollectorMXBean_klass; 1.20 - static klassOop _managementFactory_klass; 1.21 - static klassOop _garbageCollectorImpl_klass; 1.22 - static klassOop _gcInfo_klass; 1.23 + static Klass* _sensor_klass; 1.24 + static Klass* _threadInfo_klass; 1.25 + static Klass* _memoryUsage_klass; 1.26 + static Klass* _memoryPoolMXBean_klass; 1.27 + static Klass* _memoryManagerMXBean_klass; 1.28 + static Klass* _garbageCollectorMXBean_klass; 1.29 + static Klass* _managementFactory_klass; 1.30 + static Klass* _garbageCollectorImpl_klass; 1.31 + static Klass* _gcInfo_klass; 1.32 1.33 - static klassOop load_and_initialize_klass(Symbol* sh, TRAPS); 1.34 + static Klass* load_and_initialize_klass(Symbol* sh, TRAPS); 1.35 1.36 public: 1.37 static void init(); 1.38 @@ -83,16 +83,16 @@ 1.39 return _vm_init_done_time->get_value(); 1.40 } 1.41 1.42 - // methods to return a klassOop. 1.43 - static klassOop java_lang_management_ThreadInfo_klass(TRAPS); 1.44 - static klassOop java_lang_management_MemoryUsage_klass(TRAPS); 1.45 - static klassOop java_lang_management_MemoryPoolMXBean_klass(TRAPS); 1.46 - static klassOop java_lang_management_MemoryManagerMXBean_klass(TRAPS); 1.47 - static klassOop java_lang_management_GarbageCollectorMXBean_klass(TRAPS); 1.48 - static klassOop sun_management_Sensor_klass(TRAPS); 1.49 - static klassOop sun_management_ManagementFactory_klass(TRAPS); 1.50 - static klassOop sun_management_GarbageCollectorImpl_klass(TRAPS); 1.51 - static klassOop com_sun_management_GcInfo_klass(TRAPS); 1.52 + // methods to return a Klass*. 1.53 + static Klass* java_lang_management_ThreadInfo_klass(TRAPS); 1.54 + static Klass* java_lang_management_MemoryUsage_klass(TRAPS); 1.55 + static Klass* java_lang_management_MemoryPoolMXBean_klass(TRAPS); 1.56 + static Klass* java_lang_management_MemoryManagerMXBean_klass(TRAPS); 1.57 + static Klass* java_lang_management_GarbageCollectorMXBean_klass(TRAPS); 1.58 + static Klass* sun_management_Sensor_klass(TRAPS); 1.59 + static Klass* sun_management_ManagementFactory_klass(TRAPS); 1.60 + static Klass* sun_management_GarbageCollectorImpl_klass(TRAPS); 1.61 + static Klass* com_sun_management_GcInfo_klass(TRAPS); 1.62 1.63 static instanceOop create_thread_info_instance(ThreadSnapshot* snapshot, TRAPS); 1.64 static instanceOop create_thread_info_instance(ThreadSnapshot* snapshot, objArrayHandle monitors_array, typeArrayHandle depths_array, objArrayHandle synchronizers_array, TRAPS);