diff --git a/jemalloc/src/internal/jemalloc_arena.h b/jemalloc/src/internal/jemalloc_arena.h index 610735dc..e3f07065 100644 --- a/jemalloc/src/internal/jemalloc_arena.h +++ b/jemalloc/src/internal/jemalloc_arena.h @@ -185,6 +185,7 @@ struct arena_chunk_s { /* Number of dirty pages. */ size_t ndirty; + /* Map of pages within chunk that keeps track of free/large/small. */ arena_chunk_map_t map[1]; /* Dynamically sized. */ }; diff --git a/jemalloc/src/jemalloc_arena.c b/jemalloc/src/jemalloc_arena.c index 869fa1a5..cc3e2ca6 100644 --- a/jemalloc/src/jemalloc_arena.c +++ b/jemalloc/src/jemalloc_arena.c @@ -1610,6 +1610,7 @@ arena_stats_merge(arena_t *arena, size_t *nactive, size_t *ndirty, void arena_dalloc_large(arena_t *arena, arena_chunk_t *chunk, void *ptr) { + /* Large allocation. */ malloc_mutex_lock(&arena->lock); diff --git a/jemalloc/src/jemalloc_ctl.c b/jemalloc/src/jemalloc_ctl.c index 855f747e..0b57d615 100644 --- a/jemalloc/src/jemalloc_ctl.c +++ b/jemalloc/src/jemalloc_ctl.c @@ -506,7 +506,7 @@ ctl_refresh(void) #endif /* - * Clear sum stats, since the will be merged into by + * Clear sum stats, since they will be merged into by * ctl_arena_refresh(). */ ctl_arena_clear(&ctl_stats.arenas[narenas]); @@ -1231,7 +1231,7 @@ swap_prezeroed_ctl(const size_t *mib, size_t miblen, void *oldp, } else { /* * swap_prezeroed isn't actually used by the swap code until it - * is set during a successfull chunk_swap_enabled() call. We + * is set during a successful chunk_swap_enabled() call. We * use it here to store the value that we'll pass to * chunk_swap_enable() in a swap.fds mallctl(). This is not * very clean, but the obvious alternatives are even worse. diff --git a/jemalloc/src/jemalloc_stats.c b/jemalloc/src/jemalloc_stats.c index 818ec5c4..580f0fe4 100644 --- a/jemalloc/src/jemalloc_stats.c +++ b/jemalloc/src/jemalloc_stats.c @@ -607,7 +607,7 @@ stats_print(void (*write4)(void *, const char *, const char *, const char *, if (ninitialized > 1) { /* Print merged arena stats. */ malloc_cprintf(write4, w4opaque, - "\nMerge arenas stats:\n"); + "\nMerged arenas stats:\n"); stats_arena_print(write4, w4opaque, narenas); }