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

Normalize rdelm/rd structure field naming.

Browse Source
This commit is contained in:
Jason Evans 2015-03-10 18:29:49 -07:00
parent 38e42d311c
commit f5c8f37259
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/jemalloc/internal/arena.h
View File

@ -329,25 +329,25 @@ struct arena_s {
* *
* LRU-----------------------------------------------------------MRU * LRU-----------------------------------------------------------MRU
* *
* /------------------\ * /-- arena ---\
* | arena | * | |
* | | * | |
* | /------------\ | /-----------\ * |------------| /- chunk -\
* ...---->|chunks_cache|<---------------------->| chunk |<--... * ...->|chunks_cache|<--------------------------->| /----\ |<--...
* | \------------/ | | | * |------------| | |node| |
* | | | | * | | | | | |
* | | /---\ /---\ | | * | | /- run -\ /- run -\ | | | |
* | | |run| |run| | | * | | | | | | | | | |
* | | | | | | | | * | | | | | | | | | |
* | /----------\ | |---| |---| | /-----\ | * |------------| |-------| |-------| | |----| |
* ...----->|runs_dirty|<---->|rd |<---->|rd |<---->|rdelm|<-----... * ...->|runs_dirty |<-->|rd |<-->|rd |<---->|rd |<----...
* | \----------/ | |---| |---| | \-----/ | * |------------| |-------| |-------| | |----| |
* | | | | | | | | * | | | | | | | | | |
* | | | | | | | | * | | | | | | | \----/ |
* | | \---/ \---/ | | * | | \-------/ \-------/ | |
* | | | | * | | | |
* | | | | * | | | |
* \------------------/ \-----------/ * \------------/ \---------/
*/ */
arena_runs_dirty_link_t runs_dirty; arena_runs_dirty_link_t runs_dirty;
extent_node_t chunks_cache; extent_node_t chunks_cache;

8
include/jemalloc/internal/extent.h
View File

@ -34,7 +34,7 @@ struct extent_node_s {
prof_tctx_t *en_prof_tctx; prof_tctx_t *en_prof_tctx;
/* Linkage for arena's runs_dirty and chunks_cache rings. */ /* Linkage for arena's runs_dirty and chunks_cache rings. */
arena_runs_dirty_link_t rdelm; arena_runs_dirty_link_t rd;
qr(extent_node_t) cc_link; qr(extent_node_t) cc_link;
union { union {
@ -186,7 +186,7 @@ JEMALLOC_INLINE void
extent_node_dirty_linkage_init(extent_node_t *node) extent_node_dirty_linkage_init(extent_node_t *node)
{ {
qr_new(&node->rdelm, rd_link); qr_new(&node->rd, rd_link);
qr_new(node, cc_link); qr_new(node, cc_link);
} }
@ -195,7 +195,7 @@ extent_node_dirty_insert(extent_node_t *node,
arena_runs_dirty_link_t *runs_dirty, extent_node_t *chunks_dirty) arena_runs_dirty_link_t *runs_dirty, extent_node_t *chunks_dirty)
{ {
qr_meld(runs_dirty, &node->rdelm, rd_link); qr_meld(runs_dirty, &node->rd, rd_link);
qr_meld(chunks_dirty, node, cc_link); qr_meld(chunks_dirty, node, cc_link);
} }
@ -203,7 +203,7 @@ JEMALLOC_INLINE void
extent_node_dirty_remove(extent_node_t *node) extent_node_dirty_remove(extent_node_t *node)
{ {
qr_remove(&node->rdelm, rd_link); qr_remove(&node->rd, rd_link);
qr_remove(node, cc_link); qr_remove(node, cc_link);
} }

8
src/arena.c
View File

@ -1064,7 +1064,7 @@ arena_dirty_count(arena_t *arena)
rdelm != &arena->runs_dirty; rdelm = qr_next(rdelm, rd_link)) { rdelm != &arena->runs_dirty; rdelm = qr_next(rdelm, rd_link)) {
size_t npages; size_t npages;
if (rdelm == &chunkselm->rdelm) { if (rdelm == &chunkselm->rd) {
npages = extent_node_size_get(chunkselm) >> LG_PAGE; npages = extent_node_size_get(chunkselm) >> LG_PAGE;
chunkselm = qr_next(chunkselm, cc_link); chunkselm = qr_next(chunkselm, cc_link);
} else { } else {
@ -1122,7 +1122,7 @@ arena_stash_dirty(arena_t *arena, bool all, size_t npurge,
size_t npages; size_t npages;
rdelm_next = qr_next(rdelm, rd_link); rdelm_next = qr_next(rdelm, rd_link);
if (rdelm == &chunkselm->rdelm) { if (rdelm == &chunkselm->rd) {
extent_node_t *chunkselm_next; extent_node_t *chunkselm_next;
bool zero; bool zero;
UNUSED void *chunk; UNUSED void *chunk;
@ -1205,7 +1205,7 @@ arena_purge_stashed(arena_t *arena,
rdelm != purge_runs_sentinel; rdelm = qr_next(rdelm, rd_link)) { rdelm != purge_runs_sentinel; rdelm = qr_next(rdelm, rd_link)) {
size_t npages; size_t npages;
if (rdelm == &chunkselm->rdelm) { if (rdelm == &chunkselm->rd) {
size_t size = extent_node_size_get(chunkselm); size_t size = extent_node_size_get(chunkselm);
bool unzeroed; bool unzeroed;
@ -1275,7 +1275,7 @@ arena_unstash_purged(arena_t *arena,
chunkselm = qr_next(purge_chunks_sentinel, cc_link); chunkselm = qr_next(purge_chunks_sentinel, cc_link);
rdelm != purge_runs_sentinel; rdelm = rdelm_next) { rdelm != purge_runs_sentinel; rdelm = rdelm_next) {
rdelm_next = qr_next(rdelm, rd_link); rdelm_next = qr_next(rdelm, rd_link);
if (rdelm == &chunkselm->rdelm) { if (rdelm == &chunkselm->rd) {
extent_node_t *chunkselm_next = qr_next(chunkselm, extent_node_t *chunkselm_next = qr_next(chunkselm,
cc_link); cc_link);
void *addr = extent_node_addr_get(chunkselm); void *addr = extent_node_addr_get(chunkselm);