src/share/vm/services/memTracker.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2012, 2014, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2015, 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.
*** 45,57 ****
  
  
  NMT_TrackingLevel MemTracker::init_tracking_level() {
    NMT_TrackingLevel level = NMT_off;
    char buf[64];
-   char nmt_option[64];
    jio_snprintf(buf, sizeof(buf), "NMT_LEVEL_%d", os::current_process_id());
!   if (os::getenv(buf, nmt_option, sizeof(nmt_option))) {
      if (strcmp(nmt_option, "summary") == 0) {
        level = NMT_summary;
      } else if (strcmp(nmt_option, "detail") == 0) {
  #if PLATFORM_NATIVE_STACK_WALKING_SUPPORTED
        level = NMT_detail;
--- 45,57 ----
  
  
  NMT_TrackingLevel MemTracker::init_tracking_level() {
    NMT_TrackingLevel level = NMT_off;
    char buf[64];
    jio_snprintf(buf, sizeof(buf), "NMT_LEVEL_%d", os::current_process_id());
!   const char *nmt_option = ::getenv(buf);
!   if (nmt_option != NULL) {
      if (strcmp(nmt_option, "summary") == 0) {
        level = NMT_summary;
      } else if (strcmp(nmt_option, "detail") == 0) {
  #if PLATFORM_NATIVE_STACK_WALKING_SUPPORTED
        level = NMT_detail;
*** 321,326 ****
    out->print_cr("             Tracking stack depth: %d", NMT_TrackingStackDepth);
    NOT_PRODUCT(out->print_cr("Peak concurrent access: %d", MallocSiteTable::access_peak_count());)
    out->print_cr(" ");
    walker.report_statistics(out);
  }
- 
--- 321,325 ----