Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/excludeSrc.make	Fri Sep 06 11:11:19 2013 -0700
     1.2 +++ b/make/excludeSrc.make	Wed Sep 11 00:38:18 2013 -0400
     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/share/vm/gc_implementation/shared/allocationStats.hpp	Fri Sep 06 11:11:19 2013 -0700
     2.2 +++ b/src/share/vm/gc_implementation/shared/allocationStats.hpp	Wed Sep 11 00:38:18 2013 -0400
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -26,11 +26,9 @@
    2.11  #define SHARE_VM_GC_IMPLEMENTATION_SHARED_ALLOCATIONSTATS_HPP
    2.12  
    2.13  #include "utilities/macros.hpp"
    2.14 -#if INCLUDE_ALL_GCS
    2.15 -#include "gc_implementation/shared/gcUtil.hpp"
    2.16  #include "memory/allocation.hpp"
    2.17  #include "utilities/globalDefinitions.hpp"
    2.18 -#endif // INCLUDE_ALL_GCS
    2.19 +#include "gc_implementation/shared/gcUtil.hpp"
    2.20  
    2.21  class AllocationStats VALUE_OBJ_CLASS_SPEC {
    2.22    // A duration threshold (in ms) used to filter

     3.1 --- a/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp	Fri Sep 06 11:11:19 2013 -0700
     3.2 +++ b/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp	Wed Sep 11 00:38:18 2013 -0400
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2011, 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_HSPACECOUNTERS_HPP
    3.12  
    3.13  #include "utilities/macros.hpp"
    3.14 -#if INCLUDE_ALL_GCS
    3.15  #include "gc_implementation/shared/generationCounters.hpp"
    3.16  #include "memory/generation.hpp"
    3.17  #include "runtime/perfData.hpp"
    3.18 -#endif // INCLUDE_ALL_GCS
    3.19  
    3.20  // A HSpaceCounter is a holder class for performance counters
    3.21  // that track a collections (logical spaces) in a heap;

     4.1 --- a/src/share/vm/memory/binaryTreeDictionary.cpp	Fri Sep 06 11:11:19 2013 -0700
     4.2 +++ b/src/share/vm/memory/binaryTreeDictionary.cpp	Wed Sep 11 00:38:18 2013 -0400
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2001, 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 @@ -33,10 +33,10 @@
    4.11  #include "runtime/globals.hpp"
    4.12  #include "utilities/ostream.hpp"
    4.13  #include "utilities/macros.hpp"
    4.14 +#include "gc_implementation/shared/spaceDecorator.hpp"
    4.15  #if INCLUDE_ALL_GCS
    4.16  #include "gc_implementation/concurrentMarkSweep/adaptiveFreeList.hpp"
    4.17  #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
    4.18 -#include "gc_implementation/shared/spaceDecorator.hpp"
    4.19  #include "gc_implementation/concurrentMarkSweep/freeChunk.hpp"
    4.20  #endif // INCLUDE_ALL_GCS
    4.21  

     5.1 --- a/src/share/vm/utilities/yieldingWorkgroup.hpp	Fri Sep 06 11:11:19 2013 -0700
     5.2 +++ b/src/share/vm/utilities/yieldingWorkgroup.hpp	Wed Sep 11 00:38:18 2013 -0400
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 2005, 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 @@ -26,10 +26,7 @@
    5.11  #define SHARE_VM_UTILITIES_YIELDINGWORKGROUP_HPP
    5.12  
    5.13  #include "utilities/macros.hpp"
    5.14 -#if INCLUDE_ALL_GCS
    5.15  #include "utilities/workgroup.hpp"
    5.16 -#endif // INCLUDE_ALL_GCS
    5.17 -
    5.18  
    5.19  // Forward declarations
    5.20  class YieldingFlexibleWorkGang;