nginx-devel June 2019

nginx-devel@nginx.org

21 participants
49 discussions

by Maxim Dounin

Hello! On Tue, Sep 18, 2018 at 08:12:20AM -0400, Thomas Ward wrote: > Downstream in Ubuntu, it has been proposed to demote pcre3 and > use pcre2 instead as it is newer. > https://trac.nginx.org/nginx/ticket/720 shows it was marked 4 > years ago that NGINX does not support pcre2. Are there any > plans to use pcre2 instead of pcre3? There are no immediate plans. When we last checked, there were no problems with PCRE, but PCRE2 wasn't available in most distributions we support, making the switch mostly meaningless. Also, it looks like PCRE2 is still not supported even by Exim, which is the parent project of PCRE and PCRE2: https://bugs.exim.org/show_bug.cgi?id=1878 As such, adding PCRE2 support to nginx looks premature. -- Maxim Dounin http://mdounin.ru/

1 year, 1 month

cache: move open to thread pool

by Ka-Hing Cheung

commit 0bcfefa040abdff674047c15701d237ff16a5f2b Author: Ka-Hing Cheung <kahing(a)cloudflare.com> Date: Fri Aug 3 13:37:58 2018 -0700 move open to thread pool At cloudflare we found that open() can block a long time, especially at p99 and p999. Moving it to thread pool improved overall p99 by 6x or so during peak time. This has the side effect of disabling nginx's open_file_cache when "aio threads" is turned on. For us we found that to have no impact (probably because we have way too many files for open file cache to be effective anyway). thread pool does increase CPU usage somewhat but we have not measured difference in CPU usage for stock "aio threads" compared to after this patch. Only the cache hit open() is moved to thread pool. We wrote more about it here: https://blog.cloudflare.com/how-we-scaled-nginx-and-saved-the-world-54-year… diff --git src/core/ngx_open_file_cache.c src/core/ngx_open_file_cache.c index b23ee78d..9177ebfd 100644 --- src/core/ngx_open_file_cache.c +++ src/core/ngx_open_file_cache.c @@ -35,8 +35,6 @@ static ngx_fd_t ngx_open_file_wrapper(ngx_str_t *name, ngx_int_t access, ngx_log_t *log); static ngx_int_t ngx_file_info_wrapper(ngx_str_t *name, ngx_open_file_info_t *of, ngx_file_info_t *fi, ngx_log_t *log); -static ngx_int_t ngx_open_and_stat_file(ngx_str_t *name, - ngx_open_file_info_t *of, ngx_log_t *log); static void ngx_open_file_add_event(ngx_open_file_cache_t *cache, ngx_cached_open_file_t *file, ngx_open_file_info_t *of, ngx_log_t *log); static void ngx_open_file_cleanup(void *data); @@ -836,7 +834,7 @@ ngx_file_info_wrapper(ngx_str_t *name, ngx_open_file_info_t *of, } -static ngx_int_t +ngx_int_t ngx_open_and_stat_file(ngx_str_t *name, ngx_open_file_info_t *of, ngx_log_t *log) { diff --git src/core/ngx_open_file_cache.h src/core/ngx_open_file_cache.h index d119c129..94b4d552 100644 --- src/core/ngx_open_file_cache.h +++ src/core/ngx_open_file_cache.h @@ -124,6 +124,8 @@ ngx_open_file_cache_t *ngx_open_file_cache_init(ngx_pool_t *pool, ngx_uint_t max, time_t inactive); ngx_int_t ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name, ngx_open_file_info_t *of, ngx_pool_t *pool); +ngx_int_t ngx_open_and_stat_file(ngx_str_t *name, + ngx_open_file_info_t *of, ngx_log_t *log); #endif /* _NGX_OPEN_FILE_CACHE_H_INCLUDED_ */ diff --git src/http/ngx_http_cache.h src/http/ngx_http_cache.h index f9e96640..2910f6a1 100644 --- src/http/ngx_http_cache.h +++ src/http/ngx_http_cache.h @@ -114,6 +114,7 @@ struct ngx_http_cache_s { unsigned exists:1; unsigned temp_file:1; unsigned purged:1; + unsigned opening:1; unsigned reading:1; unsigned secondary:1; unsigned background:1; diff --git src/http/ngx_http_file_cache.c src/http/ngx_http_file_cache.c index 56866fa4..9cb110bf 100644 --- src/http/ngx_http_file_cache.c +++ src/http/ngx_http_file_cache.c @@ -18,6 +18,10 @@ static void ngx_http_file_cache_lock_wait(ngx_http_request_t *r, ngx_http_cache_t *c); static ngx_int_t ngx_http_file_cache_read(ngx_http_request_t *r, ngx_http_cache_t *c); +static ngx_int_t ngx_http_file_cache_aio_open(ngx_http_request_t *r, + ngx_http_cache_t *c, ngx_int_t *rv); +static ngx_int_t ngx_http_file_cache_do_aio_open(ngx_http_request_t *r, + ngx_http_cache_t *c, ngx_open_file_info_t *of, ngx_int_t *rv); static ssize_t ngx_http_file_cache_aio_read(ngx_http_request_t *r, ngx_http_cache_t *c); #if (NGX_HAVE_FILE_AIO) @@ -268,9 +272,7 @@ ngx_http_file_cache_open(ngx_http_request_t *r) ngx_uint_t test; ngx_http_cache_t *c; ngx_pool_cleanup_t *cln; - ngx_open_file_info_t of; ngx_http_file_cache_t *cache; - ngx_http_core_loc_conf_t *clcf; c = r->cache; @@ -278,6 +280,10 @@ ngx_http_file_cache_open(ngx_http_request_t *r) return NGX_AGAIN; } + if (c->opening) { + return ngx_http_file_cache_aio_open(r, c, &rv); + } + if (c->reading) { return ngx_http_file_cache_read(r, c); } @@ -343,23 +349,33 @@ ngx_http_file_cache_open(ngx_http_request_t *r) goto done; } - clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + return ngx_http_file_cache_aio_open(r, c, &rv); - ngx_memzero(&of, sizeof(ngx_open_file_info_t)); +done: - of.uniq = c->uniq; - of.valid = clcf->open_file_cache_valid; - of.min_uses = clcf->open_file_cache_min_uses; - of.events = clcf->open_file_cache_events; - of.directio = NGX_OPEN_FILE_DIRECTIO_OFF; - of.read_ahead = clcf->read_ahead; + if (rv == NGX_DECLINED) { + return ngx_http_file_cache_lock(r, c); + } - if (ngx_open_cached_file(clcf->open_file_cache, &c->file.name, &of, r->pool) - != NGX_OK) - { - switch (of.err) { + return rv; +} + +static ngx_int_t +ngx_http_file_cache_aio_open(ngx_http_request_t *r, ngx_http_cache_t *c, + ngx_int_t *rv) +{ + ngx_int_t rc; + ngx_open_file_info_t of; + ngx_http_file_cache_t *cache = c->file_cache; - case 0: + rc = ngx_http_file_cache_do_aio_open(r, c, &of, rv); + if (rc == NGX_AGAIN) { + return rc; + } + + if (rc != NGX_OK) { + switch (of.err) { + case NGX_OK: return NGX_ERROR; case NGX_ENOENT: @@ -391,14 +407,13 @@ ngx_http_file_cache_open(ngx_http_request_t *r) done: - if (rv == NGX_DECLINED) { + if (*rv == NGX_DECLINED) { return ngx_http_file_cache_lock(r, c); } - return rv; + return *rv; } - static ngx_int_t ngx_http_file_cache_lock(ngx_http_request_t *r, ngx_http_cache_t *c) { @@ -663,6 +678,127 @@ ngx_http_file_cache_read(ngx_http_request_t *r, ngx_http_cache_t *c) } +#if (NGX_THREADS) +typedef struct { + ngx_str_t name; + ngx_pool_t *pool; + ngx_open_file_info_t of; + ngx_int_t rv; +} ngx_thread_file_open_ctx_t; + +static void +ngx_http_file_cache_thread_open_handler(void *data, ngx_log_t *log) +{ + ngx_thread_file_open_ctx_t *ctx = data; + ngx_pool_t *pool = ctx->pool; + ngx_open_file_info_t *of = &ctx->of; + ngx_pool_cleanup_t *cln; + ngx_pool_cleanup_file_t *clnf; + ngx_int_t rc; + + ngx_log_debug0(NGX_LOG_DEBUG_CORE, log, 0, "thread read handler"); + + cln = ngx_pool_cleanup_add(pool, sizeof(ngx_pool_cleanup_file_t)); + if (cln == NULL) { + ctx->of.err = NGX_ERROR; + return; + } + + of->fd = NGX_INVALID_FILE; + + rc = ngx_open_and_stat_file(&ctx->name, of, pool->log); + if (rc == NGX_OK && !of->is_dir) { + cln->handler = ngx_pool_cleanup_file; + clnf = cln->data; + + clnf->fd = of->fd; + clnf->name = ctx->name.data; + clnf->log = pool->log; + } +} + + +static ngx_int_t +ngx_http_file_cache_thread_open(ngx_http_cache_t *c, ngx_open_file_info_t *of, + ngx_int_t *rv, ngx_pool_t *pool) +{ + ngx_thread_task_t *task; + ngx_thread_file_open_ctx_t *ctx; + ngx_file_t *file = &c->file; + + task = file->thread_task; + + if (task == NULL) { + task = ngx_thread_task_alloc(pool, sizeof(ngx_thread_file_open_ctx_t)); + if (task == NULL) { + return NGX_ERROR; + } + + file->thread_task = task; + } + + ctx = task->ctx; + + if (task->event.complete) { + task->event.complete = 0; + + *of = ctx->of; + *rv = ctx->rv; + return of->err; + } + + task->handler = ngx_http_file_cache_thread_open_handler; + + ctx->pool = pool; + ctx->name = file->name; + ctx->of = *of; + ctx->rv = *rv; + + if (file->thread_handler(task, file) != NGX_OK) { + return NGX_ERROR; + } + + return NGX_AGAIN; +} +#endif + +static ngx_int_t +ngx_http_file_cache_do_aio_open(ngx_http_request_t *r, ngx_http_cache_t *c, + ngx_open_file_info_t *of, ngx_int_t *rv) +{ + ngx_http_core_loc_conf_t *clcf; + + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + + ngx_memzero(of, sizeof(ngx_open_file_info_t)); + + of->uniq = c->uniq; + of->valid = clcf->open_file_cache_valid; + of->min_uses = clcf->open_file_cache_min_uses; + of->events = clcf->open_file_cache_events; + of->directio = NGX_OPEN_FILE_DIRECTIO_OFF; + of->read_ahead = clcf->read_ahead; + +#if (NGX_THREADS) + if (clcf->aio == NGX_HTTP_AIO_THREADS) { + ngx_int_t rc; + + c->file.thread_task = c->thread_task; + c->file.thread_handler = ngx_http_cache_thread_handler; + c->file.thread_ctx = r; + + rc = ngx_http_file_cache_thread_open(c, of, rv, r->pool); + + c->thread_task = c->file.thread_task; + c->opening = (rc == NGX_AGAIN); + + return rc; + } +#endif + + return ngx_open_cached_file(clcf->open_file_cache, &c->file.name, of, r->pool); +} + static ssize_t ngx_http_file_cache_aio_read(ngx_http_request_t *r, ngx_http_cache_t *c) {

