merge duplicated code into a utility function

Author: struct

include/iso_alloc_internal.h

@@ -515,6 +515,7 @@ INTERNAL_HIDDEN INLINE int64_t check_canary_no_abort(iso_alloc_zone *zone, void
 INTERNAL_HIDDEN INLINE uint64_t _get_backtrace_hash(uint32_t frames);
 INTERNAL_HIDDEN INLINE size_t next_pow2(size_t sz);
 INTERNAL_HIDDEN INLINE void flush_thread_zone_cache(void);
+INTERNAL_HIDDEN INLINE void populate_thread_zone_cache(iso_alloc_zone *zone);
 INTERNAL_HIDDEN FLATTEN void iso_free_chunk_from_zone(iso_alloc_zone *zone, void *p, bool permanent);
 INTERNAL_HIDDEN iso_alloc_zone *is_zone_usable(iso_alloc_zone *zone, size_t size);
 INTERNAL_HIDDEN iso_alloc_zone *iso_find_zone_fit(size_t size);

src/iso_alloc.c

@@ -1005,6 +1005,20 @@ INTERNAL_HIDDEN INLINE size_t next_pow2(size_t sz) {
     return sz + 1;
 }
 
+INTERNAL_HIDDEN INLINE void populate_thread_zone_cache(iso_alloc_zone *zone) {
+#if THREAD_SUPPORT && THREAD_ZONE_CACHE
+    if(thread_zone_cache_count < THREAD_ZONE_CACHE_SZ) {
+        thread_zone_cache[thread_zone_cache_count].zone = zone;
+        thread_zone_cache[thread_zone_cache_count].chunk_size = zone->chunk_size;
+        thread_zone_cache_count++;
+    } else {
+        thread_zone_cache_count = 0;
+        thread_zone_cache[thread_zone_cache_count].zone = zone;
+        thread_zone_cache[thread_zone_cache_count].chunk_size = zone->chunk_size;
+    }
+#endif
+}
+
 INTERNAL_HIDDEN void *_iso_alloc(iso_alloc_zone *zone, size_t size) {
     LOCK_ROOT();
 
@@ -1134,17 +1148,7 @@ INTERNAL_HIDDEN void *_iso_alloc(iso_alloc_zone *zone, size_t size) {
     void *p = _iso_alloc_bitslot_from_zone(free_bit_slot, zone);
     MASK_ZONE_PTRS(zone);
 
-#if THREAD_SUPPORT && THREAD_ZONE_CACHE
-    if(thread_zone_cache_count < THREAD_ZONE_CACHE_SZ) {
-        thread_zone_cache[thread_zone_cache_count].zone = zone;
-        thread_zone_cache[thread_zone_cache_count].chunk_size = zone->chunk_size;
-        thread_zone_cache_count++;
-    } else {
-        thread_zone_cache_count = 0;
-        thread_zone_cache[thread_zone_cache_count].zone = zone;
-        thread_zone_cache[thread_zone_cache_count].chunk_size = zone->chunk_size;
-    }
-#endif
+    populate_thread_zone_cache(zone);
 
     UNLOCK_ROOT();
     return p;
@@ -1481,17 +1485,7 @@ INTERNAL_HIDDEN FLATTEN void iso_free_chunk_from_zone(iso_alloc_zone *zone, void
 
     POISON_ZONE_CHUNK(zone, p);
 
-#if THREAD_SUPPORT && THREAD_ZONE_CACHE
-    if(thread_zone_cache_count < THREAD_ZONE_CACHE_SZ) {
-        thread_zone_cache[thread_zone_cache_count].zone = zone;
-        thread_zone_cache[thread_zone_cache_count].chunk_size = zone->chunk_size;
-        thread_zone_cache_count++;
-    } else {
-        thread_zone_cache_count = 0;
-        thread_zone_cache[thread_zone_cache_count].zone = zone;
-        thread_zone_cache[thread_zone_cache_count].chunk_size = zone->chunk_size;
-    }
-#endif
+    populate_thread_zone_cache(zone);
 
     return;
 }