equal
deleted
inserted
replaced
35 #include "oops/symbolOop.hpp" |
35 #include "oops/symbolOop.hpp" |
36 #include "prims/jvm_misc.hpp" |
36 #include "prims/jvm_misc.hpp" |
37 #include "prims/nativeLookup.hpp" |
37 #include "prims/nativeLookup.hpp" |
38 #include "runtime/arguments.hpp" |
38 #include "runtime/arguments.hpp" |
39 #include "runtime/handles.inline.hpp" |
39 #include "runtime/handles.inline.hpp" |
40 #include "runtime/hpi.hpp" |
|
41 #include "runtime/javaCalls.hpp" |
40 #include "runtime/javaCalls.hpp" |
42 #include "runtime/sharedRuntime.hpp" |
41 #include "runtime/sharedRuntime.hpp" |
43 #include "runtime/signature.hpp" |
42 #include "runtime/signature.hpp" |
44 #ifdef TARGET_OS_FAMILY_linux |
43 #ifdef TARGET_OS_FAMILY_linux |
45 # include "os_linux.inline.hpp" |
44 # include "os_linux.inline.hpp" |
152 Handle loader(THREAD, |
151 Handle loader(THREAD, |
153 instanceKlass::cast(method->method_holder())->class_loader()); |
152 instanceKlass::cast(method->method_holder())->class_loader()); |
154 if (loader.is_null()) { |
153 if (loader.is_null()) { |
155 entry = lookup_special_native(jni_name); |
154 entry = lookup_special_native(jni_name); |
156 if (entry == NULL) { |
155 if (entry == NULL) { |
157 entry = (address) hpi::dll_lookup(os::native_java_library(), jni_name); |
156 entry = (address) os::dll_lookup(os::native_java_library(), jni_name); |
158 } |
157 } |
159 if (entry != NULL) { |
158 if (entry != NULL) { |
160 in_base_library = true; |
159 in_base_library = true; |
161 return entry; |
160 return entry; |
162 } |
161 } |
179 |
178 |
180 if (entry == NULL) { |
179 if (entry == NULL) { |
181 // findNative didn't find it, if there are any agent libraries look in them |
180 // findNative didn't find it, if there are any agent libraries look in them |
182 AgentLibrary* agent; |
181 AgentLibrary* agent; |
183 for (agent = Arguments::agents(); agent != NULL; agent = agent->next()) { |
182 for (agent = Arguments::agents(); agent != NULL; agent = agent->next()) { |
184 entry = (address) hpi::dll_lookup(agent->os_lib(), jni_name); |
183 entry = (address) os::dll_lookup(agent->os_lib(), jni_name); |
185 if (entry != NULL) { |
184 if (entry != NULL) { |
186 return entry; |
185 return entry; |
187 } |
186 } |
188 } |
187 } |
189 } |
188 } |