40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 2f31dab873a4b980cb1bd09a001257afb75385b9 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Wed, 2 Aug 2023 12:06:27 -0700
|
|
Subject: [PATCH] sd-event: Make malloc_trim() conditional on glibc
|
|
|
|
musl does not have this API
|
|
|
|
Upstream-Status: Inappropriate [musl-specific]
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
src/libsystemd/sd-event/sd-event.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
|
|
index a1305ef0149..b8a73da2a3b 100644
|
|
--- a/src/libsystemd/sd-event/sd-event.c
|
|
+++ b/src/libsystemd/sd-event/sd-event.c
|
|
@@ -1877,7 +1877,7 @@ _public_ int sd_event_add_exit(
|
|
}
|
|
|
|
_public_ int sd_event_trim_memory(void) {
|
|
- int r;
|
|
+ int r = 0;
|
|
|
|
/* A default implementation of a memory pressure callback. Simply releases our own allocation caches
|
|
* and glibc's. This is automatically used when people call sd_event_add_memory_pressure() with a
|
|
@@ -1891,7 +1891,9 @@ _public_ int sd_event_trim_memory(void) {
|
|
|
|
usec_t before_timestamp = now(CLOCK_MONOTONIC);
|
|
hashmap_trim_pools();
|
|
+#ifdef __GLIBC__
|
|
r = malloc_trim(0);
|
|
+#endif
|
|
usec_t after_timestamp = now(CLOCK_MONOTONIC);
|
|
|
|
if (r > 0)
|
|
--
|
|
GitLab
|
|
|