Mercurial > hg > nginx

changeset 4419:7084faa7a4b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Limit req: number of cleanup calls reduced. Doing a cleanup before every lookup seems to be too aggressive. It can lead to premature removal of the nodes still usable, which increases the amount of work under a mutex lock and therefore decreases performance. In order to improve cleanup behavior, cleanup function call has been moved right before the allocation of a new node.
author Valentin Bartenev <vbart@nginx.com>
date Mon, 30 Jan 2012 10:01:39 +0000
parents aac79fc948cc
children 9ce48f9eb85b
files src/http/modules/ngx_http_limit_req_module.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_limit_req_module.c
+++ b/src/http/modules/ngx_http_limit_req_module.c
@@ -182,8 +182,6 @@ ngx_http_limit_req_handler(ngx_http_requ
 
     ngx_shmtx_lock(&ctx->shpool->mutex);
 
-    ngx_http_limit_req_expire(ctx, 1);
-
     rc = ngx_http_limit_req_lookup(lrcf, hash, vv->data, len, &excess);
 
     ngx_shmtx_unlock(&ctx->shpool->mutex);
@@ -385,6 +383,8 @@ ngx_http_limit_req_lookup(ngx_http_limit
            + offsetof(ngx_http_limit_req_node_t, data)
            + len;
 
+    ngx_http_limit_req_expire(ctx, 1);
+
     node = ngx_slab_alloc_locked(ctx->shpool, size);
 
     if (node == NULL) {