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

Rename blpop_blocked_clients to bpop_blocked_clients

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-12-06 14:05:01 +01:00
parent c8a0070a61
commit 5fa95ad763
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/redis.c
View File

@ -573,7 +573,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
} }
/* Close connections of timedout clients */ /* Close connections of timedout clients */
if ((server.maxidletime && !(loops % 100)) || server.blpop_blocked_clients) if ((server.maxidletime && !(loops % 100)) || server.bpop_blocked_clients)
closeTimedoutClients(); closeTimedoutClients();
/* Check if a background saving or AOF rewrite in progress terminated */ /* Check if a background saving or AOF rewrite in progress terminated */
@ -759,7 +759,7 @@ void initServerConfig() {
server.rdbcompression = 1; server.rdbcompression = 1;
server.activerehashing = 1; server.activerehashing = 1;
server.maxclients = 0; server.maxclients = 0;
server.blpop_blocked_clients = 0; server.bpop_blocked_clients = 0;
server.maxmemory = 0; server.maxmemory = 0;
server.maxmemory_policy = REDIS_MAXMEMORY_VOLATILE_LRU; server.maxmemory_policy = REDIS_MAXMEMORY_VOLATILE_LRU;
server.maxmemory_samples = 3; server.maxmemory_samples = 3;
@ -1170,7 +1170,7 @@ sds genRedisInfoString(void) {
(float)c_ru.ru_stime.tv_sec+(float)c_ru.ru_stime.tv_usec/1000000, (float)c_ru.ru_stime.tv_sec+(float)c_ru.ru_stime.tv_usec/1000000,
listLength(server.clients)-listLength(server.slaves), listLength(server.clients)-listLength(server.slaves),
listLength(server.slaves), listLength(server.slaves),
server.blpop_blocked_clients, server.bpop_blocked_clients,
zmalloc_used_memory(), zmalloc_used_memory(),
hmem, hmem,
zmalloc_get_rss(), zmalloc_get_rss(),

2
src/redis.h
View File

@ -433,7 +433,7 @@ struct redisServer {
int maxmemory_policy; int maxmemory_policy;
int maxmemory_samples; int maxmemory_samples;
/* Blocked clients */ /* Blocked clients */
unsigned int blpop_blocked_clients; unsigned int bpop_blocked_clients;
unsigned int vm_blocked_clients; unsigned int vm_blocked_clients;
/* Sort parameters - qsort_r() is only available under BSD so we /* Sort parameters - qsort_r() is only available under BSD so we
* have to take this state global, in order to pass it to sortCompare() */ * have to take this state global, in order to pass it to sortCompare() */

4
src/t_list.c
View File

@ -725,7 +725,7 @@ void blockForKeys(redisClient *c, robj **keys, int numkeys, time_t timeout, robj
} }
/* Mark the client as a blocked client */ /* Mark the client as a blocked client */
c->flags |= REDIS_BLOCKED; c->flags |= REDIS_BLOCKED;
server.blpop_blocked_clients++; server.bpop_blocked_clients++;
} }
/* Unblock a client that's waiting in a blocking operation such as BLPOP */ /* Unblock a client that's waiting in a blocking operation such as BLPOP */
@ -753,7 +753,7 @@ void unblockClientWaitingData(redisClient *c) {
c->bpop.keys = NULL; c->bpop.keys = NULL;
c->bpop.target = NULL; c->bpop.target = NULL;
c->flags &= (~REDIS_BLOCKED); c->flags &= (~REDIS_BLOCKED);
server.blpop_blocked_clients--; server.bpop_blocked_clients--;
/* We want to process data if there is some command waiting /* We want to process data if there is some command waiting
* in the input buffer. Note that this is safe even if * in the input buffer. Note that this is safe even if
* unblockClientWaitingData() gets called from freeClient() because * unblockClientWaitingData() gets called from freeClient() because