Summary of Changes: MOVED TO ARCHIVE: - core/hakmem_tiny_legacy_slow_box.inc → archive/ * Slow path legacy code preserved for reference * Superseded by Gatekeeper Box architecture - core/superslab_allocate.c → archive/superslab_allocate_legacy.c * Legacy SuperSlab allocation implementation * Functionality integrated into new Box system - core/superslab_head.c → archive/superslab_head_legacy.c * Legacy slab head management * Refactored through Box architecture REMOVED DEAD CODE: - Eliminated unused allocation policy variants from ss_allocation_box.c * Reduced from 127+ lines of conditional logic to focused implementation * Removed: old policy branches, unused allocation strategies * Kept: current Box-based allocation path ADDED NEW INFRASTRUCTURE: - core/superslab_head_stub.c (41 lines) * Minimal stub for backward compatibility * Delegates to new architecture - Enhanced core/superslab_cache.c (75 lines added) * Added missing API functions for cache management * Proper interface for SuperSlab cache integration REFACTORED CORE SYSTEMS: - core/hakmem_super_registry.c * Moved registration logic from scattered locations * Centralized SuperSlab registry management - core/hakmem_tiny.c * Removed 27 lines of redundant initialization * Simplified through Box architecture - core/hakmem_tiny_alloc.inc * Streamlined allocation path to use Gatekeeper * Removed legacy decision logic - core/box/ss_allocation_box.c/h * Dramatically simplified allocation policy * Removed conditional branches for unused strategies * Focused on current Box-based approach BUILD SYSTEM: - Updated Makefile for archive structure - Removed obsolete object file references - Maintained build compatibility SAFETY & TESTING: - All deletions verified: no broken references - Build verification: RELEASE=0 and RELEASE=1 pass - Smoke tests: 100% pass rate - Functional verification: allocation/free intact Architecture Consolidation: Before: Multiple overlapping allocation paths with legacy code branches After: Single unified path through Gatekeeper Boxes with clear architecture Benefits: - Reduced code size and complexity - Improved maintainability - Single source of truth for allocation logic - Better diagnostic/observability hooks - Foundation for future optimizations 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
102 lines
4.2 KiB
C++
102 lines
4.2 KiB
C++
// Phase 6-1.7: Box Theory Refactoring - Mutual exclusion check
|
|
#if HAKMEM_TINY_PHASE6_BOX_REFACTOR
|
|
#if defined(HAKMEM_TINY_PHASE6_METADATA)
|
|
#error "Cannot enable PHASE6_BOX_REFACTOR with other Phase 6 options"
|
|
#endif
|
|
|
|
// Box 1: Atomic Operations (Layer 0 - Foundation)
|
|
#include "tiny_atomic.h"
|
|
|
|
// Box 5: Allocation Fast Path (Layer 1 - 3-4 instructions)
|
|
#include "tiny_alloc_fast.inc.h"
|
|
|
|
// ---------------- Refill count (Front) global config ----------------
|
|
// Parsed once at init; hot path reads plain ints (no getenv).
|
|
int g_refill_count_global = 0; // HAKMEM_TINY_REFILL_COUNT
|
|
int g_refill_count_hot = 0; // HAKMEM_TINY_REFILL_COUNT_HOT
|
|
int g_refill_count_mid = 0; // HAKMEM_TINY_REFILL_COUNT_MID
|
|
int g_refill_count_class[TINY_NUM_CLASSES] = {0}; // HAKMEM_TINY_REFILL_COUNT_C{0..7}
|
|
|
|
// Export wrapper functions for hakmem.c to call
|
|
// Phase 6-1.7 Optimization: Remove diagnostic overhead, rely on LTO for inlining
|
|
void* hak_tiny_alloc_fast_wrapper(size_t size) {
|
|
static _Atomic int g_alloc_fast_trace = 0;
|
|
if (atomic_fetch_add_explicit(&g_alloc_fast_trace, 1, memory_order_relaxed) < 128) {
|
|
HAK_TRACE("[tiny_alloc_fast_wrapper_enter]\n");
|
|
}
|
|
// Phase E5: Ultra fast path (8-instruction alloc, bypasses all layers)
|
|
// Enable with: HAKMEM_ULTRA_FAST_PATH=1 (compile-time)
|
|
#if HAKMEM_ULTRA_FAST_PATH
|
|
void* ret = tiny_alloc_fast_ultra(size);
|
|
if (ret) return ret;
|
|
// Miss → fallback to full fast path
|
|
#endif
|
|
|
|
// Bench-only ultra-short path: bypass diagnostics and pointer tracking
|
|
// Enable with: HAKMEM_BENCH_FAST_FRONT=1
|
|
static int g_bench_fast_front = -1;
|
|
if (__builtin_expect(g_bench_fast_front == -1, 0)) {
|
|
const char* e = getenv("HAKMEM_BENCH_FAST_FRONT");
|
|
g_bench_fast_front = (e && *e && *e != '0') ? 1 : 0;
|
|
}
|
|
if (__builtin_expect(g_bench_fast_front, 0)) {
|
|
return tiny_alloc_fast(size);
|
|
}
|
|
|
|
static _Atomic uint64_t wrapper_call_count = 0;
|
|
uint64_t call_num = atomic_fetch_add(&wrapper_call_count, 1);
|
|
|
|
// Pointer tracking init (first call only)
|
|
PTR_TRACK_INIT();
|
|
|
|
// PRIORITY 3: Periodic canary validation (every 1000 ops)
|
|
periodic_canary_check(call_num, "hak_tiny_alloc_fast_wrapper");
|
|
|
|
// Box I: Periodic full integrity check (every 5000 ops)
|
|
#if HAKMEM_INTEGRITY_LEVEL >= 3
|
|
if ((call_num % 5000) == 0) {
|
|
extern void integrity_periodic_full_check(const char*);
|
|
integrity_periodic_full_check("periodic check in alloc wrapper");
|
|
}
|
|
#endif
|
|
|
|
#if !HAKMEM_BUILD_RELEASE
|
|
if (call_num > 14250 && call_num < 14280 && size <= 1024) {
|
|
fprintf(stderr, "[HAK_TINY_ALLOC_FAST_WRAPPER] call=%lu size=%zu\n", call_num, size);
|
|
fflush(stderr);
|
|
}
|
|
#endif
|
|
|
|
void* result = tiny_alloc_fast(size);
|
|
|
|
#if !HAKMEM_BUILD_RELEASE
|
|
if (call_num > 14250 && call_num < 14280 && size <= 1024) {
|
|
fprintf(stderr, "[HAK_TINY_ALLOC_FAST_WRAPPER] call=%lu returned %p\n", call_num, result);
|
|
fflush(stderr);
|
|
}
|
|
#endif
|
|
return result;
|
|
}
|
|
|
|
void hak_tiny_free_fast_wrapper(void* ptr) {
|
|
static _Atomic uint64_t free_call_count = 0;
|
|
uint64_t call_num = atomic_fetch_add(&free_call_count, 1);
|
|
if (call_num > 14135 && call_num < 14145) {
|
|
fprintf(stderr, "[HAK_TINY_FREE_FAST_WRAPPER] call=%lu ptr=%p\n", call_num, ptr);
|
|
fflush(stderr);
|
|
}
|
|
// Box 6 v1 (tiny_free_fast) は v2 に置き換え済み。
|
|
// Wrapper からは Box 経路の slow/fast 判定に委ねる。
|
|
hak_tiny_free(ptr);
|
|
if (call_num > 14135 && call_num < 14145) {
|
|
fprintf(stderr, "[HAK_TINY_FREE_FAST_WRAPPER] call=%lu completed\n", call_num);
|
|
fflush(stderr);
|
|
}
|
|
}
|
|
|
|
// Metadata-only fallback when Box Refactor is disabled
|
|
#elif defined(HAKMEM_TINY_PHASE6_METADATA)
|
|
// Phase 6-1.6: Metadata header (recommended)
|
|
#include "hakmem_tiny_metadata.inc"
|
|
#endif
|