Mercurial > hg > truffle
annotate src/os/windows/vm/version.rc @ 17716:cdb71841f4bc
6498581: ThreadInterruptTest3 produces wrong output on Windows
Summary: There is race condition between os::interrupt and os::is_interrupted on Windows. In JVM_Sleep(Thread.sleep), check if thread gets interrupted, it may see interrupted but not really interrupted so cause spurious waking up (early return from sleep). Fix by checking if interrupt event really gets set thus prevent false return. For intrinsic of _isInterrupted, on Windows, go fastpath only on bit not set.
Reviewed-by: acorn, kvn
Contributed-by: david.holmes@oracle.com, yumin.qi@oracle.com
| author | minqi |
|---|---|
| date | Wed, 26 Feb 2014 15:20:41 -0800 |
| parents | c18cbe5936b8 |
| children |
| rev | line source |
|---|---|
| 0 | 1 // |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
2 // Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. |
| 0 | 3 // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
| 4 // | |
| 5 // This code is free software; you can redistribute it and/or modify it | |
| 6 // under the terms of the GNU General Public License version 2 only, as | |
| 7 // published by the Free Software Foundation. | |
| 8 // | |
| 9 // This code is distributed in the hope that it will be useful, but WITHOUT | |
| 10 // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 // FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 // version 2 for more details (a copy is included in the LICENSE file that | |
| 13 // accompanied this code). | |
| 14 // | |
| 15 // You should have received a copy of the GNU General Public License version | |
| 16 // 2 along with this work; if not, write to the Free Software Foundation, | |
| 17 // Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
| 18 // | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
19 // Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
20 // or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
0
diff
changeset
|
21 // questions. |
| 0 | 22 // |
| 23 // | |
| 24 | |
| 25 #include "winresrc.h" | |
| 26 | |
| 27 // Need 2 defines so macro argument to XSTR will get expanded before quoting. | |
| 28 #define XSTR(x) STR(x) | |
| 29 #define STR(x) #x | |
| 30 | |
| 31 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL | |
| 32 | |
| 33 ///////////////////////////////////////////////////////////////////////////// | |
| 34 // | |
| 35 // Version | |
| 36 // | |
| 37 | |
| 38 VS_VERSION_INFO VERSIONINFO | |
| 39 FILEVERSION HS_VER | |
| 40 PRODUCTVERSION JDK_VER | |
| 41 FILEFLAGSMASK 0x3fL | |
| 42 #ifdef _DEBUG | |
| 43 FILEFLAGS 0x1L | |
| 44 #else | |
| 45 FILEFLAGS 0x0L | |
| 46 #endif | |
| 47 // FILEOS 0x4 is Win32, 0x40004 is Win32 NT only | |
| 48 FILEOS 0x4L | |
| 49 // FILETYPE should be 0x1 for .exe and 0x2 for .dll | |
| 50 FILETYPE 0x2L | |
| 51 FILESUBTYPE 0x0L | |
| 52 BEGIN | |
| 53 BLOCK "StringFileInfo" | |
| 54 BEGIN | |
| 55 BLOCK "000004b0" | |
| 56 BEGIN | |
| 57 VALUE "CompanyName", XSTR(HS_COMPANY) "\0" | |
| 58 VALUE "FileDescription", XSTR(HS_FILEDESC) "\0" | |
| 59 VALUE "FileVersion", XSTR(HS_DOTVER) "\0" | |
| 60 VALUE "Full Version", XSTR(HS_BUILD_ID) "\0" | |
| 61 VALUE "InternalName", XSTR(HS_INTERNAL_NAME) "\0" | |
| 62 VALUE "LegalCopyright", XSTR(HS_COPYRIGHT) "\0" | |
| 63 VALUE "OriginalFilename", XSTR(HS_FNAME) "\0" | |
| 64 VALUE "ProductName", XSTR(HS_NAME) "\0" | |
| 65 VALUE "ProductVersion", XSTR(JDK_DOTVER) "\0" | |
| 66 END | |
| 67 END | |
| 68 BLOCK "VarFileInfo" | |
| 69 BEGIN | |
| 70 VALUE "Translation", 0x0, 1200 | |
| 71 END | |
| 72 END |