gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Precise timeouts: fix comments after functional change.

Browse Source
This commit is contained in:
antirez 2020-03-26 16:05:20 +01:00
parent 444089c55e
commit 0e5723ff18
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server.c
View File

@ -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 * reached the timeout already, if they are no longer existing or no longer
* blocked with such timeout, we just go forward. * 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. In beforeSleep() we call clientsHandleTimeout() to run
* the tree and unblock the clients. */ * 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 /* 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 * to handle blocked clients timeouts. The client is not added to the list
* timeout is zero (block forever). */ * if its timeout is zero (block forever). */
void addClientToTimeoutTable(client *c) { void addClientToTimeoutTable(client *c) {
if (c->bpop.timeout == 0) return; if (c->bpop.timeout == 0) return;
uint64_t timeout = c->bpop.timeout; uint64_t timeout = c->bpop.timeout;
@ -1563,8 +1563,8 @@ void addClientToTimeoutTable(client *c) {
raxTryInsert(server.clients_timeout_table,buf,sizeof(buf),NULL,NULL); raxTryInsert(server.clients_timeout_table,buf,sizeof(buf),NULL,NULL);
} }
/* This function is called in beforeSleep() in order to unblock ASAP clients /* This function is called in beforeSleep() in order to unblock clients
* that are waiting in blocking operations with a short timeout set. */ * that are waiting in blocking operations with a timeout set. */
void clientsHandleTimeout(void) { void clientsHandleTimeout(void) {
if (raxSize(server.clients_timeout_table) == 0) return; if (raxSize(server.clients_timeout_table) == 0) return;
uint64_t now = mstime(); uint64_t now = mstime();

2
src/server.h
View File

@ -1067,7 +1067,7 @@ struct redisServer {
list *clients_pending_read; /* Client has pending read socket buffers. */ list *clients_pending_read; /* Client has pending read socket buffers. */
list *slaves, *monitors; /* List of slaves and MONITORs */ list *slaves, *monitors; /* List of slaves and MONITORs */
client *current_client; /* Current client executing the command. */ 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. */ long fixed_time_expire; /* If > 0, expire keys against server.mstime. */
rax *clients_index; /* Active clients dictionary by client ID. */ rax *clients_index; /* Active clients dictionary by client ID. */
int clients_paused; /* True if clients are currently paused */ int clients_paused; /* True if clients are currently paused */