truffle: src/os/windows/vm/os_windows.cpp comparison

comparison src/os/windows/vm/os_windows.cpp @ 14518:d8041d695d19

Merged with jdk9/dev/hotspot changeset 3812c088b945

author	twisti
date	Tue, 11 Mar 2014 18:45:59 -0700
parents	359f7e70ae7f 6c9332549827
children	b51e29501f30 4ca6dc0799b6

comparison

equal deleted inserted replaced

-:f97c5ec83832
+:d8041d695d19
 /*
-* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2014, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 // For Windows at the moment does nothing
 void os::run_periodic_checks() {
 return;
 }
-#ifndef _WIN64
 // previous UnhandledExceptionFilter, if there is one
 static LPTOP_LEVEL_EXCEPTION_FILTER prev_uef_handler = NULL;
 LONG WINAPI Handle_FLT_Exception(struct _EXCEPTION_POINTERS* exceptionInfo);
-#endif
 void os::init_system_properties_values() {
 /* sysclasspath, java_home, dll_dir */
 {
 char *home_path;
 char *dll_path;
 CloseHandle(osthread->thread_handle());
 CloseHandle(osthread->interrupt_event());
 delete osthread;
 }
-static int    has_performance_count = 0;
 static jlong first_filetime;
 static jlong initial_performance_count;
 static jlong performance_frequency;
 }
 jlong os::elapsed_counter() {
 LARGE_INTEGER count;
-if (has_performance_count) {
+if (win32::_has_performance_count) {
 QueryPerformanceCounter(&count);
 return as_long(count) - initial_performance_count;
 } else {
 FILETIME wt;
 GetSystemTimeAsFileTime(&wt);
 }
 }
 jlong os::elapsed_frequency() {
-if (has_performance_count) {
+if (win32::_has_performance_count) {
 return performance_frequency;
 } else {
 // the FILETIME time is the number of 100-nanosecond intervals since January 1,1601.
 return 10000000;
 }
 bool os::bind_to_processor(uint processor_id) {
 // Not yet implemented.
 return false;
 }
-static void initialize_performance_counter() {
+void os::win32::initialize_performance_counter() {
 LARGE_INTEGER count;
 if (QueryPerformanceFrequency(&count)) {
-has_performance_count = 1;
+win32::_has_performance_count = 1;
 performance_frequency = as_long(count);
 QueryPerformanceCounter(&count);
 initial_performance_count = as_long(count);
 } else {
-has_performance_count = 0;
+win32::_has_performance_count = 0;
 FILETIME wt;
 GetSystemTimeAsFileTime(&wt);
 first_filetime = jlong_from(wt.dwHighDateTime, wt.dwLowDateTime);
 }
 }
 return windows_to_java_time(wt);
 }
 }
 jlong os::javaTimeNanos() {
-if (!has_performance_count) {
+if (!win32::_has_performance_count) {
 return javaTimeMillis() * NANOSECS_PER_MILLISEC; // the best we can do.
 } else {
 LARGE_INTEGER current_count;
 QueryPerformanceCounter(&current_count);
 double current = as_long(current_count);
 return time;
 }
 }
 void os::javaTimeNanos_info(jvmtiTimerInfo *info_ptr) {
-if (!has_performance_count) {
+if (!win32::_has_performance_count) {
 // javaTimeMillis() doesn't have much percision,
 // but it is not going to wrap -- so all 64 bits
 info_ptr->max_value = ALL_64_BITS;
 // this is a wall clock timer, so may skip
 strcpy(buf, saved_jvm_path);
 return;
 }
 buf[0] = '\0';
-if (Arguments::created_by_gamma_launcher()) {
+if (Arguments::sun_java_launcher_is_altjvm()) {
-// Support for the gamma launcher. Check for an
+// Support for the java launcher's '-XXaltjvm=<path>' option. Check
-// JAVA_HOME environment variable
+// for a JAVA_HOME environment variable and fix up the path so it
-// and fix up the path so it looks like
+// looks like jvm.dll is installed there (append a fake suffix
-// libjvm.so is installed there (append a fake suffix
+// hotspot/jvm.dll).
-// hotspot/libjvm.so).
+char* java_home_var = ::getenv("JAVA_HOME");
-char* java_home_var = ::getenv("JAVA_HOME");
+if (java_home_var != NULL && java_home_var[0] != 0) {
-if (java_home_var != NULL && java_home_var[0] != 0) {
+strncpy(buf, java_home_var, buflen);
-strncpy(buf, java_home_var, buflen);
+// determine if this is a legacy image or modules image
+// modules image doesn't have "jre" subdirectory
-// determine if this is a legacy image or modules image
+size_t len = strlen(buf);
-// modules image doesn't have "jre" subdirectory
+char* jrebin_p = buf + len;
-size_t len = strlen(buf);
+jio_snprintf(jrebin_p, buflen-len, "\\jre\\bin\\");
-char* jrebin_p = buf + len;
+if (0 != _access(buf, 0)) {
-jio_snprintf(jrebin_p, buflen-len, "\\jre\\bin\\");
+jio_snprintf(jrebin_p, buflen-len, "\\bin\\");
-if (0 != _access(buf, 0)) {
+}
-jio_snprintf(jrebin_p, buflen-len, "\\bin\\");
+len = strlen(buf);
-}
+jio_snprintf(buf + len, buflen-len, "hotspot\\jvm.dll");
-len = strlen(buf);
+}
-jio_snprintf(buf + len, buflen-len, "hotspot\\jvm.dll");
+}
-}
-}
+if (buf[0] == '\0') {
+GetModuleFileName(vm_lib_handle, buf, buflen);
-if(buf[0] == '\0') {
-GetModuleFileName(vm_lib_handle, buf, buflen);
 }
 strcpy(saved_jvm_path, buf);
 }
 // Continue the execution
 #endif
 return EXCEPTION_CONTINUE_EXECUTION;
 }
-#ifndef  _WIN64
 //-----------------------------------------------------------------------------
 LONG WINAPI Handle_FLT_Exception(struct _EXCEPTION_POINTERS* exceptionInfo) {
+PCONTEXT ctx = exceptionInfo->ContextRecord;
+#ifndef  _WIN64
 // handle exception caused by native method modifying control word
-PCONTEXT ctx = exceptionInfo->ContextRecord;
 DWORD exception_code = exceptionInfo->ExceptionRecord->ExceptionCode;
 switch (exception_code) {
 case EXCEPTION_FLT_DENORMAL_OPERAND:
 case EXCEPTION_FLT_DIVIDE_BY_ZERO:
 if (prev_uef_handler != NULL) {
 // We didn't handle this exception so pass it to the previous
 // UnhandledExceptionFilter.
 return (prev_uef_handler)(exceptionInfo);
 }
+#else // !_WIN64
-return EXCEPTION_CONTINUE_SEARCH;
-}
-#else //_WIN64
 /*
 On Windows, the mxcsr control bits are non-volatile across calls
 See also CR 6192333
-If EXCEPTION_FLT_* happened after some native method modified
+*/
-mxcsr - it is not a jvm fault.
-However should we decide to restore of mxcsr after a faulty
-native method we can uncomment following code
 jint MxCsr = INITIAL_MXCSR;
 // we can't use StubRoutines::addr_mxcsr_std()
 // because in Win64 mxcsr is not saved there
 if (MxCsr != ctx->MxCsr) {
 ctx->MxCsr = MxCsr;
 return EXCEPTION_CONTINUE_EXECUTION;
 }
+#endif // !_WIN64
-*/
-#endif //_WIN64
+return EXCEPTION_CONTINUE_SEARCH;
+}
 // Fatal error reporting is single threaded so we can make this a
 // static and preallocated.  If it's more than MAX_PATH silently ignore
 // it.
 static char saved_error_file[MAX_PATH] = {0};
 case EXCEPTION_INT_OVERFLOW:
 return Handle_IDiv_Exception(exceptionInfo);
 } // switch
 }
-#ifndef _WIN64
 if (((thread->thread_state() == _thread_in_Java) ||
 (thread->thread_state() == _thread_in_native)) &&
 exception_code != EXCEPTION_UNCAUGHT_CXX_EXCEPTION)
 {
 LONG result=Handle_FLT_Exception(exceptionInfo);
 if (result==EXCEPTION_CONTINUE_EXECUTION) return result;
 }
-#endif //_WIN64
 }
 if (exception_code != EXCEPTION_BREAKPOINT) {
 report_error(t, exception_code, pc, exceptionInfo->ExceptionRecord,
 exceptionInfo->ContextRecord);
 result = OS_TIMEOUT;
 }
 return result;
 }
+//
+// Short sleep, direct OS call.
+//
+// ms = 0, means allow others (if any) to run.
+//
+void os::naked_short_sleep(jlong ms) {
+assert(ms < 1000, "Un-interruptable sleep, short time use only");
+Sleep(ms);
+}
 // Sleep forever; naked call to OS-specific sleep; use with CAUTION
 void os::infinite_sleep() {
 while (true) {    // sleep forever ...
 Sleep(100000);  // ... 100 seconds at a time
 }
 volatile intx os::win32::_os_thread_count    = 0;
 bool   os::win32::_is_nt              = false;
 bool   os::win32::_is_windows_2003    = false;
 bool   os::win32::_is_windows_server  = false;
+bool   os::win32::_has_performance_count = 0;
 void os::win32::initialize_system_info() {
 SYSTEM_INFO si;
 GetSystemInfo(&si);
 _vm_page_size    = si.dwPageSize;

Mercurial > hg > truffle

comparison src/os/windows/vm/os_windows.cpp @ 14518:d8041d695d19