Skip to content

Commit 6288817

Browse files
authored
Merge pull request #106 from struct/reorder_funcs
reorder functions, move tagging to its own file
2 parents 421ea7b + 26f348b commit 6288817

6 files changed

Lines changed: 710 additions & 707 deletions

File tree

PERFORMANCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ larsonN isoalloc 249.791 63996 7.09 17.51 0 15567
251251
252252
larsonN-sized jemalloc 4.872 84428 39.56 0.22 1 52874
253253
larsonN-sized mimalloc 4.335 95388 39.82 0.13 0 25625
254-
larsonN-sized smimalloc 6.332 1q06372 39.71 0.17 0 27642
254+
larsonN-sized smimalloc 6.332 106372 39.71 0.17 0 27642
255255
larsonN-sized tcmalloc 4.230 64956 39.59 0.15 0 15669
256256
larsonN-sized scudo 44.601 32900 28.68 4.65 0 7793
257257
larsonN-sized isoalloc 363.176 70240 39.59 0.29 0 17222

include/iso_alloc_internal.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -526,11 +526,10 @@ extern iso_alloc_root *_root;
526526
INTERNAL_HIDDEN INLINE void check_big_canary(iso_alloc_big_zone_t *big);
527527
INTERNAL_HIDDEN INLINE void check_canary(iso_alloc_zone_t *zone, const void *p);
528528
INTERNAL_HIDDEN INLINE void iso_clear_user_chunk(uint8_t *p, size_t size);
529-
INTERNAL_HIDDEN INLINE void fill_free_bit_slot_cache(iso_alloc_zone_t *zone);
530529
INTERNAL_HIDDEN INLINE void insert_free_bit_slot(iso_alloc_zone_t *zone, int64_t bit_slot);
531530
INTERNAL_HIDDEN INLINE void write_canary(iso_alloc_zone_t *zone, void *p);
532531
INTERNAL_HIDDEN INLINE void populate_zone_cache(iso_alloc_zone_t *zone);
533-
INTERNAL_HIDDEN INLINE void _flush_chunk_quarantine(void);
532+
INTERNAL_HIDDEN INLINE void flush_chunk_quarantine(void);
534533
INTERNAL_HIDDEN INLINE void clear_zone_cache(void);
535534
INTERNAL_HIDDEN iso_alloc_zone_t *is_zone_usable(iso_alloc_zone_t *zone, size_t size);
536535
INTERNAL_HIDDEN iso_alloc_zone_t *find_suitable_zone(size_t size);
@@ -547,6 +546,7 @@ INTERNAL_HIDDEN bool is_pow2(uint64_t sz);
547546
INTERNAL_HIDDEN bool _is_zone_retired(iso_alloc_zone_t *zone);
548547
INTERNAL_HIDDEN bool _refresh_zone_mem_tags(iso_alloc_zone_t *zone);
549548
INTERNAL_HIDDEN iso_alloc_zone_t *_iso_free_internal_unlocked(void *p, bool permanent, iso_alloc_zone_t *zone);
549+
INTERNAL_HIDDEN void fill_free_bit_slot_cache(iso_alloc_zone_t *zone);
550550
INTERNAL_HIDDEN void flush_caches(void);
551551
INTERNAL_HIDDEN void iso_free_chunk_from_zone(iso_alloc_zone_t *zone, void *p, bool permanent);
552552
INTERNAL_HIDDEN void create_canary_chunks(iso_alloc_zone_t *zone);
@@ -570,9 +570,9 @@ INTERNAL_HIDDEN void _unmap_zone(iso_alloc_zone_t *zone);
570570
INTERNAL_HIDDEN void *_tag_ptr(void *p, iso_alloc_zone_t *zone);
571571
INTERNAL_HIDDEN void *_untag_ptr(void *p, iso_alloc_zone_t *zone);
572572
INTERNAL_HIDDEN void *create_guard_page(void *p);
573-
INTERNAL_HIDDEN void *mmap_rw_pages(size_t size, bool populate, const char *name);
574-
INTERNAL_HIDDEN void *mmap_pages(size_t size, bool populate, const char *name, int32_t prot);
575-
INTERNAL_HIDDEN void *_iso_big_alloc(size_t size);
573+
INTERNAL_HIDDEN ASSUME_ALIGNED void *mmap_rw_pages(size_t size, bool populate, const char *name);
574+
INTERNAL_HIDDEN ASSUME_ALIGNED void *mmap_pages(size_t size, bool populate, const char *name, int32_t prot);
575+
INTERNAL_HIDDEN ASSUME_ALIGNED void *_iso_big_alloc(size_t size);
576576
INTERNAL_HIDDEN ASSUME_ALIGNED void *_iso_alloc(iso_alloc_zone_t *zone, size_t size);
577577
INTERNAL_HIDDEN ASSUME_ALIGNED void *_iso_alloc_bitslot_from_zone(bit_slot_t bitslot, iso_alloc_zone_t *zone);
578578
INTERNAL_HIDDEN ASSUME_ALIGNED void *_iso_calloc(size_t nmemb, size_t size);

0 commit comments

Comments
 (0)