comparison src/share/vm/prims/jvmtiEventController.cpp @ 14726:92aa6797d639

Backed out merge changeset: b51e29501f30 Backed out merge revision to its first parent (8f483e200405)
author Doug Simon <doug.simon@oracle.com>
date Mon, 24 Mar 2014 21:30:43 +0100
parents 0d8d78c0329a
children
comparison
equal deleted inserted replaced
14719:0bdd0d157040 14726:92aa6797d639
1 /* 1 /*
2 * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
987 987
988 988
989 989
990 void 990 void
991 JvmtiEventController::set_frame_pop(JvmtiEnvThreadState *ets, JvmtiFramePop fpop) { 991 JvmtiEventController::set_frame_pop(JvmtiEnvThreadState *ets, JvmtiFramePop fpop) {
992 MutexLockerEx mu(SafepointSynchronize::is_at_safepoint() ? NULL : JvmtiThreadState_lock); 992 MutexLocker mu(JvmtiThreadState_lock);
993 JvmtiEventControllerPrivate::set_frame_pop(ets, fpop); 993 JvmtiEventControllerPrivate::set_frame_pop(ets, fpop);
994 } 994 }
995 995
996 996
997 void 997 void
998 JvmtiEventController::clear_frame_pop(JvmtiEnvThreadState *ets, JvmtiFramePop fpop) { 998 JvmtiEventController::clear_frame_pop(JvmtiEnvThreadState *ets, JvmtiFramePop fpop) {
999 MutexLockerEx mu(SafepointSynchronize::is_at_safepoint() ? NULL : JvmtiThreadState_lock); 999 MutexLocker mu(JvmtiThreadState_lock);
1000 JvmtiEventControllerPrivate::clear_frame_pop(ets, fpop); 1000 JvmtiEventControllerPrivate::clear_frame_pop(ets, fpop);
1001 } 1001 }
1002 1002
1003 1003
1004 void 1004 void
1005 JvmtiEventController::clear_to_frame_pop(JvmtiEnvThreadState *ets, JvmtiFramePop fpop) { 1005 JvmtiEventController::clear_to_frame_pop(JvmtiEnvThreadState *ets, JvmtiFramePop fpop) {
1006 MutexLockerEx mu(SafepointSynchronize::is_at_safepoint() ? NULL : JvmtiThreadState_lock); 1006 MutexLocker mu(JvmtiThreadState_lock);
1007 JvmtiEventControllerPrivate::clear_to_frame_pop(ets, fpop); 1007 JvmtiEventControllerPrivate::clear_to_frame_pop(ets, fpop);
1008 } 1008 }
1009 1009
1010 void 1010 void
1011 JvmtiEventController::change_field_watch(jvmtiEvent event_type, bool added) { 1011 JvmtiEventController::change_field_watch(jvmtiEvent event_type, bool added) {