changeset 624:d4da38525468 NGINX_1_0_2

nginx 1.0.2 *) Feature: now shared zones and caches use POSIX semaphores. *) Bugfix: in the "rotate" parameter of the "image_filter" directive. Thanks to Adam Bocim. *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 1.0.1.
author Igor Sysoev <http://sysoev.ru>
date Tue, 10 May 2011 00:00:00 +0400
parents 9b9e61f1b500
children 30f948276abe
files CHANGES CHANGES.ru auto/os/freebsd auto/unix src/core/nginx.h src/core/ngx_shmtx.c src/core/ngx_shmtx.h src/event/ngx_event.c src/http/modules/ngx_http_image_filter_module.c src/http/modules/perl/nginx.pm src/os/unix/ngx_darwin_config.h src/os/unix/ngx_freebsd_config.h src/os/unix/ngx_linux_config.h src/os/unix/ngx_posix_config.h src/os/unix/ngx_solaris_config.h
diffstat 15 files changed, 313 insertions(+), 89 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES	Tue May 03 00:00:00 2011 +0400
+++ b/CHANGES	Tue May 10 00:00:00 2011 +0400
@@ -1,4 +1,15 @@
 
+Changes with nginx 1.0.2                                         10 May 2011
+
+    *) Feature: now shared zones and caches use POSIX semaphores.
+
+    *) Bugfix: in the "rotate" parameter of the "image_filter" directive. 
+       Thanks to Adam Bocim.
+
+    *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 
+       1.0.1.
+
+
 Changes with nginx 1.0.1                                         03 May 2011
 
     *) Change: now the "split_clients" directive uses MurmurHash2 algorithm 
@@ -69,8 +80,7 @@
 
 Changes with nginx 0.9.5                                         21 Feb 2011
 
-    *) Change: now nginx uses a default listen backlog value -1 on 
-       Linux.
+    *) Change: now nginx uses a default listen backlog value -1 on Linux. 
        Thanks to Andrei Nigmatulin.
 
     *) Feature: the "utf8" parameter of "geoip_country" and "geoip_city" 
--- a/CHANGES.ru	Tue May 03 00:00:00 2011 +0400
+++ b/CHANGES.ru	Tue May 10 00:00:00 2011 +0400
@@ -1,4 +1,14 @@
 
+Изменения в nginx 1.0.2                                           10.05.2011
+
+    *) Добавление: теперь разделяемые зоны и кэши используют семафоры POSIX.
+
+    *) Исправление: в работе параметра rotate директивы image_filter.
+       Спасибо Adam Bocim.
+
+    *) Исправление: nginx не собирался на Solaris; ошибка появилась в 1.0.1.
+
+
 Изменения в nginx 1.0.1                                           03.05.2011
 
     *) Изменение: теперь директива split_clients использует алгоритм 
--- a/auto/os/freebsd	Tue May 03 00:00:00 2011 +0400
+++ b/auto/os/freebsd	Tue May 10 00:00:00 2011 +0400
@@ -49,6 +49,15 @@
     have=NGX_HAVE_AIO_SENDFILE . auto/have
 fi
 
+# POSIX semaphores
+# http://www.freebsd.org/cgi/query-pr.cgi?pr=kern/127545
+
+if [ $osreldate -ge 701106 ]; then
+    echo " + POSIX semaphores should work"
+else
+    have=NGX_HAVE_POSIX_SEM . auto/nohave
+fi
+
 
 # kqueue
 
--- a/auto/unix	Tue May 03 00:00:00 2011 +0400
+++ b/auto/unix	Tue May 10 00:00:00 2011 +0400
@@ -141,7 +141,7 @@
     ngx_feature_name=NGX_SYS_NERR
     ngx_feature_run=value
     ngx_feature_incs='#include <errno.h>
-                      #include <string.h>'
+                      #include <string.h>
                       #include <stdio.h>'
     ngx_feature_path=
     ngx_feature_libs=
