1.1 --- a/src/share/vm/classfile/classLoader.cpp Tue Nov 23 13:22:55 2010 -0800
1.2 +++ b/src/share/vm/classfile/classLoader.cpp Wed Dec 01 18:26:32 2010 -0500
1.3 @@ -48,7 +48,6 @@
1.4 #include "runtime/fprofiler.hpp"
1.5 #include "runtime/handles.hpp"
1.6 #include "runtime/handles.inline.hpp"
1.7 -#include "runtime/hpi.hpp"
1.8 #include "runtime/init.hpp"
1.9 #include "runtime/interfaceSupport.hpp"
1.10 #include "runtime/java.hpp"
1.11 @@ -61,15 +60,12 @@
1.12 #include "utilities/hashtable.hpp"
1.13 #include "utilities/hashtable.inline.hpp"
1.14 #ifdef TARGET_OS_FAMILY_linux
1.15 -# include "hpi_linux.hpp"
1.16 # include "os_linux.inline.hpp"
1.17 #endif
1.18 #ifdef TARGET_OS_FAMILY_solaris
1.19 -# include "hpi_solaris.hpp"
1.20 # include "os_solaris.inline.hpp"
1.21 #endif
1.22 #ifdef TARGET_OS_FAMILY_windows
1.23 -# include "hpi_windows.hpp"
1.24 # include "os_windows.inline.hpp"
1.25 #endif
1.26
1.27 @@ -208,13 +204,13 @@
1.28 struct stat st;
1.29 if (os::stat(path, &st) == 0) {
1.30 // found file, open it
1.31 - int file_handle = hpi::open(path, 0, 0);
1.32 + int file_handle = os::open(path, 0, 0);
1.33 if (file_handle != -1) {
1.34 // read contents into resource array
1.35 u1* buffer = NEW_RESOURCE_ARRAY(u1, st.st_size);
1.36 size_t num_read = os::read(file_handle, (char*) buffer, st.st_size);
1.37 // close file
1.38 - hpi::close(file_handle);
1.39 + os::close(file_handle);
1.40 // construct ClassFileStream
1.41 if (num_read == (size_t)st.st_size) {
1.42 if (UsePerfData) {
1.43 @@ -607,18 +603,18 @@
1.44 // Load zip library
1.45 char path[JVM_MAXPATHLEN];
1.46 char ebuf[1024];
1.47 - hpi::dll_build_name(path, sizeof(path), Arguments::get_dll_dir(), "zip");
1.48 - void* handle = hpi::dll_load(path, ebuf, sizeof ebuf);
1.49 + os::dll_build_name(path, sizeof(path), Arguments::get_dll_dir(), "zip");
1.50 + void* handle = os::dll_load(path, ebuf, sizeof ebuf);
1.51 if (handle == NULL) {
1.52 vm_exit_during_initialization("Unable to load ZIP library", path);
1.53 }
1.54 // Lookup zip entry points
1.55 - ZipOpen = CAST_TO_FN_PTR(ZipOpen_t, hpi::dll_lookup(handle, "ZIP_Open"));
1.56 - ZipClose = CAST_TO_FN_PTR(ZipClose_t, hpi::dll_lookup(handle, "ZIP_Close"));
1.57 - FindEntry = CAST_TO_FN_PTR(FindEntry_t, hpi::dll_lookup(handle, "ZIP_FindEntry"));
1.58 - ReadEntry = CAST_TO_FN_PTR(ReadEntry_t, hpi::dll_lookup(handle, "ZIP_ReadEntry"));
1.59 - ReadMappedEntry = CAST_TO_FN_PTR(ReadMappedEntry_t, hpi::dll_lookup(handle, "ZIP_ReadMappedEntry"));
1.60 - GetNextEntry = CAST_TO_FN_PTR(GetNextEntry_t, hpi::dll_lookup(handle, "ZIP_GetNextEntry"));
1.61 + ZipOpen = CAST_TO_FN_PTR(ZipOpen_t, os::dll_lookup(handle, "ZIP_Open"));
1.62 + ZipClose = CAST_TO_FN_PTR(ZipClose_t, os::dll_lookup(handle, "ZIP_Close"));
1.63 + FindEntry = CAST_TO_FN_PTR(FindEntry_t, os::dll_lookup(handle, "ZIP_FindEntry"));
1.64 + ReadEntry = CAST_TO_FN_PTR(ReadEntry_t, os::dll_lookup(handle, "ZIP_ReadEntry"));
1.65 + ReadMappedEntry = CAST_TO_FN_PTR(ReadMappedEntry_t, os::dll_lookup(handle, "ZIP_ReadMappedEntry"));
1.66 + GetNextEntry = CAST_TO_FN_PTR(GetNextEntry_t, os::dll_lookup(handle, "ZIP_GetNextEntry"));
1.67
1.68 // ZIP_Close is not exported on Windows in JDK5.0 so don't abort if ZIP_Close is NULL
1.69 if (ZipOpen == NULL || FindEntry == NULL || ReadEntry == NULL || GetNextEntry == NULL) {
1.70 @@ -627,7 +623,7 @@
1.71
1.72 // Lookup canonicalize entry in libjava.dll
1.73 void *javalib_handle = os::native_java_library();
1.74 - CanonicalizeEntry = CAST_TO_FN_PTR(canonicalize_fn_t, hpi::dll_lookup(javalib_handle, "Canonicalize"));
1.75 + CanonicalizeEntry = CAST_TO_FN_PTR(canonicalize_fn_t, os::dll_lookup(javalib_handle, "Canonicalize"));
1.76 // This lookup only works on 1.3. Do not check for non-null here
1.77 }
1.78
1.79 @@ -1076,7 +1072,7 @@
1.80 assert(orig != NULL && out != NULL && len > 0, "bad arguments");
1.81 if (CanonicalizeEntry != NULL) {
1.82 JNIEnv* env = JavaThread::current()->jni_environment();
1.83 - if ((CanonicalizeEntry)(env, hpi::native_path(orig), out, len) < 0) {
1.84 + if ((CanonicalizeEntry)(env, os::native_path(orig), out, len) < 0) {
1.85 return false;
1.86 }
1.87 } else {
