< prev index next >

src/os/posix/vm/os_posix.cpp

Print this page
rev 11647 : 8161258: Simplify including platform files.
Summary: Include patform files with macros cpu_header() etc. Do various cleanups of macro usages. Remove _64/_32 from adlc generated files and platform .hpp files. Merge stubRoutines_x86*.hpp. Remove empty mutex_<os>* files.
Reviewed-by: dholmes, coleenp, kbarrett

*** 26,35 **** --- 26,36 ---- #include "prims/jvm.h" #include "semaphore_posix.hpp" #include "runtime/frame.inline.hpp" #include "runtime/interfaceSupport.hpp" #include "runtime/os.hpp" + #include "utilities/macros.hpp" #include "utilities/vmError.hpp" #include <signal.h> #include <unistd.h> #include <sys/resource.h>
*** 212,222 **** getrlimit(RLIMIT_CORE, &rlim); if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); else st->print("%luk", rlim.rlim_cur >> 10); // Isn't there on solaris ! #if !defined(TARGET_OS_FAMILY_solaris) && !defined(TARGET_OS_FAMILY_aix) st->print(", NPROC "); getrlimit(RLIMIT_NPROC, &rlim); if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); else st->print("%lu", rlim.rlim_cur); #endif --- 213,223 ---- getrlimit(RLIMIT_CORE, &rlim); if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); else st->print("%luk", rlim.rlim_cur >> 10); // Isn't there on solaris ! #if !defined(SOLARIS) && !defined(AIX) st->print(", NPROC "); getrlimit(RLIMIT_NPROC, &rlim); if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); else st->print("%lu", rlim.rlim_cur); #endif
*** 1060,1091 **** int os::Posix::unblock_thread_signal_mask(const sigset_t *set) { return pthread_sigmask(SIG_UNBLOCK, set, NULL); } address os::Posix::ucontext_get_pc(const ucontext_t* ctx) { ! #ifdef TARGET_OS_FAMILY_linux ! return Linux::ucontext_get_pc(ctx); ! #elif defined(TARGET_OS_FAMILY_solaris) ! return Solaris::ucontext_get_pc(ctx); ! #elif defined(TARGET_OS_FAMILY_aix) return Aix::ucontext_get_pc(ctx); ! #elif defined(TARGET_OS_FAMILY_bsd) return Bsd::ucontext_get_pc(ctx); #else VMError::report_and_die("unimplemented ucontext_get_pc"); #endif } void os::Posix::ucontext_set_pc(ucontext_t* ctx, address pc) { ! #ifdef TARGET_OS_FAMILY_linux ! Linux::ucontext_set_pc(ctx, pc); ! #elif defined(TARGET_OS_FAMILY_solaris) ! Solaris::ucontext_set_pc(ctx, pc); ! #elif defined(TARGET_OS_FAMILY_aix) Aix::ucontext_set_pc(ctx, pc); ! #elif defined(TARGET_OS_FAMILY_bsd) Bsd::ucontext_set_pc(ctx, pc); #else VMError::report_and_die("unimplemented ucontext_get_pc"); #endif } --- 1061,1092 ---- int os::Posix::unblock_thread_signal_mask(const sigset_t *set) { return pthread_sigmask(SIG_UNBLOCK, set, NULL); } address os::Posix::ucontext_get_pc(const ucontext_t* ctx) { ! #if defined(AIX) return Aix::ucontext_get_pc(ctx); ! #elif defined(BSD) return Bsd::ucontext_get_pc(ctx); + #elif defined(LINUX) + return Linux::ucontext_get_pc(ctx); + #elif defined(SOLARIS) + return Solaris::ucontext_get_pc(ctx); #else VMError::report_and_die("unimplemented ucontext_get_pc"); #endif } void os::Posix::ucontext_set_pc(ucontext_t* ctx, address pc) { ! #if defined(AIX) Aix::ucontext_set_pc(ctx, pc); ! #elif defined(BSD) Bsd::ucontext_set_pc(ctx, pc); + #elif defined(LINUX) + Linux::ucontext_set_pc(ctx, pc); + #elif defined(SOLARIS) + Solaris::ucontext_set_pc(ctx, pc); #else VMError::report_and_die("unimplemented ucontext_get_pc"); #endif }
< prev index next >