From 1f391e37ea3dd9f166204c3e658eab29ace4284b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 24 Nov 2019 15:35:51 +0100 Subject: [PATCH] Switch back to hoard2 for now. We'll reconsider rpmalloc when it has less overhead. --- src/system/libroot/posix/Jamfile | 2 +- src/system/libroot/posix/{malloc => malloc_hoard2}/Jamfile | 2 +- .../libroot/posix/{malloc => malloc_hoard2}/arch-specific.cpp | 0 .../libroot/posix/{malloc => malloc_hoard2}/arch-specific.h | 0 src/system/libroot/posix/{malloc => malloc_hoard2}/block.h | 0 src/system/libroot/posix/{malloc => malloc_hoard2}/config.h | 0 src/system/libroot/posix/{malloc => malloc_hoard2}/heap.cpp | 0 src/system/libroot/posix/{malloc => malloc_hoard2}/heap.h | 0 src/system/libroot/posix/{malloc => malloc_hoard2}/heapstats.h | 0 .../libroot/posix/{malloc => malloc_hoard2}/processheap.cpp | 0 .../libroot/posix/{malloc => malloc_hoard2}/processheap.h | 0 .../libroot/posix/{malloc => malloc_hoard2}/superblock.cpp | 0 src/system/libroot/posix/{malloc => malloc_hoard2}/superblock.h | 0 .../libroot/posix/{malloc => malloc_hoard2}/threadheap.cpp | 0 src/system/libroot/posix/{malloc => malloc_hoard2}/threadheap.h | 0 src/system/libroot/posix/{malloc => malloc_hoard2}/wrapper.cpp | 0 16 files changed, 2 insertions(+), 2 deletions(-) rename src/system/libroot/posix/{malloc => malloc_hoard2}/Jamfile (86%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/arch-specific.cpp (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/arch-specific.h (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/block.h (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/config.h (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/heap.cpp (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/heap.h (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/heapstats.h (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/processheap.cpp (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/processheap.h (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/superblock.cpp (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/superblock.h (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/threadheap.cpp (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/threadheap.h (100%) rename src/system/libroot/posix/{malloc => malloc_hoard2}/wrapper.cpp (100%) diff --git a/src/system/libroot/posix/Jamfile b/src/system/libroot/posix/Jamfile index 9ba0da3023..c3c2725a7b 100644 --- a/src/system/libroot/posix/Jamfile +++ b/src/system/libroot/posix/Jamfile @@ -49,7 +49,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 rpmalloc ; +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 pthread ; SubInclude HAIKU_TOP src system libroot posix signal ; diff --git a/src/system/libroot/posix/malloc/Jamfile b/src/system/libroot/posix/malloc_hoard2/Jamfile similarity index 86% rename from src/system/libroot/posix/malloc/Jamfile rename to src/system/libroot/posix/malloc_hoard2/Jamfile index 9a14024dd2..27a166114f 100644 --- a/src/system/libroot/posix/malloc/Jamfile +++ b/src/system/libroot/posix/malloc_hoard2/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src system libroot posix malloc ; +SubDir HAIKU_TOP src system libroot posix malloc_hoard2 ; UsePrivateHeaders libroot shared ; diff --git a/src/system/libroot/posix/malloc/arch-specific.cpp b/src/system/libroot/posix/malloc_hoard2/arch-specific.cpp similarity index 100% rename from src/system/libroot/posix/malloc/arch-specific.cpp rename to src/system/libroot/posix/malloc_hoard2/arch-specific.cpp diff --git a/src/system/libroot/posix/malloc/arch-specific.h b/src/system/libroot/posix/malloc_hoard2/arch-specific.h similarity index 100% rename from src/system/libroot/posix/malloc/arch-specific.h rename to src/system/libroot/posix/malloc_hoard2/arch-specific.h diff --git a/src/system/libroot/posix/malloc/block.h b/src/system/libroot/posix/malloc_hoard2/block.h similarity index 100% rename from src/system/libroot/posix/malloc/block.h rename to src/system/libroot/posix/malloc_hoard2/block.h diff --git a/src/system/libroot/posix/malloc/config.h b/src/system/libroot/posix/malloc_hoard2/config.h similarity index 100% rename from src/system/libroot/posix/malloc/config.h rename to src/system/libroot/posix/malloc_hoard2/config.h diff --git a/src/system/libroot/posix/malloc/heap.cpp b/src/system/libroot/posix/malloc_hoard2/heap.cpp similarity index 100% rename from src/system/libroot/posix/malloc/heap.cpp rename to src/system/libroot/posix/malloc_hoard2/heap.cpp diff --git a/src/system/libroot/posix/malloc/heap.h b/src/system/libroot/posix/malloc_hoard2/heap.h similarity index 100% rename from src/system/libroot/posix/malloc/heap.h rename to src/system/libroot/posix/malloc_hoard2/heap.h diff --git a/src/system/libroot/posix/malloc/heapstats.h b/src/system/libroot/posix/malloc_hoard2/heapstats.h similarity index 100% rename from src/system/libroot/posix/malloc/heapstats.h rename to src/system/libroot/posix/malloc_hoard2/heapstats.h diff --git a/src/system/libroot/posix/malloc/processheap.cpp b/src/system/libroot/posix/malloc_hoard2/processheap.cpp similarity index 100% rename from src/system/libroot/posix/malloc/processheap.cpp rename to src/system/libroot/posix/malloc_hoard2/processheap.cpp diff --git a/src/system/libroot/posix/malloc/processheap.h b/src/system/libroot/posix/malloc_hoard2/processheap.h similarity index 100% rename from src/system/libroot/posix/malloc/processheap.h rename to src/system/libroot/posix/malloc_hoard2/processheap.h diff --git a/src/system/libroot/posix/malloc/superblock.cpp b/src/system/libroot/posix/malloc_hoard2/superblock.cpp similarity index 100% rename from src/system/libroot/posix/malloc/superblock.cpp rename to src/system/libroot/posix/malloc_hoard2/superblock.cpp diff --git a/src/system/libroot/posix/malloc/superblock.h b/src/system/libroot/posix/malloc_hoard2/superblock.h similarity index 100% rename from src/system/libroot/posix/malloc/superblock.h rename to src/system/libroot/posix/malloc_hoard2/superblock.h diff --git a/src/system/libroot/posix/malloc/threadheap.cpp b/src/system/libroot/posix/malloc_hoard2/threadheap.cpp similarity index 100% rename from src/system/libroot/posix/malloc/threadheap.cpp rename to src/system/libroot/posix/malloc_hoard2/threadheap.cpp diff --git a/src/system/libroot/posix/malloc/threadheap.h b/src/system/libroot/posix/malloc_hoard2/threadheap.h similarity index 100% rename from src/system/libroot/posix/malloc/threadheap.h rename to src/system/libroot/posix/malloc_hoard2/threadheap.h diff --git a/src/system/libroot/posix/malloc/wrapper.cpp b/src/system/libroot/posix/malloc_hoard2/wrapper.cpp similarity index 100% rename from src/system/libroot/posix/malloc/wrapper.cpp rename to src/system/libroot/posix/malloc_hoard2/wrapper.cpp