Mercurial > hg > nginx-vendor-current

diff auto/os/conf @ 138:8e6d4d96ec4c NGINX_0_3_16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.16 *) Feature: the ngx_http_map_module. *) Feature: the "types_hash_max_size" and "types_hash_bucket_size" directives. *) Feature: the "ssi_value_length" directive. *) Feature: the "worker_rlimit_core" directive. *) Workaround: the connection number in logs was always 1 if nginx was built by the icc 8.1 or 9.0 compilers with optimization for Pentium 4. *) Bugfix: the "config timefmt" SSI command set incorrect time format. *) Bugfix: nginx did not close connection to IMAP/POP3 backend for the SSL connections; bug appeared in 0.3.13. Thanks to Rob Mueller. *) Bugfix: segmentation fault may occurred in at SSL shutdown; bug appeared in 0.3.13.
author Igor Sysoev <http://sysoev.ru>
date Fri, 16 Dec 2005 00:00:00 +0300
parents 91372f004adf
children 84910468f6de
line wrap: on
line diff
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -59,12 +59,36 @@ esac
 
 case "$NGX_MACHINE" in
 
-    i386 | i686 | i86pc | amd64)
+    i386 | i686 | i86pc)
         have=NGX_HAVE_NONALIGNED . auto/have
+        NGX_MACH_CACHE_LINE=32
+    ;;
+
+    amd64)
+        have=NGX_HAVE_NONALIGNED . auto/have
+        NGX_MACH_CACHE_LINE=64
     ;;
 
-    sun4u | sparc | sparc64 | ia64 )
+    sun4u | sparc | sparc64)
         have=NGX_ALIGNMENT value=16 . auto/define
+        # TODO
+        NGX_MACH_CACHE_LINE=64
+    ;;
+
+    ia64 )
+        have=NGX_ALIGNMENT value=16 . auto/define
+        # TODO
+        NGX_MACH_CACHE_LINE=64
+    ;;
+
+    *)
+        NGX_MACH_CACHE_LINE=32
     ;;
 
 esac
+
+if test -z "$NGX_CPU_CACHE_LINE"; then
+    NGX_CPU_CACHE_LINE=$NGX_MACH_CACHE_LINE
+fi
+
+have=NGX_CPU_CACHE_LINE value=$NGX_CPU_CACHE_LINE . auto/define