Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/excludeSrc.make	Thu Sep 19 09:26:08 2013 +0200
     1.2 +++ b/make/excludeSrc.make	Thu Sep 19 09:34:20 2013 +0200
     1.3 @@ -99,7 +99,7 @@
     1.4  	psTasks.cpp psVirtualspace.cpp psYoungGen.cpp vmPSOperations.cpp asParNewGeneration.cpp \
     1.5  	parCardTableModRefBS.cpp parGCAllocBuffer.cpp parNewGeneration.cpp mutableSpace.cpp \
     1.6  	gSpaceCounters.cpp allocationStats.cpp spaceCounters.cpp gcAdaptivePolicyCounters.cpp \
     1.7 -	mutableNUMASpace.cpp immutableSpace.cpp yieldingWorkGroup.cpp
     1.8 +	mutableNUMASpace.cpp immutableSpace.cpp yieldingWorkGroup.cpp hSpaceCounters.cpp
     1.9  endif
    1.10  
    1.11  ifeq ($(INCLUDE_NMT), false)

     2.1 --- a/src/os/windows/vm/os_windows.cpp	Thu Sep 19 09:26:08 2013 +0200
     2.2 +++ b/src/os/windows/vm/os_windows.cpp	Thu Sep 19 09:34:20 2013 +0200
     2.3 @@ -5430,7 +5430,7 @@
     2.4        if ((start = strrchr(lib_name, *os::file_separator())) != NULL) {
     2.5          lib_name = ++start;
     2.6        } else {
     2.7 -        // Need to check for C:
     2.8 +        // Need to check for drive prefix
     2.9          if ((start = strchr(lib_name, ':')) != NULL) {
    2.10            lib_name = ++start;
    2.11          }

     3.1 --- a/src/share/vm/gc_implementation/shared/allocationStats.hpp	Thu Sep 19 09:26:08 2013 +0200
     3.2 +++ b/src/share/vm/gc_implementation/shared/allocationStats.hpp	Thu Sep 19 09:34:20 2013 +0200
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -26,11 +26,9 @@
    3.11  #define SHARE_VM_GC_IMPLEMENTATION_SHARED_ALLOCATIONSTATS_HPP
    3.12  
    3.13  #include "utilities/macros.hpp"
    3.14 -#if INCLUDE_ALL_GCS
    3.15 -#include "gc_implementation/shared/gcUtil.hpp"
    3.16  #include "memory/allocation.hpp"
    3.17  #include "utilities/globalDefinitions.hpp"
    3.18 -#endif // INCLUDE_ALL_GCS
    3.19 +#include "gc_implementation/shared/gcUtil.hpp"
    3.20  
    3.21  class AllocationStats VALUE_OBJ_CLASS_SPEC {
    3.22    // A duration threshold (in ms) used to filter

     4.1 --- a/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp	Thu Sep 19 09:26:08 2013 +0200
     4.2 +++ b/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp	Thu Sep 19 09:34:20 2013 +0200
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -26,11 +26,9 @@
    4.11  #define SHARE_VM_GC_IMPLEMENTATION_SHARED_HSPACECOUNTERS_HPP
    4.12  
    4.13  #include "utilities/macros.hpp"
    4.14 -#if INCLUDE_ALL_GCS
    4.15  #include "gc_implementation/shared/generationCounters.hpp"
    4.16  #include "memory/generation.hpp"
    4.17  #include "runtime/perfData.hpp"
    4.18 -#endif // INCLUDE_ALL_GCS
    4.19  
    4.20  // A HSpaceCounter is a holder class for performance counters
    4.21  // that track a collections (logical spaces) in a heap;

     5.1 --- a/src/share/vm/memory/binaryTreeDictionary.cpp	Thu Sep 19 09:26:08 2013 +0200
     5.2 +++ b/src/share/vm/memory/binaryTreeDictionary.cpp	Thu Sep 19 09:34:20 2013 +0200
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it
    5.10 @@ -33,10 +33,10 @@
    5.11  #include "runtime/globals.hpp"
    5.12  #include "utilities/ostream.hpp"
    5.13  #include "utilities/macros.hpp"
    5.14 +#include "gc_implementation/shared/spaceDecorator.hpp"
    5.15  #if INCLUDE_ALL_GCS
    5.16  #include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp"
    5.17  #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
    5.18 -#include "gc_implementation/shared/spaceDecorator.hpp"
    5.19  #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
    5.20  #endif // INCLUDE_ALL_GCS
    5.21  

     6.1 --- a/src/share/vm/prims/jvmti.xml	Thu Sep 19 09:26:08 2013 +0200
     6.2 +++ b/src/share/vm/prims/jvmti.xml	Thu Sep 19 09:34:20 2013 +0200
     6.3 @@ -458,8 +458,10 @@
     6.4        the same name from being loaded dynamically.
     6.5  <p/>
     6.6        The VM will invoke the Agent_OnUnload_L function of the agent, if such
     6.7 -      a function is exported, at the same point during startup as it would
     6.8 -      have called the dynamic entry point Agent_OnUnLoad.
     6.9 +      a function is exported, at the same point during VM execution as it would
    6.10 +      have called the dynamic entry point Agent_OnUnLoad. A statically loaded
    6.11 +      agent cannot be unloaded. The Agent_OnUnload_L function will still be
    6.12 +      called to do any other agent shutdown related tasks. 
    6.13        If a <i>statically linked</i> agent L exports a function called
    6.14        Agent_OnUnLoad_L and a function called Agent_OnUnLoad, the Agent_OnUnLoad
    6.15        function will be ignored.

     7.1 --- a/src/share/vm/runtime/arguments.hpp	Thu Sep 19 09:26:08 2013 +0200
     7.2 +++ b/src/share/vm/runtime/arguments.hpp	Thu Sep 19 09:34:20 2013 +0200
     7.3 @@ -144,7 +144,7 @@
     7.4    void set_os_lib(void* os_lib)             { _os_lib = os_lib; }
     7.5    AgentLibrary* next() const                { return _next; }
     7.6    bool is_static_lib() const                { return _is_static_lib; }
     7.7 -  void set_static_lib(bool static_lib)      { _is_static_lib = static_lib; }
     7.8 +  void set_static_lib(bool is_static_lib)   { _is_static_lib = is_static_lib; }
     7.9    bool valid()                              { return (_state == agent_valid); }
    7.10    void set_valid()                          { _state = agent_valid; }
    7.11    void set_invalid()                        { _state = agent_invalid; }

     8.1 --- a/src/share/vm/runtime/os.cpp	Thu Sep 19 09:26:08 2013 +0200
     8.2 +++ b/src/share/vm/runtime/os.cpp	Thu Sep 19 09:34:20 2013 +0200
     8.3 @@ -459,6 +459,7 @@
     8.4   */
     8.5  void* os::find_agent_function(AgentLibrary *agent_lib, bool check_lib,
     8.6                                const char *syms[], size_t syms_len) {
     8.7 +  assert(agent_lib != NULL, "sanity check");
     8.8    const char *lib_name;
     8.9    void *handle = agent_lib->os_lib();
    8.10    void *entryName = NULL;
    8.11 @@ -489,6 +490,7 @@
    8.12    void *proc_handle;
    8.13    void *save_handle;
    8.14  
    8.15 +  assert(agent_lib != NULL, "sanity check");
    8.16    if (agent_lib->name() == NULL) {
    8.17      return false;
    8.18    }
    8.19 @@ -498,14 +500,13 @@
    8.20    // We want to look in this process' symbol table.
    8.21    agent_lib->set_os_lib(proc_handle);
    8.22    ret = find_agent_function(agent_lib, true, syms, syms_len);
    8.23 -  agent_lib->set_os_lib(save_handle);
    8.24    if (ret != NULL) {
    8.25      // Found an entry point like Agent_OnLoad_lib_name so we have a static agent
    8.26 -    agent_lib->set_os_lib(proc_handle);
    8.27      agent_lib->set_valid();
    8.28      agent_lib->set_static_lib(true);
    8.29      return true;
    8.30    }
    8.31 +  agent_lib->set_os_lib(save_handle);
    8.32    return false;
    8.33  }
    8.34  

     9.1 --- a/src/share/vm/runtime/thread.cpp	Thu Sep 19 09:26:08 2013 +0200
     9.2 +++ b/src/share/vm/runtime/thread.cpp	Thu Sep 19 09:34:20 2013 +0200
     9.3 @@ -3721,7 +3721,7 @@
     9.4      const char *name = agent->name();
     9.5      const char *msg = "Could not find agent library ";
     9.6  
     9.7 -    // First check to see if agent is statcally linked into executable
     9.8 +    // First check to see if agent is statically linked into executable
     9.9      if (os::find_builtin_agent(agent, on_load_symbols, num_symbol_entries)) {
    9.10        library = agent->os_lib();
    9.11      } else if (agent->is_absolute_path()) {

    10.1 --- a/src/share/vm/utilities/yieldingWorkgroup.hpp	Thu Sep 19 09:26:08 2013 +0200
    10.2 +++ b/src/share/vm/utilities/yieldingWorkgroup.hpp	Thu Sep 19 09:34:20 2013 +0200
    10.3 @@ -1,5 +1,5 @@
    10.4  /*
    10.5 - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    10.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    10.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8   *
    10.9   * This code is free software; you can redistribute it and/or modify it
   10.10 @@ -26,10 +26,7 @@
   10.11  #define SHARE_VM_UTILITIES_YIELDINGWORKGROUP_HPP
   10.12  
   10.13  #include "utilities/macros.hpp"
   10.14 -#if INCLUDE_ALL_GCS
   10.15  #include "utilities/workgroup.hpp"
   10.16 -#endif // INCLUDE_ALL_GCS
   10.17 -
   10.18  
   10.19  // Forward declarations
   10.20  class YieldingFlexibleWorkGang;

    11.1 --- a/test/TEST.groups	Thu Sep 19 09:26:08 2013 +0200
    11.2 +++ b/test/TEST.groups	Thu Sep 19 09:34:20 2013 +0200
    11.3 @@ -84,6 +84,7 @@
    11.4    runtime/NMT/ThreadedVirtualAllocTestType.java \
    11.5    runtime/NMT/VirtualAllocTestType.java \
    11.6    runtime/RedefineObject/TestRedefineObject.java \
    11.7 +  runtime/XCheckJniJsig/XCheckJSig.java \
    11.8    serviceability/attach/AttachWithStalePidFile.java
    11.9  
   11.10  # JRE adds further tests to compact3
   11.11 @@ -159,7 +160,18 @@
   11.12    gc/g1/TestRegionAlignment.java \
   11.13    gc/g1/TestShrinkToOneRegion.java \
   11.14    gc/metaspace/G1AddMetaspaceDependency.java \
   11.15 -  runtime/6929067/Test6929067.sh
   11.16 +  gc/startup_warnings/TestCMS.java \
   11.17 +  gc/startup_warnings/TestCMSIncrementalMode.java \
   11.18 +  gc/startup_warnings/TestCMSNoIncrementalMode.java \
   11.19 +  gc/startup_warnings/TestDefaultMaxRAMFraction.java \
   11.20 +  gc/startup_warnings/TestDefNewCMS.java \
   11.21 +  gc/startup_warnings/TestIncGC.java \
   11.22 +  gc/startup_warnings/TestParallelGC.java \
   11.23 +  gc/startup_warnings/TestParallelScavengeSerialOld.java \
   11.24 +  gc/startup_warnings/TestParNewCMS.java \
   11.25 +  gc/startup_warnings/TestParNewSerialOld.java \
   11.26 +  runtime/6929067/Test6929067.sh \
   11.27 +  runtime/SharedArchiveFile/SharedArchiveFile.java
   11.28  
   11.29  # Minimal VM on Compact 2 adds in some compact2 tests
   11.30  #