Title: [286670] trunk/Source/bmalloc
- Revision
- 286670
- Author
- commit-qu...@webkit.org
- Date
- 2021-12-08 11:46:15 -0800 (Wed, 08 Dec 2021)
Log Message
[libpas] Guard Darwin-specific malloc zone usage in mbmalloc sources
https://bugs.webkit.org/show_bug.cgi?id=234005
Patch by Zan Dobersek <zdober...@igalia.com> on 2021-12-08
Reviewed by Yusuke Suzuki.
Use PAS_OS(DARWIN) build guards for the Darwin-specific malloc header
inclusions and malloc_zone_pressure_relief() calls.
* libpas/src/mbmalloc/mbmalloc_bmalloc.c:
(mbscavenge):
* libpas/src/mbmalloc/mbmalloc_hotbit.c:
(mbscavenge):
* libpas/src/mbmalloc/mbmalloc_iso_common_primitive.c:
(mbscavenge):
Modified Paths
Diff
Modified: trunk/Source/bmalloc/ChangeLog (286669 => 286670)
--- trunk/Source/bmalloc/ChangeLog 2021-12-08 19:33:47 UTC (rev 286669)
+++ trunk/Source/bmalloc/ChangeLog 2021-12-08 19:46:15 UTC (rev 286670)
@@ -1,5 +1,22 @@
2021-12-08 Zan Dobersek <zdober...@igalia.com>
+ [libpas] Guard Darwin-specific malloc zone usage in mbmalloc sources
+ https://bugs.webkit.org/show_bug.cgi?id=234005
+
+ Reviewed by Yusuke Suzuki.
+
+ Use PAS_OS(DARWIN) build guards for the Darwin-specific malloc header
+ inclusions and malloc_zone_pressure_relief() calls.
+
+ * libpas/src/mbmalloc/mbmalloc_bmalloc.c:
+ (mbscavenge):
+ * libpas/src/mbmalloc/mbmalloc_hotbit.c:
+ (mbscavenge):
+ * libpas/src/mbmalloc/mbmalloc_iso_common_primitive.c:
+ (mbscavenge):
+
+2021-12-08 Zan Dobersek <zdober...@igalia.com>
+
[libpas] Remove the stale SkipListTests.cpp file
https://bugs.webkit.org/show_bug.cgi?id=234000
Modified: trunk/Source/bmalloc/libpas/src/mbmalloc/mbmalloc_bmalloc.c (286669 => 286670)
--- trunk/Source/bmalloc/libpas/src/mbmalloc/mbmalloc_bmalloc.c 2021-12-08 19:33:47 UTC (rev 286669)
+++ trunk/Source/bmalloc/libpas/src/mbmalloc/mbmalloc_bmalloc.c 2021-12-08 19:46:15 UTC (rev 286670)
@@ -27,9 +27,12 @@
#if PAS_ENABLE_BMALLOC
-#include <malloc/malloc.h>
#include "pas_scavenger.h"
+#if PAS_OS(DARWIN)
+#include <malloc/malloc.h>
+#endif
+
void* mbmalloc(size_t size)
{
return bmalloc_try_allocate(size);
@@ -53,7 +56,9 @@
void mbscavenge(void)
{
pas_scavenger_run_synchronously_now();
+#if PAS_OS(DARWIN)
malloc_zone_pressure_relief(NULL, 0);
+#endif
}
#endif /* PAS_ENABLE_BMALLOC */
Modified: trunk/Source/bmalloc/libpas/src/mbmalloc/mbmalloc_hotbit.c (286669 => 286670)
--- trunk/Source/bmalloc/libpas/src/mbmalloc/mbmalloc_hotbit.c 2021-12-08 19:33:47 UTC (rev 286669)
+++ trunk/Source/bmalloc/libpas/src/mbmalloc/mbmalloc_hotbit.c 2021-12-08 19:46:15 UTC (rev 286670)
@@ -27,9 +27,12 @@
#if PAS_ENABLE_HOTBIT
-#include <malloc/malloc.h>
#include "pas_scavenger.h"
+#if PAS_OS(DARWIN)
+#include <malloc/malloc.h>
+#endif
+
void* mbmalloc(size_t size)
{
return hotbit_try_allocate(size);
@@ -53,7 +56,9 @@
void mbscavenge(void)
{
pas_scavenger_run_synchronously_now();
+#if PAS_OS(DARWIN)
malloc_zone_pressure_relief(NULL, 0);
+#endif
}
#endif /* PAS_ENABLE_HOTBIT */
Modified: trunk/Source/bmalloc/libpas/src/mbmalloc/mbmalloc_iso_common_primitive.c (286669 => 286670)
--- trunk/Source/bmalloc/libpas/src/mbmalloc/mbmalloc_iso_common_primitive.c 2021-12-08 19:33:47 UTC (rev 286669)
+++ trunk/Source/bmalloc/libpas/src/mbmalloc/mbmalloc_iso_common_primitive.c 2021-12-08 19:46:15 UTC (rev 286670)
@@ -30,7 +30,6 @@
#include "Verifier.h"
#include "iso_heap_config.h"
#include "iso_heap_innards.h"
-#include <malloc/malloc.h>
#include "pas_bootstrap_free_heap.h"
#include "pas_fd_stream.h"
#include "pas_heap.h"
@@ -45,6 +44,10 @@
#include <stdlib.h>
#include <unistd.h>
+#if PAS_OS(DARWIN)
+#include <malloc/malloc.h>
+#endif
+
static const bool verbose = false;
#ifdef PAS_VERIFIED
static const bool verbose_scavenge = true;
@@ -138,7 +141,9 @@
if (really_scavenge_at_end) {
pas_scavenger_run_synchronously_now();
+#if PAS_OS(DARWIN)
malloc_zone_pressure_relief(NULL, 0);
+#endif
}
if (verbose_scavenge) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
