OpenJDK / jdk / jdk

changeset 60759:5451929d765c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8252481: Remove excessive include of memTracker.hpp Reviewed-by: lfoltan, ccheung
author iklam
date Tue, 01 Sep 2020 08:29:15 -0700
parents 1e20fdeca15a
children 8051a4f3f57c
files src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp src/hotspot/share/gc/shared/oopStorage.cpp src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp src/hotspot/share/jfr/utilities/jfrAllocation.cpp src/hotspot/share/jfr/utilities/jfrAllocation.hpp src/hotspot/share/jfr/utilities/jfrHashtable.hpp src/hotspot/share/memory/allocation.hpp src/hotspot/share/memory/allocation.inline.hpp src/hotspot/share/memory/heapInspection.cpp src/hotspot/share/oops/method.cpp src/hotspot/share/runtime/park.cpp src/hotspot/share/utilities/hashtable.inline.hpp
diffstat 13 files changed, 20 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/gc/g1/g1CodeCacheRemSet.cpp	Tue Sep 01 08:29:15 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, 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
@@ -33,6 +33,7 @@
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
+#include "services/memTracker.hpp"
 #include "utilities/hashtable.inline.hpp"
 #include "utilities/stack.inline.hpp"
 
--- a/src/hotspot/share/gc/shared/oopStorage.cpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/gc/shared/oopStorage.cpp	Tue Sep 01 08:29:15 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -39,6 +39,7 @@
 #include "runtime/safepoint.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.hpp"
+#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/count_trailing_zeros.hpp"
 #include "utilities/debug.hpp"
--- a/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp	Tue Sep 01 08:29:15 2020 -0700
@@ -27,6 +27,8 @@
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
+class JavaThread;
+
 #define MSGBIT(e) (1<<(e))
 
 enum JFR_Msg {
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp	Tue Sep 01 08:29:15 2020 -0700
@@ -31,6 +31,7 @@
 #include "jfr/recorder/stringpool/jfrStringPoolBuffer.hpp"
 #include "jfr/utilities/jfrLinkedList.hpp"
 
+class JavaThread;
 class JfrChunkWriter;
 class JfrStringPool;
 
--- a/src/hotspot/share/jfr/utilities/jfrAllocation.cpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/jfr/utilities/jfrAllocation.cpp	Tue Sep 01 08:29:15 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, 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
@@ -29,6 +29,7 @@
 #include "memory/allocation.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/vm_version.hpp"
+#include "services/memTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/nativeCallStack.hpp"
--- a/src/hotspot/share/jfr/utilities/jfrAllocation.hpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/jfr/utilities/jfrAllocation.hpp	Tue Sep 01 08:29:15 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, 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
@@ -26,7 +26,6 @@
 #define SHARE_JFR_UTILITIES_JFRALLOCATION_HPP
 
 #include "memory/allocation.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/exceptions.hpp"
 
 /*
--- a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp	Tue Sep 01 08:29:15 2020 -0700
@@ -27,6 +27,7 @@
 
 #include "jfr/utilities/jfrAllocation.hpp"
 #include "runtime/atomic.hpp"
+#include "services/memTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 
--- a/src/hotspot/share/memory/allocation.hpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/memory/allocation.hpp	Tue Sep 01 08:29:15 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -479,7 +479,7 @@
   NEW_C_HEAP_ARRAY3(type, (size), memflags, pc, AllocFailStrategy::RETURN_NULL)
 
 #define NEW_C_HEAP_ARRAY_RETURN_NULL(type, size, memflags)\
-  NEW_C_HEAP_ARRAY3(type, (size), memflags, CURRENT_PC, AllocFailStrategy::RETURN_NULL)
+  NEW_C_HEAP_ARRAY2(type, (size), memflags, AllocFailStrategy::RETURN_NULL)
 
 #define REALLOC_C_HEAP_ARRAY(type, old, size, memflags)\
   (type*) (ReallocateHeap((char*)(old), (size) * sizeof(type), memflags))
--- a/src/hotspot/share/memory/allocation.inline.hpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/memory/allocation.inline.hpp	Tue Sep 01 08:29:15 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -28,7 +28,6 @@
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 
--- a/src/hotspot/share/memory/heapInspection.cpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/memory/heapInspection.cpp	Tue Sep 01 08:29:15 2020 -0700
@@ -37,6 +37,7 @@
 #include "oops/reflectionAccessorImplKlassHelper.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
+#include "services/memTracker.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/stack.inline.hpp"
--- a/src/hotspot/share/oops/method.cpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/oops/method.cpp	Tue Sep 01 08:29:15 2020 -0700
@@ -67,6 +67,7 @@
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
+#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/quickSort.hpp"
 #include "utilities/vmError.hpp"
--- a/src/hotspot/share/runtime/park.cpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/runtime/park.cpp	Tue Sep 01 08:29:15 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "memory/allocation.inline.hpp"
 #include "runtime/thread.hpp"
+#include "services/memTracker.hpp"
 
 // Lifecycle management for TSM ParkEvents.
 // ParkEvents are type-stable (TSM).
--- a/src/hotspot/share/utilities/hashtable.inline.hpp	Tue Sep 01 15:42:30 2020 +0000
+++ b/src/hotspot/share/utilities/hashtable.inline.hpp	Tue Sep 01 08:29:15 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
@@ -27,6 +27,7 @@
 
 #include "memory/allocation.inline.hpp"
 #include "runtime/atomic.hpp"
+#include "services/memTracker.hpp"
 #include "utilities/hashtable.hpp"
 #include "utilities/dtrace.hpp"
© 2007, Oracle and/or its affiliates
Terms of Use · Privacy · Trademarks