njs_vm_function() and njs_vm_external() functions name and

behavior unification.  The function can be used with both
original compiled VM and its clones.

diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index 94fd858d50607248af7ae22b05397457ce8c351a..f8a88d476ca2152925349d182ac84d444f77b92f 100644 (file)
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -1152,8 +1152,8 @@ ngx_http_js_compile(ngx_conf_t *cf, ngx_http_js_ctx_t *js, ngx_str_t *script)
 
     nxt_lvlhsh_init(&externals);
 
-    if (njs_add_external(&externals, mcp, 0, ngx_http_js_externals,
-                         nxt_nitems(ngx_http_js_externals))
+    if (njs_vm_external_add(&externals, mcp, 0, ngx_http_js_externals,
+                            nxt_nitems(ngx_http_js_externals))
         != NJS_OK)
     {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "could not add js externals");
@@ -1191,7 +1191,7 @@ ngx_http_js_compile(ngx_conf_t *cf, ngx_http_js_ctx_t *js, ngx_str_t *script)
     if (function) {
         ngx_str_set(&name, "$r");
 
-        rc = njs_external_get(vm, NULL, &name, &js->args[0]);
+        rc = njs_vm_external(vm, NULL, &name, &js->args[0]);
         if (rc != NXT_OK) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "could not get $r external");
@@ -1200,7 +1200,7 @@ ngx_http_js_compile(ngx_conf_t *cf, ngx_http_js_ctx_t *js, ngx_str_t *script)
 
         ngx_str_set(&name, "response");
 
-        rc = njs_external_get(vm, &js->args[0], &name, &js->args[1]);
+        rc = njs_vm_external(vm, &js->args[0], &name, &js->args[1]);
         if (rc != NXT_OK) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                                "could not get $r.response external");

diff --git a/njs/njs_extern.c b/njs/njs_extern.c
index fd48abdca770401c051dc79dc4fd08ef8425cd36..b13e28b8b4decdb28a4dfd7359a3cde87e133921 100644 (file)
--- a/njs/njs_extern.c
+++ b/njs/njs_extern.c
@@ -51,7 +51,7 @@ const nxt_lvlhsh_proto_t  njs_extern_hash_proto
 
 
 nxt_int_t
-njs_add_external(nxt_lvlhsh_t *hash, nxt_mem_cache_pool_t *mcp,
+njs_vm_external_add(nxt_lvlhsh_t *hash, nxt_mem_cache_pool_t *mcp,
     uintptr_t object, njs_external_t *external, nxt_uint_t n)
 {
     nxt_int_t           ret;
@@ -111,7 +111,7 @@ njs_add_external(nxt_lvlhsh_t *hash, nxt_mem_cache_pool_t *mcp,
         }
 
         if (external->properties != NULL) {
-            ret = njs_add_external(&ext->hash, mcp, object,
+            ret = njs_vm_external_add(&ext->hash, mcp, object,
                                    external->properties, external->nproperties);
             if (nxt_slow_path(ret != NXT_OK)) {
                 return ret;
@@ -128,7 +128,7 @@ njs_add_external(nxt_lvlhsh_t *hash, nxt_mem_cache_pool_t *mcp,
 
 
 nxt_int_t
-njs_external_get(njs_vm_t *vm, njs_opaque_value_t *obj, nxt_str_t *property,
+njs_vm_external(njs_vm_t *vm, njs_opaque_value_t *obj, nxt_str_t *property,
     njs_opaque_value_t *value)
 {
     uint32_t            (*key_hash)(const void *, size_t);

diff --git a/njs/njs_variable.c b/njs/njs_variable.c
index 6782cc11b12a59a5eec8434e96261d706be1d026..a102a309c905cd64016a281bc92d85696ae761ec 100644 (file)
--- a/njs/njs_variable.c
+++ b/njs/njs_variable.c
@@ -136,8 +136,8 @@ njs_vm_function(njs_vm_t *vm, nxt_str_t *name)
 
     var = lhq.value;
 
-    value = (njs_value_t *) ((u_char *) vm->scopes[NJS_SCOPE_GLOBAL]
-                             + njs_offset(var->index));
+    value = (njs_value_t *) ((u_char *) vm->global_scope
+                           + njs_offset(var->index) - NJS_INDEX_GLOBAL_OFFSET);
 
     return value->data.u.function;
 }

diff --git a/njs/njscript.c b/njs/njscript.c
index 9938e4ee831f2b0536fd4a1b847a8f8156e7c5c5..8e633147726d098df449efe2e792dc88c5e418f8 100644 (file)
--- a/njs/njscript.c
+++ b/njs/njscript.c
@@ -280,6 +280,7 @@ njs_vm_clone(njs_vm_t *vm, nxt_mem_cache_pool_t *mcp, void **external)
 
         nvm->variables_hash = vm->variables_hash;
         nvm->values_hash = vm->values_hash;
+        nvm->externals_hash = vm->externals_hash;
 
         nvm->retval = njs_value_void;
         nvm->current = vm->current;

diff --git a/njs/njscript.h b/njs/njscript.h
index bfc88838101b1c59e9d588e15973bdbfa50bf537..ed1c4bf33fb0d6a53fc528b12d9d823e6b66d9c0 100644 (file)
--- a/njs/njscript.h
+++ b/njs/njscript.h
@@ -73,10 +73,10 @@ struct njs_external_s {
 #define NJS_DONE                    NXT_DONE
 
 
-NXT_EXPORT nxt_int_t njs_add_external(nxt_lvlhsh_t *hash,
+NXT_EXPORT nxt_int_t njs_vm_external_add(nxt_lvlhsh_t *hash,
     nxt_mem_cache_pool_t *mcp, uintptr_t object, njs_external_t *external,
     nxt_uint_t n);
-NXT_EXPORT nxt_int_t njs_external_get(njs_vm_t *vm, njs_opaque_value_t *object,
+NXT_EXPORT nxt_int_t njs_vm_external(njs_vm_t *vm, njs_opaque_value_t *object,
     nxt_str_t *property, njs_opaque_value_t *value);
 
 NXT_EXPORT njs_vm_t *njs_vm_create(nxt_mem_cache_pool_t *mcp,

diff --git a/njs/test/njs_unit_test.c b/njs/test/njs_unit_test.c
index 7acf67c8fd64599f6d868f8130b140feded28b4f..404d255392eeedfa4b1acb21b2e082ef21c7ec07 100644 (file)
--- a/njs/test/njs_unit_test.c
+++ b/njs/test/njs_unit_test.c
@@ -4811,8 +4811,8 @@ njs_unit_test_externals(nxt_lvlhsh_t *externals, nxt_mem_cache_pool_t *mcp)
 {
     nxt_lvlhsh_init(externals);
 
-    return njs_add_external(externals, mcp, 0, nxt_test_external,
-                            nxt_nitems(nxt_test_external));
+    return njs_vm_external_add(externals, mcp, 0, nxt_test_external,
+                               nxt_nitems(nxt_test_external));
 }
 
 
@@ -4937,7 +4937,7 @@ njs_unit_test(nxt_bool_t disassemble)
                 r_name.len = 2;
                 r_name.data = (u_char *) "$r";
 
-                ret = njs_external_get(vm, NULL, &r_name, &value);
+                ret = njs_vm_external(nvm, NULL, &r_name, &value);
                 if (ret != NXT_OK) {
                     return NXT_ERROR;
                 }