Mercurial > hg > graal-compiler
diff src/share/vm/runtime/os.hpp @ 14909:4ca6dc0799b6
Backout jdk9 merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 01 Apr 2014 13:57:07 +0200 |
parents | d8041d695d19 |
children | ad431bf0de07 |
line wrap: on
line diff
--- a/src/share/vm/runtime/os.hpp Tue Apr 01 14:09:03 2014 +0200 +++ b/src/share/vm/runtime/os.hpp Tue Apr 01 13:57:07 2014 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,10 +41,6 @@ #ifdef TARGET_OS_FAMILY_windows # include "jvm_windows.h" #endif -#ifdef TARGET_OS_FAMILY_aix -# include "jvm_aix.h" -# include <setjmp.h> -#endif #ifdef TARGET_OS_FAMILY_bsd # include "jvm_bsd.h" # include <setjmp.h> @@ -165,7 +161,6 @@ static jlong javaTimeNanos(); static void javaTimeNanos_info(jvmtiTimerInfo *info_ptr); static void run_periodic_checks(); - static bool supports_monotonic_clock(); // Returns the elapsed time in seconds since the vm started. @@ -400,7 +395,7 @@ // was equal. However, some platforms mask off faulting addresses // to the page size, so now we just check that the address is // within the page. This makes the thread argument unnecessary, - // but we retain the NULL check to preserve existing behavior. + // but we retain the NULL check to preserve existing behaviour. if (thread == NULL) return false; address page = (address) _mem_serialize_page; return addr >= page && addr < (page + os::vm_page_size()); @@ -435,10 +430,7 @@ static intx current_thread_id(); static int current_process_id(); static int sleep(Thread* thread, jlong ms, bool interruptable); - // Short standalone OS sleep suitable for slow path spin loop. - // Ignores Thread.interrupt() (so keep it short). - // ms = 0, will sleep for the least amount of time allowed by the OS. - static void naked_short_sleep(jlong ms); + static int naked_sleep(); static void infinite_sleep(); // never returns, use with CAUTION static void yield(); // Yields to all threads with same priority enum YieldResult { @@ -548,7 +540,7 @@ // Loads .dll/.so and // in case of error it checks if .dll/.so was built for the - // same architecture as HotSpot is running on + // same architecture as Hotspot is running on static void* dll_load(const char *name, char *ebuf, int ebuflen); // lookup symbol in a shared library @@ -777,10 +769,6 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.hpp" #endif -#ifdef TARGET_OS_FAMILY_aix -# include "os_aix.hpp" -# include "os_posix.hpp" -#endif #ifdef TARGET_OS_FAMILY_bsd # include "os_posix.hpp" # include "os_bsd.hpp" @@ -809,9 +797,6 @@ #ifdef TARGET_OS_ARCH_linux_ppc # include "os_linux_ppc.hpp" #endif -#ifdef TARGET_OS_ARCH_aix_ppc -# include "os_aix_ppc.hpp" -#endif #ifdef TARGET_OS_ARCH_bsd_x86 # include "os_bsd_x86.hpp" #endif @@ -819,10 +804,6 @@ # include "os_bsd_zero.hpp" #endif -#ifndef OS_NATIVE_THREAD_CREATION_FAILED_MSG -#define OS_NATIVE_THREAD_CREATION_FAILED_MSG "unable to create native thread: possibly out of memory or process/resource limits reached" -#endif - public: #ifndef PLATFORM_PRINT_NATIVE_STACK // No platform-specific code for printing the native stack. @@ -845,9 +826,6 @@ // Hint to the underlying OS that a task switch would not be good. // Void return because it's a hint and can fail. static void hint_no_preempt(); - static const char* native_thread_creation_failed_msg() { - return OS_NATIVE_THREAD_CREATION_FAILED_MSG; - } // Used at creation if requested by the diagnostic flag PauseAtStartup. // Causes the VM to wait until an external stimulus has been applied