@@ -234,6 +234,18 @@
 . auto/feature
 
 
+ngx_feature="POSIX semaphores"
+ngx_feature_name="NGX_HAVE_POSIX_SEM"
+ngx_feature_run=yes
+ngx_feature_incs="#include <semaphore.h>"
+ngx_feature_path=
+ngx_feature_libs=
+ngx_feature_test="sem_t  sem;
+                  if (sem_init(&sem, 1, 0) == -1) return 1;
+                  sem_destroy(&sem);"
+. auto/feature
+
+
 ngx_feature="struct msghdr.msg_control"
 ngx_feature_name="NGX_HAVE_MSGHDR_MSG_CONTROL"
 ngx_feature_run=no
--- a/src/core/nginx.h	Tue May 03 00:00:00 2011 +0400
+++ b/src/core/nginx.h	Tue May 10 00:00:00 2011 +0400
@@ -8,8 +8,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1000001
-#define NGINX_VERSION      "1.0.1"
+#define nginx_version      1000002
+#define NGINX_VERSION      "1.0.2"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define NGINX_VAR          "NGINX"
--- a/src/core/ngx_shmtx.c	Tue May 03 00:00:00 2011 +0400
+++ b/src/core/ngx_shmtx.c	Tue May 10 00:00:00 2011 +0400
@@ -16,9 +16,166 @@
 {
     mtx->lock = addr;
 
+    if (mtx->spin == (ngx_uint_t) -1) {
+        return NGX_OK;
+    }
+
+    mtx->spin = 2048;
+
+#if (NGX_HAVE_POSIX_SEM)
+
+    if (sem_init(&mtx->sem, 1, 0) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_errno,
+                      "sem_init() failed");
+    } else {
+        mtx->semaphore = 1;
+    }
+
+#endif
+
     return NGX_OK;
 }
 
+
+void
+ngx_shmtx_destory(ngx_shmtx_t *mtx)
+{
+#if (NGX_HAVE_POSIX_SEM)
+
+    if (mtx->semaphore) {
+        if (sem_destroy(&mtx->sem) == -1) {
+            ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_errno,
+                          "sem_destroy() failed");
+        }
+    }
+
+#endif
+}
+
+
+ngx_uint_t
+ngx_shmtx_trylock(ngx_shmtx_t *mtx)
+{
+    ngx_atomic_uint_t  val;
+
+    val = *mtx->lock;
+
+    return ((val & 0x80000000) == 0
+            && ngx_atomic_cmp_set(mtx->lock, val, val | 0x80000000));
+}
+
+
+void
+ngx_shmtx_lock(ngx_shmtx_t *mtx)
+{
+    ngx_uint_t         i, n;
+    ngx_atomic_uint_t  val;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, "shmtx lock");
+
+    for ( ;; ) {
+
+        val = *mtx->lock;
+
+        if ((val & 0x80000000) == 0
+            && ngx_atomic_cmp_set(mtx->lock, val, val | 0x80000000))
+        {
+            return;
+        }
+
+        if (ngx_ncpu > 1) {
+
+            for (n = 1; n < mtx->spin; n <<= 1) {
+
+                for (i = 0; i < n; i++) {
+                    ngx_cpu_pause();
+                }
+
+                val = *mtx->lock;
+
+                if ((val & 0x80000000) == 0
+                    && ngx_atomic_cmp_set(mtx->lock, val, val | 0x80000000))
+                {
+                    return;
+                }
+            }
+        }
+
+#if (NGX_HAVE_POSIX_SEM)
+
+        if (mtx->semaphore) {
+            val = *mtx->lock;
+
+            if ((val & 0x80000000)
+                && ngx_atomic_cmp_set(mtx->lock, val, val + 1))
+            {
+                ngx_log_debug1(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0,
+                               "shmtx wait %XA", val);
+
+                while (sem_wait(&mtx->sem) == -1) {
+                    ngx_err_t  err;
+
+                    err = ngx_errno;
+
+                    if (err != NGX_EINTR) {
+                        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, err,
+                                   "sem_wait() failed while waiting on shmtx");
+                        break;
+                    }
+                }
+
+                ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0,
+                               "shmtx awoke");
+            }
+
+            continue;
+        }
+
+#endif
+
+        ngx_sched_yield();
+    }
+}
+
+
+void
+ngx_shmtx_unlock(ngx_shmtx_t *mtx)
+{
+    ngx_atomic_uint_t  val, old, wait;
+
+    if (mtx->spin != (ngx_uint_t) -1) {
+        ngx_log_debug0(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, "shmtx unlock");
+    }
+
+    for ( ;; ) {
+
+        old = *mtx->lock;
+        wait = old & 0x7fffffff;
+        val = wait ? wait - 1 : 0;
+
+        if (ngx_atomic_cmp_set(mtx->lock, old, val)) {
+            break;
+        }
+    }
+
+#if (NGX_HAVE_POSIX_SEM)
+
+    if (wait == 0 || !mtx->semaphore) {
+        return;
+    }
+
+    ngx_log_debug1(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0,
+                   "shmtx wake %XA", old);
+
+    if (sem_post(&mtx->sem) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_errno,
+                      "sem_post() failed while wake shmtx");
+    }
+
+#endif
+}
+
+
 #else
 
 
