eea3b988bd
Implementation: - Step 1: TLS SLL Guard Box (push前meta/class/state突合) - Step 2: SP_REBIND_SLOT macro (原子的slab rebind) - Step 3: Unified Geometry Box (ポインタ演算API統一) - Step 4: Unified Guard Box (HAKMEM_TINY_GUARD=1 統一制御) New Files (545 lines): - core/box/tiny_guard_box.h (277L) - TLS push guard (SuperSlab/slab/class/state validation) - Recycle guard (EMPTY確認) - Drain guard (準備) - 統一ENV制御: HAKMEM_TINY_GUARD=1 - core/box/tiny_geometry_box.h (174L) - BASE_FROM_USER/USER_FROM_BASE conversion - SS_FROM_PTR/SLAB_IDX_FROM_PTR lookup - PTR_CLASSIFY combined helper - 85+箇所の重複コード削減候補を特定 - core/box/sp_rebind_slot_box.h (94L) - SP_REBIND_SLOT macro (geometry + TLS reset + class_map原子化) - 6箇所に適用 (Stage 0/0.5/1/2/3) - デバッグトレース: HAKMEM_SP_REBIND_TRACE=1 Results: - ✅ TLS_SLL_DUP完全根絶 (0 crashes, 0 guard rejects) - ✅ パフォーマンス改善 +5.9% (15.16M → 16.05M ops/s on WS8192) - ✅ コンパイル警告0件（新規） - ✅ Box Theory準拠 (Single Responsibility, Clear Contract, Observable, Composable) Test Results: - Debug build: HAKMEM_TINY_GUARD=1 で10M iterations完走 - Release build: 3回平均 16.05M ops/s - Guard reject rate: 0% - Core dump: なし Box Theory Compliance: - Single Responsibility: 各Boxが単一責任 (guard/rebind/geometry) - Clear Contract: 明確なAPI境界 - Observable: ENV変数で制御可能な検証 - Composable: 全allocation/free pathから利用可能 Performance Impact: - Release build (guard無効): 影響なし (+5.9%改善) - Debug build (guard有効): 数%のオーバーヘッド (検証コスト) Architecture Improvements: - ポインタ演算の一元管理 (85+箇所の統一候補) - Slab rebindの原子性保証 - 検証機能の統合 (単一ENV制御) Phase 9 Status: - 性能目標 (25-30M ops/s): 未達 (16.05M = 53-64%) - TLS_SLL_DUP根絶: ✅ 達成 - コード品質: ✅ 大幅向上 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
95 lines
3.8 KiB
C
95 lines
3.8 KiB
C
// sp_rebind_slot_box.h - SuperSlab Slot Rebinding (atomic class change)
|
|
// Purpose: Atomically rebind a slab slot to a new class with consistent state
|
|
// License: MIT
|
|
// Date: 2025-11-30
|
|
|
|
#ifndef HAKMEM_SP_REBIND_SLOT_BOX_H
|
|
#define HAKMEM_SP_REBIND_SLOT_BOX_H
|
|
|
|
#include "hakmem_tiny_superslab_internal.h"
|
|
#include "box/tls_sll_box.h" // TLS_SLL_RESET
|
|
|
|
// ========== SuperSlab Slot Rebinding ==========
|
|
//
|
|
// Atomically rebind a slab slot when:
|
|
// - Stage 1: EMPTY → ACTIVE (same or different class)
|
|
// - Stage 2: UNUSED → ACTIVE (new class)
|
|
// - Stage 3: New SuperSlab (initial class assignment)
|
|
//
|
|
// Operations (in order):
|
|
// 1. Remember old class (for TLS cleanup)
|
|
// 2. Fix geometry if needed (update capacity/class_idx)
|
|
// 3. Reset TLS SLL for BOTH old and new class (防御的)
|
|
// 4. Update class_map (out-of-band lookup)
|
|
//
|
|
// Box Theory:
|
|
// - Single Responsibility: Ensure slab→class binding consistency
|
|
// - Clear Contract: (ss, slab_idx, new_class) → consistent state
|
|
// - Observable: Debug log shows old_cls→new_cls transitions
|
|
// - Composable: Called from all acquire paths
|
|
|
|
#if !HAKMEM_BUILD_RELEASE
|
|
#define SP_REBIND_SLOT(ss, slab_idx, new_class_idx) \
|
|
do { \
|
|
static __thread int s_trace = -1; \
|
|
if (__builtin_expect(s_trace == -1, 0)) { \
|
|
const char* e = getenv("HAKMEM_SP_REBIND_TRACE"); \
|
|
s_trace = (e && *e && *e != '0') ? 1 : 0; \
|
|
} \
|
|
\
|
|
/* Step 1: Remember old class for TLS cleanup */ \
|
|
uint8_t old_class_idx = (ss)->slabs[slab_idx].class_idx; \
|
|
\
|
|
/* Step 2: Fix geometry (updates capacity, class_idx, etc) */ \
|
|
sp_fix_geometry_if_needed((ss), (slab_idx), (new_class_idx)); \
|
|
\
|
|
/* Step 3: Reset TLS SLL for old class (if different) */ \
|
|
if (old_class_idx != (uint8_t)(new_class_idx) && \
|
|
old_class_idx < TINY_NUM_CLASSES) { \
|
|
TLS_SLL_RESET(old_class_idx); \
|
|
if (s_trace) { \
|
|
fprintf(stderr, \
|
|
"[SP_REBIND_SLOT] OLD class TLS reset: cls=%d ss=%p slab=%d (old_cls=%d -> new_cls=%d)\n", \
|
|
old_class_idx, (void*)(ss), (slab_idx), old_class_idx, (new_class_idx)); \
|
|
} \
|
|
} \
|
|
\
|
|
/* Step 4: Reset TLS SLL for new class (防御的 - 常にクリア) */ \
|
|
if ((new_class_idx) < TINY_NUM_CLASSES) { \
|
|
TLS_SLL_RESET(new_class_idx); \
|
|
if (s_trace) { \
|
|
fprintf(stderr, \
|
|
"[SP_REBIND_SLOT] NEW class TLS reset: cls=%d ss=%p slab=%d\n", \
|
|
(new_class_idx), (void*)(ss), (slab_idx)); \
|
|
} \
|
|
} \
|
|
\
|
|
/* Step 5: Update class_map (out-of-band lookup) */ \
|
|
ss_slab_meta_class_idx_set((ss), (slab_idx), (uint8_t)(new_class_idx)); \
|
|
\
|
|
if (s_trace) { \
|
|
fprintf(stderr, \
|
|
"[SP_REBIND_SLOT] COMPLETE: ss=%p slab=%d old_cls=%d -> new_cls=%d cap=%u\n", \
|
|
(void*)(ss), (slab_idx), old_class_idx, (new_class_idx), \
|
|
(unsigned)(ss)->slabs[slab_idx].capacity); \
|
|
} \
|
|
} while (0)
|
|
#else
|
|
// Release build: no trace, just execute operations
|
|
#define SP_REBIND_SLOT(ss, slab_idx, new_class_idx) \
|
|
do { \
|
|
uint8_t old_class_idx = (ss)->slabs[slab_idx].class_idx; \
|
|
sp_fix_geometry_if_needed((ss), (slab_idx), (new_class_idx)); \
|
|
if (old_class_idx != (uint8_t)(new_class_idx) && \
|
|
old_class_idx < TINY_NUM_CLASSES) { \
|
|
TLS_SLL_RESET(old_class_idx); \
|
|
} \
|
|
if ((new_class_idx) < TINY_NUM_CLASSES) { \
|
|
TLS_SLL_RESET(new_class_idx); \
|
|
} \
|
|
ss_slab_meta_class_idx_set((ss), (slab_idx), (uint8_t)(new_class_idx)); \
|
|
} while (0)
|
|
#endif
|
|
|
|
#endif // HAKMEM_SP_REBIND_SLOT_BOX_H
|