nginx-devel February 2019

nginx-devel@nginx.org

16 participants
92 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/

9 months, 3 weeks

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

[PATCH] Apply cache locking behaviour to stale cache entries.

by Elliot Thomas

Hello, This patch applies cache locking behaviour to stale cache entries, so in the case where the *_cache_lock directives are used, the same locking behaviour is used for stale content as it is for new entries. Previously, this was only done for new cache entries. (see: http://mailman.nginx.org/pipermail/nginx/2016-January/049734.html) This is useful when serving stale content is not permissable but sending many requests upstream is undesriable. This patch exposes the ngx_http_file_cache_lock function; this function is then called in ngx_http_upstream if a cache entry has expired. I have attached two versions of this patch, a "minimal" one that avoids changes where not strictly necessary, and a "cleaner" version which is more invasive but (in my opinion) cleaner. Both patches cause no (additional) failures in the nginx test suite. I tested with as many modules as I could reasonably enable. Additionally, a colleague will add tests for this new behaviour in a follow-up patch. Regards, Elliot. ----------------------------- http://www.bbc.co.uk This e-mail (and any attachments) is confidential and may contain personal views which are not the views of the BBC unless specifically stated. If you have received it in error, please delete it from your system. Do not use, copy or disclose the information in any way nor act in reliance on it and notify the sender immediately. Please note that the BBC monitors e-mails sent or received. Further communication will signify your consent to this. -----------------------------

3 years, 2 months

SO_REUSEPORT

by Mathew Heard

Hi All, Hit a rather strange issue today on a production service where during a configuration reload (evident by the worker processes in the process of being shutdown). During this reload a percentage of connections were not getting accepted (and hence not processed). I was able to confirm that none of the processes were accepting the connections. Our configuration includes the reuseport option so my theory was that for some reason connections were still being routed to the shutting down worker, which was not accepting new connections. This has a striking resemblance to the HAProxy issues in previous years with connections received during live configuration reloads. Software Versions: nginx version: nginx/1.15.8 linux kernel: 4.9.2 Does anyone have an idea of where to look for this issue? Or have you see anything like it before? I am aware the kernel is a bit on the older side, anyone seen any relevant issues / patches? Regards, Mathew

3 years, 3 months

[njs] Fixed lexer referencing in runtime.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/33c663d84114 branches: changeset: 814:33c663d84114 user: Dmitry Volyntsev <xeioex(a)nginx.com> date: Thu Feb 28 19:30:32 2019 +0300 description: Fixed lexer referencing in runtime. diffstat: njs/njs.c | 4 ++++ njs/njs_parser.c | 2 +- njs/njs_regexp.c | 2 +- njs/test/njs_unit_test.c | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diffs (59 lines): diff -r 21925caaa3c5 -r 33c663d84114 njs/njs.c --- a/njs/njs.c Thu Feb 28 15:32:15 2019 +0300 +++ b/njs/njs.c Thu Feb 28 19:30:32 2019 +0300 @@ -255,6 +255,8 @@ njs_vm_compile(njs_vm_t *vm, u_char **st goto fail; } + parser->lexer = NULL; + scope = parser->scope; ret = njs_variables_scope_reference(vm, scope); @@ -327,7 +329,9 @@ njs_vm_clone(njs_vm_t *vm, njs_external_ nvm->mem_pool = nmp; nvm->shared = vm->shared; + nvm->trace = vm->trace; + nvm->trace.data = nvm; nvm->variables_hash = vm->variables_hash; nvm->values_hash = vm->values_hash; diff -r 21925caaa3c5 -r 33c663d84114 njs/njs_parser.c --- a/njs/njs_parser.c Thu Feb 28 15:32:15 2019 +0300 +++ b/njs/njs_parser.c Thu Feb 28 19:30:32 2019 +0300 @@ -2771,7 +2771,7 @@ njs_parser_trace_handler(nxt_trace_t *tr trace = trace->next; p = trace->handler(trace, td, p); - if (vm->parser != NULL) { + if (vm->parser != NULL && vm->parser->lexer != NULL) { lexer = vm->parser->lexer; if (lexer->file.length != 0) { diff -r 21925caaa3c5 -r 33c663d84114 njs/njs_regexp.c --- a/njs/njs_regexp.c Thu Feb 28 15:32:15 2019 +0300 +++ b/njs/njs_regexp.c Thu Feb 28 19:30:32 2019 +0300 @@ -376,7 +376,7 @@ njs_regexp_compile_trace_handler(nxt_tra trace = trace->next; p = trace->handler(trace, td, start); - if (vm->parser != NULL) { + if (vm->parser != NULL && vm->parser->lexer != NULL) { njs_syntax_error(vm, "%*s in %uD", p - start, start, vm->parser->lexer->line); diff -r 21925caaa3c5 -r 33c663d84114 njs/test/njs_unit_test.c --- a/njs/test/njs_unit_test.c Thu Feb 28 15:32:15 2019 +0300 +++ b/njs/test/njs_unit_test.c Thu Feb 28 19:30:32 2019 +0300 @@ -6651,6 +6651,9 @@ static njs_unit_test_t njs_test[] = { nxt_string("new RegExp('', 'x')"), nxt_string("SyntaxError: Invalid RegExp flags \"x\"") }, + { nxt_string("new RegExp('[')"), + nxt_string("SyntaxError: pcre_compile(\"[\") failed: missing terminating ] for character class") }, + { nxt_string("[0].map(RegExp().toString)"), nxt_string("TypeError: \"this\" argument is not a regexp") },

3 years, 5 months

[njs] Added additional RegExp tests.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/195158f4a6a7 branches: changeset: 815:195158f4a6a7 user: Dmitry Volyntsev <xeioex(a)nginx.com> date: Thu Feb 28 20:34:47 2019 +0300 description: Added additional RegExp tests. diffstat: njs/test/njs_unit_test.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r 33c663d84114 -r 195158f4a6a7 njs/test/njs_unit_test.c --- a/njs/test/njs_unit_test.c Thu Feb 28 19:30:32 2019 +0300 +++ b/njs/test/njs_unit_test.c Thu Feb 28 20:34:47 2019 +0300 @@ -6627,6 +6627,12 @@ static njs_unit_test_t njs_test[] = { nxt_string("var r = /LS/i.exec(false); r[0]"), nxt_string("ls") }, + { nxt_string("var r = (/^.+$/mg), s = 'ab\\nc'; [r.exec(s), r.exec(s)]"), + nxt_string("ab,c") }, + + { nxt_string("var r = (/^.+$/mg); [r.global, r.multiline, r.ignoreCase]"), + nxt_string("true,true,false") }, + { nxt_string("var r = /./; r"), nxt_string("/./") },

3 years, 5 months

[njs] Shell: passing original filename to parser.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/21925caaa3c5 branches: changeset: 813:21925caaa3c5 user: Dmitry Volyntsev <xeioex(a)nginx.com> date: Thu Feb 28 15:32:15 2019 +0300 description: Shell: passing original filename to parser. diffstat: njs/njs_shell.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diffs (45 lines): diff -r 4276436234aa -r 21925caaa3c5 njs/njs_shell.c --- a/njs/njs_shell.c Tue Feb 26 10:19:14 2019 +0800 +++ b/njs/njs_shell.c Thu Feb 28 15:32:15 2019 +0300 @@ -14,6 +14,7 @@ #include <fcntl.h> #include <stdlib.h> #include <sys/stat.h> +#include <sys/param.h> #include <locale.h> #include <readline.h> @@ -195,6 +196,7 @@ static njs_console_t njs_console; int main(int argc, char **argv) { + char path[MAXPATHLEN], *p; nxt_int_t ret; njs_opts_t opts; njs_vm_opt_t vm_options; @@ -215,14 +217,19 @@ main(int argc, char **argv) nxt_memzero(&vm_options, sizeof(njs_vm_opt_t)); if (!opts.quiet) { - if (opts.file != NULL) { - vm_options.file.start = (u_char *) opts.file; - vm_options.file.length = strlen(opts.file); - nxt_file_basename(&vm_options.file, &vm_options.file); + if (opts.file == NULL) { + p = getcwd(path, sizeof(path)); + if (p == NULL) { + fprintf(stderr, "getcwd() failed:%s\n", strerror(errno)); + return EXIT_FAILURE; + } - } else { - vm_options.file = nxt_string_value("shell"); + memcpy(path + strlen(path), "/shell", sizeof("/shell")); + opts.file = path; } + + vm_options.file.start = (u_char *) opts.file; + vm_options.file.length = strlen(opts.file); } vm_options.init = !opts.interactive;

3 years, 5 months

[njs] Improved parser syntax error.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/d62d0d255b15 branches: changeset: 811:d62d0d255b15 user: hongzhidao <hongzhidao(a)gmail.com> date: Tue Feb 26 10:11:53 2019 +0800 description: Improved parser syntax error. diffstat: njs/njs_parser.c | 46 ++++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 22 deletions(-) diffs (65 lines): diff -r fc69d402ec6d -r d62d0d255b15 njs/njs_parser.c --- a/njs/njs_parser.c Wed Feb 27 17:52:50 2019 +0800 +++ b/njs/njs_parser.c Tue Feb 26 10:11:53 2019 +0800 @@ -278,30 +278,28 @@ njs_parser_statement_chain(njs_vm_t *vm, token = njs_parser_statement(vm, parser, token); - if (nxt_fast_path(token > NJS_TOKEN_ILLEGAL)) { - - if (parser->node != NULL) { - /* The statement is not empty block or just semicolon. */ - - node = njs_parser_node_new(vm, parser, NJS_TOKEN_STATEMENT); - if (nxt_slow_path(node == NULL)) { - return NJS_TOKEN_ERROR; - } - - node->left = last; - node->right = parser->node; - *dest = node; - - while (token == NJS_TOKEN_SEMICOLON) { - token = njs_parser_token(parser); - if (nxt_slow_path(token <= NJS_TOKEN_ILLEGAL)) { - break; - } + if (nxt_slow_path(token <= NJS_TOKEN_ILLEGAL)) { + return njs_parser_unexpected_token(vm, parser, token); + } + + if (parser->node != NULL) { + /* The statement is not empty block or just semicolon. */ + + node = njs_parser_node_new(vm, parser, NJS_TOKEN_STATEMENT); + if (nxt_slow_path(node == NULL)) { + return NJS_TOKEN_ERROR; + } + + node->left = last; + node->right = parser->node; + *dest = node; + + while (token == NJS_TOKEN_SEMICOLON) { + token = njs_parser_token(parser); + if (nxt_slow_path(token <= NJS_TOKEN_ILLEGAL)) { + break; } } - - } else if (!njs_is_error(&vm->retval)) { - (void) njs_parser_unexpected_token(vm, parser, token); } return token; @@ -2830,6 +2828,10 @@ njs_parser_lexer_error(njs_vm_t *vm, njs { va_list args; + if (njs_is_error(&vm->retval)) { + return; + } + va_start(args, fmt); njs_parser_scope_error(vm, parser->scope, type, parser->lexer->line, fmt, args);

3 years, 5 months

[njs] Improved njs_value_index().

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/4276436234aa branches: changeset: 812:4276436234aa user: hongzhidao <hongzhidao(a)gmail.com> date: Tue Feb 26 10:19:14 2019 +0800 description: Improved njs_value_index(). diffstat: njs/njs_string.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diffs (92 lines): diff -r d62d0d255b15 -r 4276436234aa njs/njs_string.c --- a/njs/njs_string.c Tue Feb 26 10:11:53 2019 +0800 +++ b/njs/njs_string.c Tue Feb 26 10:19:14 2019 +0800 @@ -4313,22 +4313,23 @@ uri_error: static nxt_int_t njs_values_hash_test(nxt_lvlhsh_query_t *lhq, void *data) { + u_char *start; njs_value_t *value; value = data; - if (lhq->key.length == sizeof(njs_value_t) - && memcmp(lhq->key.start, value, sizeof(njs_value_t)) == 0) - { - return NXT_OK; + if (lhq->key.length == sizeof(njs_value_t)) { + start = (u_char *) value; + + } else { + /* + * Only primitive values are added into values_hash. + * If size != sizeof(njs_value_t) it is a long string. + */ + start = value->long_string.data->start; } - if (njs_is_string(value) - && value->long_string.size == lhq->key.length - && memcmp(value->long_string.data->start, lhq->key.start, - lhq->key.length) - == 0) - { + if (memcmp(lhq->key.start, start, lhq->key.length) == 0) { return NXT_OK; } @@ -4349,7 +4350,7 @@ static const nxt_lvlhsh_proto_t njs_val /* * Constant values such as njs_value_true are copied to values_hash during - * code generation when them are used as operands to guarantee aligned value. + * code generation when they are used as operands to guarantee aligned value. */ njs_index_t @@ -4358,18 +4359,22 @@ njs_value_index(njs_vm_t *vm, const njs_ u_char *start; uint32_t value_size, size, length; nxt_int_t ret; + nxt_bool_t long_string; njs_value_t *value; njs_string_t *string; nxt_lvlhsh_t *values_hash; nxt_lvlhsh_query_t lhq; - if (src->type != NJS_STRING || src->short_string.size != NJS_STRING_LONG) { + long_string = src->type == NJS_STRING + && src->short_string.size == NJS_STRING_LONG; + + if (long_string) { + size = src->long_string.size; + start = src->long_string.data->start; + + } else { size = sizeof(njs_value_t); start = (u_char *) src; - - } else { - size = src->long_string.size; - start = src->long_string.data->start; } lhq.key_hash = nxt_djb_hash(start, size); @@ -4386,7 +4391,7 @@ njs_value_index(njs_vm_t *vm, const njs_ } else { value_size = 0; - if (start != (u_char *) src) { + if (long_string) { /* Long string value is allocated together with string. */ value_size = sizeof(njs_value_t) + sizeof(njs_string_t); @@ -4406,7 +4411,7 @@ njs_value_index(njs_vm_t *vm, const njs_ *value = *src; - if (start != (u_char *) src) { + if (long_string) { string = (njs_string_t *) ((u_char *) value + sizeof(njs_value_t)); value->long_string.data = string;

3 years, 5 months

[njs] Shell: fixed function redeclarations.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/fc69d402ec6d branches: changeset: 810:fc69d402ec6d user: hongzhidao <hongzhidao(a)gmail.com> date: Wed Feb 27 17:52:50 2019 +0800 description: Shell: fixed function redeclarations. This closes #108 issue on Github. diffstat: njs/njs_parser.c | 39 +++++++++++++++++++++++++++++---------- njs/njs_parser.h | 4 ++++ njs/njs_variable.c | 2 +- njs/test/njs_expect_test.exp | 12 ++++++++++++ 4 files changed, 46 insertions(+), 11 deletions(-) diffs (119 lines): diff -r 984b7794c5f2 -r fc69d402ec6d njs/njs_parser.c --- a/njs/njs_parser.c Wed Feb 27 17:49:03 2019 +0800 +++ b/njs/njs_parser.c Wed Feb 27 17:52:50 2019 +0800 @@ -565,6 +565,33 @@ njs_parser_labelled_statement(njs_vm_t * } +static njs_function_t * +njs_parser_function_alloc(njs_vm_t *vm, njs_parser_t *parser, + njs_variable_t *var) +{ + njs_value_t *value; + njs_function_t *function; + + function = njs_function_alloc(vm); + if (nxt_slow_path(function == NULL)) { + return NULL; + } + + var->value.data.u.function = function; + var->value.type = NJS_FUNCTION; + var->value.data.truth = 1; + + if (var->index != NJS_INDEX_NONE + && njs_scope_accumulative(vm, parser->scope)) + { + value = (njs_value_t *) var->index; + *value = var->value; + } + + return function; +} + + static njs_token_t njs_parser_function_declaration(njs_vm_t *vm, njs_parser_t *parser) { @@ -613,15 +640,11 @@ njs_parser_function_declaration(njs_vm_t parser->node = node; - function = njs_function_alloc(vm); + function = njs_parser_function_alloc(vm, parser, var); if (nxt_slow_path(function == NULL)) { return NJS_TOKEN_ERROR; } - var->value.data.u.function = function; - var->value.type = NJS_FUNCTION; - var->value.data.truth = 1; - token = njs_parser_function_lambda(vm, parser, function->u.lambda, token); return token; @@ -671,15 +694,11 @@ njs_parser_function_expression(njs_vm_t return token; } - function = njs_function_alloc(vm); + function = njs_parser_function_alloc(vm, parser, var); if (nxt_slow_path(function == NULL)) { return NJS_TOKEN_ERROR; } - var->value.data.u.function = function; - var->value.type = NJS_FUNCTION; - var->value.data.truth = 1; - lambda = function->u.lambda; } else { diff -r 984b7794c5f2 -r fc69d402ec6d njs/njs_parser.h --- a/njs/njs_parser.h Wed Feb 27 17:49:03 2019 +0800 +++ b/njs/njs_parser.h Wed Feb 27 17:52:50 2019 +0800 @@ -379,6 +379,10 @@ njs_parser_global_scope(njs_vm_t *vm) } +#define njs_scope_accumulative(vm, scope) \ + ((vm)->options.accumulative && (scope)->type == NJS_SCOPE_GLOBAL) + + extern const nxt_lvlhsh_proto_t njs_keyword_hash_proto; diff -r 984b7794c5f2 -r fc69d402ec6d njs/njs_variable.c --- a/njs/njs_variable.c Wed Feb 27 17:49:03 2019 +0800 +++ b/njs/njs_variable.c Wed Feb 27 17:52:50 2019 +0800 @@ -508,7 +508,7 @@ njs_scope_next_index(njs_vm_t *vm, njs_p njs_value_t *value; nxt_array_t *values; - if (vm->options.accumulative && scope->type == NJS_SCOPE_GLOBAL) { + if (njs_scope_accumulative(vm, scope)) { /* * When non-clonable VM runs in accumulative mode all * global variables should be allocated in absolute scope diff -r 984b7794c5f2 -r fc69d402ec6d njs/test/njs_expect_test.exp --- a/njs/test/njs_expect_test.exp Wed Feb 27 17:49:03 2019 +0800 +++ b/njs/test/njs_expect_test.exp Wed Feb 27 17:52:50 2019 +0800 @@ -172,6 +172,18 @@ njs_test { "o.a.toDateString*o.a.toLocaleDateString*o.a.toString"} } +# function declarations in interactive mode +njs_test { + {"function a() { return 1; }\r\n" + "undefined\r\n>> "} + {"a();\r\n" + "1\r\n>> "} + {"function a() { return 2; }\r\n" + "undefined\r\n>> "} + {"a();\r\n" + "2\r\n>> "} +} + # console object njs_test { {"console.log()\r\n"

3 years, 5 months

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

nginx-devel February 2019