1 year, 3 months

HTTP/2: allow unlimited number of requests in connection

by Michael Würtinger

Hello, we're running a gRPC service behind an NGINX load balancer and we often see that the connection gets shut down with a GOAWAY message. Since our request deadlines are quite small and it takes some time to re-establish a connection this often leads to many failed requests. After analyzing the situation we realized that it is caused by the "http2_max_requests" option which defaults to 1000. After setting this to a ridiculously high value our problems disappeared. While there probably are use cases where limiting the life time of a connection makes sense we were wondering why it is not possible to disable this functionality and let a connection just live as long as possible? The following patch allows to do just that by setting http2_max_requests to 0. Please let me know what you think. Thanks, Michael # HG changeset patch # User Michael Würtinger <michael.wuertinger(a)egym.com> # Date 1561569724 -7200 # Wed Jun 26 19:22:04 2019 +0200 # Node ID d703d79897320bfc743b2ea6421e301985b2c7e4 # Parent 35ea9229c71a9207a24e51f327e1749e3accb26c HTTP/2: allow unlimited number of requests in connection Allows to disable the "http2_max_requests" limit by setting it to 0. This enables very long living HTTP/2 connections which is desirable for some use cases like gRPC connections. diff -r 35ea9229c71a -r d703d7989732 src/http/v2/ngx_http_v2.c --- a/src/http/v2/ngx_http_v2.c Tue Jun 25 15:19:45 2019 +0300 +++ b/src/http/v2/ngx_http_v2.c Wed Jun 26 19:22:04 2019 +0200 @@ -1173,7 +1173,9 @@ ngx_http_v2_set_dependency(h2c, node, depend, excl); } - if (h2c->connection->requests >= h2scf->max_requests) { + if (h2scf->max_requests > 0 + && h2c->connection->requests >= h2scf->max_requests) + { h2c->goaway = 1; if (ngx_http_v2_send_goaway(h2c, NGX_HTTP_V2_NO_ERROR) == NGX_ERROR) { @@ -4514,7 +4516,7 @@ h2scf = ngx_http_get_module_srv_conf(h2c->http_connection->conf_ctx, ngx_http_v2_module); - if (h2c->idle++ > 10 * h2scf->max_requests) { + if (h2c->idle++ > 10 * h2scf->max_requests && h2scf->max_requests > 0) { ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0, "http2 flood detected"); ngx_http_v2_finalize_connection(h2c, NGX_HTTP_V2_NO_ERROR); -- <https://egym.com>

