Mercurial > hg > nginx

changeset 5637:5a65b9d8bc2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjusted default value of types_hash_bucket_size (ticket #352). The ngx_cacheline_size may be too low on some platforms, resulting in unexpected hash build problems (as no collisions are tolerated due to low bucket_size, and max_size isn't big enough to build a hash without collisions). These problems aren't fatal anymore but nevertheless need to be addressed.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 31 Mar 2014 22:47:42 +0400
parents 54f847c88cf7
children 0c0dd1aacdf5
files src/http/ngx_http_core_module.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3710,8 +3710,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t 
                               prev->types_hash_max_size, 1024);
 
     ngx_conf_merge_uint_value(conf->types_hash_bucket_size,
-                              prev->types_hash_bucket_size,
-                              ngx_cacheline_size);
+                              prev->types_hash_bucket_size, 64);
 
     conf->types_hash_bucket_size = ngx_align(conf->types_hash_bucket_size,
                                              ngx_cacheline_size);