src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp

rev 60538 : imported patch jep387-misc.patch

*** 1,8 ****
  /*
!  * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2018, SAP and/or its affiliates.
   * 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.
--- 1,8 ----
  /*
!  * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2018, 2020 SAP SE. 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.
*** 20,31 ****
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  #include "precompiled.hpp"
! #include "memory/metaspace.hpp"
  #include "memory/metaspace/metaspaceDCmd.hpp"
  #include "memory/resourceArea.hpp"
  #include "services/diagnosticCommand.hpp"
  #include "services/nmtCommon.hpp"
  
--- 20,32 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
+ 
  #include "precompiled.hpp"
! #include "memory/metaspace/metaspaceReport.hpp"
  #include "memory/metaspace/metaspaceDCmd.hpp"
  #include "memory/resourceArea.hpp"
  #include "services/diagnosticCommand.hpp"
  #include "services/nmtCommon.hpp"
  
*** 36,46 ****
    , _basic("basic", "Prints a basic summary (does not need a safepoint).", "BOOLEAN", false, "false")
    , _show_loaders("show-loaders", "Shows usage by class loader.", "BOOLEAN", false, "false")
    , _by_spacetype("by-spacetype", "Break down numbers by loader type.", "BOOLEAN", false, "false")
    , _by_chunktype("by-chunktype", "Break down numbers by chunk type.", "BOOLEAN", false, "false")
    , _show_vslist("vslist", "Shows details about the underlying virtual space.", "BOOLEAN", false, "false")
-   , _show_vsmap("vsmap", "Shows chunk composition of the underlying virtual spaces", "BOOLEAN", false, "false")
    , _scale("scale", "Memory usage in which to scale. Valid values are: 1, KB, MB or GB (fixed scale) "
             "or \"dynamic\" for a dynamically choosen scale.",
             "STRING", false, "dynamic")
    , _show_classes("show-classes", "If show-loaders is set, shows loaded classes for each loader.", "BOOLEAN", false, "false")
  {
--- 37,46 ----
*** 48,58 ****
    _dcmdparser.add_dcmd_option(&_show_loaders);
    _dcmdparser.add_dcmd_option(&_show_classes);
    _dcmdparser.add_dcmd_option(&_by_chunktype);
    _dcmdparser.add_dcmd_option(&_by_spacetype);
    _dcmdparser.add_dcmd_option(&_show_vslist);
-   _dcmdparser.add_dcmd_option(&_show_vsmap);
    _dcmdparser.add_dcmd_option(&_scale);
  }
  
  int MetaspaceDCmd::num_arguments() {
    ResourceMark rm;
--- 48,57 ----
*** 79,102 ****
        }
      }
    }
    if (_basic.value() == true) {
      if (_show_loaders.value() || _by_chunktype.value() || _by_spacetype.value() ||
!         _show_vslist.value() || _show_vsmap.value()) {
        // Basic mode. Just print essentials. Does not need to be at a safepoint.
        output()->print_cr("In basic mode, additional arguments are ignored.");
      }
      MetaspaceUtils::print_basic_report(output(), scale);
    } else {
      // Full mode. Requires safepoint.
      int flags = 0;
!     if (_show_loaders.value())         flags |= MetaspaceUtils::rf_show_loaders;
!     if (_show_classes.value())         flags |= MetaspaceUtils::rf_show_classes;
!     if (_by_chunktype.value())         flags |= MetaspaceUtils::rf_break_down_by_chunktype;
!     if (_by_spacetype.value())         flags |= MetaspaceUtils::rf_break_down_by_spacetype;
!     if (_show_vslist.value())          flags |= MetaspaceUtils::rf_show_vslist;
!     if (_show_vsmap.value())           flags |= MetaspaceUtils::rf_show_vsmap;
      VM_PrintMetadata op(output(), scale, flags);
      VMThread::execute(&op);
    }
  }
  
--- 78,100 ----
        }
      }
    }
    if (_basic.value() == true) {
      if (_show_loaders.value() || _by_chunktype.value() || _by_spacetype.value() ||
!         _show_vslist.value()) {
        // Basic mode. Just print essentials. Does not need to be at a safepoint.
        output()->print_cr("In basic mode, additional arguments are ignored.");
      }
      MetaspaceUtils::print_basic_report(output(), scale);
    } else {
      // Full mode. Requires safepoint.
      int flags = 0;
!     if (_show_loaders.value())         flags |= MetaspaceReporter::rf_show_loaders;
!     if (_show_classes.value())         flags |= MetaspaceReporter::rf_show_classes;
!     if (_by_chunktype.value())         flags |= MetaspaceReporter::rf_break_down_by_chunktype;
!     if (_by_spacetype.value())         flags |= MetaspaceReporter::rf_break_down_by_spacetype;
!     if (_show_vslist.value())          flags |= MetaspaceReporter::rf_show_vslist;
      VM_PrintMetadata op(output(), scale, flags);
      VMThread::execute(&op);
    }
  }