@@ -65,4 +222,62 @@
 }
 
 
+ngx_uint_t
+ngx_shmtx_trylock(ngx_shmtx_t *mtx)
+{
+    ngx_err_t  err;
+
+    err = ngx_trylock_fd(mtx->fd);
+
+    if (err == 0) {
+        return 1;
+    }
+
+    if (err == NGX_EAGAIN) {
+        return 0;
+    }
+
+#if __osf__ /* Tru64 UNIX */
+
+    if (err == NGX_EACCESS) {
+        return 0;
+    }
+
 #endif
+
+    ngx_log_abort(err, ngx_trylock_fd_n " %s failed", mtx->name);
+
+    return 0;
+}
+
+
+void
+ngx_shmtx_lock(ngx_shmtx_t *mtx)
+{
+    ngx_err_t  err;
+
+    err = ngx_lock_fd(mtx->fd);
+
+    if (err == 0) {
+        return;
+    }
+
+    ngx_log_abort(err, ngx_lock_fd_n " %s failed", mtx->name);
+}
+
+
+void
+ngx_shmtx_unlock(ngx_shmtx_t *mtx)
+{
+    ngx_err_t  err;
+
+    err = ngx_unlock_fd(mtx->fd);
+
+    if (err == 0) {
+        return;
+    }
+
+    ngx_log_abort(err, ngx_unlock_fd_n " %s failed", mtx->name);
+}
+
+#endif
--- a/src/core/ngx_shmtx.h	Tue May 03 00:00:00 2011 +0400
+++ b/src/core/ngx_shmtx.h	Tue May 10 00:00:00 2011 +0400
@@ -15,95 +15,23 @@
 typedef struct {
 #if (NGX_HAVE_ATOMIC_OPS)
     ngx_atomic_t  *lock;
+#if (NGX_HAVE_POSIX_SEM)
+    ngx_uint_t     semaphore;
+    sem_t          sem;
+#endif
 #else
     ngx_fd_t       fd;
     u_char        *name;
 #endif
+    ngx_uint_t     spin;
 } ngx_shmtx_t;
 
 
 ngx_int_t ngx_shmtx_create(ngx_shmtx_t *mtx, void *addr, u_char *name);
