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) 2006, 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_JVMTITHREADSTATE_INLINE_HPP |
stefank@2314 | 26 | #define SHARE_VM_PRIMS_JVMTITHREADSTATE_INLINE_HPP |
stefank@2314 | 27 | |
stefank@2314 | 28 | #include "prims/jvmtiEnvThreadState.hpp" |
stefank@2314 | 29 | #include "prims/jvmtiThreadState.hpp" |
stefank@2314 | 30 | |
duke@435 | 31 | // JvmtiEnvThreadStateIterator implementation |
duke@435 | 32 | |
duke@435 | 33 | inline JvmtiEnvThreadStateIterator::JvmtiEnvThreadStateIterator(JvmtiThreadState* thread_state) { |
duke@435 | 34 | state = thread_state; |
duke@435 | 35 | Thread::current()->entering_jvmti_env_iteration(); |
duke@435 | 36 | } |
duke@435 | 37 | |
duke@435 | 38 | inline JvmtiEnvThreadStateIterator::~JvmtiEnvThreadStateIterator() { |
duke@435 | 39 | Thread::current()->leaving_jvmti_env_iteration(); |
duke@435 | 40 | } |
duke@435 | 41 | |
duke@435 | 42 | inline JvmtiEnvThreadState* JvmtiEnvThreadStateIterator::first() { |
duke@435 | 43 | return state->head_env_thread_state(); |
duke@435 | 44 | } |
duke@435 | 45 | |
duke@435 | 46 | inline JvmtiEnvThreadState* JvmtiEnvThreadStateIterator::next(JvmtiEnvThreadState* ets) { |
duke@435 | 47 | return ets->next(); |
duke@435 | 48 | } |
duke@435 | 49 | |
duke@435 | 50 | // JvmtiThreadState implementation |
duke@435 | 51 | |
duke@435 | 52 | JvmtiEnvThreadState* JvmtiThreadState::env_thread_state(JvmtiEnvBase *env) { |
duke@435 | 53 | JvmtiEnvThreadStateIterator it(this); |
duke@435 | 54 | for (JvmtiEnvThreadState* ets = it.first(); ets != NULL; ets = it.next(ets)) { |
duke@435 | 55 | if ((JvmtiEnvBase*)(ets->get_env()) == env) { |
duke@435 | 56 | return ets; |
duke@435 | 57 | } |
duke@435 | 58 | } |
duke@435 | 59 | return NULL; |
duke@435 | 60 | } |
duke@435 | 61 | |
duke@435 | 62 | JvmtiEnvThreadState* JvmtiThreadState::head_env_thread_state() { |
duke@435 | 63 | return _head_env_thread_state; |
duke@435 | 64 | } |
duke@435 | 65 | |
duke@435 | 66 | void JvmtiThreadState::set_head_env_thread_state(JvmtiEnvThreadState* ets) { |
duke@435 | 67 | _head_env_thread_state = ets; |
duke@435 | 68 | } |
stefank@2314 | 69 | |
stefank@2314 | 70 | #endif // SHARE_VM_PRIMS_JVMTITHREADSTATE_INLINE_HPP |