Rename blpop_blocked_clients to bpop_blocked_clients

diff --git a/src/redis.c b/src/redis.c
index 58a796c037e1fe9477f4487228f6f555e41fd39b..8a5f9632aec78a083748db6227d5dbc45494d6d6 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -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();
 
     /* Check if a background saving or AOF rewrite in progress terminated */
         closeTimedoutClients();
 
     /* Check if a background saving or AOF rewrite in progress terminated */


@@ -759,7 +759,7 @@ void initServerConfig() {
     server.rdbcompression = 1;
     server.activerehashing = 1;
     server.maxclients = 0;
     server.rdbcompression = 1;
     server.activerehashing = 1;
     server.maxclients = 0;

-    server.blpop_blocked_clients = 0;
+    server.bpop_blocked_clients = 0;

     server.maxmemory = 0;
     server.maxmemory_policy = REDIS_MAXMEMORY_VOLATILE_LRU;
     server.maxmemory_samples = 3;
     server.maxmemory = 0;
     server.maxmemory_policy = REDIS_MAXMEMORY_VOLATILE_LRU;
     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,
         listLength(server.clients)-listLength(server.slaves),
         listLength(server.slaves),
         (float)c_ru.ru_stime.tv_sec+(float)c_ru.ru_stime.tv_usec/1000000,
         listLength(server.clients)-listLength(server.slaves),
         listLength(server.slaves),

-        server.blpop_blocked_clients,
+        server.bpop_blocked_clients,

         zmalloc_used_memory(),
         hmem,
         zmalloc_get_rss(),
         zmalloc_used_memory(),
         hmem,
         zmalloc_get_rss(),

diff --git a/src/redis.h b/src/redis.h
index f1142a5b34fc52e37d10f8adcf5ee40f251f9a71..27cb82598ede70538be75b629c006cb3491780f8 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -433,7 +433,7 @@ struct redisServer {
     int maxmemory_policy;
     int maxmemory_samples;
     /* Blocked clients */
     int maxmemory_policy;
     int maxmemory_samples;
     /* Blocked clients */

-    unsigned int blpop_blocked_clients;
+    unsigned int bpop_blocked_clients;

     unsigned int vm_blocked_clients;
     /* Sort parameters - qsort_r() is only available under BSD so we
      * have to take this state global, in order to pass it to sortCompare() */
     unsigned int vm_blocked_clients;
     /* Sort parameters - qsort_r() is only available under BSD so we
      * have to take this state global, in order to pass it to sortCompare() */

diff --git a/src/t_list.c b/src/t_list.c
index a47ab65c854c5c462b3aaecb1d2a12510b71177e..b46b0494370637b365024a950be4b4eec9f9bae2 100644 (file)
--- a/src/t_list.c
+++ b/src/t_list.c
@@ -725,7 +725,7 @@ void blockForKeys(redisClient *c, robj **keys, int numkeys, time_t timeout, robj
     }
     /* Mark the client as a blocked client */
     c->flags |= REDIS_BLOCKED;
     }
     /* Mark the client as a blocked client */
     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.target = NULL;
     c->flags &= (~REDIS_BLOCKED);
     c->bpop.keys = NULL;
     c->bpop.target = NULL;
     c->flags &= (~REDIS_BLOCKED);

-    server.blpop_blocked_clients--;
+    server.bpop_blocked_clients--;

     /* We want to process data if there is some command waiting
      * in the input buffer. Note that this is safe even if
      * unblockClientWaitingData() gets called from freeClient() because
     /* We want to process data if there is some command waiting
      * in the input buffer. Note that this is safe even if
      * unblockClientWaitingData() gets called from freeClient() because