Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Atomic keys introduction for strings, symbols, small numbers. #785

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Atomic keys introduction for strings, symbols, small numbers. #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
15c089e
Reserved atom_id in njs_value_t.
VadimZhestikov Aug 29, 2024
774aff8
Added predefined strings hash.
VadimZhestikov Sep 21, 2024
ebaa37d
Define vm->atom_hash* and manipualtion of them.
VadimZhestikov Oct 5, 2024
7087734
Use atom_hash* instead of keywords_hash in the code, atoms not used yet.
VadimZhestikov Oct 8, 2024
3afdcf5
Introduce njs_atom_atomize_key().
VadimZhestikov Oct 16, 2024
457909e
Use atom_ids in the code.
VadimZhestikov Oct 16, 2024
3810cb3
Inline optimizations.
VadimZhestikov Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion auto/sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ NJS_LIB_SRCS=" \
src/njs_utils.c \
src/njs_chb.c \
src/njs_value.c \
src/njs_atom.c \
src/njs_vm.c \
src/njs_vmcode.c \
src/njs_lexer.c \
src/njs_lexer_keyword.c \
src/njs_parser.c \
src/njs_variable.c \
src/njs_scope.c \
Expand Down
2 changes: 1 addition & 1 deletion nginx/ngx_js.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ ngx_engine_njs_init(ngx_engine_t *engine, ngx_engine_opts_t *opts)
vm_options.argv = ngx_argv;
vm_options.argc = ngx_argc;

vm = njs_vm_create(&vm_options);
vm = njs_vm_create_parent(&vm_options, opts->conf->preload_vm);
if (vm == NULL) {
return NGX_ERROR;
}
Expand Down
7 changes: 4 additions & 3 deletions src/njs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ typedef njs_int_t (*njs_function_native_t) (njs_vm_t *vm, njs_value_t *args,
njs_uint_t nargs, njs_index_t magic8, njs_value_t *retval);


