diff --git a/core/box/hak_wrappers.inc.h b/core/box/hak_wrappers.inc.h index 375c8580..bfc9563e 100644 --- a/core/box/hak_wrappers.inc.h +++ b/core/box/hak_wrappers.inc.h @@ -44,8 +44,13 @@ void* malloc(size_t size) { return __libc_malloc(size); } + // Cache getenv result to avoid 8.51% CPU overhead on hot path + static _Atomic int debug_enabled = -1; // -1 = uninitialized static _Atomic int debug_count = 0; - if (getenv("HAKMEM_SFC_DEBUG") && debug_count < 100) { + if (__builtin_expect(debug_enabled < 0, 0)) { + debug_enabled = (getenv("HAKMEM_SFC_DEBUG") != NULL) ? 1 : 0; + } + if (debug_enabled && debug_count < 100) { int n = atomic_fetch_add(&debug_count, 1); if (n < 20) fprintf(stderr, "[SFC_DEBUG] malloc(%zu)\n", size); } @@ -66,9 +71,13 @@ void* malloc(size_t size) { extern void* __libc_malloc(size_t); return __libc_malloc(size); } - const char* lds = getenv("HAKMEM_LD_SAFE"); - int mode = (lds ? atoi(lds) : 1); - if (mode >= 2 || size > TINY_MAX_SIZE) { + // Cache HAKMEM_LD_SAFE to avoid repeated getenv on hot path + static _Atomic int ld_safe_mode = -1; // -1 = uninitialized + if (__builtin_expect(ld_safe_mode < 0, 0)) { + const char* lds = getenv("HAKMEM_LD_SAFE"); + ld_safe_mode = (lds ? atoi(lds) : 1); + } + if (ld_safe_mode >= 2 || size > TINY_MAX_SIZE) { extern void* __libc_malloc(size_t); return __libc_malloc(size); } @@ -106,10 +115,15 @@ void* calloc(size_t nmemb, size_t size) { if (hak_ld_block_jemalloc() && hak_jemalloc_loaded()) { extern void* __libc_calloc(size_t, size_t); return __libc_calloc(nmemb, size); } if (!g_initialized) { hak_init(); } if (g_initializing) { extern void* __libc_calloc(size_t, size_t); return __libc_calloc(nmemb, size); } - const char* lds = getenv("HAKMEM_LD_SAFE"); - int mode = (lds ? atoi(lds) : 1); + // Reuse cached ld_safe_mode from malloc (same static variable scope won't work, use inline function instead) + // For now, duplicate the caching logic + static _Atomic int ld_safe_mode_calloc = -1; + if (__builtin_expect(ld_safe_mode_calloc < 0, 0)) { + const char* lds = getenv("HAKMEM_LD_SAFE"); + ld_safe_mode_calloc = (lds ? atoi(lds) : 1); + } size_t total = nmemb * size; - if (mode >= 2 || total > TINY_MAX_SIZE) { extern void* __libc_calloc(size_t, size_t); return __libc_calloc(nmemb, size); } + if (ld_safe_mode_calloc >= 2 || total > TINY_MAX_SIZE) { extern void* __libc_calloc(size_t, size_t); return __libc_calloc(nmemb, size); } } g_hakmem_lock_depth++; size_t total_size = nmemb * size;