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

Define SBRK_INVALID instead of using a magic number

Browse Source
This commit is contained in:
Kevin Svetlitski 2023-07-24 10:36:32 -07:00 committed by Qi Wang
parent 7e54dd1ddb
commit 1431153695
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/extent_dss.c
View File

@ -8,6 +8,8 @@
/******************************************************************************/ /******************************************************************************/
/* Data. */ /* Data. */
#define SBRK_INVALID ((void *)-1)
const char *opt_dss = DSS_DEFAULT; const char *opt_dss = DSS_DEFAULT;
const char *const dss_prec_names[] = { const char *const dss_prec_names[] = {
@ -94,7 +96,7 @@ extent_dss_max_update(void *new_addr) {
* up to date. * up to date.
*/ */
void *max_cur = extent_dss_sbrk(0); void *max_cur = extent_dss_sbrk(0);
if (max_cur == (void *)-1) { if (max_cur == SBRK_INVALID) {
return NULL; return NULL;
} }
atomic_store_p(&dss_max, max_cur, ATOMIC_RELEASE); atomic_store_p(&dss_max, max_cur, ATOMIC_RELEASE);
@ -220,7 +222,7 @@ extent_alloc_dss(tsdn_t *tsdn, arena_t *arena, void *new_addr, size_t size,
* Failure, whether due to OOM or a race with a raw * Failure, whether due to OOM or a race with a raw
* sbrk() call from outside the allocator. * sbrk() call from outside the allocator.
*/ */
if (dss_prev == (void *)-1) { if (dss_prev == SBRK_INVALID) {
/* OOM. */ /* OOM. */
atomic_store_b(&dss_exhausted, true, atomic_store_b(&dss_exhausted, true,
ATOMIC_RELEASE); ATOMIC_RELEASE);
@ -270,7 +272,7 @@ extent_dss_boot(void) {
dss_base = extent_dss_sbrk(0); dss_base = extent_dss_sbrk(0);
atomic_store_b(&dss_extending, false, ATOMIC_RELAXED); atomic_store_b(&dss_extending, false, ATOMIC_RELAXED);
atomic_store_b(&dss_exhausted, dss_base == (void *)-1, ATOMIC_RELAXED); atomic_store_b(&dss_exhausted, dss_base == SBRK_INVALID, ATOMIC_RELAXED);
atomic_store_p(&dss_max, dss_base, ATOMIC_RELAXED); atomic_store_p(&dss_max, dss_base, ATOMIC_RELAXED);
} }