Tue, 14 Jan 2014 12:44:12 +0100
8030662: "assert(counter_changed) failed: failed dependencies, but counter didn't change" still fails
Summary: Erroneously removed call to SystemDictionary::notice_modification() from jvmti with fix for 8029383
Reviewed-by: iveresov, twisti, kvn
duke@435 | 1 | /* |
stefank@2314 | 2 | * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. |
duke@435 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | * |
duke@435 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | * published by the Free Software Foundation. |
duke@435 | 8 | * |
duke@435 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | * accompanied this code). |
duke@435 | 14 | * |
duke@435 | 15 | * You should have received a copy of the GNU General Public License version |
duke@435 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | * |
trims@1907 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
trims@1907 | 20 | * or visit www.oracle.com if you need additional information or have any |
trims@1907 | 21 | * questions. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
stefank@2314 | 25 | #ifndef SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP |
stefank@2314 | 26 | #define SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP |
stefank@2314 | 27 | |
stefank@2314 | 28 | #include "prims/jvmtiEventController.hpp" |
stefank@2314 | 29 | #include "prims/jvmtiImpl.hpp" |
stefank@2314 | 30 | #include "prims/jvmtiUtil.hpp" |
stefank@2314 | 31 | |
duke@435 | 32 | // these inline functions are in a separate file to break include cycles |
duke@435 | 33 | |
duke@435 | 34 | |
duke@435 | 35 | /////////////////////////////////////////////////////////////// |
duke@435 | 36 | // |
duke@435 | 37 | // JvmtiEventEnabled |
duke@435 | 38 | // |
duke@435 | 39 | |
duke@435 | 40 | inline jlong JvmtiEventEnabled::bit_for(jvmtiEvent event_type) { |
duke@435 | 41 | assert(JvmtiEventController::is_valid_event_type(event_type), "invalid event type"); |
duke@435 | 42 | return ((jlong)1) << (event_type - TOTAL_MIN_EVENT_TYPE_VAL); |
duke@435 | 43 | } |
duke@435 | 44 | |
duke@435 | 45 | inline jlong JvmtiEventEnabled::get_bits() { |
duke@435 | 46 | assert(_init_guard == JEE_INIT_GUARD, "enable bits uninitialized or corrupted"); |
duke@435 | 47 | return _enabled_bits; |
duke@435 | 48 | } |
duke@435 | 49 | |
duke@435 | 50 | inline void JvmtiEventEnabled::set_bits(jlong bits) { |
duke@435 | 51 | assert(_init_guard == JEE_INIT_GUARD, "enable bits uninitialized or corrupted on set"); |
duke@435 | 52 | _enabled_bits = bits; |
duke@435 | 53 | } |
duke@435 | 54 | |
duke@435 | 55 | inline bool JvmtiEventEnabled::is_enabled(jvmtiEvent event_type) { |
duke@435 | 56 | return (bit_for(event_type) & get_bits()) != 0; |
duke@435 | 57 | } |
duke@435 | 58 | |
duke@435 | 59 | |
duke@435 | 60 | /////////////////////////////////////////////////////////////// |
duke@435 | 61 | // |
duke@435 | 62 | // JvmtiEnvThreadEventEnable |
duke@435 | 63 | // |
duke@435 | 64 | |
duke@435 | 65 | inline bool JvmtiEnvThreadEventEnable::is_enabled(jvmtiEvent event_type) { |
duke@435 | 66 | assert(JvmtiUtil::event_threaded(event_type), "Only thread filtered events should be tested here"); |
duke@435 | 67 | return _event_enabled.is_enabled(event_type); |
duke@435 | 68 | } |
duke@435 | 69 | |
duke@435 | 70 | inline void JvmtiEnvThreadEventEnable::set_user_enabled(jvmtiEvent event_type, bool enabled) { |
duke@435 | 71 | _event_user_enabled.set_enabled(event_type, enabled); |
duke@435 | 72 | } |
duke@435 | 73 | |
duke@435 | 74 | |
duke@435 | 75 | /////////////////////////////////////////////////////////////// |
duke@435 | 76 | // |
duke@435 | 77 | // JvmtiThreadEventEnable |
duke@435 | 78 | // |
duke@435 | 79 | |
duke@435 | 80 | inline bool JvmtiThreadEventEnable::is_enabled(jvmtiEvent event_type) { |
duke@435 | 81 | assert(JvmtiUtil::event_threaded(event_type), "Only thread filtered events should be tested here"); |
duke@435 | 82 | return _event_enabled.is_enabled(event_type); |
duke@435 | 83 | } |
duke@435 | 84 | |
duke@435 | 85 | |
duke@435 | 86 | /////////////////////////////////////////////////////////////// |
duke@435 | 87 | // |
duke@435 | 88 | // JvmtiEnvEventEnable |
duke@435 | 89 | // |
duke@435 | 90 | |
duke@435 | 91 | inline bool JvmtiEnvEventEnable::is_enabled(jvmtiEvent event_type) { |
duke@435 | 92 | assert(!JvmtiUtil::event_threaded(event_type), "Only non thread filtered events should be tested here"); |
duke@435 | 93 | return _event_enabled.is_enabled(event_type); |
duke@435 | 94 | } |
duke@435 | 95 | |
duke@435 | 96 | inline void JvmtiEnvEventEnable::set_user_enabled(jvmtiEvent event_type, bool enabled) { |
duke@435 | 97 | _event_user_enabled.set_enabled(event_type, enabled); |
duke@435 | 98 | } |
duke@435 | 99 | |
duke@435 | 100 | |
duke@435 | 101 | /////////////////////////////////////////////////////////////// |
duke@435 | 102 | // |
duke@435 | 103 | // JvmtiEventController |
duke@435 | 104 | // |
duke@435 | 105 | |
duke@435 | 106 | inline bool JvmtiEventController::is_enabled(jvmtiEvent event_type) { |
duke@435 | 107 | return _universal_global_event_enabled.is_enabled(event_type); |
duke@435 | 108 | } |
stefank@2314 | 109 | |
stefank@2314 | 110 | #endif // SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP |