comparison src/share/vm/interpreter/invocationCounter.cpp @ 10408:836a62f43af9

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents e1e681a5558e aeaca88565e6
children 88672775a26c
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
1 /* 1 /*
2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 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.
107 } 107 }
108 108
109 109
110 static address do_nothing(methodHandle method, TRAPS) { 110 static address do_nothing(methodHandle method, TRAPS) {
111 // dummy action for inactive invocation counters 111 // dummy action for inactive invocation counters
112 method->invocation_counter()->set_carry(); 112 MethodCounters* mcs = method->method_counters();
113 method->invocation_counter()->set_state(InvocationCounter::wait_for_nothing); 113 assert(mcs != NULL, "");
114 mcs->invocation_counter()->set_carry();
115 mcs->invocation_counter()->set_state(InvocationCounter::wait_for_nothing);
114 return NULL; 116 return NULL;
115 } 117 }
116 118
117 119
118 static address do_decay(methodHandle method, TRAPS) { 120 static address do_decay(methodHandle method, TRAPS) {
119 // decay invocation counters so compilation gets delayed 121 // decay invocation counters so compilation gets delayed
120 method->invocation_counter()->decay(); 122 MethodCounters* mcs = method->method_counters();
123 assert(mcs != NULL, "");
124 mcs->invocation_counter()->decay();
121 return NULL; 125 return NULL;
122 } 126 }
123 127
124 128
125 void InvocationCounter::def(State state, int init, Action action) { 129 void InvocationCounter::def(State state, int init, Action action) {