typedef enum {
enum {
NJS_SYMBOL_INVALID,
NJS_SYMBOL_ASYNC_ITERATOR,
NJS_SYMBOL_HAS_INSTANCE,
Expand All @@ -126,8 +126,7 @@ typedef enum {
NJS_SYMBOL_TO_PRIMITIVE,
NJS_SYMBOL_TO_STRING_TAG,
NJS_SYMBOL_UNSCOPABLES,
NJS_SYMBOL_KNOWN_MAX,
} njs_wellknown_symbol_t;
};


typedef enum {
Expand Down Expand Up @@ -292,6 +291,8 @@ typedef njs_int_t (*njs_iterator_handler_t)(njs_vm_t *vm,


NJS_EXPORT void njs_vm_opt_init(njs_vm_opt_t *options);
NJS_EXPORT njs_vm_t *njs_vm_create_parent(njs_vm_opt_t *options,
njs_vm_t *vm_parent);
NJS_EXPORT njs_vm_t *njs_vm_create(njs_vm_opt_t *options);
NJS_EXPORT void njs_vm_destroy(njs_vm_t *vm);

Expand Down
174 changes: 92 additions & 82 deletions src/njs_array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ njs_int_t
njs_array_convert_to_slow_array(njs_vm_t *vm, njs_array_t *array)
{
uint32_t i, length;
njs_int_t ret;
njs_value_t index, value;
njs_object_prop_t *prop;

Expand All @@ -153,7 +154,10 @@ njs_array_convert_to_slow_array(njs_vm_t *vm, njs_array_t *array)

for (i = 0; i < length; i++) {
if (njs_is_valid(&array->start[i])) {
njs_uint32_to_string(&index, i);
ret = njs_uint32_to_string(vm, &index, i);
if (njs_slow_path(ret != NJS_OK)) {
return NJS_ERROR;
}
prop = njs_object_property_add(vm, &value, &index, 0);
if (njs_slow_path(prop == NULL)) {
return NJS_ERROR;
Expand All @@ -176,15 +180,14 @@ njs_array_length_redefine(njs_vm_t *vm, njs_value_t *value, uint32_t length,
{
njs_object_prop_t *prop;

static const njs_value_t string_length = njs_string("length");

if (njs_slow_path(!njs_is_array(value))) {
njs_internal_error(vm, "njs_array_length_redefine() "
"applied to non-array");
return NJS_ERROR;
}

prop = njs_object_property_add(vm, value, njs_value_arg(&string_length), 1);
prop = njs_object_property_add(vm, value,
njs_value_arg(&njs_atom.vs_length), 1);
if (njs_slow_path(prop == NULL)) {
njs_internal_error(vm, "njs_array_length_redefine() "
"cannot redefine \"length\"");
Expand Down Expand Up @@ -603,23 +606,24 @@ njs_array_of(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
}


static const njs_object_prop_t njs_array_constructor_properties[] =
static njs_object_prop_t njs_array_constructor_properties[] =
{
NJS_DECLARE_PROP_LENGTH(1),

NJS_DECLARE_PROP_NAME("Array"),
NJS_DECLARE_PROP_NAME(njs_atom.vs_Array),

NJS_DECLARE_PROP_HANDLER("prototype", njs_object_prototype_create, 0, 0, 0),
NJS_DECLARE_PROP_HANDLER(njs_atom.vs_prototype, njs_object_prototype_create,
0, 0),

NJS_DECLARE_PROP_NATIVE("from", njs_array_from, 1, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_from, njs_array_from, 1, 0),

NJS_DECLARE_PROP_NATIVE("isArray", njs_array_is_array, 1, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_isArray, njs_array_is_array, 1, 0),

NJS_DECLARE_PROP_NATIVE("of", njs_array_of, 0, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_of, njs_array_of, 0, 0),
};


const njs_object_init_t njs_array_constructor_init = {
static const njs_object_init_t njs_array_constructor_init = {
njs_array_constructor_properties,
njs_nitems(njs_array_constructor_properties),
};
Expand Down Expand Up @@ -787,8 +791,8 @@ static njs_int_t
njs_array_prototype_slice_copy(njs_vm_t *vm, njs_value_t *this,
int64_t start, int64_t length, njs_value_t *retval)
{
u_char *c, buf[4];
size_t size;
u_char *dst;
uint32_t n;
njs_int_t ret;
njs_array_t *array, *keys;
Expand Down Expand Up @@ -828,10 +832,14 @@ njs_array_prototype_slice_copy(njs_vm_t *vm, njs_value_t *this,

do {
value = &array->start[n++];
dst = njs_string_short_start(value);
dst = njs_utf8_copy(dst, &src, end);
size = dst - njs_string_short_start(value);
njs_string_short_set(value, size, 1);
c = buf;
c = njs_utf8_copy(c, &src, end);
size = c - buf;

ret = njs_string_new(vm, value, buf, size, 1);
if (njs_slow_path(ret != NJS_OK)) {
return NJS_ERROR;
}

length--;
} while (length != 0);
Expand Down Expand Up @@ -1611,10 +1619,9 @@ njs_array_prototype_to_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
njs_value_t value;
njs_lvlhsh_query_t lhq;

static const njs_value_t join_string = njs_string("join");

if (njs_is_object(njs_argument(args, 0))) {
njs_object_property_init(&lhq, &join_string, NJS_JOIN_HASH);
lhq.proto = &njs_object_hash_proto;
lhq.key_hash = njs_atom.vs_join.atom_id;

ret = njs_object_property(vm, njs_object(njs_argument(args, 0)), &lhq,
&value);
Expand Down Expand Up @@ -1655,7 +1662,7 @@ njs_array_prototype_join(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,

if (njs_slow_path(!njs_is_string(value))) {
if (njs_is_undefined(value)) {
value = njs_value_arg(&njs_string_comma);
value = njs_value_arg(&njs_atom.vs_spec_COMMA);

} else {
ret = njs_value_to_string(vm, value, value);
Expand All @@ -1668,7 +1675,7 @@ njs_array_prototype_join(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
(void) njs_string_prop(&separator, value);

if (njs_slow_path(!njs_is_object(this))) {
njs_value_assign(retval, &njs_string_empty);
njs_value_assign(retval, &njs_atom.vs_);
return NJS_OK;
}

Expand All @@ -1680,7 +1687,7 @@ njs_array_prototype_join(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
}

if (njs_slow_path(len == 0)) {
njs_value_assign(retval, &njs_string_empty);
njs_value_assign(retval, &njs_atom.vs_);
return NJS_OK;
}

Expand Down Expand Up @@ -1886,14 +1893,13 @@ njs_is_concat_spreadable(njs_vm_t *vm, njs_value_t *value)
njs_int_t ret;
njs_value_t retval;

static const njs_value_t key =
njs_wellknown_symbol(NJS_SYMBOL_IS_CONCAT_SPREADABLE);

if (njs_slow_path(!njs_is_object(value))) {
return NJS_DECLINED;
}

ret = njs_value_property(vm, value, njs_value_arg(&key), &retval);
ret = njs_value_property(vm, value,
njs_value_arg(&njs_atom.vw_isConcatSpreadable),
&retval);
if (njs_slow_path(ret == NJS_ERROR)) {
return NJS_ERROR;
}
Expand Down Expand Up @@ -2776,7 +2782,10 @@ njs_sort_indexed_properties(njs_vm_t *vm, njs_value_t *obj, int64_t length,
njs_value_assign(&p->value, &start[i]);

} else {
njs_uint32_to_string(&key, i);
ret = njs_uint32_to_string(vm, &key, i);
if (njs_slow_path(ret != NJS_OK)) {
goto exception;
}
ret = njs_value_property(vm, obj, &key, &p->value);
if (njs_slow_path(ret == NJS_ERROR)) {
goto exception;
Expand Down Expand Up @@ -3179,115 +3188,116 @@ njs_array_prototype_iterator_obj(njs_vm_t *vm, njs_value_t *args,
}


static const njs_object_prop_t njs_array_prototype_properties[] =
static njs_object_prop_t njs_array_prototype_properties[] =
{
NJS_DECLARE_PROP_HANDLER("length", njs_array_length, 0, 0,
NJS_DECLARE_PROP_HANDLER(njs_atom.vs_length, njs_array_length, 0,
NJS_OBJECT_PROP_VALUE_W),

NJS_DECLARE_PROP_HANDLER("constructor",
njs_object_prototype_create_constructor,
0, 0, NJS_OBJECT_PROP_VALUE_CW),
NJS_DECLARE_PROP_HANDLER(njs_atom.vs_constructor,
njs_object_prototype_create_constructor, 0,
NJS_OBJECT_PROP_VALUE_CW),

NJS_DECLARE_PROP_NATIVE("concat", njs_array_prototype_concat, 1, 0),

NJS_DECLARE_PROP_NATIVE("copyWithin", njs_array_prototype_copy_within, 2,
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_concat, njs_array_prototype_concat, 1,
0),

NJS_DECLARE_PROP_NATIVE("entries", njs_array_prototype_iterator_obj, 0,
NJS_ENUM_BOTH),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_copyWithin,
njs_array_prototype_copy_within, 2, 0),

NJS_DECLARE_PROP_NATIVE(njs_atom.vs_entries,
njs_array_prototype_iterator_obj, 0, NJS_ENUM_BOTH),

NJS_DECLARE_PROP_NATIVE("every", njs_array_prototype_iterator, 1,
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_every, njs_array_prototype_iterator, 1,
njs_array_func(NJS_ARRAY_EVERY)),

NJS_DECLARE_PROP_NATIVE("fill", njs_array_prototype_fill, 1, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_fill, njs_array_prototype_fill, 1, 0),

NJS_DECLARE_PROP_NATIVE("filter", njs_array_prototype_iterator, 1,
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_filter, njs_array_prototype_iterator, 1,
njs_array_func(NJS_ARRAY_FILTER)),

NJS_DECLARE_PROP_NATIVE("find", njs_array_prototype_iterator, 1,
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_find, njs_array_prototype_iterator, 1,
njs_array_func(NJS_ARRAY_FIND)),

NJS_DECLARE_PROP_NATIVE("findIndex", njs_array_prototype_iterator, 1,
njs_array_func(NJS_ARRAY_FIND_INDEX)),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_findIndex, njs_array_prototype_iterator,
1, njs_array_func(NJS_ARRAY_FIND_INDEX)),

NJS_DECLARE_PROP_NATIVE("forEach", njs_array_prototype_iterator, 1,
njs_array_func(NJS_ARRAY_FOR_EACH)),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_forEach, njs_array_prototype_iterator,
1, njs_array_func(NJS_ARRAY_FOR_EACH)),

NJS_DECLARE_PROP_NATIVE("includes", njs_array_prototype_iterator, 1,
njs_array_arg(NJS_ARRAY_INCLUDES)),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_includes, njs_array_prototype_iterator,
1, njs_array_arg(NJS_ARRAY_INCLUDES)),

NJS_DECLARE_PROP_NATIVE("indexOf", njs_array_prototype_iterator, 1,
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_indexOf, njs_array_prototype_iterator, 1,
njs_array_arg(NJS_ARRAY_INDEX_OF)),

NJS_DECLARE_PROP_NATIVE("join", njs_array_prototype_join, 1, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_join, njs_array_prototype_join, 1, 0),

NJS_DECLARE_PROP_NATIVE("keys", njs_array_prototype_iterator_obj, 0,
NJS_ENUM_KEYS),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_keys, njs_array_prototype_iterator_obj,
0, NJS_ENUM_KEYS),

NJS_DECLARE_PROP_NATIVE("lastIndexOf",
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_lastIndexOf,
njs_array_prototype_reverse_iterator, 1,
NJS_ARRAY_LAST_INDEX_OF),

NJS_DECLARE_PROP_NATIVE("map", njs_array_prototype_iterator, 1,
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_map, njs_array_prototype_iterator, 1,
njs_array_func(NJS_ARRAY_MAP)),

NJS_DECLARE_PROP_NATIVE("pop", njs_array_prototype_pop, 0, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_pop, njs_array_prototype_pop, 0, 0),

NJS_DECLARE_PROP_NATIVE("push", njs_array_prototype_push, 1, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_push, njs_array_prototype_push, 1, 0),

NJS_DECLARE_PROP_NATIVE("reduce", njs_array_prototype_iterator, 1,
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_reduce, njs_array_prototype_iterator, 1,
njs_array_func(NJS_ARRAY_REDUCE)),

NJS_DECLARE_PROP_NATIVE("reduceRight",
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_reduceRight,
njs_array_prototype_reverse_iterator, 1,
njs_array_func(NJS_ARRAY_REDUCE_RIGHT)),

NJS_DECLARE_PROP_NATIVE("reverse", njs_array_prototype_reverse, 0, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_reverse, njs_array_prototype_reverse, 0, 0),

NJS_DECLARE_PROP_NATIVE("shift", njs_array_prototype_shift, 0, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_shift, njs_array_prototype_shift, 0, 0),

NJS_DECLARE_PROP_NATIVE("slice", njs_array_prototype_slice, 2, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_slice, njs_array_prototype_slice, 2, 0),

NJS_DECLARE_PROP_NATIVE("some", njs_array_prototype_iterator, 1,
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_some, njs_array_prototype_iterator, 1,
njs_array_func(NJS_ARRAY_SOME)),

NJS_DECLARE_PROP_NATIVE("sort", njs_array_prototype_sort, 1, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_sort, njs_array_prototype_sort, 1, 0),

NJS_DECLARE_PROP_NATIVE("splice", njs_array_prototype_splice, 2, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_splice, njs_array_prototype_splice, 2,
0),

NJS_DECLARE_PROP_NATIVE("toReversed", njs_array_prototype_to_reversed, 0, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_toReversed,
njs_array_prototype_to_reversed, 0, 0),

NJS_DECLARE_PROP_NATIVE("toSorted", njs_array_prototype_to_sorted, 1, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_toSorted, njs_array_prototype_to_sorted,
1, 0),

NJS_DECLARE_PROP_NATIVE("toSpliced", njs_array_prototype_to_spliced, 2, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_toSpliced,
njs_array_prototype_to_spliced, 2, 0),

NJS_DECLARE_PROP_NATIVE("toString", njs_array_prototype_to_string, 0, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_toString, njs_array_prototype_to_string,
0, 0),

NJS_DECLARE_PROP_NATIVE("unshift", njs_array_prototype_unshift, 1, 0),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_unshift, njs_array_prototype_unshift, 1,
0),

NJS_DECLARE_PROP_NATIVE("values", njs_array_prototype_iterator_obj, 0,
NJS_ENUM_VALUES),
NJS_DECLARE_PROP_NATIVE(njs_atom.vs_values, njs_array_prototype_iterator_obj,
0, NJS_ENUM_VALUES),

{
.type = NJS_PROPERTY,
.name = njs_wellknown_symbol(NJS_SYMBOL_ITERATOR),
.u.value = njs_native_function2(njs_array_prototype_iterator_obj, 0,
NJS_ENUM_VALUES),
.writable = 1,
.configurable = 1,
},
NJS_DECLARE_PROP_NATIVE(njs_atom.vw_iterator,
njs_array_prototype_iterator_obj, 0,
NJS_ENUM_VALUES),
};


const njs_object_init_t njs_array_prototype_init = {
static const njs_object_init_t njs_array_prototype_init = {
njs_array_prototype_properties,
njs_nitems(njs_array_prototype_properties),
};


const njs_object_prop_t njs_array_instance_properties[] =
njs_object_prop_t njs_array_instance_properties[] =
{
NJS_DECLARE_PROP_HANDLER("length", njs_array_length, 0, 0,
NJS_DECLARE_PROP_HANDLER(njs_atom.vs_length, njs_array_length, 0,
NJS_OBJECT_PROP_VALUE_W),
};

Expand Down
Loading