1.1 --- a/src/share/vm/runtime/simpleThresholdPolicy.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/runtime/simpleThresholdPolicy.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -26,7 +26,7 @@
1.11 #define SHARE_VM_RUNTIME_SIMPLETHRESHOLDPOLICY_HPP
1.12
1.13 #include "code/nmethod.hpp"
1.14 -#include "oops/methodDataOop.hpp"
1.15 +#include "oops/methodData.hpp"
1.16 #include "runtime/compilationPolicy.hpp"
1.17 #include "utilities/globalDefinitions.hpp"
1.18
1.19 @@ -38,8 +38,8 @@
1.20
1.21 // Check if the counter is big enough and set carry (effectively infinity).
1.22 inline void set_carry_if_necessary(InvocationCounter *counter);
1.23 - // Set carry flags in the counters (in methodOop and MDO).
1.24 - inline void handle_counter_overflow(methodOop method);
1.25 + // Set carry flags in the counters (in Method* and MDO).
1.26 + inline void handle_counter_overflow(Method* method);
1.27 // Call and loop predicates determine whether a transition to a higher compilation
1.28 // level should be performed (pointers to predicate functions are passed to common_TF().
1.29 // Predicates also take compiler load into account.
1.30 @@ -47,14 +47,14 @@
1.31 bool call_predicate(int i, int b, CompLevel cur_level);
1.32 bool loop_predicate(int i, int b, CompLevel cur_level);
1.33 // Common transition function. Given a predicate determines if a method should transition to another level.
1.34 - CompLevel common(Predicate p, methodOop method, CompLevel cur_level);
1.35 + CompLevel common(Predicate p, Method* method, CompLevel cur_level);
1.36 // Transition functions.
1.37 // call_event determines if a method should be compiled at a different
1.38 // level with a regular invocation entry.
1.39 - CompLevel call_event(methodOop method, CompLevel cur_level);
1.40 + CompLevel call_event(Method* method, CompLevel cur_level);
1.41 // loop_event checks if a method should be OSR compiled at a different
1.42 // level.
1.43 - CompLevel loop_event(methodOop method, CompLevel cur_level);
1.44 + CompLevel loop_event(Method* method, CompLevel cur_level);
1.45 void print_counters(const char* prefix, methodHandle mh);
1.46 protected:
1.47 int c1_count() const { return _c1_count; }
1.48 @@ -72,7 +72,7 @@
1.49 virtual void submit_compile(methodHandle mh, int bci, CompLevel level, JavaThread* thread);
1.50 // Simple methods are as good being compiled with C1 as C2.
1.51 // This function tells if it's such a function.
1.52 - inline bool is_trivial(methodOop method);
1.53 + inline bool is_trivial(Method* method);
1.54
1.55 // Predicate helpers are used by .*_predicate() methods as well as others.
1.56 // They check the given counter values, multiplied by the scale against the thresholds.
1.57 @@ -80,7 +80,7 @@
1.58 template<CompLevel level> static inline bool loop_predicate_helper(int i, int b, double scale);
1.59
1.60 // Get a compilation level for a given method.
1.61 - static CompLevel comp_level(methodOop method) {
1.62 + static CompLevel comp_level(Method* method) {
1.63 nmethod *nm = method->code();
1.64 if (nm != NULL && nm->is_in_use()) {
1.65 return (CompLevel)nm->comp_level();
1.66 @@ -100,15 +100,15 @@
1.67 }
1.68 virtual CompLevel initial_compile_level() { return MIN2((CompLevel)TieredStopAtLevel, CompLevel_initial_compile); }
1.69 virtual void do_safepoint_work() { }
1.70 - virtual void delay_compilation(methodOop method) { }
1.71 - virtual void disable_compilation(methodOop method) { }
1.72 + virtual void delay_compilation(Method* method) { }
1.73 + virtual void disable_compilation(Method* method) { }
1.74 virtual void reprofile(ScopeDesc* trap_scope, bool is_osr);
1.75 virtual nmethod* event(methodHandle method, methodHandle inlinee,
1.76 int branch_bci, int bci, CompLevel comp_level, nmethod* nm, JavaThread* thread);
1.77 // Select task is called by CompileBroker. We should return a task or NULL.
1.78 virtual CompileTask* select_task(CompileQueue* compile_queue);
1.79 // Tell the runtime if we think a given method is adequately profiled.
1.80 - virtual bool is_mature(methodOop method);
1.81 + virtual bool is_mature(Method* method);
1.82 // Initialize: set compiler thread count
1.83 virtual void initialize();
1.84 virtual bool should_not_inline(ciEnv* env, ciMethod* callee) {
