Replaced vm with mp in NJS_CHB_MP_INIT().

diff --git a/external/njs_query_string_module.c b/external/njs_query_string_module.c
index f9b7c552a5c47ac9d61204769b079b017d7a1436..e2f849d27d2f064017e4df22bd27d3d2054c25fd 100644 (file)
--- a/external/njs_query_string_module.c
+++ b/external/njs_query_string_module.c
@@ -152,7 +152,7 @@ njs_query_string_decode(njs_vm_t *vm, njs_value_t *value, const u_char *start,
         -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     };
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
     njs_utf8_decode_init(&ctx);
 
     cp = 0;
@@ -749,7 +749,7 @@ njs_query_string_stringify(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         encode = njs_value_function(val);
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     keys = njs_vm_object_keys(vm, object, njs_value_arg(&value));
     if (njs_slow_path(keys == NULL)) {
@@ -841,7 +841,7 @@ njs_query_string_escape(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     njs_value_string_get(string, &str);
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     ret = njs_query_string_encode(&chain, &str);
     if (njs_slow_path(ret != NJS_OK)) {

diff --git a/external/njs_xml_module.c b/external/njs_xml_module.c
index 6bdbb63912236016e99ae57455a44308da7770d1..e524ba5caa9a0e764271ffff8bff2d838e86221f 100644 (file)
--- a/external/njs_xml_module.c
+++ b/external/njs_xml_module.c
@@ -1785,7 +1785,7 @@ njs_xml_ext_canonicalization(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         }
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     buf = xmlOutputBufferCreateIO(njs_xml_buf_write_cb, NULL, &chain, NULL);
     if (njs_slow_path(buf == NULL)) {

diff --git a/external/njs_zlib_module.c b/external/njs_zlib_module.c
index 7945e646027def4fd6fc7d90c3d957929f780178..d3a667d8c01604842a86745338b3a836f008e83a 100644 (file)
--- a/external/njs_zlib_module.c
+++ b/external/njs_zlib_module.c
@@ -320,7 +320,7 @@ njs_zlib_ext_deflate(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         }
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     do {
         stream.next_out = njs_chb_reserve(&chain, chunk_size);
@@ -461,7 +461,7 @@ njs_zlib_ext_inflate(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         }
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     while (rc != Z_STREAM_END) {
         stream.next_out = njs_chb_reserve(&chain, chunk_size);

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index 5a131bc9a6e13fbad0496cb033ab5cf7fc97e1c3..ce4ce365c42f425105408f691589a4465531d767 100644 (file)
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -3121,7 +3121,7 @@ ngx_http_js_header_in_array(njs_vm_t *vm, ngx_http_request_t *r,
                                               (*hh)->value.len);
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     for (i = 0; i < n; i++) {
         njs_chb_append(&chain, hh[i]->value.data, hh[i]->value.len);
@@ -4166,7 +4166,7 @@ ngx_http_js_header_generic(njs_vm_t *vm, ngx_http_request_t *r,
                                           (*ph)->value.len);
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     sep = flags & NJS_HEADER_SEMICOLON ? ';' : ',';
 

diff --git a/nginx/ngx_js_fetch.c b/nginx/ngx_js_fetch.c
index 9539a687f8acbc01149bef46d9bdcf64417fb057..63e7a2986ee9468773022735f884d482b44db1ac 100644 (file)
--- a/nginx/ngx_js_fetch.c
+++ b/nginx/ngx_js_fetch.c
@@ -732,7 +732,7 @@ ngx_js_ext_fetch(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     http->header_only = njs_strstr_eq(&request.method, &njs_str_value("HEAD"));
 
-    NJS_CHB_MP_INIT(&http->chain, vm);
+    NJS_CHB_MP_INIT(&http->chain, njs_vm_memory_pool(vm));
 
     njs_chb_append(&http->chain, request.method.start, request.method.length);
     njs_chb_append_literal(&http->chain, " ");
@@ -1035,7 +1035,7 @@ ngx_js_ext_response_constructor(njs_vm_t *vm, njs_value_t *args,
         }
     }
 
-    NJS_CHB_MP_INIT(&response->chain, vm);
+    NJS_CHB_MP_INIT(&response->chain, njs_vm_memory_pool(vm));
 
     body = njs_arg(args, nargs, 1);
 
@@ -2516,7 +2516,7 @@ ngx_js_http_process_headers(ngx_js_http_t *http)
 
     njs_chb_destroy(&http->chain);
 
-    NJS_CHB_MP_INIT(&http->response.chain, http->vm);
+    NJS_CHB_MP_INIT(&http->response.chain, njs_vm_memory_pool(http->vm));
 
     http->process = ngx_js_http_process_body;
 
@@ -3296,7 +3296,7 @@ ngx_headers_js_get(njs_vm_t *vm, njs_value_t *value, njs_str_t *name,
         return NJS_DECLINED;
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     h = ph;
 

diff --git a/src/njs_array.c b/src/njs_array.c
index 15a6b6d3073ebc59ff2caacb39f3123daac79ea1..913bc8cfc385b5656a8771d4f03c1383dc805661 100644 (file)
--- a/src/njs_array.c
+++ b/src/njs_array.c
@@ -1686,7 +1686,7 @@ njs_array_prototype_join(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     value = &entry;
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     for (i = 0; i < len; i++) {
         ret = njs_value_property_i64(vm, this, i, value);

diff --git a/src/njs_chb.h b/src/njs_chb.h
index 3dbe5ac9e56fd93e414db0b8ff09367e3b7a9b41..4bd1cb3f60fa12eb375ee5f9e36591c0a43ddff2 100644 (file)
--- a/src/njs_chb.h
+++ b/src/njs_chb.h
@@ -34,8 +34,8 @@ typedef struct {
 
 void njs_chb_init(njs_chb_t *chain, void *pool, njs_chb_alloc_t alloc,
     njs_chb_free_t free);
-#define NJS_CHB_MP_INIT(chain, vm)                                           \
-    njs_chb_init(chain, njs_vm_memory_pool(vm), (njs_chb_alloc_t) njs_mp_alloc,\
+#define NJS_CHB_MP_INIT(chain, mp)                                           \
+    njs_chb_init(chain, mp, (njs_chb_alloc_t) njs_mp_alloc,                  \
     (njs_chb_free_t) njs_mp_free)
 #define NJS_CHB_CTX_INIT(chain, ctx)                                         \
     njs_chb_init(chain, ctx, (njs_chb_alloc_t) js_malloc,                    \

diff --git a/src/njs_error.c b/src/njs_error.c
index 6a14d767dd1be578281fef7ba754e76a78f13f51..b9da659739e8729fe6046eebdb676ceef8cd4540 100644 (file)
--- a/src/njs_error.c
+++ b/src/njs_error.c
@@ -1149,7 +1149,7 @@ njs_backtrace_to_string(njs_vm_t *vm, njs_arr_t *backtrace, njs_str_t *dst)
         return NJS_OK;
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     njs_chb_append_str(&chain, dst);
     njs_chb_append(&chain, "\n", 1);

diff --git a/src/njs_function.c b/src/njs_function.c
index c677be573603b76b4a564cd26645d51daeaeb27e..326549f5ee5dea8ec24d32d4048e0b7811650d64 100644 (file)
--- a/src/njs_function.c
+++ b/src/njs_function.c
@@ -1032,7 +1032,7 @@ njs_function_constructor(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         goto fail;
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     if (async) {
         njs_chb_append_literal(&chain, "(async function(");

diff --git a/src/njs_json.c b/src/njs_json.c
index 85c5d0e8da67b987214e1e47a885c9128efc1aae..8ba133140a8e2cb17f8c84c539fa44a847e0d8c7 100644 (file)
--- a/src/njs_json.c
+++ b/src/njs_json.c
@@ -1093,7 +1093,7 @@ njs_json_stringify_iterator(njs_json_stringify_t *stringify,
         goto memory_error;
     }
 
-    NJS_CHB_MP_INIT(&chain, stringify->vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(stringify->vm));
 
     for ( ;; ) {
         if (state->index == 0) {
@@ -1977,7 +1977,7 @@ njs_vm_value_dump(njs_vm_t *vm, njs_str_t *retval, njs_value_t *value,
         value = &exception;
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     if (!njs_dump_is_recursive(value)) {
         ret = njs_dump_terminal(stringify, &chain, value, console);

diff --git a/src/njs_regexp.c b/src/njs_regexp.c
index 1c7cfe87cafb178b79cbfacfed31ff006bea1558..479f0b757fc56a5f5242738d1ab9230e85751a93 100644 (file)
--- a/src/njs_regexp.c
+++ b/src/njs_regexp.c
@@ -1373,7 +1373,7 @@ njs_regexp_prototype_symbol_replace(njs_vm_t *vm, njs_value_t *args,
         }
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     results.separate = 0;
     results.pointer = 0;

diff --git a/src/njs_string.c b/src/njs_string.c
index 9405a8db32fc7b29087dd42a41bf811a0c4813e6..6a91cb4c48bb49296f5c3f2d8d2424bc85152a0c 100644 (file)
--- a/src/njs_string.c
+++ b/src/njs_string.c
@@ -2955,7 +2955,7 @@ njs_string_get_substitution(njs_vm_t *vm, njs_value_t *matched,
     p = rep.start;
     end = rep.start + rep.length;
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     while (p < end) {
         r = njs_strlchr(p, end, '$');
@@ -3244,7 +3244,7 @@ njs_string_prototype_replace(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         return NJS_OK;
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     start = string.start;
 
@@ -3899,7 +3899,7 @@ njs_string_decode_uri(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
     src = string.start;
     end = string.start + string.size;
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     njs_utf8_decode_init(&ctx);
 
@@ -4173,7 +4173,7 @@ njs_string_atob(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     len = njs_base64_decoded_length(len, pad);
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     dst = njs_chb_reserve(&chain, len * 2);
     if (njs_slow_path(dst == NULL)) {

diff --git a/src/njs_typed_array.c b/src/njs_typed_array.c
index 2a485a1990ac2410ce0fb6c8a8317c7aabdc2087..5930dcb0c2e1ec5ff9fd97438efb57555e983da2 100644 (file)
--- a/src/njs_typed_array.c
+++ b/src/njs_typed_array.c
@@ -2131,7 +2131,7 @@ njs_typed_array_prototype_join(njs_vm_t *vm, njs_value_t *args,
         return NJS_ERROR;
     }
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     njs_typed_array_to_chain(vm, &chain, array, separator);
 

diff --git a/src/njs_vm.c b/src/njs_vm.c
index dbeffa51b72a7d7e6849a445f82215fb38affc42..43b2ccc28be74849afbe984ba369f95461807523 100644 (file)
--- a/src/njs_vm.c
+++ b/src/njs_vm.c
@@ -233,7 +233,7 @@ njs_vm_compile(njs_vm_t *vm, u_char **start, u_char *end)
     }
 
     if (njs_slow_path(vm->options.ast)) {
-        NJS_CHB_MP_INIT(&chain, vm);
+        NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
         ret = njs_parser_serialize_ast(parser.node, &chain);
         if (njs_slow_path(ret == NJS_ERROR)) {
             return ret;

diff --git a/src/test/njs_benchmark.c b/src/test/njs_benchmark.c
index 98c618c8ea3906bd5f818f6642f5ea4704e1bc5f..66c4e84b1452e1b86cba9190c1d3320740cd43d4 100644 (file)
--- a/src/test/njs_benchmark.c
+++ b/src/test/njs_benchmark.c
@@ -745,7 +745,7 @@ njs_benchmark_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
 
     } else if (memcmp(mode.start, "chb", 3) == 0) {
 
-        NJS_CHB_MP_INIT(&chain, vm);
+        NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
         njs_chb_append_literal(&chain, "abc");
         njs_chb_append(&chain, s.start, s.length);

diff --git a/src/test/njs_externals_test.c b/src/test/njs_externals_test.c
index 7d2e82af3bc2d3b154d84be115367c9f9d2e578c..33f0020ac90a58b156ca66fdc4fcfab05e8f3f58 100644 (file)
--- a/src/test/njs_externals_test.c
+++ b/src/test/njs_externals_test.c
@@ -323,7 +323,7 @@ njs_unit_test_r_header(njs_vm_t *vm, njs_object_prop_t *prop,
 
     ret = njs_vm_prop_name(vm, prop, &h);
     if (ret == NJS_OK) {
-        NJS_CHB_MP_INIT(&chain, vm);
+        NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
         njs_chb_append(&chain, h.start, h.length);
         njs_chb_append(&chain, (u_char *) "|АБВ", njs_length("|АБВ"));

diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c
index 980fd7fa6d0d0ca54e7520c1db2a3b2bcc25d9b7..9c935e5b30aace5a1679c5a664455862de604886 100644 (file)
--- a/src/test/njs_unit_test.c
+++ b/src/test/njs_unit_test.c
@@ -22399,7 +22399,7 @@ njs_chb_test(njs_vm_t *vm, njs_opts_t *opts, njs_stat_t *stat)
 
     static const njs_str_t  expected = njs_str("arg: \"XYZ\" -5");
 
-    NJS_CHB_MP_INIT(&chain, vm);
+    NJS_CHB_MP_INIT(&chain, njs_vm_memory_pool(vm));
 
     p = njs_chb_reserve(&chain, 513);
     if (p == NULL) {