comparison src/share/vm/prims/jvmtiImpl.cpp @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents 291ffc492eb6 8b46b0196eb0
children b9a918201d47
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
1 /* 1 /*
2 * Copyright (c) 2003, 2012, 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.
903 } 903 }
904 tty->print_cr("]"); 904 tty->print_cr("]");
905 #endif 905 #endif
906 } 906 }
907 907
908 #ifndef KERNEL
909
910 JvmtiDeferredEvent JvmtiDeferredEvent::compiled_method_load_event( 908 JvmtiDeferredEvent JvmtiDeferredEvent::compiled_method_load_event(
911 nmethod* nm) { 909 nmethod* nm) {
912 JvmtiDeferredEvent event = JvmtiDeferredEvent(TYPE_COMPILED_METHOD_LOAD); 910 JvmtiDeferredEvent event = JvmtiDeferredEvent(TYPE_COMPILED_METHOD_LOAD);
913 event._event_data.compiled_method_load = nm; 911 event._event_data.compiled_method_load = nm;
914 // Keep the nmethod alive until the ServiceThread can process 912 // Keep the nmethod alive until the ServiceThread can process
1096 } 1094 }
1097 _queue_tail = new_tail; 1095 _queue_tail = new_tail;
1098 } 1096 }
1099 } 1097 }
1100 } 1098 }
1101
1102 #endif // ndef KERNEL