[nginx] Removed busy locks.

Ruslan Ermilov ru at nginx.com
Fri Mar 20 03:46:47 UTC 2015


details:   http://hg.nginx.org/nginx/rev/ac7c7241ed8c
branches:  
changeset: 6032:ac7c7241ed8c
user:      Ruslan Ermilov <ru at nginx.com>
date:      Fri Mar 20 06:45:32 2015 +0300
description:
Removed busy locks.

diffstat:

 auto/sources                    |    8 +-
 src/event/ngx_event.h           |    9 -
 src/event/ngx_event_busy_lock.c |  286 -------------------------------------
 src/event/ngx_event_busy_lock.h |   65 --------
 src/event/ngx_event_mutex.c     |   70 ---------
 src/http/ngx_http.h             |    1 -
 src/http/ngx_http_busy_lock.c   |  307 ----------------------------------------
 src/http/ngx_http_busy_lock.h   |   54 -------
 src/os/unix/ngx_thread.h        |    3 -
 9 files changed, 1 insertions(+), 802 deletions(-)

diffs (truncated from 889 to 300 lines):

diff -r c8acea7c7041 -r ac7c7241ed8c auto/sources
--- a/auto/sources	Fri Mar 20 06:43:19 2015 +0300
+++ b/auto/sources	Fri Mar 20 06:45:32 2015 +0300
@@ -92,14 +92,12 @@ EVENT_INCS="src/event src/event/modules"
 EVENT_DEPS="src/event/ngx_event.h \
             src/event/ngx_event_timer.h \
             src/event/ngx_event_posted.h \
-            src/event/ngx_event_busy_lock.h \
             src/event/ngx_event_connect.h \
             src/event/ngx_event_pipe.h"
 
 EVENT_SRCS="src/event/ngx_event.c \
             src/event/ngx_event_timer.c \
             src/event/ngx_event_posted.c \
-            src/event/ngx_event_busy_lock.c \
             src/event/ngx_event_accept.c \
             src/event/ngx_event_connect.c \
             src/event/ngx_event_pipe.c"
@@ -297,8 +295,7 @@ HTTP_DEPS="src/http/ngx_http.h \
            src/http/ngx_http_variables.h \
            src/http/ngx_http_script.h \
            src/http/ngx_http_upstream.h \
-           src/http/ngx_http_upstream_round_robin.h \
-           src/http/ngx_http_busy_lock.h"
+           src/http/ngx_http_upstream_round_robin.h"
 
 HTTP_SRCS="src/http/ngx_http.c \
            src/http/ngx_http_core_module.c \
@@ -322,9 +319,6 @@ HTTP_SRCS="src/http/ngx_http.c \
            src/http/modules/ngx_http_headers_filter_module.c \
            src/http/modules/ngx_http_not_modified_filter_module.c"
 
-# STUB
-HTTP_SRCS="$HTTP_SRCS src/http/ngx_http_busy_lock.c"
-
 HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
 
 HTTP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c
