Renamed mallochook to mallochooks for consistency

schmelter-sap · Aug 15, 2023 · e08a57f · e08a57f
1 parent 67e0966
commit e08a57f
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/make/modules/java.base/Copy.gmk b/make/modules/java.base/Copy.gmk
@@ -283,12 +283,12 @@ TARGETS += $(CREATE_CLASSFILE_CONSTANTS_H)
 
 ifeq ($(call isTargetOs, windows), false)
 
-  $(eval $(call SetupCopyFiles, CREATE_MALLOC_HOOK_H, \
-      FILES := $(TOPDIR)/src/java.base/unix/native/libmallochooks/mallochook.h, \
+  $(eval $(call SetupCopyFiles, CREATE_MALLOC_HOOKS_H, \
+      FILES := $(TOPDIR)/src/java.base/unix/native/libmallochooks/mallochooks.h, \
       DEST := $(SUPPORT_OUTPUTDIR)/modules_include/java.base/, \
   ))
 
-  TARGETS += $(CREATE_MALLOC_HOOK_H)
+  TARGETS += $(CREATE_MALLOC_HOOKS_H)
 endif
 
 ################################################################################
diff --git a/src/hotspot/os/posix/malloctrace/mallocTrace2.cpp b/src/hotspot/os/posix/malloctrace/mallocTrace2.cpp
@@ -1,6 +1,7 @@
 #include "precompiled.hpp"
 
 #include "jvm_io.h"
+#include "mallochooks.h"
 #include "malloctrace/mallocTrace2.hpp"
 #include "utilities/ostream.hpp"
 

diff --git a/src/hotspot/os/posix/malloctrace/mallocTrace2.hpp b/src/hotspot/os/posix/malloctrace/mallocTrace2.hpp
@@ -1,7 +1,6 @@
 #ifndef OS_POSIX_MALLOCTRACE_MALLOCTRACE_HPP
 #define OS_POSIX_MALLOCTRACE_MALLOCTRACE_HPP
 
-#include "mallochook.h"
 #include "utilities/globalDefinitions.hpp"
 
 class outputStream;

diff --git a/...e/unix/native/libmallochooks/mallochook.c → .../unix/native/libmallochooks/mallochooks.c b/...e/unix/native/libmallochooks/mallochook.c → .../unix/native/libmallochooks/mallochooks.c
diff --git a/...e/unix/native/libmallochooks/mallochook.h → .../unix/native/libmallochooks/mallochooks.h b/...e/unix/native/libmallochooks/mallochook.h → .../unix/native/libmallochooks/mallochooks.h
diff --git a/src/utils/mallochook/testmallochook.c b/src/utils/mallochook/testmallochook.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <malloc.h>
 
-#include "mallochook.h"
+#include "mallochooks.h"
 
 #define PRINT_CALLER_ADDRESS 1