3 years, 4 months

[PATCH] Contrib: vim syntax, update core and 3rd party module directives.

by Gena Makhomed

# HG changeset patch # User Gena Makhomed <gmm(a)csdoc.com> # Date 1561880341 -10800 # Sun Jun 30 10:39:01 2019 +0300 # Node ID f298b850ea1a8499b3ea51bde571d010dc7dfc69 # Parent 35ea9229c71a9207a24e51f327e1749e3accb26c Contrib: vim syntax, update core and 3rd party module directives. diff -r 35ea9229c71a -r f298b850ea1a contrib/vim/syntax/nginx.vim --- a/contrib/vim/syntax/nginx.vim Tue Jun 25 15:19:45 2019 +0300 +++ b/contrib/vim/syntax/nginx.vim Sun Jun 30 10:39:01 2019 +0300 @@ -333,6 +333,7 @@ syn keyword ngxDirective contained js_content syn keyword ngxDirective contained js_filter syn keyword ngxDirective contained js_include +syn keyword ngxDirective contained js_path syn keyword ngxDirective contained js_preread syn keyword ngxDirective contained js_set syn keyword ngxDirective contained keepalive @@ -353,6 +354,7 @@ syn keyword ngxDirective contained limit_rate syn keyword ngxDirective contained limit_rate_after syn keyword ngxDirective contained limit_req +syn keyword ngxDirective contained limit_req_dry_run syn keyword ngxDirective contained limit_req_log_level syn keyword ngxDirective contained limit_req_status syn keyword ngxDirective contained limit_req_zone @@ -472,6 +474,7 @@ syn keyword ngxDirective contained proxy_responses syn keyword ngxDirective contained proxy_send_lowat syn keyword ngxDirective contained proxy_send_timeout +syn keyword ngxDirective contained proxy_session_drop syn keyword ngxDirective contained proxy_set_body syn keyword ngxDirective contained proxy_set_header syn keyword ngxDirective contained proxy_socket_keepalive @@ -1325,6 +1328,7 @@ syn keyword ngxDirectiveThirdParty contained lua_code_cache syn keyword ngxDirectiveThirdParty contained lua_fake_shm syn keyword ngxDirectiveThirdParty contained lua_http10_buffering +syn keyword ngxDirectiveThirdParty contained lua_load_resty_core syn keyword ngxDirectiveThirdParty contained lua_malloc_trim syn keyword ngxDirectiveThirdParty contained lua_max_pending_timers syn keyword ngxDirectiveThirdParty contained lua_max_running_timers @@ -1779,6 +1783,7 @@ syn keyword ngxDirectiveThirdParty contained vod_fallback_upstream_location syn keyword ngxDirectiveThirdParty contained vod_force_continuous_timestamps syn keyword ngxDirectiveThirdParty contained vod_force_playlist_type_vod +syn keyword ngxDirectiveThirdParty contained vod_force_sequence_index syn keyword ngxDirectiveThirdParty contained vod_gop_look_ahead syn keyword ngxDirectiveThirdParty contained vod_gop_look_behind syn keyword ngxDirectiveThirdParty contained vod_ignore_edit_list

