technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Var: Make nxt_var_cache_value() more general

Browse Source 
This commit enhances nxt_var_cache_value() to enable variable access
using string names, complementing the existing reference index method.
The modification ensures future compatibility with njs variable access.
This commit is contained in:
Zhidao HONG
2024-01-31 14:14:28 +08:00
parent 01fd121c4e
commit 63507c499e
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nxt_var.c
View File

@@ -54,7 +54,7 @@ static nxt_var_ref_t *nxt_var_ref_get(nxt_tstr_state_t *state, nxt_str_t *name);
static nxt_int_t nxt_var_cache_test(nxt_lvlhsh_query_t *lhq, void *data); static nxt_int_t nxt_var_cache_test(nxt_lvlhsh_query_t *lhq, void *data);
static nxt_str_t *nxt_var_cache_value(nxt_task_t *task, nxt_tstr_state_t *state, static nxt_str_t *nxt_var_cache_value(nxt_task_t *task, nxt_tstr_state_t *state,
nxt_var_cache_t *cache, uint32_t index, void *ctx); nxt_var_cache_t *cache, nxt_var_ref_t *ref, void *ctx);
static u_char *nxt_var_next_part(u_char *start, u_char *end, nxt_str_t *part); static u_char *nxt_var_next_part(u_char *start, u_char *end, nxt_str_t *part);
@@ -205,16 +205,12 @@ nxt_var_cache_test(nxt_lvlhsh_query_t *lhq, void *data)
static nxt_str_t * static nxt_str_t *
nxt_var_cache_value(nxt_task_t *task, nxt_tstr_state_t *state, nxt_var_cache_value(nxt_task_t *task, nxt_tstr_state_t *state,
nxt_var_cache_t *cache, uint32_t index, void *ctx) nxt_var_cache_t *cache, nxt_var_ref_t *ref, void *ctx)
{ {
nxt_int_t ret; nxt_int_t ret;
nxt_str_t *value; nxt_str_t *value;
nxt_var_ref_t *ref;
nxt_lvlhsh_query_t lhq; nxt_lvlhsh_query_t lhq;
ref = state->var_refs->elts;
ref = &ref[index];
value = cache->spare; value = cache->spare;
if (value == NULL) { if (value == NULL) {
@@ -230,10 +226,10 @@ nxt_var_cache_value(nxt_task_t *task, nxt_tstr_state_t *state,
goto not_cached; goto not_cached;
} }
lhq.key_hash = nxt_murmur_hash2_uint32(&index); lhq.key_hash = nxt_murmur_hash2_uint32(&ref->index);
lhq.replace = 0; lhq.replace = 0;
lhq.key.length = sizeof(uint32_t); lhq.key.length = sizeof(uint32_t);
lhq.key.start = (u_char *) &index; lhq.key.start = (u_char *) &ref->index;
lhq.value = value; lhq.value = value;
lhq.proto = &nxt_var_cache_proto; lhq.proto = &nxt_var_cache_proto;
lhq.pool = cache->pool; lhq.pool = cache->pool;
@@ -493,20 +489,24 @@ nxt_var_interpreter(nxt_task_t *task, nxt_tstr_state_t *state,
{ {
u_char *p, *src; u_char *p, *src;
size_t length, last, next; size_t length, last, next;
uint32_t index;
nxt_str_t *value, **part; nxt_str_t *value, **part;
nxt_uint_t i; nxt_uint_t i;
nxt_array_t parts; nxt_array_t parts;
nxt_var_ref_t *ref;
nxt_var_sub_t *subs; nxt_var_sub_t *subs;
nxt_memzero(&parts, sizeof(nxt_array_t)); nxt_memzero(&parts, sizeof(nxt_array_t));
nxt_array_init(&parts, cache->pool, sizeof(nxt_str_t *)); nxt_array_init(&parts, cache->pool, sizeof(nxt_str_t *));
ref = state->var_refs->elts;
subs = nxt_var_subs(var); subs = nxt_var_subs(var);
length = var->length; length = var->length;
for (i = 0; i < var->vars; i++) { for (i = 0; i < var->vars; i++) {
value = nxt_var_cache_value(task, state, cache, subs[i].index, ctx); index = subs[i].index;
value = nxt_var_cache_value(task, state, cache, &ref[index], ctx);
if (nxt_slow_path(value == NULL)) { if (nxt_slow_path(value == NULL)) {
return NXT_ERROR; return NXT_ERROR;
} }