diff --git a/src/redis.c b/src/redis.c index 889772c37588bfcbfc4e26d4e3c5a83b5df2037a..423c8c3a840369b5394f20d334abe67f49d911d5 100644 --- a/src/redis.c +++ b/src/redis.c @@ -645,7 +645,7 @@ void updateDictResizePolicy(void) { * it will get more aggressive to avoid that too much memory is used by * keys that can be removed from the keyspace. * - * No more than REDIS_DBCRON_DBS_PER_SEC databases are tested at every + * No more than REDIS_DBCRON_DBS_PER_CALL databases are tested at every * iteration. */ void activeExpireCycle(void) { static unsigned int current_db = 0; @@ -659,7 +659,7 @@ void activeExpireCycle(void) { timelimit = 1000000*REDIS_EXPIRELOOKUPS_TIME_PERC/server.hz/100; if (timelimit <= 0) timelimit = 1; - for (j = 0; j < REDIS_DBCRON_DBS_PER_SEC; j++) { + for (j = 0; j < REDIS_DBCRON_DBS_PER_CALL; j++) { int expired; redisDb *db = server.db+(current_db % server.dbnum); @@ -844,14 +844,14 @@ void databasesCron(void) { unsigned int j; /* Resize */ - for (j = 0; j < REDIS_DBCRON_DBS_PER_SEC; j++) { + for (j = 0; j < REDIS_DBCRON_DBS_PER_CALL; j++) { tryResizeHashTables(resize_db % server.dbnum); resize_db++; } /* Rehash */ if (server.activerehashing) { - for (j = 0; j < REDIS_DBCRON_DBS_PER_SEC; j++) { + for (j = 0; j < REDIS_DBCRON_DBS_PER_CALL; j++) { int work_done = incrementallyRehash(rehash_db % server.dbnum); rehash_db++; if (work_done) { diff --git a/src/redis.h b/src/redis.h index abdb4709a38e2d79ad06cfda2efe0742f1f3291d..d4d4f571d15394529b05d7c5f2b09b4aebdabed1 100644 --- a/src/redis.h +++ b/src/redis.h @@ -76,7 +76,7 @@ #define REDIS_CONFIGLINE_MAX 1024 #define REDIS_EXPIRELOOKUPS_PER_CRON 10 /* lookup 10 expires per loop */ #define REDIS_EXPIRELOOKUPS_TIME_PERC 25 /* CPU max % for keys collection */ -#define REDIS_DBCRON_DBS_PER_SEC 16 +#define REDIS_DBCRON_DBS_PER_CALL 16 #define REDIS_MAX_WRITE_PER_EVENT (1024*64) #define REDIS_SHARED_SELECT_CMDS 10 #define REDIS_SHARED_INTEGERS 10000