3 years, 4 months

effect of bcrypt hash $cost on HTTP Basic authentication's login performance?

by PGNet Dev

When generating hashed data for "HTTP Basic" login auth protection, using bcrypt as the hash algorithm, one can vary the resultant hash strength by varying specify bcrypt's $cost, e.g. php -r "echo password_hash('$my_pass', PASSWORD_BCRYPT, ['cost' => $cost]) . PHP_EOL;" Of course, increased $cost requires increased encryption time. E.g., on my desktop, the hash encryption times vary with cost as, cost time 5 0m0.043s 6 0m0.055s 7 0m0.059s 8 0m0.075s 9 0m0.081s 10 0m0.110s 11 0m0.169s 12 0m0.285s 13 0m0.518s 14 0m0.785s 15 0m1.945s 16 0m3.782s 17 0m7.512s 18 0m14.973s 19 0m29.903s 20 0m59.735s 21 1m59.418s 22 3m58.792s ... For site login usage, does *client* login time vary at all with the hash $cost? Other than the initial, one-time hash generation, is there any login-performance reason NOT to use the highest hash $cost?

3 years, 5 months

Bug in ngx_http_slice_filter_module ngx_http_slice_parse_content_range function

by Carey Gister

The ngx_http_slice_parse_content_range function assumes that the parsed buffer is null terminated. Since the buffer is an ngx_str_t, that assumption is false. If, by chance, the buffer is null terminated it is simply a matter of luck, and not design. In particular, if the headers_out.content_range ngx_str_t was allocated in the ngx_http_range_filter_module then the buffer was allocated as a non-zero terminated buffer by ngx_pnalloc. The fact that the buffer is not null terminated may lead to ngx_http_slice_parse_content_range returning an NGX_ERROR code after the buffer was successfully parsed, or, if the caller is unfortunate, leading to a random memory access failure. I've written a replacement function that uses the length of the ngx_str_t as a guard condition. This code works and passes all of the unit tests. How should I submit the replacement? Carey Gister 415-310-5304

