From f5c8f37259d7697c3f850ac1e5ef63b724cf7689 Mon Sep 17 00:00:00 2001
From: Jason Evans <je@fb.com>
Date: Tue, 10 Mar 2015 18:29:49 -0700
Subject: [PATCH] Normalize rdelm/rd structure field naming.

---
 include/jemalloc/internal/arena.h  | 38 +++++++++++++++---------------
 include/jemalloc/internal/extent.h |  8 +++----
 src/arena.c                        |  8 +++----
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/include/jemalloc/internal/arena.h b/include/jemalloc/internal/arena.h
index de298e55..9cbc591a 100644
--- a/include/jemalloc/internal/arena.h
+++ b/include/jemalloc/internal/arena.h
@@ -329,25 +329,25 @@ struct arena_s {
 	 *
 	 *   LRU-----------------------------------------------------------MRU
 	 *
-	 *        /------------------\
-	 *        |      arena       |
-	 *        |                  |
-	 *        |  /------------\  |                     /-----------\
-	 *   ...---->|chunks_cache|<---------------------->|   chunk   |<--...
-	 *        |  \------------/  |                     |           |
-	 *        |                  |                     |           |
-	 *        |                  |  /---\      /---\   |           |
-	 *        |                  |  |run|      |run|   |           |
-	 *        |                  |  |   |      |   |   |           |
-	 *        |   /----------\   |  |---|      |---|   |  /-----\  |
-	 *   ...----->|runs_dirty|<---->|rd |<---->|rd |<---->|rdelm|<-----...
-	 *        |   \----------/   |  |---|      |---|   |  \-----/  |
-	 *        |                  |  |   |      |   |   |           |
-	 *        |                  |  |   |      |   |   |           |
-	 *        |                  |  \---/      \---/   |           |
-	 *        |                  |                     |           |
-	 *        |                  |                     |           |
-	 *        \------------------/                     \-----------/
+	 *        /-- arena ---\
+	 *        |            |
+	 *        |            |
+	 *        |------------|                             /- chunk -\
+	 *   ...->|chunks_cache|<--------------------------->|  /----\ |<--...
+	 *        |------------|                             |  |node| |
+	 *        |            |                             |  |    | |
+	 *        |            |    /- run -\    /- run -\   |  |    | |
+	 *        |            |    |       |    |       |   |  |    | |
+	 *        |            |    |       |    |       |   |  |    | |
+	 *        |------------|    |-------|    |-------|   |  |----| |
+	 *   ...->|runs_dirty  |<-->|rd     |<-->|rd     |<---->|rd  |<----...
+	 *        |------------|    |-------|    |-------|   |  |----| |
+	 *        |            |    |       |    |       |   |  |    | |
+	 *        |            |    |       |    |       |   |  \----/ |
+	 *        |            |    \-------/    \-------/   |         |
+	 *        |            |                             |         |
+	 *        |            |                             |         |
+	 *        \------------/                             \---------/
 	 */
 	arena_runs_dirty_link_t	runs_dirty;
 	extent_node_t		chunks_cache;
diff --git a/include/jemalloc/internal/extent.h b/include/jemalloc/internal/extent.h
index 5dbc04a5..3751adc4 100644
--- a/include/jemalloc/internal/extent.h
+++ b/include/jemalloc/internal/extent.h
@@ -34,7 +34,7 @@ struct extent_node_s {
 	prof_tctx_t		*en_prof_tctx;
 
 	/* 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;
 
 	union {
@@ -186,7 +186,7 @@ JEMALLOC_INLINE void
 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);
 }
 
@@ -195,7 +195,7 @@ extent_node_dirty_insert(extent_node_t *node,
     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);
 }
 
@@ -203,7 +203,7 @@ JEMALLOC_INLINE void
 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);
 }
 
diff --git a/src/arena.c b/src/arena.c
index 5d792f99..8af1a5df 100644
--- a/src/arena.c
+++ b/src/arena.c
@@ -1064,7 +1064,7 @@ arena_dirty_count(arena_t *arena)
 	    rdelm != &arena->runs_dirty; rdelm = qr_next(rdelm, rd_link)) {
 		size_t npages;
 
-		if (rdelm == &chunkselm->rdelm) {
+		if (rdelm == &chunkselm->rd) {
 			npages = extent_node_size_get(chunkselm) >> LG_PAGE;
 			chunkselm = qr_next(chunkselm, cc_link);
 		} else {
@@ -1122,7 +1122,7 @@ arena_stash_dirty(arena_t *arena, bool all, size_t npurge,
 		size_t npages;
 		rdelm_next = qr_next(rdelm, rd_link);
 
-		if (rdelm == &chunkselm->rdelm) {
+		if (rdelm == &chunkselm->rd) {
 			extent_node_t *chunkselm_next;
 			bool zero;
 			UNUSED void *chunk;
@@ -1205,7 +1205,7 @@ arena_purge_stashed(arena_t *arena,
 	    rdelm != purge_runs_sentinel; rdelm = qr_next(rdelm, rd_link)) {
 		size_t npages;
 
-		if (rdelm == &chunkselm->rdelm) {
+		if (rdelm == &chunkselm->rd) {
 			size_t size = extent_node_size_get(chunkselm);
 			bool unzeroed;
 
@@ -1275,7 +1275,7 @@ arena_unstash_purged(arena_t *arena,
 	    chunkselm = qr_next(purge_chunks_sentinel, cc_link);
 	    rdelm != purge_runs_sentinel; rdelm = rdelm_next) {
 		rdelm_next = qr_next(rdelm, rd_link);
-		if (rdelm == &chunkselm->rdelm) {
+		if (rdelm == &chunkselm->rd) {
 			extent_node_t *chunkselm_next = qr_next(chunkselm,
 			    cc_link);
 			void *addr = extent_node_addr_get(chunkselm);