-
-
-#if (NGX_HAVE_ATOMIC_OPS)
-
-static ngx_inline ngx_uint_t
-ngx_shmtx_trylock(ngx_shmtx_t *mtx)
-{
-    return (*mtx->lock == 0 && ngx_atomic_cmp_set(mtx->lock, 0, ngx_pid));
-}
-
-#define ngx_shmtx_lock(mtx)   ngx_spinlock((mtx)->lock, ngx_pid, 1024)
-
-#define ngx_shmtx_unlock(mtx) (void) ngx_atomic_cmp_set((mtx)->lock, ngx_pid, 0)
-
-#define ngx_shmtx_destory(mtx)
-
-
-#else
-
-static ngx_inline ngx_uint_t
-ngx_shmtx_trylock(ngx_shmtx_t *mtx)
-{
-    ngx_err_t  err;
-
-    err = ngx_trylock_fd(mtx->fd);
-
-    if (err == 0) {
-        return 1;
-    }
-
-    if (err == NGX_EAGAIN) {
-        return 0;
-    }
-
-#if __osf__ /* Tru64 UNIX */
-
-    if (err == NGX_EACCESS) {
-        return 0;
-    }
-
-#endif
-
-    ngx_log_abort(err, ngx_trylock_fd_n " %s failed", mtx->name);
-
-    return 0;
-}
-
-
-static ngx_inline void
-ngx_shmtx_lock(ngx_shmtx_t *mtx)
-{
-    ngx_err_t  err;
-
-    err = ngx_lock_fd(mtx->fd);
-
-    if (err == 0) {
-        return;
-    }
-
-    ngx_log_abort(err, ngx_lock_fd_n " %s failed", mtx->name);
-}
-
-
-static ngx_inline void
-ngx_shmtx_unlock(ngx_shmtx_t *mtx)
-{
-    ngx_err_t  err;
-
-    err = ngx_unlock_fd(mtx->fd);
-
-    if (err == 0) {
-        return;
-    }
-
-    ngx_log_abort(err, ngx_unlock_fd_n " %s failed", mtx->name);
-}
-
-
 void ngx_shmtx_destory(ngx_shmtx_t *mtx);
-
-#endif
+ngx_uint_t ngx_shmtx_trylock(ngx_shmtx_t *mtx);
+void ngx_shmtx_lock(ngx_shmtx_t *mtx);
+void ngx_shmtx_unlock(ngx_shmtx_t *mtx);
 
 
 #endif /* _NGX_SHMTX_H_INCLUDED_ */
--- a/src/event/ngx_event.c	Tue May 03 00:00:00 2011 +0400
+++ b/src/event/ngx_event.c	Tue May 10 00:00:00 2011 +0400
@@ -519,6 +519,7 @@
     shared = shm.addr;
 
     ngx_accept_mutex_ptr = (ngx_atomic_t *) shared;
+    ngx_accept_mutex.spin = (ngx_uint_t) -1;
 
     if (ngx_shmtx_create(&ngx_accept_mutex, shared, cycle->lock_file.data)
         != NGX_OK)
--- a/src/http/modules/ngx_http_image_filter_module.c	Tue May 03 00:00:00 2011 +0400
+++ b/src/http/modules/ngx_http_image_filter_module.c	Tue May 10 00:00:00 2011 +0400
@@ -723,7 +723,7 @@
 static ngx_buf_t *
 ngx_http_image_resize(ngx_http_request_t *r, ngx_http_image_filter_ctx_t *ctx)
 {
-    int                            sx, sy, dx, dy, ox, oy, size,
+    int                            sx, sy, dx, dy, ox, oy, ax, ay, size,
                                    colors, palette, transparent,
                                    red, green, blue, t;
     u_char                        *out;
@@ -852,6 +852,9 @@
     if (ctx->angle) {
         src = dst;
 
+        ax = (dx % 2 == 0) ? 1 : 0;
+        ay = (dy % 2 == 0) ? 1 : 0;
+
         switch (ctx->angle) {
 
         case 90:
@@ -861,7 +864,17 @@
                 gdImageDestroy(src);
                 return NULL;
             }
-            gdImageCopyRotated(dst, src, dy/2, dx/2, 0, 0, dx, dy, ctx->angle);
+            if (ctx->angle == 90) {
+                ox = dy / 2 + ay;
+                oy = dx / 2 - ax;
+
+            } else {
+                ox = dy / 2 - ay;
+                oy = dx / 2 + ax;
+            }
+
+            gdImageCopyRotated(dst, src, ox, oy, 0, 0,
+                               dx + ax, dy + ay, ctx->angle);
             gdImageDestroy(src);
 
             t = dx;
@@ -875,7 +888,8 @@
                 gdImageDestroy(src);
                 return NULL;
             }
-            gdImageCopyRotated(dst, src, dx/2, dy/2, 0, 0, dx, dy, ctx->angle);
+            gdImageCopyRotated(dst, src, dx / 2 - ax, dy / 2 - ay, 0, 0,
+                               dx + ax, dy + ay, ctx->angle);
             gdImageDestroy(src);
             break;
         }
