src/share/vm/services/nmtCommon.cpp

Thu, 29 May 2014 08:58:51 -0400

author
lfoltan
date
Thu, 29 May 2014 08:58:51 -0400
changeset 9314
46ab61b0758b
parent 7074
833b0f92429a
permissions
-rw-r--r--

8041623: Solaris Studio 12.4 C++ 5.13, CHECK_UNHANDLED_OOPS use of class oop's copy constructor definitions causing error level diagnostic.
Summary: Fix several minor compilation issues with volatile oops for CHECK_UNHANDLED_OOPS support.
Reviewed-by: coleenp, hseigel

     1 /*
     2  * Copyright (c) 2013, 2014, 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  */
    24 #include "precompiled.hpp"
    25 #include "services/nmtCommon.hpp"
    27 const char* NMTUtil::_memory_type_names[] = {
    28   "Java Heap",
    29   "Class",
    30   "Thread",
    31   "Thread Stack",
    32   "Code",
    33   "GC",
    34   "Compiler",
    35   "Internal",
    36   "Other",
    37   "Symbol",
    38   "Native Memory Tracking",
    39   "Shared class space",
    40   "Arena Chunk",
    41   "Test",
    42   "Tracing",
    43   "Unknown"
    44 };
    47 const char* NMTUtil::scale_name(size_t scale) {
    48   switch(scale) {
    49     case K: return "KB";
    50     case M: return "MB";
    51     case G: return "GB";
    52   }
    53   ShouldNotReachHere();
    54   return NULL;
    55 }
    57 size_t NMTUtil::scale_from_name(const char* scale) {
    58   assert(scale != NULL, "Null pointer check");
    59   if (strncmp(scale, "KB", 2) == 0 ||
    60       strncmp(scale, "kb", 2) == 0) {
    61     return K;
    62   } else if (strncmp(scale, "MB", 2) == 0 ||
    63              strncmp(scale, "mb", 2) == 0) {
    64     return M;
    65   } else if (strncmp(scale, "GB", 2) == 0 ||
    66              strncmp(scale, "gb", 2) == 0) {
    67     return G;
    68   } else {
    69     return 0; // Invalid value
    70   }
    71   return K;
    72 }

mercurial