From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: pclouds@gmail.com, brad@comstyle.com, collin.funk1@gmail.com,
"Carlo Marcelo Arenas Belón" <carenas@gmail.com>
Subject: [PATCH] builtin/gc: improve total_ram calculation for HAVE_BSD_SYSCTL
Date: Wed, 2 Jul 2025 07:42:44 -0700 [thread overview]
Message-ID: <20250702144244.43858-1-carenas@gmail.com> (raw)
In BSD systems other than macOS, since 9806f5a7bf (gc --auto:
exclude base pack if not enough mem to "repack -ad", 2018-04-15),
sysctl() use HW_PHYSMEM with the wrong size for the target.
Use the correct type for physical_memory on each option and make
sure it is initialized, so it is safe to use even if sysctl() fails.
While at it, add a cast to the returned value for consistency.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
builtin/gc.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/builtin/gc.c b/builtin/gc.c
index 845876ff02..3b2ca99af9 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -539,21 +539,25 @@ static uint64_t total_ram(void)
return total;
}
#elif defined(HAVE_BSD_SYSCTL) && (defined(HW_MEMSIZE) || defined(HW_PHYSMEM) || defined(HW_PHYSMEM64))
- int64_t physical_memory;
int mib[2];
size_t length;
-
- mib[0] = CTL_HW;
# if defined(HW_MEMSIZE)
+ int64_t physical_memory = 0;
+
mib[1] = HW_MEMSIZE;
# elif defined(HW_PHYSMEM64)
+ int64_t physical_memory = 0;
+
mib[1] = HW_PHYSMEM64;
# else
+ int physical_memory = 0;
+
mib[1] = HW_PHYSMEM;
# endif
- length = sizeof(int64_t);
+ mib[0] = CTL_HW;
+ length = sizeof(physical_memory);
if (!sysctl(mib, 2, &physical_memory, &length, NULL, 0))
- return physical_memory;
+ return (uint64_t)physical_memory;
#elif defined(GIT_WINDOWS_NATIVE)
MEMORYSTATUSEX memInfo;
--
2.50.0.147.gafe0d4ec5b
next reply other threads:[~2025-07-02 14:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-02 14:42 Carlo Marcelo Arenas Belón [this message]
2025-07-02 15:23 ` [PATCH] builtin/gc: improve total_ram calculation for HAVE_BSD_SYSCTL Patrick Steinhardt
2025-07-02 17:04 ` Carlo Marcelo Arenas Belón
2025-07-02 15:46 ` [PATCH v2] builtin/gc: protect against sysctl() failure in total_ram Carlo Marcelo Arenas Belón
2025-07-02 18:42 ` Junio C Hamano
2025-07-02 20:22 ` Carlo Marcelo Arenas Belón
2025-07-02 20:59 ` Junio C Hamano
2025-07-02 20:21 ` [PATCH v3] builtin/gc: correct total_ram calculation with HAVE_BSD_SYSCTL Carlo Marcelo Arenas Belón
2025-07-02 21:14 ` Junio C Hamano
2025-07-02 22:42 ` Carlo Marcelo Arenas Belón
2025-07-02 22:59 ` Junio C Hamano
2025-07-03 8:01 ` [PATCH v4] " Carlo Marcelo Arenas Belón
2025-07-07 13:39 ` Junio C Hamano
2025-07-07 16:45 ` [PATCH v5] " Carlo Marcelo Arenas Belón
2025-07-07 17:09 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250702144244.43858-1-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=brad@comstyle.com \
--cc=collin.funk1@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.