summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2020-03-26 16:05:20 +0100
committerantirez <antirez@gmail.com>2020-03-27 16:35:03 +0100
commit13e4c2a9b12cbaa0361e1701926e2d398f78e6b9 (patch)
treeca12aa8ae14a042437d17d9621c141cf868a28e9
parentaa9d92d94a7f18f768e25bdbb94179b32e7b9e13 (diff)
downloadredis-13e4c2a9b12cbaa0361e1701926e2d398f78e6b9.tar.gz
Precise timeouts: fix comments after functional change.
-rw-r--r--src/server.c10
-rw-r--r--src/server.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server.c b/src/server.c
index fc21a128e..2624cbecd 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1530,7 +1530,7 @@ int clientsCronHandleTimeout(client *c, mstime_t now_ms) {
* reached the timeout already, if they are no longer existing or no longer
* blocked with such timeout, we just go forward.
*
- * Every time a client blocks with a short timeout, we add the client in
+ * Every time a client blocks with a timeout, we add the client in
* the tree. In beforeSleep() we call clientsHandleTimeout() to run
* the tree and unblock the clients. */
@@ -1552,8 +1552,8 @@ void decodeTimeoutKey(unsigned char *buf, uint64_t *toptr, uint64_t *idptr) {
}
/* Add the specified client id / timeout as a key in the radix tree we use
- * to handle short timeouts. The client is not added to the list if its
- * timeout is zero (block forever). */
+ * to handle blocked clients timeouts. The client is not added to the list
+ * if its timeout is zero (block forever). */
void addClientToTimeoutTable(client *c) {
if (c->bpop.timeout == 0) return;
uint64_t timeout = c->bpop.timeout;
@@ -1563,8 +1563,8 @@ void addClientToTimeoutTable(client *c) {
raxTryInsert(server.clients_timeout_table,buf,sizeof(buf),NULL,NULL);
}
-/* This function is called in beforeSleep() in order to unblock ASAP clients
- * that are waiting in blocking operations with a short timeout set. */
+/* This function is called in beforeSleep() in order to unblock clients
+ * that are waiting in blocking operations with a timeout set. */
void clientsHandleTimeout(void) {
if (raxSize(server.clients_timeout_table) == 0) return;
uint64_t now = mstime();
diff --git a/src/server.h b/src/server.h
index 7ccab28ba..c6862051a 100644
--- a/src/server.h
+++ b/src/server.h
@@ -1067,7 +1067,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. */
- rax *clients_timeout_table; /* Radix tree for clients with short timeout. */
+ rax *clients_timeout_table; /* Radix tree for blocked clients timeouts. */
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 */