Fincer
/
openntpd-openbsd
mirror of https://github.com/Fincer/openntpd-openbsd
1
0
Fork 0
Code Issues 0 Projects 0 Releases 61 Wiki Activity
Browse Source

Improve speed for the multi-threaded case by reducing lock contention. 

tested by many; ok florian@
OPENBSD_6_5
otto 6 years ago
parent
dcc9f7dd37
commit
f876cbde7a
1 changed files with 21 additions and 30 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +21
    -30
      src/lib/libc/stdlib/malloc.c

+ 21
- 30
src/lib/libc/stdlib/malloc.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: malloc.c,v 1.256 2018/12/09 11:32:02 florian Exp $ */
/* $OpenBSD: malloc.c,v 1.257 2018/12/10 07:57:49 otto Exp $ */
/* /*
* Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net> * Copyright (c) 2008, 2010, 2011, 2016 Otto Moerbeek <otto@drijf.net>
* Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@ -1309,14 +1309,14 @@ findpool(void *p, struct dir_info *argpool, struct dir_info **foundpool,
} }
static void static void
ofree(struct dir_info *argpool, void *p, int clear, int check, size_t argsz)
ofree(struct dir_info **argpool, void *p, int clear, int check, size_t argsz)
{ {
struct region_info *r; struct region_info *r;
struct dir_info *pool; struct dir_info *pool;
char *saved_function; char *saved_function;
size_t sz; size_t sz;
r = findpool(p, argpool, &pool, &saved_function);
r = findpool(p, *argpool, &pool, &saved_function);
REALSIZE(sz, r); REALSIZE(sz, r);
if (check) { if (check) {
@ -1405,12 +1405,9 @@ ofree(struct dir_info *argpool, void *p, int clear, int check, size_t argsz)
} }
} }
if (argpool != pool) {
pool->active--;
if (*argpool != pool) {
pool->func = saved_function; pool->func = saved_function;
_MALLOC_UNLOCK(pool->mutex);
_MALLOC_LOCK(argpool->mutex);
argpool->active++;
*argpool = pool;
} }
} }
@ -1433,7 +1430,7 @@ free(void *ptr)
malloc_recurse(d); malloc_recurse(d);
return; return;
} }
ofree(d, ptr, 0, 0, 0);
ofree(&d, ptr, 0, 0, 0);
d->active--; d->active--;
_MALLOC_UNLOCK(d->mutex); _MALLOC_UNLOCK(d->mutex);
errno = saved_errno; errno = saved_errno;
@ -1471,7 +1468,7 @@ freezero(void *ptr, size_t sz)
malloc_recurse(d); malloc_recurse(d);
return; return;
} }
ofree(d, ptr, 1, 1, sz);
ofree(&d, ptr, 1, 1, sz);
d->active--; d->active--;
_MALLOC_UNLOCK(d->mutex); _MALLOC_UNLOCK(d->mutex);
errno = saved_errno; errno = saved_errno;
@ -1479,7 +1476,7 @@ freezero(void *ptr, size_t sz)
DEF_WEAK(freezero); DEF_WEAK(freezero);
static void * static void *
orealloc(struct dir_info *argpool, void *p, size_t newsz, void *f)
orealloc(struct dir_info **argpool, void *p, size_t newsz, void *f)
{ {
struct region_info *r; struct region_info *r;
struct dir_info *pool; struct dir_info *pool;
@ -1490,14 +1487,14 @@ orealloc(struct dir_info *argpool, void *p, size_t newsz, void *f)
uint32_t chunknum; uint32_t chunknum;
if (p == NULL) if (p == NULL)
return omalloc(argpool, newsz, 0, f);
return omalloc(*argpool, newsz, 0, f);
if (newsz >= SIZE_MAX - mopts.malloc_guard - MALLOC_PAGESIZE) { if (newsz >= SIZE_MAX - mopts.malloc_guard - MALLOC_PAGESIZE) {
errno = ENOMEM; errno = ENOMEM;
return NULL; return NULL;
} }
r = findpool(p, argpool, &pool, &saved_function);
r = findpool(p, *argpool, &pool, &saved_function);
REALSIZE(oldsz, r); REALSIZE(oldsz, r);
if (mopts.chunk_canaries && oldsz <= MALLOC_MAXCHUNK) { if (mopts.chunk_canaries && oldsz <= MALLOC_MAXCHUNK) {
@ -1631,7 +1628,7 @@ gotit:
} }
if (newsz != 0 && oldsz != 0) if (newsz != 0 && oldsz != 0)
memcpy(q, p, oldsz < newsz ? oldsz : newsz); memcpy(q, p, oldsz < newsz ? oldsz : newsz);
ofree(pool, p, 0, 0, 0);
ofree(&pool, p, 0, 0, 0);
ret = q; ret = q;
} else { } else {
/* oldsz == newsz */ /* oldsz == newsz */
@ -1641,12 +1638,9 @@ gotit:
ret = p; ret = p;
} }
done: done:
if (argpool != pool) {
pool->active--;
if (*argpool != pool) {
pool->func = saved_function; pool->func = saved_function;
_MALLOC_UNLOCK(pool->mutex);
_MALLOC_LOCK(argpool->mutex);
argpool->active++;
*argpool = pool;
} }
return ret; return ret;
} }
@ -1669,7 +1663,7 @@ realloc(void *ptr, size_t size)
malloc_recurse(d); malloc_recurse(d);
return NULL; return NULL;
} }
r = orealloc(d, ptr, size, CALLER);
r = orealloc(&d, ptr, size, CALLER);
d->active--; d->active--;
_MALLOC_UNLOCK(d->mutex); _MALLOC_UNLOCK(d->mutex);
@ -1730,7 +1724,7 @@ calloc(size_t nmemb, size_t size)
/*DEF_STRONG(calloc);*/ /*DEF_STRONG(calloc);*/
static void * static void *
orecallocarray(struct dir_info *argpool, void *p, size_t oldsize,
orecallocarray(struct dir_info **argpool, void *p, size_t oldsize,
size_t newsize, void *f) size_t newsize, void *f)
{ {
struct region_info *r; struct region_info *r;
@ -1740,12 +1734,12 @@ orecallocarray(struct dir_info *argpool, void *p, size_t oldsize,
size_t sz; size_t sz;
if (p == NULL) if (p == NULL)
return omalloc(argpool, newsize, 1, f);
return omalloc(*argpool, newsize, 1, f);
if (oldsize == newsize) if (oldsize == newsize)
return p; return p;
r = findpool(p, argpool, &pool, &saved_function);
r = findpool(p, *argpool, &pool, &saved_function);
REALSIZE(sz, r); REALSIZE(sz, r);
if (sz <= MALLOC_MAXCHUNK) { if (sz <= MALLOC_MAXCHUNK) {
@ -1772,15 +1766,12 @@ orecallocarray(struct dir_info *argpool, void *p, size_t oldsize,
} else } else
memcpy(newptr, p, newsize); memcpy(newptr, p, newsize);
ofree(pool, p, 1, 0, oldsize);
ofree(&pool, p, 1, 0, oldsize);
done: done:
if (argpool != pool) {
pool->active--;
if (*argpool != pool) {
pool->func = saved_function; pool->func = saved_function;
_MALLOC_UNLOCK(pool->mutex);
_MALLOC_LOCK(argpool->mutex);
argpool->active++;
*argpool = pool;
} }
return newptr; return newptr;
@ -1883,7 +1874,7 @@ recallocarray(void *ptr, size_t oldnmemb, size_t newnmemb, size_t size)
return NULL; return NULL;
} }
r = orecallocarray(d, ptr, oldsize, newsize, CALLER);
r = orecallocarray(&d, ptr, oldsize, newsize, CALLER);
d->active--; d->active--;
_MALLOC_UNLOCK(d->mutex); _MALLOC_UNLOCK(d->mutex);


Write Preview
Loading…
Cancel
Save