From ace437d26ae9c2b27d08492135da52d211c53e01 Mon Sep 17 00:00:00 2001 From: Slobodan Predolac Date: Tue, 30 Sep 2025 07:13:12 -0700 Subject: [PATCH] Running clang-format on two files --- src/jemalloc.c | 49 ++++++++++++++++++++++++------------------------- src/pages.c | 14 +++++++------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/jemalloc.c b/src/jemalloc.c index 5c77621c..a3f01b3c 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -172,8 +172,7 @@ unsigned ncpus; unsigned opt_debug_double_free_max_scan = SAFETY_CHECK_DOUBLE_FREE_MAX_SCAN_DEFAULT; -size_t opt_calloc_madvise_threshold = - CALLOC_MADVISE_THRESHOLD_DEFAULT; +size_t opt_calloc_madvise_threshold = CALLOC_MADVISE_THRESHOLD_DEFAULT; /* Protects arenas initialization. */ static malloc_mutex_t arenas_lock; @@ -261,8 +260,8 @@ _init_init_lock(void) { # ifdef _MSC_VER # pragma section(".CRT$XCU", read) JEMALLOC_SECTION(".CRT$XCU") -JEMALLOC_ATTR(used) static const - void(WINAPI *init_init_lock)(void) = _init_init_lock; +JEMALLOC_ATTR(used) +static const void(WINAPI *init_init_lock)(void) = _init_init_lock; # endif # endif #else @@ -2883,8 +2882,8 @@ malloc_default(size_t size) { */ JEMALLOC_EXPORT - JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * - JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1) je_malloc(size_t size) { +JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * +JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1) je_malloc(size_t size) { LOG("core.malloc.entry", "size: %zu", size); void *ret = imalloc_fastpath(size, &malloc_default); @@ -2935,9 +2934,9 @@ JEMALLOC_ATTR(nonnull(1)) } JEMALLOC_EXPORT - JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * - JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(2) - je_aligned_alloc(size_t alignment, size_t size) { +JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * +JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(2) + je_aligned_alloc(size_t alignment, size_t size) { void *ret; static_opts_t sopts; @@ -2976,9 +2975,9 @@ JEMALLOC_EXPORT } JEMALLOC_EXPORT - JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * - JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE2(1, 2) - je_calloc(size_t num, size_t size) { +JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * +JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE2(1, 2) + je_calloc(size_t num, size_t size) { void *ret; static_opts_t sopts; dynamic_opts_t dopts; @@ -3186,8 +3185,8 @@ je_free_aligned_sized(void *ptr, size_t alignment, size_t size) { #ifdef JEMALLOC_OVERRIDE_MEMALIGN JEMALLOC_EXPORT - JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * - JEMALLOC_ATTR(malloc) je_memalign(size_t alignment, size_t size) { +JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * +JEMALLOC_ATTR(malloc) je_memalign(size_t alignment, size_t size) { void *ret; static_opts_t sopts; dynamic_opts_t dopts; @@ -3225,8 +3224,8 @@ JEMALLOC_EXPORT #ifdef JEMALLOC_OVERRIDE_VALLOC JEMALLOC_EXPORT - JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * - JEMALLOC_ATTR(malloc) je_valloc(size_t size) { +JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * +JEMALLOC_ATTR(malloc) je_valloc(size_t size) { void *ret; static_opts_t sopts; @@ -3262,8 +3261,8 @@ JEMALLOC_EXPORT #ifdef JEMALLOC_OVERRIDE_PVALLOC JEMALLOC_EXPORT - JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * - JEMALLOC_ATTR(malloc) je_pvalloc(size_t size) { +JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * +JEMALLOC_ATTR(malloc) je_pvalloc(size_t size) { void *ret; static_opts_t sopts; @@ -3457,9 +3456,9 @@ JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN smallocx_return_t #endif JEMALLOC_EXPORT - JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * - JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1) - je_mallocx(size_t size, int flags) { +JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * +JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1) + je_mallocx(size_t size, int flags) { void *ret; static_opts_t sopts; dynamic_opts_t dopts; @@ -3639,8 +3638,8 @@ label_oom: } JEMALLOC_EXPORT - JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * - JEMALLOC_ALLOC_SIZE(2) je_rallocx(void *ptr, size_t size, int flags) { +JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * +JEMALLOC_ALLOC_SIZE(2) je_rallocx(void *ptr, size_t size, int flags) { LOG("core.rallocx.entry", "ptr: %p, size: %zu, flags: %d", ptr, size, flags); void *ret = do_rallocx(ptr, size, flags, false); @@ -3689,8 +3688,8 @@ do_realloc_nonnull_zero(void *ptr) { } JEMALLOC_EXPORT - JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * - JEMALLOC_ALLOC_SIZE(2) je_realloc(void *ptr, size_t size) { +JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW * +JEMALLOC_ALLOC_SIZE(2) je_realloc(void *ptr, size_t size) { LOG("core.realloc.entry", "ptr: %p, size: %zu\n", ptr, size); if (likely(ptr != NULL && size != 0)) { diff --git a/src/pages.c b/src/pages.c index 44c57b28..bc1093a3 100644 --- a/src/pages.c +++ b/src/pages.c @@ -622,9 +622,9 @@ pages_dodump(void *addr, size_t size) { # include # include -#ifndef PIDFD_SELF -#define PIDFD_SELF -10000 -#endif +# ifndef PIDFD_SELF +# define PIDFD_SELF -10000 +# endif static atomic_b_t process_madvise_gate = ATOMIC_INIT(true); @@ -659,15 +659,15 @@ pages_purge_process_madvise_impl( * TODO: remove this save/restore of errno after supporting errno * preservation for free() call properly. */ - int saved_errno = get_errno(); + int saved_errno = get_errno(); size_t purged_bytes = (size_t)syscall(JE_SYS_PROCESS_MADVISE_NR, PIDFD_SELF, (struct iovec *)vec, vec_len, MADV_DONTNEED, 0); - if (purged_bytes == (size_t) -1) { + if (purged_bytes == (size_t)-1) { if (errno == EPERM || errno == EINVAL || errno == ENOSYS || errno == EBADF) { /* Process madvise not supported the way we need it. */ - atomic_store_b(&process_madvise_gate, false, - ATOMIC_RELAXED); + atomic_store_b( + &process_madvise_gate, false, ATOMIC_RELAXED); } set_errno(saved_errno); }