project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce variable scope.

Browse Source 
This resolves #274.
This commit is contained in:
Dmitry-Me 2015-09-08 15:09:20 +03:00 committed by Jason Evans
parent 6d91929e52
commit 78ae1ac486
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/chunk_dss.c
View File

@ -69,8 +69,6 @@ void *
chunk_alloc_dss(arena_t *arena, void *new_addr, size_t size, size_t alignment, chunk_alloc_dss(arena_t *arena, void *new_addr, size_t size, size_t alignment,
bool *zero, bool *commit) bool *zero, bool *commit)
{ {
void *ret;
cassert(have_dss); cassert(have_dss);
assert(size > 0 && (size & chunksize_mask) == 0); assert(size > 0 && (size & chunksize_mask) == 0);
assert(alignment > 0 && (alignment & chunksize_mask) == 0); assert(alignment > 0 && (alignment & chunksize_mask) == 0);
@ -84,9 +82,6 @@ chunk_alloc_dss(arena_t *arena, void *new_addr, size_t size, size_t alignment,
malloc_mutex_lock(&dss_mtx); malloc_mutex_lock(&dss_mtx);
if (dss_prev != (void *)-1) { if (dss_prev != (void *)-1) {
size_t gap_size, cpad_size;
void *cpad, *dss_next;
intptr_t incr;
/* /*
* The loop is necessary to recover from races with other * The loop is necessary to recover from races with other
@ -94,6 +89,9 @@ chunk_alloc_dss(arena_t *arena, void *new_addr, size_t size, size_t alignment,
* malloc. * malloc.
*/ */
do { do {
void *ret, *cpad, *dss_next;
size_t gap_size, cpad_size;
intptr_t incr;
/* Avoid an unnecessary system call. */ /* Avoid an unnecessary system call. */
if (new_addr != NULL && dss_max != new_addr) if (new_addr != NULL && dss_max != new_addr)
break; break;

6
src/chunk_mmap.c
View File

@ -6,14 +6,16 @@
static void * static void *
chunk_alloc_mmap_slow(size_t size, size_t alignment, bool *zero, bool *commit) chunk_alloc_mmap_slow(size_t size, size_t alignment, bool *zero, bool *commit)
{ {
void *ret, *pages; void *ret;
size_t alloc_size, leadsize; size_t alloc_size;
alloc_size = size + alignment - PAGE; alloc_size = size + alignment - PAGE;
/* Beware size_t wrap-around. */ /* Beware size_t wrap-around. */
if (alloc_size < size) if (alloc_size < size)
return (NULL); return (NULL);
do { do {
void *pages;
size_t leadsize;
pages = pages_map(NULL, alloc_size); pages = pages_map(NULL, alloc_size);
if (pages == NULL) if (pages == NULL)
return (NULL); return (NULL);

4
src/prof.c
View File

@ -1577,7 +1577,6 @@ prof_idump(void)
{ {
tsd_t *tsd; tsd_t *tsd;
prof_tdata_t *tdata; prof_tdata_t *tdata;
char filename[PATH_MAX + 1];
cassert(config_prof); cassert(config_prof);
@ -1593,6 +1592,7 @@ prof_idump(void)
} }
if (opt_prof_prefix[0] != '\0') { if (opt_prof_prefix[0] != '\0') {
char filename[PATH_MAX + 1];
malloc_mutex_lock(&prof_dump_seq_mtx); malloc_mutex_lock(&prof_dump_seq_mtx);
prof_dump_filename(filename, 'i', prof_dump_iseq); prof_dump_filename(filename, 'i', prof_dump_iseq);
prof_dump_iseq++; prof_dump_iseq++;
@ -1631,7 +1631,6 @@ prof_gdump(void)
{ {
tsd_t *tsd; tsd_t *tsd;
prof_tdata_t *tdata; prof_tdata_t *tdata;
char filename[DUMP_FILENAME_BUFSIZE];
cassert(config_prof); cassert(config_prof);
@ -1647,6 +1646,7 @@ prof_gdump(void)
} }
if (opt_prof_prefix[0] != '\0') { if (opt_prof_prefix[0] != '\0') {
char filename[DUMP_FILENAME_BUFSIZE];
malloc_mutex_lock(&prof_dump_seq_mtx); malloc_mutex_lock(&prof_dump_seq_mtx);
prof_dump_filename(filename, 'u', prof_dump_useq); prof_dump_filename(filename, 'u', prof_dump_useq);
prof_dump_useq++; prof_dump_useq++;