*** old/src/share/vm/memory/metaspaceShared.cpp	Wed Feb 17 11:15:32 2016
--- new/src/share/vm/memory/metaspaceShared.cpp	Wed Feb 17 11:15:31 2016

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2012, 2016, 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.

*** 38,47 ****
--- 38,48 ----
  #include "memory/filemap.hpp"
  #include "memory/metaspace.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "oops/objArrayOop.hpp"
  #include "oops/oop.inline.hpp"
+ #include "runtime/logTimer.hpp"
  #include "runtime/os.hpp"
  #include "runtime/signature.hpp"
  #include "runtime/vmThread.hpp"
  #include "runtime/vm_operations.hpp"
  #include "utilities/defaultStream.hpp"

*** 769,779 ****
--- 770,780 ----
  }
  
  // Preload classes from a list, populate the shared spaces and dump to a
  // file.
  void MetaspaceShared::preload_and_dump(TRAPS) {
!   TraceTime timer("Dump Shared Spaces", TraceStartupTime);
!   { TraceStartupTime timer("Dump Shared Spaces");
      ResourceMark rm;
      char class_list_path_str[JVM_MAXPATHLEN];
  
      tty->print_cr("Allocated shared space: " SIZE_FORMAT " bytes at " PTR_FORMAT,
                    MetaspaceShared::shared_rs()->size(),

*** 851,860 ****
--- 852,862 ----
      // are implemented by K are not verified.
      link_and_cleanup_shared_classes(CATCH);
      tty->print_cr("Rewriting and linking classes: done");
  
      VMThread::execute(&op);
+   }
    // Since various initialization steps have been undone by this process,
    // it is not reasonable to continue running a java process.
    exit(0);
  }