diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2012-06-20 13:13:16 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2012-06-20 13:13:16 +0000 |
| commit | 86684b2565900870ab39d72f079cea6b09c05332 (patch) | |
| tree | 0a5929feea1d908e03c3053dce3688758c110c05 /lib/libc/stdlib | |
| parent | cfc0a76afd4296c2d5408b6f0a4c5925eea5e216 (diff) | |
two small fixes to free page cache. first, we need two nibbles of random
in order to span the the entire cache. second, on free use the same offset
to put things in the cache instead of always starting at zero.
ok otto
Diffstat (limited to 'lib/libc/stdlib')
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 6f646934b22..92efd7d68b7 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.c,v 1.142 2012/06/18 17:03:51 matthew Exp $ */ +/* $OpenBSD: malloc.c,v 1.143 2012/06/20 13:13:15 tedu Exp $ */ /* * Copyright (c) 2008 Otto Moerbeek <otto@drijf.net> * @@ -317,7 +317,7 @@ unmap(struct dir_info *d, void *p, size_t sz) rsz = mopts.malloc_cache - d->free_regions_size; if (psz > rsz) tounmap = psz - rsz; - offset = getrnibble(); + offset = getrnibble() + getrnibble() << 4; for (i = 0; tounmap > 0 && i < mopts.malloc_cache; i++) { r = &d->free_regions[(i + offset) & (mopts.malloc_cache - 1)]; if (r->p != NULL) { @@ -337,7 +337,7 @@ unmap(struct dir_info *d, void *p, size_t sz) if (tounmap > 0) wrterror("malloc cache underflow", NULL); for (i = 0; i < mopts.malloc_cache; i++) { - r = &d->free_regions[i]; + r = &d->free_regions[(i + offset) & (mopts.malloc_cache - 1)]; if (r->p == NULL) { if (mopts.malloc_hint) madvise(p, sz, MADV_FREE); @@ -398,7 +398,7 @@ map(struct dir_info *d, size_t sz, int zero_fill) /* zero fill not needed */ return p; } - offset = getrnibble(); + offset = getrnibble() + getrnibble() << 4; for (i = 0; i < mopts.malloc_cache; i++) { r = &d->free_regions[(i + offset) & (mopts.malloc_cache - 1)]; if (r->p != NULL) { |