--- a/src/http/modules/perl/nginx.pm	Tue May 03 00:00:00 2011 +0400
+++ b/src/http/modules/perl/nginx.pm	Tue May 10 00:00:00 2011 +0400
@@ -48,7 +48,7 @@
     HTTP_INSUFFICIENT_STORAGE
 );
 
-our $VERSION = '1.0.1';
+our $VERSION = '1.0.2';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);
--- a/src/os/unix/ngx_darwin_config.h	Tue May 03 00:00:00 2011 +0400
+++ b/src/os/unix/ngx_darwin_config.h	Tue May 10 00:00:00 2011 +0400
@@ -56,6 +56,11 @@
 #include <ngx_auto_config.h>
 
 
+#if (NGX_HAVE_POSIX_SEM)
+#include <semaphore.h>
+#endif
+
+
 #if (NGX_HAVE_POLL)
 #include <poll.h>
 #endif
--- a/src/os/unix/ngx_freebsd_config.h	Tue May 03 00:00:00 2011 +0400
+++ b/src/os/unix/ngx_freebsd_config.h	Tue May 10 00:00:00 2011 +0400
@@ -68,6 +68,11 @@
 #include <ngx_auto_config.h>
 
 
+#if (NGX_HAVE_POSIX_SEM)
+#include <semaphore.h>
+#endif
+
+
 #if (NGX_HAVE_POLL)
 #include <poll.h>
 #endif
--- a/src/os/unix/ngx_linux_config.h	Tue May 03 00:00:00 2011 +0400
+++ b/src/os/unix/ngx_linux_config.h	Tue May 10 00:00:00 2011 +0400
@@ -58,6 +58,11 @@
 #include <ngx_auto_config.h>
 
 
+#if (NGX_HAVE_POSIX_SEM)
+#include <semaphore.h>
+#endif
+
+
 #if (NGX_HAVE_SYS_PRCTL_H)
 #include <sys/prctl.h>
 #endif
--- a/src/os/unix/ngx_posix_config.h	Tue May 03 00:00:00 2011 +0400
+++ b/src/os/unix/ngx_posix_config.h	Tue May 10 00:00:00 2011 +0400
@@ -96,6 +96,11 @@
 #include <ngx_auto_config.h>
 
 
+#if (NGX_HAVE_POSIX_SEM)
+#include <semaphore.h>
+#endif
+
+
 #if (NGX_HAVE_POLL)
 #include <poll.h>
 #endif
--- a/src/os/unix/ngx_solaris_config.h	Tue May 03 00:00:00 2011 +0400
+++ b/src/os/unix/ngx_solaris_config.h	Tue May 10 00:00:00 2011 +0400
@@ -57,6 +57,11 @@
 #include <ngx_auto_config.h>
 
 
+#if (NGX_HAVE_POSIX_SEM)
+#include <semaphore.h>
+#endif
+
+
 #if (NGX_HAVE_POLL)
 #include <poll.h>
 #endif