commit c87ab25d189e0ae76fd568db4bf273e2788cf1a9
author Jason Evans <je@fb.com> Tue Feb 02 20:37:24 2016 -0800
committer Jason Evans <jasone@canonware.com> Fri Feb 19 20:29:06 2016 -0800
tree 8433524850dc689fc69c3297183d717f0877882a
parent 9998000b2b77205a37ae630d5fd1ec9ee4569476

Use ticker for incremental tcache GC.

include/jemalloc/internal/tcache.h

diff --git a/include/jemalloc/internal/tcache.h b/include/jemalloc/internal/tcache.h
index aa73060..c64f5d3 100644
--- a/include/jemalloc/internal/tcache.h
+++ b/include/jemalloc/internal/tcache.h
@@ -83,7 +83,7 @@
 struct tcache_s {
 	ql_elm(tcache_t) link;		/* Used for aggregating stats. */
 	uint64_t	prof_accumbytes;/* Cleared after arena_prof_accum(). */
-	unsigned	ev_cnt;		/* Event count since incremental GC. */
+	ticker_t	gc_ticker;	/* Drives incremental GC. */
 	szind_t		next_gc_bin;	/* Next bin to GC. */
 	tcache_bin_t	tbins[1];	/* Dynamically sized. */
 	/*
@@ -247,9 +247,7 @@
 	if (TCACHE_GC_INCR == 0)
 		return;
 
-	tcache->ev_cnt++;
-	assert(tcache->ev_cnt <= TCACHE_GC_INCR);
-	if (unlikely(tcache->ev_cnt == TCACHE_GC_INCR))
+	if (unlikely(ticker_tick(&tcache->gc_ticker)))
 		tcache_event_hard(tsd, tcache);
 }
 

src/tcache.c

diff --git a/src/tcache.c b/src/tcache.c
index 78c6230..e8c3152 100644
--- a/src/tcache.c
+++ b/src/tcache.c
@@ -67,7 +67,6 @@
 	tcache->next_gc_bin++;
 	if (tcache->next_gc_bin == nhbins)
 		tcache->next_gc_bin = 0;
-	tcache->ev_cnt = 0;
 }
 
 void *
@@ -330,6 +329,8 @@
 
 	tcache_arena_associate(tcache, arena);
 
+	ticker_init(&tcache->gc_ticker, TCACHE_GC_INCR);
+
 	assert((TCACHE_NSLOTS_SMALL_MAX & 1U) == 0);
 	for (i = 0; i < nhbins; i++) {
 		tcache->tbins[i].lg_fill_div = 1;