fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Darft #2 for key collection algo: more improvements.

Browse Source 
This commit makes the fast collection cycle time configurable, at
the same time it does not allow to run a new fast collection cycle
for the same amount of time as the max duration of the fast
collection cycle.
This commit is contained in:
antirez 2013-08-05 16:11:56 +02:00
parent b09ea1bd90
commit 66a26471dc
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/redis.c
View File

@ -697,6 +697,7 @@ int activeExpireCycleTryExpire(redisDb *db, struct dictEntry *de, long long now)
* more incrementally from the beforeSleep() function of the event loop. */ * more incrementally from the beforeSleep() function of the event loop. */
#define EXPIRED_HISTORY_LEN 10 #define EXPIRED_HISTORY_LEN 10
#define EXPIRE_FAST_CYCLE_DURATION 1000
void activeExpireCycle(int fast) { void activeExpireCycle(int fast) {
/* This function has some global state in order to continue the work /* This function has some global state in order to continue the work
@ -707,6 +708,7 @@ void activeExpireCycle(int fast) {
unsigned int j, iteration = 0; unsigned int j, iteration = 0;
unsigned int dbs_per_call = REDIS_DBCRON_DBS_PER_CALL; unsigned int dbs_per_call = REDIS_DBCRON_DBS_PER_CALL;
long long start = ustime(), timelimit; long long start = ustime(), timelimit;
static long long last_fast_cycle = 0;
#if 0 #if 0
static int expired_history[EXPIRED_HISTORY_LEN]; static int expired_history[EXPIRED_HISTORY_LEN];
@ -714,7 +716,17 @@ void activeExpireCycle(int fast) {
static int expired_perc_avg = 0; static int expired_perc_avg = 0;
#endif #endif
if (fast && !timelimit_exit) return; if (fast) {
/* Don't start a fast cycle if the previous cycle did not exited
* for time limt. Also don't repeat a fast cycle for the same period
* as the fast cycle total duration itself. */
if (!timelimit_exit) return;
if (start < last_fast_cycle + EXPIRE_FAST_CYCLE_DURATION) {
printf("CANT START A FAST CYCLE\n");
return;
}
last_fast_cycle = start;
}
#if 0 #if 0
if (fast) { if (fast) {
@ -751,7 +763,7 @@ void activeExpireCycle(int fast) {
timelimit_exit = 0; timelimit_exit = 0;
if (timelimit <= 0) timelimit = 1; if (timelimit <= 0) timelimit = 1;
if (fast) timelimit = 1000; /* 1 millisecond. */ if (fast) timelimit = EXPIRE_FAST_CYCLE_DURATION; /* in microseconds. */
for (j = 0; j < dbs_per_call; j++) { for (j = 0; j < dbs_per_call; j++) {
int expired; int expired;