src/os/windows/vm/version.rc

Mon, 19 Dec 2011 10:02:05 -0800

author
johnc
date
Mon, 19 Dec 2011 10:02:05 -0800
changeset 3339
e7dead7e90af
parent 1907
c18cbe5936b8
child 6876
710a3c8b516e
child 8897
cff49fc368a3
permissions
-rw-r--r--

7117303: VM uses non-monotonic time source and complains that it is non-monotonic
Summary: Replaces calls to os::javaTimeMillis(), which does not (and cannot) guarantee monotonicity, in GC code to an equivalent expression that uses os::javaTimeNanos(). os::javaTimeNanos is guaranteed monotonically non-decreasing if the underlying platform provides a monotonic time source. Changes in OS files are to make use of the newly defined constants in globalDefinitions.hpp.
Reviewed-by: dholmes, ysr

     1 //
     2 // Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
     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 //
    19 // Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    20 // or visit www.oracle.com if you need additional information or have any
    21 // questions.
    22 //  
    23 //
    25 #include "winresrc.h"
    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
    31 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
    33 /////////////////////////////////////////////////////////////////////////////
    34 //
    35 // Version
    36 //
    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

mercurial