From 8728f4797fcb3e99b6e1ec2629efbf4119c37497 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 16 Sep 2024 16:12:01 -0400
Subject: [PATCH] libroot: Move malloc implementations to their own
 subdirectory.

No functional change intended.
---
 src/system/libroot/posix/Jamfile                              | 3 +--
 src/system/libroot/posix/malloc/Jamfile                       | 4 ++++
 .../libroot/posix/{malloc_debug => malloc/debug}/Jamfile      | 2 +-
 .../posix/{malloc_debug => malloc/debug}/guarded_heap.cpp     | 0
 .../libroot/posix/{malloc_debug => malloc/debug}/heap.cpp     | 0
 .../posix/{malloc_debug => malloc/debug}/malloc_debug_api.cpp | 0
 .../posix/{malloc_debug => malloc/debug}/malloc_debug_api.h   | 0
 .../libroot/posix/{malloc_hoard2 => malloc/hoard2}/Jamfile    | 2 +-
 .../posix/{malloc_hoard2 => malloc/hoard2}/arch-specific.cpp  | 0
 .../posix/{malloc_hoard2 => malloc/hoard2}/arch-specific.h    | 0
 .../libroot/posix/{malloc_hoard2 => malloc/hoard2}/block.h    | 0
 .../libroot/posix/{malloc_hoard2 => malloc/hoard2}/config.h   | 0
 .../libroot/posix/{malloc_hoard2 => malloc/hoard2}/heap.cpp   | 0
 .../libroot/posix/{malloc_hoard2 => malloc/hoard2}/heap.h     | 0
 .../posix/{malloc_hoard2 => malloc/hoard2}/heapstats.h        | 0
 .../posix/{malloc_hoard2 => malloc/hoard2}/processheap.cpp    | 0
 .../posix/{malloc_hoard2 => malloc/hoard2}/processheap.h      | 0
 .../posix/{malloc_hoard2 => malloc/hoard2}/superblock.cpp     | 0
 .../posix/{malloc_hoard2 => malloc/hoard2}/superblock.h       | 0
 .../posix/{malloc_hoard2 => malloc/hoard2}/threadheap.cpp     | 0
 .../posix/{malloc_hoard2 => malloc/hoard2}/threadheap.h       | 0
 .../posix/{malloc_hoard2 => malloc/hoard2}/wrapper.cpp        | 0
 22 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 src/system/libroot/posix/malloc/Jamfile
 rename src/system/libroot/posix/{malloc_debug => malloc/debug}/Jamfile (86%)
 rename src/system/libroot/posix/{malloc_debug => malloc/debug}/guarded_heap.cpp (100%)
 rename src/system/libroot/posix/{malloc_debug => malloc/debug}/heap.cpp (100%)
 rename src/system/libroot/posix/{malloc_debug => malloc/debug}/malloc_debug_api.cpp (100%)
 rename src/system/libroot/posix/{malloc_debug => malloc/debug}/malloc_debug_api.h (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/Jamfile (86%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/arch-specific.cpp (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/arch-specific.h (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/block.h (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/config.h (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/heap.cpp (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/heap.h (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/heapstats.h (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/processheap.cpp (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/processheap.h (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/superblock.cpp (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/superblock.h (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/threadheap.cpp (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/threadheap.h (100%)
 rename src/system/libroot/posix/{malloc_hoard2 => malloc/hoard2}/wrapper.cpp (100%)

diff --git a/src/system/libroot/posix/Jamfile b/src/system/libroot/posix/Jamfile
index b918a746d1..68fdf3ef56 100644
--- a/src/system/libroot/posix/Jamfile
+++ b/src/system/libroot/posix/Jamfile
@@ -57,8 +57,7 @@ for arch in $(TARGET_ARCHS) {
 
 SubInclude HAIKU_TOP src system libroot posix crypt ;
 SubInclude HAIKU_TOP src system libroot posix locale ;
-SubInclude HAIKU_TOP src system libroot posix malloc_hoard2 ;
-SubInclude HAIKU_TOP src system libroot posix malloc_debug ;
+SubInclude HAIKU_TOP src system libroot posix malloc ;
 SubInclude HAIKU_TOP src system libroot posix pthread ;
 SubInclude HAIKU_TOP src system libroot posix signal ;
 SubInclude HAIKU_TOP src system libroot posix stdio ;
diff --git a/src/system/libroot/posix/malloc/Jamfile b/src/system/libroot/posix/malloc/Jamfile
new file mode 100644
index 0000000000..210cd21c86
--- /dev/null
+++ b/src/system/libroot/posix/malloc/Jamfile
@@ -0,0 +1,4 @@
+SubDir HAIKU_TOP src system libroot posix malloc ;
+
+HaikuSubInclude debug ;
+HaikuSubInclude hoard2 ;
diff --git a/src/system/libroot/posix/malloc_debug/Jamfile b/src/system/libroot/posix/malloc/debug/Jamfile
similarity index 86%
rename from src/system/libroot/posix/malloc_debug/Jamfile
rename to src/system/libroot/posix/malloc/debug/Jamfile
index f272da30ac..1097650b65 100644
--- a/src/system/libroot/posix/malloc_debug/Jamfile
+++ b/src/system/libroot/posix/malloc/debug/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src system libroot posix malloc_debug ;
+SubDir HAIKU_TOP src system libroot posix malloc debug ;
 
 UsePrivateHeaders libroot shared runtime_loader ;
 
diff --git a/src/system/libroot/posix/malloc_debug/guarded_heap.cpp b/src/system/libroot/posix/malloc/debug/guarded_heap.cpp
similarity index 100%
rename from src/system/libroot/posix/malloc_debug/guarded_heap.cpp
rename to src/system/libroot/posix/malloc/debug/guarded_heap.cpp
diff --git a/src/system/libroot/posix/malloc_debug/heap.cpp b/src/system/libroot/posix/malloc/debug/heap.cpp
similarity index 100%
rename from src/system/libroot/posix/malloc_debug/heap.cpp
rename to src/system/libroot/posix/malloc/debug/heap.cpp
diff --git a/src/system/libroot/posix/malloc_debug/malloc_debug_api.cpp b/src/system/libroot/posix/malloc/debug/malloc_debug_api.cpp
similarity index 100%
rename from src/system/libroot/posix/malloc_debug/malloc_debug_api.cpp
rename to src/system/libroot/posix/malloc/debug/malloc_debug_api.cpp
diff --git a/src/system/libroot/posix/malloc_debug/malloc_debug_api.h b/src/system/libroot/posix/malloc/debug/malloc_debug_api.h
similarity index 100%
rename from src/system/libroot/posix/malloc_debug/malloc_debug_api.h
rename to src/system/libroot/posix/malloc/debug/malloc_debug_api.h
diff --git a/src/system/libroot/posix/malloc_hoard2/Jamfile b/src/system/libroot/posix/malloc/hoard2/Jamfile
similarity index 86%
rename from src/system/libroot/posix/malloc_hoard2/Jamfile
rename to src/system/libroot/posix/malloc/hoard2/Jamfile
index 27a166114f..45625f5f37 100644
--- a/src/system/libroot/posix/malloc_hoard2/Jamfile
+++ b/src/system/libroot/posix/malloc/hoard2/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src system libroot posix malloc_hoard2 ;
+SubDir HAIKU_TOP src system libroot posix malloc hoard2 ;
 
 UsePrivateHeaders libroot shared ;
 
diff --git a/src/system/libroot/posix/malloc_hoard2/arch-specific.cpp b/src/system/libroot/posix/malloc/hoard2/arch-specific.cpp
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/arch-specific.cpp
rename to src/system/libroot/posix/malloc/hoard2/arch-specific.cpp
diff --git a/src/system/libroot/posix/malloc_hoard2/arch-specific.h b/src/system/libroot/posix/malloc/hoard2/arch-specific.h
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/arch-specific.h
rename to src/system/libroot/posix/malloc/hoard2/arch-specific.h
diff --git a/src/system/libroot/posix/malloc_hoard2/block.h b/src/system/libroot/posix/malloc/hoard2/block.h
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/block.h
rename to src/system/libroot/posix/malloc/hoard2/block.h
diff --git a/src/system/libroot/posix/malloc_hoard2/config.h b/src/system/libroot/posix/malloc/hoard2/config.h
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/config.h
rename to src/system/libroot/posix/malloc/hoard2/config.h
diff --git a/src/system/libroot/posix/malloc_hoard2/heap.cpp b/src/system/libroot/posix/malloc/hoard2/heap.cpp
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/heap.cpp
rename to src/system/libroot/posix/malloc/hoard2/heap.cpp
diff --git a/src/system/libroot/posix/malloc_hoard2/heap.h b/src/system/libroot/posix/malloc/hoard2/heap.h
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/heap.h
rename to src/system/libroot/posix/malloc/hoard2/heap.h
diff --git a/src/system/libroot/posix/malloc_hoard2/heapstats.h b/src/system/libroot/posix/malloc/hoard2/heapstats.h
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/heapstats.h
rename to src/system/libroot/posix/malloc/hoard2/heapstats.h
diff --git a/src/system/libroot/posix/malloc_hoard2/processheap.cpp b/src/system/libroot/posix/malloc/hoard2/processheap.cpp
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/processheap.cpp
rename to src/system/libroot/posix/malloc/hoard2/processheap.cpp
diff --git a/src/system/libroot/posix/malloc_hoard2/processheap.h b/src/system/libroot/posix/malloc/hoard2/processheap.h
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/processheap.h
rename to src/system/libroot/posix/malloc/hoard2/processheap.h
diff --git a/src/system/libroot/posix/malloc_hoard2/superblock.cpp b/src/system/libroot/posix/malloc/hoard2/superblock.cpp
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/superblock.cpp
rename to src/system/libroot/posix/malloc/hoard2/superblock.cpp
diff --git a/src/system/libroot/posix/malloc_hoard2/superblock.h b/src/system/libroot/posix/malloc/hoard2/superblock.h
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/superblock.h
rename to src/system/libroot/posix/malloc/hoard2/superblock.h
diff --git a/src/system/libroot/posix/malloc_hoard2/threadheap.cpp b/src/system/libroot/posix/malloc/hoard2/threadheap.cpp
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/threadheap.cpp
rename to src/system/libroot/posix/malloc/hoard2/threadheap.cpp
diff --git a/src/system/libroot/posix/malloc_hoard2/threadheap.h b/src/system/libroot/posix/malloc/hoard2/threadheap.h
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/threadheap.h
rename to src/system/libroot/posix/malloc/hoard2/threadheap.h
diff --git a/src/system/libroot/posix/malloc_hoard2/wrapper.cpp b/src/system/libroot/posix/malloc/hoard2/wrapper.cpp
similarity index 100%
rename from src/system/libroot/posix/malloc_hoard2/wrapper.cpp
rename to src/system/libroot/posix/malloc/hoard2/wrapper.cpp