Connection limit for pool.

yatsukhnenko · yatsukhnenko · commit c75b3b93a046 · 2019-02-24T17:06:23.000+02:00
diff --git a/common.h b/common.h
@@ -736,6 +736,11 @@ typedef struct {
 } RedisSock;
 /* }}} */
 
+typedef struct {
+    zend_llist list;
+    int nb_active;
+} ConnectionPool;
+
 #if (PHP_MAJOR_VERSION < 7)
 typedef struct {
     zend_object std;
diff --git a/library.c b/library.c
@@ -63,18 +63,19 @@ extern zend_class_entry *redis_exception_ce;
 
 extern int le_redis_pconnect;
 
-static zend_llist *
+static ConnectionPool *
 redis_sock_get_connection_pool(RedisSock *redis_sock TSRMLS_DC)
 {
     zend_string *persistent_id = strpprintf(0, "phpredis_%s:%d", ZSTR_VAL(redis_sock->host), redis_sock->port);
     zend_resource *le = zend_hash_find_ptr(&EG(persistent_list), persistent_id);
     if (!le) {
-        zend_llist *list = pecalloc(1, sizeof(*list) + sizeof(*le), 1);
-        zend_llist_init(list, sizeof(php_stream *), NULL, 1);
-        le = (zend_resource *)((char *)list + sizeof(*list));
+        ConnectionPool *p = pecalloc(1, sizeof(*p) + sizeof(*le), 1);
+        zend_llist_init(&p->list, sizeof(php_stream *), NULL, 1);
+        le = (zend_resource *)((char *)p + sizeof(*p));
         le->type = le_redis_pconnect;
-        le->ptr = list;
+        le->ptr = p;
         zend_hash_str_update_mem(&EG(persistent_list), ZSTR_VAL(persistent_id), ZSTR_LEN(persistent_id), le, sizeof(*le));
+        p->nb_active = 0;
     }
     zend_string_release(persistent_id);
     return le->ptr;
@@ -1765,8 +1766,8 @@ PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)
     zend_string *persistent_id = NULL;
     char host[1024];
     const char *fmtstr = "%s:%d";
-    int host_len, usocket = 0, err = 0;
-    int tcp_flag = 1;
+    int host_len, usocket = 0, err = 0, tcp_flag = 1;
+    ConnectionPool *p = NULL;
 #if (PHP_MAJOR_VERSION < 7)
     char *estr = NULL;
 #else
@@ -1796,16 +1797,23 @@ PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)
 
     if (redis_sock->persistent) {
         if (INI_INT("redis.pconnect.pooling_enabled")) {
-            zend_llist *list = redis_sock_get_connection_pool(redis_sock TSRMLS_CC);
-            if (zend_llist_count(list) > 0) {
-                redis_sock->stream = *(php_stream **)zend_llist_get_last(list);
-                zend_llist_remove_tail(list);
+            p = redis_sock_get_connection_pool(redis_sock TSRMLS_CC);
+            if (zend_llist_count(&p->list) > 0) {
+                redis_sock->stream = *(php_stream **)zend_llist_get_last(&p->list);
+                zend_llist_remove_tail(&p->list);
                 /* Check socket liveness using 0 second timeout */
                 if (php_stream_set_option(redis_sock->stream, PHP_STREAM_OPTION_CHECK_LIVENESS, 0, NULL) == PHP_STREAM_OPTION_RETURN_OK) {
                     redis_sock->status = REDIS_SOCK_STATUS_CONNECTED;
                     return SUCCESS;
                 }
                 php_stream_pclose(redis_sock->stream);
+                p->nb_active--;
+            }
+
+            int limit = INI_INT("redis.pconnect.connection_limit");
+            if (limit > 0 && p->nb_active >= limit) {
+                redis_sock_set_err(redis_sock, "Connection limit reached", sizeof("Connection limit reached") - 1);
+                return FAILURE;
             }
 
             gettimeofday(&tv, NULL);
@@ -1847,6 +1855,8 @@ PHP_REDIS_API int redis_sock_connect(RedisSock *redis_sock TSRMLS_DC)
         return FAILURE;
     }
 
+    if (p) p->nb_active++;
+
     /* Attempt to set TCP_NODELAY/TCP_KEEPALIVE if we're not using a unix socket. */
     if (!usocket) {
         php_netstream_data_t *sock = (php_netstream_data_t*)redis_sock->stream->abstract;
@@ -1902,11 +1912,15 @@ redis_sock_disconnect(RedisSock *redis_sock, int force TSRMLS_DC)
         return FAILURE;
     } else if (redis_sock->stream) {
         if (redis_sock->persistent) {
+            ConnectionPool *p = NULL;
+            if (INI_INT("redis.pconnect.pooling_enabled")) {
+                p = redis_sock_get_connection_pool(redis_sock TSRMLS_CC);
+            }
             if (force) {
                 php_stream_pclose(redis_sock->stream);
-            } else if (INI_INT("redis.pconnect.pooling_enabled")) {
-                zend_llist *list = redis_sock_get_connection_pool(redis_sock TSRMLS_CC);
-                zend_llist_prepend_element(list, &redis_sock->stream);
+                if (p) p->nb_active--;
+            } else if (p) {
+                zend_llist_prepend_element(&p->list, &redis_sock->stream);
             }
         } else {
             php_stream_close(redis_sock->stream);
diff --git a/redis.c b/redis.c
@@ -81,6 +81,7 @@ PHP_INI_BEGIN()
 
     /* redis pconnect */
     PHP_INI_ENTRY("redis.pconnect.pooling_enabled", "0", PHP_INI_ALL, NULL)
+    PHP_INI_ENTRY("redis.pconnect.connection_limit", "0", PHP_INI_ALL, NULL)
 
     /* redis session */
     PHP_INI_ENTRY("redis.session.locking_enabled", "0", PHP_INI_ALL, NULL)
@@ -754,7 +755,8 @@ static ZEND_RSRC_DTOR_FUNC(redis_connections_pool_dtor)
 #endif
 
     if (res->ptr) {
-        zend_llist_destroy(res->ptr);
+        ConnectionPool *p = res->ptr;
+        zend_llist_destroy(&p->list);
         pefree(res->ptr, 1);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ PHP_INI_BEGIN()`
`81`	`81`
`82`	`82`	`/* redis pconnect */`
`83`	`83`	`PHP_INI_ENTRY("redis.pconnect.pooling_enabled", "0", PHP_INI_ALL, NULL)`
	`84`	`+ PHP_INI_ENTRY("redis.pconnect.connection_limit", "0", PHP_INI_ALL, NULL)`
`84`	`85`
`85`	`86`	`/* redis session */`
`86`	`87`	`PHP_INI_ENTRY("redis.session.locking_enabled", "0", PHP_INI_ALL, NULL)`
`@@ -754,7 +755,8 @@ static ZEND_RSRC_DTOR_FUNC(redis_connections_pool_dtor)`
`754`	`755`	`#endif`
`755`	`756`
`756`	`757`	`if (res->ptr) {`
`757`		`- zend_llist_destroy(res->ptr);`
	`758`	`+ ConnectionPool *p = res->ptr;`
	`759`	`+ zend_llist_destroy(&p->list);`
`758`	`760`	`pefree(res->ptr, 1);`
`759`	`761`	`}`
`760`	`762`	`}`