graal-jvmci-8: src/os/windows/vm/os

comparison src/os/windows/vm/os_windows.cpp @ 7643:3ac7d10a6572

Merge with hsx25/hotspot.

author	Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date	Thu, 31 Jan 2013 15:42:25 +0100
parents	989155e2d07a 2ef7061f13b4
children	fbbc2ea60c4d

comparison

equal deleted inserted replaced

-:17b6a63fe7c2
+:3ac7d10a6572
 /*
-* Copyright (c) 1997, 2012, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 if (sigbreakHandler != NULL) {
 (*sigbreakHandler)(SIGBREAK);
 }
 return TRUE;
 break;
+case CTRL_LOGOFF_EVENT: {
+// Don't terminate JVM if it is running in a non-interactive session,
+// such as a service process.
+USEROBJECTFLAGS flags;
+HANDLE handle = GetProcessWindowStation();
+if (handle != NULL &&
+GetUserObjectInformation(handle, UOI_FLAGS, &flags,
+sizeof( USEROBJECTFLAGS), NULL)) {
+// If it is a non-interactive session, let next handler to deal
+// with it.
+if ((flags.dwFlags & WSF_VISIBLE) == 0) {
+return FALSE;
+}
+}
+}
 case CTRL_CLOSE_EVENT:
-case CTRL_LOGOFF_EVENT:
 case CTRL_SHUTDOWN_EVENT:
 os::signal_raise(SIGTERM);
 return TRUE;
 break;
 default:
 if (res == NULL) {
 warning("NUMA page allocation failed");
 }
 if( Verbose && PrintMiscellaneous ) {
 reserveTimer.stop();
-tty->print_cr("reserve_memory of %Ix bytes took %ld ms (%ld ticks)", bytes,
+tty->print_cr("reserve_memory of %Ix bytes took " JLONG_FORMAT " ms (" JLONG_FORMAT " ticks)", bytes,
 reserveTimer.milliseconds(), reserveTimer.ticks());
 }
 }
 assert(res == NULL || addr == NULL || addr == res,
 "Unexpected address from reserve.");
 hFile = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ, NULL,
 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 if (hFile == NULL) {
 if (PrintMiscellaneous && Verbose) {
 DWORD err = GetLastError();
-tty->print_cr("CreateFile() failed: GetLastError->%ld.");
+tty->print_cr("CreateFile() failed: GetLastError->%ld.", err);
 }
 return NULL;
 }
 if (allow_exec) {
 HANDLE hMap = CreateFileMapping(hFile, NULL, PAGE_WRITECOPY, 0, 0,
 NULL /*file_name*/);
 if (hMap == NULL) {
 if (PrintMiscellaneous && Verbose) {
 DWORD err = GetLastError();
-tty->print_cr("CreateFileMapping() failed: GetLastError->%ld.");
+tty->print_cr("CreateFileMapping() failed: GetLastError->%ld.", err);
 }
 CloseHandle(hFile);
 return NULL;
 }
 Millis -= prd ;
 }
 }
 v = _Event ;
 _Event = 0 ;
+// see comment at end of os::PlatformEvent::park() below:
 OrderAccess::fence() ;
 // If we encounter a nearly simultanous timeout expiry and unpark()
 // we return OS_OK indicating we awoke via unpark().
 // Implementor's license -- returning OS_TIMEOUT would be equally valid, however.
 return (v >= 0) ? OS_OK : OS_TIMEOUT ;
 guarantee (_Event >= 0, "invariant") ;
 }
 void os::PlatformEvent::unpark() {
 guarantee (_ParkHandle != NULL, "Invariant") ;
-int v ;
-for (;;) {
+// Transitions for _Event:
-v = _Event ;      // Increment _Event if it's < 1.
+//    0 :=> 1
-if (v > 0) {
+//    1 :=> 1
-// If it's already signaled just return.
+//   -1 :=> either 0 or 1; must signal target thread
-// The LD of _Event could have reordered or be satisfied
+//          That is, we can safely transition _Event from -1 to either
-// by a read-aside from this processor's write buffer.
+//          0 or 1. Forcing 1 is slightly more efficient for back-to-back
-// To avoid problems execute a barrier and then
+//          unpark() calls.
-// ratify the value.  A degenerate CAS() would also work.
+// See also: "Semaphores in Plan 9" by Mullender & Cox
-// Viz., CAS (v+0, &_Event, v) == v).
+//
-OrderAccess::fence() ;
+// Note: Forcing a transition from "-1" to "1" on an unpark() means
-if (_Event == v) return ;
+// that it will take two back-to-back park() calls for the owning
-continue ;
+// thread to block. This has the benefit of forcing a spurious return
-}
+// from the first park() call after an unpark() call which will help
-if (Atomic::cmpxchg (v+1, &_Event, v) == v) break ;
+// shake out uses of park() and unpark() without condition variables.
-}
-if (v < 0) {
+if (Atomic::xchg(1, &_Event) >= 0) return;
-::SetEvent (_ParkHandle) ;
-}
+::SetEvent(_ParkHandle);
 }
 // JSR166
 // -------------------------------------------------------

Mercurial > hg > graal-jvmci-8

comparison src/os/windows/vm/os_windows.cpp @ 7643:3ac7d10a6572