From ce03d6833213901c95e0b5961b555744d3815bd2 Mon Sep 17 00:00:00 2001 From: antirez Date: Tue, 19 Nov 2019 11:28:04 +0100 Subject: [PATCH] Rename var to fixed_time_expire now that is more general. --- src/blocked.c | 5 ++--- src/db.c | 2 +- src/server.c | 6 +++--- src/server.h | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/blocked.c b/src/blocked.c index 47bb290a4..20c0e760a 100644 --- a/src/blocked.c +++ b/src/blocked.c @@ -521,7 +521,7 @@ void handleClientsBlockedOnKeys(void) { * that) without the risk of it being freed in the second * lookup, invalidating the first one. * See https://github.com/antirez/redis/pull/6554. */ - server.call_depth++; + server.fixed_time_expire++; updateCachedTime(0); /* Serve clients blocked on list key. */ @@ -539,8 +539,7 @@ void handleClientsBlockedOnKeys(void) { * module is trying to accomplish right now. */ serveClientsBlockedOnKeyByModule(rl); } - - server.call_depth--; + server.fixed_time_expire--; /* Free this item. */ decrRefCount(rl->key); diff --git a/src/db.c b/src/db.c index e47a4a681..aac049eb7 100644 --- a/src/db.c +++ b/src/db.c @@ -1220,7 +1220,7 @@ int keyIsExpired(redisDb *db, robj *key) { * may re-open the same key multiple times, can invalidate an already * open object in a next call, if the next call will see the key expired, * while the first did not. */ - else if (server.call_depth > 0) { + else if (server.fixed_time_expire > 0) { now = server.mstime; } /* For the other cases, we want to use the most fresh time we have. */ diff --git a/src/server.c b/src/server.c index c811b869d..2e9a329dd 100644 --- a/src/server.c +++ b/src/server.c @@ -2788,7 +2788,7 @@ void initServer(void) { server.hz = server.config_hz; server.pid = getpid(); server.current_client = NULL; - server.call_depth = 0; + server.fixed_time_expire = 0; server.clients = listCreate(); server.clients_index = raxNew(); server.clients_to_close = listCreate(); @@ -3262,7 +3262,7 @@ void call(client *c, int flags) { int client_old_flags = c->flags; struct redisCommand *real_cmd = c->cmd; - server.call_depth++; + server.fixed_time_expire++; /* Sent the command to clients in MONITOR mode, only if the commands are * not generated from reading an AOF. */ @@ -3389,7 +3389,7 @@ void call(client *c, int flags) { trackingRememberKeys(caller); } - server.call_depth--; + server.fixed_time_expire--; server.stat_numcommands++; } diff --git a/src/server.h b/src/server.h index 51dce955d..5da7b4960 100644 --- a/src/server.h +++ b/src/server.h @@ -1134,7 +1134,7 @@ struct redisServer { list *clients_pending_read; /* Client has pending read socket buffers. */ list *slaves, *monitors; /* List of slaves and MONITORs */ client *current_client; /* Current client executing the command. */ - long call_depth; /* call() re-entering count. */ + long fixed_time_expire; /* If > 0, expire keys against server.mstime. */ rax *clients_index; /* Active clients dictionary by client ID. */ int clients_paused; /* True if clients are currently paused */ mstime_t clients_pause_end_time; /* Time when we undo clients_paused */