diff -r c8acea7c7041 -r ac7c7241ed8c src/event/ngx_event.h
--- a/src/event/ngx_event.h	Fri Mar 20 06:43:19 2015 +0300
+++ b/src/event/ngx_event.h	Fri Mar 20 06:45:32 2015 +0300
@@ -27,14 +27,6 @@ typedef struct {
 #endif
 
 
-typedef struct {
-    ngx_uint_t       lock;
-
-    ngx_event_t     *events;
-    ngx_event_t     *last;
-} ngx_event_mutex_t;
-
-
 struct ngx_event_s {
     void            *data;
 
@@ -533,7 +525,6 @@ ngx_int_t ngx_send_lowat(ngx_connection_
 
 #include <ngx_event_timer.h>
 #include <ngx_event_posted.h>
-#include <ngx_event_busy_lock.h>
 
 #if (NGX_WIN32)
 #include <ngx_iocp_module.h>
diff -r c8acea7c7041 -r ac7c7241ed8c src/event/ngx_event_busy_lock.c
--- a/src/event/ngx_event_busy_lock.c	Fri Mar 20 06:43:19 2015 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,286 +0,0 @@
-
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) Nginx, Inc.
- */
-
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_event.h>
-
-
-static ngx_int_t ngx_event_busy_lock_look_cacheable(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx);
-static void ngx_event_busy_lock_handler(ngx_event_t *ev);
-static void ngx_event_busy_lock_posted_handler(ngx_event_t *ev);
-
-
-/*
- * NGX_OK:     the busy lock is held
- * NGX_AGAIN:  the all busy locks are held but we will wait the specified time
- * NGX_BUSY:   ctx->timer == 0: there are many the busy locks
- *             ctx->timer != 0: there are many the waiting locks
- */
-
-ngx_int_t
-ngx_event_busy_lock(ngx_event_busy_lock_t *bl, ngx_event_busy_lock_ctx_t *ctx)
-{
-    ngx_int_t  rc;
-
-    ngx_mutex_lock(bl->mutex);
-
-    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ctx->event->log, 0,
-                   "event busy lock: b:%d mb:%d",
-                   bl->busy, bl->max_busy);
-
-    if (bl->busy < bl->max_busy) {
-        bl->busy++;
-
-        rc = NGX_OK;
-
-    } else if (ctx->timer && bl->waiting < bl->max_waiting) {
-        bl->waiting++;
-        ngx_add_timer(ctx->event, ctx->timer);
-        ctx->event->handler = ngx_event_busy_lock_handler;
-
-        if (bl->events) {
-            bl->last->next = ctx;
-
-        } else {
-            bl->events = ctx;
-        }
-
-        bl->last = ctx;
-
-        rc = NGX_AGAIN;
-
-    } else {
-        rc = NGX_BUSY;
-    }
-
-    ngx_mutex_unlock(bl->mutex);
-
-    return rc;
-}
-
-
-ngx_int_t
-ngx_event_busy_lock_cacheable(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx)
-{
-    ngx_int_t  rc;
-
-    ngx_mutex_lock(bl->mutex);
-
-    rc = ngx_event_busy_lock_look_cacheable(bl, ctx);
-
-    ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ctx->event->log, 0,
-                   "event busy lock: %d w:%d mw:%d",
-                   rc, bl->waiting, bl->max_waiting);
-
-    /*
-     * NGX_OK:     no the same request, there is free slot and we locked it
-     * NGX_BUSY:   no the same request and there is no free slot
-     * NGX_AGAIN:  the same request is processing
-     */
-
-    if (rc == NGX_AGAIN) {
-
-        if (ctx->timer && bl->waiting < bl->max_waiting) {
-            bl->waiting++;
-            ngx_add_timer(ctx->event, ctx->timer);
-            ctx->event->handler = ngx_event_busy_lock_handler;
-
-            if (bl->events == NULL) {
-                bl->events = ctx;
-            } else {
-                bl->last->next = ctx;
-            }
-            bl->last = ctx;
-
-        } else {
-            rc = NGX_BUSY;
-        }
-    }
-
-    ngx_mutex_unlock(bl->mutex);
-
-    return rc;
-}
-
-
-void
-ngx_event_busy_unlock(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx)
-{
-    ngx_event_t                *ev;
-    ngx_event_busy_lock_ctx_t  *wakeup;
-
-    ngx_mutex_lock(bl->mutex);
-
-    if (bl->events) {
-        wakeup = bl->events;
-        bl->events = bl->events->next;
-
-    } else {
-        wakeup = NULL;
-        bl->busy--;
-    }
-
-    /*
-     * MP: all ctx's and their queue must be in shared memory,
-     *     each ctx has pid to wake up
-     */
-
-    if (wakeup == NULL) {
-        ngx_mutex_unlock(bl->mutex);
-        return;
-    }
-
-    if (ctx->md5) {
-        for (wakeup = bl->events; wakeup; wakeup = wakeup->next) {
-            if (wakeup->md5 == NULL || wakeup->slot != ctx->slot) {
-                continue;
-            }
-
-            wakeup->handler = ngx_event_busy_lock_posted_handler;
-            wakeup->cache_updated = 1;
-
-            ev = wakeup->event;
-
-            ngx_post_event(ev, &ngx_posted_events);
-        }
-
-        ngx_mutex_unlock(bl->mutex);
-
-    } else {
-        bl->waiting--;
-
-        ngx_mutex_unlock(bl->mutex);
-
-        wakeup->handler = ngx_event_busy_lock_posted_handler;
-        wakeup->locked = 1;
-
-        ev = wakeup->event;
-
-        if (ev->timer_set) {
-            ngx_del_timer(ev);
-        }
-
-        ngx_post_event(ev, &ngx_posted_events);
-    }
-}
-
-
-void
-ngx_event_busy_lock_cancel(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx)
-{
-    ngx_event_busy_lock_ctx_t  *c, *p;
-
-    ngx_mutex_lock(bl->mutex);
-
-    bl->waiting--;
-
-    if (ctx == bl->events) {
-        bl->events = ctx->next;
-
-    } else {
-        p = bl->events;
-        for (c = bl->events->next; c; c = c->next) {
-            if (c == ctx) {
-                p->next = ctx->next;
-                break;
-            }
-            p = c;
-        }
-    }
-
-    ngx_mutex_unlock(bl->mutex);
-}
-
-
-static ngx_int_t
-ngx_event_busy_lock_look_cacheable(ngx_event_busy_lock_t *bl,
-    ngx_event_busy_lock_ctx_t *ctx)
-{
-    ngx_int_t    free;
-    ngx_uint_t   i, bit, cacheable, mask;
-
-    bit = 0;
-    cacheable = 0;
-    free = -1;
-
-#if (NGX_SUPPRESS_WARN)
-    mask = 0;
-#endif
-
-    for (i = 0; i < bl->max_busy; i++) {
-
-        if ((bit & 7) == 0) {
-            mask = bl->md5_mask[i / 8];
-        }
-
-        if (mask & 1) {
-            if (ngx_memcmp(&bl->md5[i * 16], ctx->md5, 16) == 0) {
-                ctx->waiting = 1;
-                ctx->slot = i;
-                return NGX_AGAIN;
-            }
-            cacheable++;
-



More information about the nginx-devel mailing list