3 years, 5 months

Default log file locations

by Peter Bittner

Hi there! In my day job I'm helping to get applications from traditional environments running in cloud environments. Cloud native applications are just "normal" applications, but there are a few properties that they should satisfy (apart from resiliency and scalability). For logging this boils down to what is prescribed by the 12-factor app: The log output should be a continuous stream, i.e. simply log to the terminal. Now, as of today, at least on Debian based container images, the behavior of Nginx is to write to /var/log/nginx/access.log and /var/log/nginx/error.log by default. We try to compensate this by making those files symbolic links to /dev/stdout and /dev/stderr. We're doing this also, because there seem to be cases when a log entry is written _before_ it is configured via the Nginx configuration file. >From my perspective it would be advantageous to have Nginx write to the terminal by default (i.e. no hardcoded log file locations) and allow to override this behavior via the Nginx configuration file. Is there any reason why the default behavior is not that way yet? Peter

3 years, 5 months

[njs] Removed unused nalloc parameter from lvlhsh allocation functions.

by Valentin Bartenev

details: https://hg.nginx.org/njs/rev/9db5e400480c branches: changeset: 1019:9db5e400480c user: Valentin Bartenev <vbart(a)nginx.com> date: Thu Jun 27 18:55:34 2019 +0300 description: Removed unused nalloc parameter from lvlhsh allocation functions. diffstat: njs/njs_event.c | 1 - njs/njs_extern.c | 2 -- njs/njs_lexer_keyword.c | 1 - njs/njs_module.c | 1 - njs/njs_object.c | 1 - njs/njs_shell.c | 5 ++--- njs/njs_string.c | 1 - njs/njs_variable.c | 2 -- njs/njs_vm.c | 2 +- njs/njs_vm.h | 2 +- njs/test/njs_unit_test.c | 3 +-- nxt/nxt_lvlhsh.c | 5 ++--- nxt/nxt_lvlhsh.h | 6 +----- nxt/test/lvlhsh_unit_test.c | 3 +-- 14 files changed, 9 insertions(+), 26 deletions(-) diffs (252 lines): diff -r 0119e834a202 -r 9db5e400480c njs/njs_event.c --- a/njs/njs_event.c Thu Jun 27 18:54:21 2019 +0300 +++ b/njs/njs_event.c Thu Jun 27 18:55:34 2019 +0300 @@ -15,7 +15,6 @@ const nxt_lvlhsh_proto_t njs_event_hash nxt_aligned(64) = { NXT_LVLHSH_DEFAULT, - 0, njs_event_hash_test, njs_lvlhsh_alloc, njs_lvlhsh_free, diff -r 0119e834a202 -r 9db5e400480c njs/njs_extern.c --- a/njs/njs_extern.c Thu Jun 27 18:54:21 2019 +0300 +++ b/njs/njs_extern.c Thu Jun 27 18:55:34 2019 +0300 @@ -50,7 +50,6 @@ const nxt_lvlhsh_proto_t njs_extern_has nxt_aligned(64) = { NXT_LVLHSH_DEFAULT, - NXT_LVLHSH_BATCH_ALLOC, njs_extern_hash_test, njs_lvlhsh_alloc, njs_lvlhsh_free, @@ -61,7 +60,6 @@ const nxt_lvlhsh_proto_t njs_extern_val nxt_aligned(64) = { NXT_LVLHSH_DEFAULT, - NXT_LVLHSH_BATCH_ALLOC, njs_extern_value_hash_test, njs_lvlhsh_alloc, njs_lvlhsh_free, diff -r 0119e834a202 -r 9db5e400480c njs/njs_lexer_keyword.c --- a/njs/njs_lexer_keyword.c Thu Jun 27 18:54:21 2019 +0300 +++ b/njs/njs_lexer_keyword.c Thu Jun 27 18:55:34 2019 +0300 @@ -138,7 +138,6 @@ const nxt_lvlhsh_proto_t njs_keyword_ha nxt_aligned(64) = { NXT_LVLHSH_DEFAULT, - 0, njs_keyword_hash_test, njs_lvlhsh_alloc, njs_lvlhsh_free, diff -r 0119e834a202 -r 9db5e400480c njs/njs_module.c --- a/njs/njs_module.c Thu Jun 27 18:54:21 2019 +0300 +++ b/njs/njs_module.c Thu Jun 27 18:55:34 2019 +0300 @@ -415,7 +415,6 @@ const nxt_lvlhsh_proto_t njs_modules_ha nxt_aligned(64) = { NXT_LVLHSH_DEFAULT, - 0, njs_module_hash_test, njs_lvlhsh_alloc, njs_lvlhsh_free, diff -r 0119e834a202 -r 9db5e400480c njs/njs_object.c --- a/njs/njs_object.c Thu Jun 27 18:54:21 2019 +0300 +++ b/njs/njs_object.c Thu Jun 27 18:55:34 2019 +0300 @@ -149,7 +149,6 @@ const nxt_lvlhsh_proto_t njs_object_has nxt_aligned(64) = { NXT_LVLHSH_DEFAULT, - 0, njs_object_hash_test, njs_lvlhsh_alloc, njs_lvlhsh_free, diff -r 0119e834a202 -r 9db5e400480c njs/njs_shell.c --- a/njs/njs_shell.c Thu Jun 27 18:54:21 2019 +0300 +++ b/njs/njs_shell.c Thu Jun 27 18:55:34 2019 +0300 @@ -107,7 +107,7 @@ static void njs_console_clear_timer(njs_ njs_host_event_t event); static nxt_int_t lvlhsh_key_test(nxt_lvlhsh_query_t *lhq, void *data); -static void *lvlhsh_pool_alloc(void *pool, size_t size, nxt_uint_t nalloc); +static void *lvlhsh_pool_alloc(void *pool, size_t size); static void lvlhsh_pool_free(void *pool, void *p, size_t size); @@ -192,7 +192,6 @@ static njs_external_t njs_externals[] = static const nxt_lvlhsh_proto_t lvlhsh_proto nxt_aligned(64) = { NXT_LVLHSH_LARGE_SLAB, - 0, lvlhsh_key_test, lvlhsh_pool_alloc, lvlhsh_pool_free, @@ -1227,7 +1226,7 @@ lvlhsh_key_test(nxt_lvlhsh_query_t *lhq, static void * -lvlhsh_pool_alloc(void *pool, size_t size, nxt_uint_t nalloc) +lvlhsh_pool_alloc(void *pool, size_t size) { return nxt_mp_align(pool, size, size); } diff -r 0119e834a202 -r 9db5e400480c njs/njs_string.c --- a/njs/njs_string.c Thu Jun 27 18:54:21 2019 +0300 +++ b/njs/njs_string.c Thu Jun 27 18:55:34 2019 +0300 @@ -4591,7 +4591,6 @@ static const nxt_lvlhsh_proto_t njs_val nxt_aligned(64) = { NXT_LVLHSH_DEFAULT, - 0, njs_values_hash_test, njs_lvlhsh_alloc, njs_lvlhsh_free, diff -r 0119e834a202 -r 9db5e400480c njs/njs_variable.c --- a/njs/njs_variable.c Thu Jun 27 18:54:21 2019 +0300 +++ b/njs/njs_variable.c Thu Jun 27 18:55:34 2019 +0300 @@ -37,7 +37,6 @@ const nxt_lvlhsh_proto_t njs_variables_ nxt_aligned(64) = { NXT_LVLHSH_DEFAULT, - 0, njs_variables_hash_test, njs_lvlhsh_alloc, njs_lvlhsh_free, @@ -232,7 +231,6 @@ const nxt_lvlhsh_proto_t njs_references nxt_aligned(64) = { NXT_LVLHSH_DEFAULT, - 0, njs_reference_hash_test, njs_lvlhsh_alloc, njs_lvlhsh_free, diff -r 0119e834a202 -r 9db5e400480c njs/njs_vm.c --- a/njs/njs_vm.c Thu Jun 27 18:54:21 2019 +0300 +++ b/njs/njs_vm.c Thu Jun 27 18:55:34 2019 +0300 @@ -3672,7 +3672,7 @@ njs_debug(njs_index_t index, njs_value_t void * -njs_lvlhsh_alloc(void *data, size_t size, nxt_uint_t nalloc) +njs_lvlhsh_alloc(void *data, size_t size) { return nxt_mp_align(data, size, size); } diff -r 0119e834a202 -r 9db5e400480c njs/njs_vm.h --- a/njs/njs_vm.h Thu Jun 27 18:54:21 2019 +0300 +++ b/njs/njs_vm.h Thu Jun 27 18:55:34 2019 +0300 @@ -1339,7 +1339,7 @@ nxt_int_t njs_builtin_match_native_funct nxt_array_t *njs_vm_backtrace(njs_vm_t *vm); -void *njs_lvlhsh_alloc(void *data, size_t size, nxt_uint_t nalloc); +void *njs_lvlhsh_alloc(void *data, size_t size); void njs_lvlhsh_free(void *data, void *p, size_t size); njs_array_t * njs_value_enumerate(njs_vm_t *vm, const njs_value_t *value, diff -r 0119e834a202 -r 9db5e400480c njs/test/njs_unit_test.c --- a/njs/test/njs_unit_test.c Thu Jun 27 18:54:21 2019 +0300 +++ b/njs/test/njs_unit_test.c Thu Jun 27 18:55:34 2019 +0300 @@ -13116,7 +13116,7 @@ lvlhsh_unit_test_key_test(nxt_lvlhsh_que static void * -lvlhsh_unit_test_pool_alloc(void *pool, size_t size, nxt_uint_t nalloc) +lvlhsh_unit_test_pool_alloc(void *pool, size_t size) { return nxt_mp_align(pool, size, size); } @@ -13131,7 +13131,6 @@ lvlhsh_unit_test_pool_free(void *pool, v static const nxt_lvlhsh_proto_t lvlhsh_proto nxt_aligned(64) = { NXT_LVLHSH_LARGE_SLAB, - 0, lvlhsh_unit_test_key_test, lvlhsh_unit_test_pool_alloc, lvlhsh_unit_test_pool_free, diff -r 0119e834a202 -r 9db5e400480c nxt/nxt_lvlhsh.c --- a/nxt/nxt_lvlhsh.c Thu Jun 27 18:54:21 2019 +0300 +++ b/nxt/nxt_lvlhsh.c Thu Jun 27 18:55:34 2019 +0300 @@ -285,8 +285,7 @@ nxt_lvlhsh_new_bucket(nxt_lvlhsh_query_t { uint32_t *bucket; - bucket = lhq->proto->alloc(lhq->pool, nxt_lvlhsh_bucket_size(lhq->proto), - lhq->proto->nalloc); + bucket = lhq->proto->alloc(lhq->pool, nxt_lvlhsh_bucket_size(lhq->proto)); if (nxt_fast_path(bucket != NULL)) { @@ -459,7 +458,7 @@ nxt_lvlhsh_convert_bucket_to_level(nxt_l proto = lhq->proto; size = nxt_lvlhsh_level_size(proto, nlvl); - lvl = proto->alloc(lhq->pool, size * (sizeof(void *)), proto->nalloc); + lvl = proto->alloc(lhq->pool, size * (sizeof(void *))); if (nxt_slow_path(lvl == NULL)) { return NXT_ERROR; diff -r 0119e834a202 -r 9db5e400480c nxt/nxt_lvlhsh.h --- a/nxt/nxt_lvlhsh.h Thu Jun 27 18:54:21 2019 +0300 +++ b/nxt/nxt_lvlhsh.h Thu Jun 27 18:55:34 2019 +0300 @@ -11,7 +11,7 @@ typedef struct nxt_lvlhsh_query_s nxt_lvlhsh_query_t; typedef nxt_int_t (*nxt_lvlhsh_test_t)(nxt_lvlhsh_query_t *lhq, void *data); -typedef void *(*nxt_lvlhsh_alloc_t)(void *ctx, size_t size, nxt_uint_t nalloc); +typedef void *(*nxt_lvlhsh_alloc_t)(void *ctx, size_t size); typedef void (*nxt_lvlhsh_free_t)(void *ctx, void *p, size_t size); @@ -19,7 +19,6 @@ typedef void (*nxt_lvlhsh_free_t)(void * #define NXT_LVLHSH_DEFAULT_BUCKET_SIZE 128 #define NXT_LVLHSH_ENTRY_SIZE 3 -#define NXT_LVLHSH_BATCH_ALLOC 16 /* 3 is shift of 64-bit pointer. */ #define NXT_LVLHSH_MEMALIGN_SHIFT (NXT_MAX_MEMALIGN_SHIFT - 3) @@ -28,7 +27,6 @@ typedef void (*nxt_lvlhsh_free_t)(void * #define NXT_LVLHSH_DEFAULT_BUCKET_SIZE 64 #define NXT_LVLHSH_ENTRY_SIZE 2 -#define NXT_LVLHSH_BATCH_ALLOC 8 /* 2 is shift of 32-bit pointer. */ #define NXT_LVLHSH_MEMALIGN_SHIFT (NXT_MAX_MEMALIGN_SHIFT - 2) @@ -73,7 +71,6 @@ typedef struct { uint32_t bucket_size; uint32_t bucket_mask; uint8_t shift[8]; - uint32_t nalloc; nxt_lvlhsh_test_t test; nxt_lvlhsh_alloc_t alloc; @@ -88,7 +85,6 @@ typedef struct { /* The maximum allowed aligned shift. */ uint32_t max_shift; - uint32_t nalloc; } nxt_lvlhsh_ctx_t; diff -r 0119e834a202 -r 9db5e400480c nxt/test/lvlhsh_unit_test.c --- a/nxt/test/lvlhsh_unit_test.c Thu Jun 27 18:54:21 2019 +0300 +++ b/nxt/test/lvlhsh_unit_test.c Thu Jun 27 18:55:34 2019 +0300 @@ -29,7 +29,7 @@ lvlhsh_unit_test_key_test(nxt_lvlhsh_que static void * -lvlhsh_unit_test_pool_alloc(void *pool, size_t size, nxt_uint_t nalloc) +lvlhsh_unit_test_pool_alloc(void *pool, size_t size) { return nxt_mp_align(pool, size, size); } @@ -44,7 +44,6 @@ lvlhsh_unit_test_pool_free(void *pool, v static const nxt_lvlhsh_proto_t lvlhsh_proto nxt_aligned(64) = { NXT_LVLHSH_LARGE_SLAB, - 0, lvlhsh_unit_test_key_test, lvlhsh_unit_test_pool_alloc, lvlhsh_unit_test_pool_free,

