summaryrefslogtreecommitdiffstats
path: root/jemalloc
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2010-01-31 11:57:29 (GMT)
committerJason Evans <jasone@canonware.com>2010-01-31 11:57:29 (GMT)
commit13668262d17fb5950e2441bc9d56a15db9c93877 (patch)
tree4bf80838c22ee86ab1031fc4ece84a8ca469e4d5 /jemalloc
parent990d10cefb4b2ff4458086aedba8fc70975a9adc (diff)
downloadjemalloc-13668262d17fb5950e2441bc9d56a15db9c93877.zip
jemalloc-13668262d17fb5950e2441bc9d56a15db9c93877.tar.gz
jemalloc-13668262d17fb5950e2441bc9d56a15db9c93877.tar.bz2
Fix some comments and whitespace.
Diffstat (limited to 'jemalloc')
-rw-r--r--jemalloc/src/internal/jemalloc_arena.h1
-rw-r--r--jemalloc/src/jemalloc_arena.c1
-rw-r--r--jemalloc/src/jemalloc_ctl.c4
-rw-r--r--jemalloc/src/jemalloc_stats.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/jemalloc/src/internal/jemalloc_arena.h b/jemalloc/src/internal/jemalloc_arena.h
index 610735d..e3f0706 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 869fa1a..cc3e2ca 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 855f747..0b57d61 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 818ec5c..580f0fe 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);
}