提交 5f5aa487 编写于 作者: A antirez

REDIS_DBCRON_DBS_PER_SEC -> REDIS_DBCRON_DBS_PER_CALL

上级 db29d71a
...@@ -645,7 +645,7 @@ void updateDictResizePolicy(void) { ...@@ -645,7 +645,7 @@ void updateDictResizePolicy(void) {
* it will get more aggressive to avoid that too much memory is used by * it will get more aggressive to avoid that too much memory is used by
* keys that can be removed from the keyspace. * 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. */ * iteration. */
void activeExpireCycle(void) { void activeExpireCycle(void) {
static unsigned int current_db = 0; static unsigned int current_db = 0;
...@@ -659,7 +659,7 @@ void activeExpireCycle(void) { ...@@ -659,7 +659,7 @@ void activeExpireCycle(void) {
timelimit = 1000000*REDIS_EXPIRELOOKUPS_TIME_PERC/server.hz/100; timelimit = 1000000*REDIS_EXPIRELOOKUPS_TIME_PERC/server.hz/100;
if (timelimit <= 0) timelimit = 1; 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; int expired;
redisDb *db = server.db+(current_db % server.dbnum); redisDb *db = server.db+(current_db % server.dbnum);
...@@ -844,14 +844,14 @@ void databasesCron(void) { ...@@ -844,14 +844,14 @@ void databasesCron(void) {
unsigned int j; unsigned int j;
/* Resize */ /* 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); tryResizeHashTables(resize_db % server.dbnum);
resize_db++; resize_db++;
} }
/* Rehash */ /* Rehash */
if (server.activerehashing) { 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); int work_done = incrementallyRehash(rehash_db % server.dbnum);
rehash_db++; rehash_db++;
if (work_done) { if (work_done) {
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
#define REDIS_CONFIGLINE_MAX 1024 #define REDIS_CONFIGLINE_MAX 1024
#define REDIS_EXPIRELOOKUPS_PER_CRON 10 /* lookup 10 expires per loop */ #define REDIS_EXPIRELOOKUPS_PER_CRON 10 /* lookup 10 expires per loop */
#define REDIS_EXPIRELOOKUPS_TIME_PERC 25 /* CPU max % for keys collection */ #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_MAX_WRITE_PER_EVENT (1024*64)
#define REDIS_SHARED_SELECT_CMDS 10 #define REDIS_SHARED_SELECT_CMDS 10
#define REDIS_SHARED_INTEGERS 10000 #define REDIS_SHARED_INTEGERS 10000
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册