3 years, 5 months

[njs] Removed unused nxt_lvlhsh_ctx_t structure.

by Valentin Bartenev

details: https://hg.nginx.org/njs/rev/40f26bb516a6 branches: changeset: 1020:40f26bb516a6 user: Valentin Bartenev <vbart(a)nginx.com> date: Thu Jun 27 18:55:34 2019 +0300 description: Removed unused nxt_lvlhsh_ctx_t structure. diffstat: nxt/nxt_lvlhsh.h | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diffs (20 lines): diff -r 9db5e400480c -r 40f26bb516a6 nxt/nxt_lvlhsh.h --- a/nxt/nxt_lvlhsh.h Thu Jun 27 18:55:34 2019 +0300 +++ b/nxt/nxt_lvlhsh.h Thu Jun 27 18:55:34 2019 +0300 @@ -79,16 +79,6 @@ typedef struct { typedef struct { - nxt_lvlhsh_test_t test; - nxt_lvlhsh_alloc_t alloc; - nxt_lvlhsh_free_t free; - - /* The maximum allowed aligned shift. */ - uint32_t max_shift; -} nxt_lvlhsh_ctx_t; - - -typedef struct { void *slot; } nxt_lvlhsh_t;

3 years, 5 months

[njs] Version bump.

by Valentin Bartenev

details: https://hg.nginx.org/njs/rev/0119e834a202 branches: changeset: 1018:0119e834a202 user: Valentin Bartenev <vbart(a)nginx.com> date: Thu Jun 27 18:54:21 2019 +0300 description: Version bump. diffstat: njs/njs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 63cd8e6679ba -r 0119e834a202 njs/njs.h --- a/njs/njs.h Tue Jun 25 14:44:55 2019 +0300 +++ b/njs/njs.h Thu Jun 27 18:54:21 2019 +0300 @@ -11,7 +11,7 @@ #include <nxt_auto_config.h> -#define NJS_VERSION "0.3.3" +#define NJS_VERSION "0.3.4" #include <nxt_types.h>

3 years, 5 months

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

nginx-devel June 2019