mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-22 13:51:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Limit zone: rbtree lookup moved to a separate function.

Browse Source 
No functional changes.
This commit is contained in:
Valentin Bartenev 2011-11-10 15:51:55 +00:00
parent 2f37fbc8f9
commit 54660dcf74
1 changed files with 85 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/http/modules/ngx_http_limit_zone_module.c
View File

@ -37,6 +37,8 @@ typedef struct {
} ngx_http_limit_zone_conf_t; } ngx_http_limit_zone_conf_t;
static ngx_rbtree_node_t *ngx_http_limit_zone_lookup(ngx_rbtree_t *rbtree,
ngx_http_variable_value_t *vv, uint32_t hash);
static void ngx_http_limit_zone_cleanup(void *data); static void ngx_http_limit_zone_cleanup(void *data);
static void *ngx_http_limit_zone_create_conf(ngx_conf_t *cf); static void *ngx_http_limit_zone_create_conf(ngx_conf_t *cf);
@ -121,9 +123,8 @@ ngx_http_limit_zone_handler(ngx_http_request_t *r)
{ {
size_t len, n; size_t len, n;
uint32_t hash; uint32_t hash;
ngx_int_t rc;
ngx_slab_pool_t *shpool; ngx_slab_pool_t *shpool;
ngx_rbtree_node_t *node, *sentinel; ngx_rbtree_node_t *node;
ngx_pool_cleanup_t *cln; ngx_pool_cleanup_t *cln;
ngx_http_variable_value_t *vv; ngx_http_variable_value_t *vv;
ngx_http_limit_zone_ctx_t *ctx; ngx_http_limit_zone_ctx_t *ctx;
@ -176,49 +177,9 @@ ngx_http_limit_zone_handler(ngx_http_request_t *r)
ngx_shmtx_lock(&shpool->mutex); ngx_shmtx_lock(&shpool->mutex);
node = ctx->rbtree->root; node = ngx_http_limit_zone_lookup(ctx->rbtree, vv, hash);
sentinel = ctx->rbtree->sentinel;
while (node != sentinel) { if (node == NULL) {
if (hash < node->key) {
node = node->left;
continue;
}
if (hash > node->key) {
node = node->right;
continue;
}
/* hash == node->key */
do {
lz = (ngx_http_limit_zone_node_t *) &node->color;
rc = ngx_memn2cmp(vv->data, lz->data, len, (size_t) lz->len);
if (rc == 0) {
if ((ngx_uint_t) lz->conn < lzcf->conn) {
lz->conn++;
goto done;
}
ngx_shmtx_unlock(&shpool->mutex);
ngx_log_error(lzcf->log_level, r->connection->log, 0,
"limiting connections by zone \"%V\"",
&lzcf->shm_zone->shm.name);
return NGX_HTTP_SERVICE_UNAVAILABLE;
}
node = (rc < 0) ? node->left : node->right;
} while (node != sentinel && hash == node->key);
break;
}
n = offsetof(ngx_rbtree_node_t, color) n = offsetof(ngx_rbtree_node_t, color)
+ offsetof(ngx_http_limit_zone_node_t, data) + offsetof(ngx_http_limit_zone_node_t, data)
@ -239,7 +200,23 @@ ngx_http_limit_zone_handler(ngx_http_request_t *r)
ngx_rbtree_insert(ctx->rbtree, node); ngx_rbtree_insert(ctx->rbtree, node);
done: } else {
lz = (ngx_http_limit_zone_node_t *) &node->color;
if ((ngx_uint_t) lz->conn >= lzcf->conn) {
ngx_shmtx_unlock(&shpool->mutex);
ngx_log_error(lzcf->log_level, r->connection->log, 0,
"limiting connections by zone \"%V\"",
&lzcf->shm_zone->shm.name);
return NGX_HTTP_SERVICE_UNAVAILABLE;
}
lz->conn++;
}
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"limit zone: %08XD %d", node->key, lz->conn); "limit zone: %08XD %d", node->key, lz->conn);
@ -297,6 +274,51 @@ ngx_http_limit_zone_rbtree_insert_value(ngx_rbtree_node_t *temp,
} }
static ngx_rbtree_node_t *
ngx_http_limit_zone_lookup(ngx_rbtree_t *rbtree, ngx_http_variable_value_t *vv,
uint32_t hash)
{
ngx_int_t rc;
ngx_rbtree_node_t *node, *sentinel;
ngx_http_limit_zone_node_t *lzn;
node = rbtree->root;
sentinel = rbtree->sentinel;
while (node != sentinel) {
if (hash < node->key) {
node = node->left;
continue;
}
if (hash > node->key) {
node = node->right;
continue;
}
/* hash == node->key */
do {
lzn = (ngx_http_limit_zone_node_t *) &node->color;
rc = ngx_memn2cmp(vv->data, lzn->data,
(size_t) vv->len, (size_t) lzn->len);
if (rc == 0) {
return node;
}
node = (rc < 0) ? node->left : node->right;
} while (node != sentinel && hash == node->key);
break;
}
return NULL;
}
static void static void
ngx_http_limit_zone_cleanup(void *data) ngx_http_limit_zone_cleanup(void *data)
{ {