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

Configuration: reduced memory consumption of long strings.

Browse Source
This commit is contained in:
Valentin Bartenev
2017-07-18 18:00:19 +03:00
parent f16510585f
commit a6c4ef7a10
2 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/nxt_conf.c
View File

@@ -14,6 +14,7 @@
#define NXT_CONF_MAX_SHORT_STRING 14 #define NXT_CONF_MAX_SHORT_STRING 14
#define NXT_CONF_MAX_STRING NXT_INT32_T_MAX
typedef enum { typedef enum {
@@ -46,7 +47,12 @@ struct nxt_aligned(8) nxt_conf_value_s {
int64_t integer; int64_t integer;
double number; double number;
u_char str[1 + NXT_CONF_MAX_SHORT_STRING]; u_char str[1 + NXT_CONF_MAX_SHORT_STRING];
nxt_str_t *string;
struct nxt_packed {
u_char *start;
uint32_t length;
} string;
nxt_conf_array_t *array; nxt_conf_array_t *array;
nxt_conf_object_t *object; nxt_conf_object_t *object;
} u; } u;
@@ -145,7 +151,8 @@ nxt_conf_get_string(nxt_conf_value_t *value, nxt_str_t *str)
str->start = &value->u.str[1]; str->start = &value->u.str[1];
} else { } else {
*str = *value->u.string; str->length = value->u.string.length;
str->start = value->u.string.start;
} }
} }
@@ -182,8 +189,8 @@ nxt_conf_create_object(nxt_mp_t *mp, nxt_uint_t count)
nxt_int_t nxt_int_t
nxt_conf_set_object_member(nxt_mp_t *mp, nxt_conf_value_t *object, nxt_conf_set_object_member(nxt_conf_value_t *object, nxt_str_t *name,
nxt_str_t *name, nxt_conf_value_t *value, uint32_t index) nxt_conf_value_t *value, uint32_t index)
{ {
nxt_conf_value_t *name_value; nxt_conf_value_t *name_value;
nxt_conf_object_member_t *member; nxt_conf_object_member_t *member;
@@ -193,13 +200,8 @@ nxt_conf_set_object_member(nxt_mp_t *mp, nxt_conf_value_t *object,
if (name->length > NXT_CONF_MAX_SHORT_STRING) { if (name->length > NXT_CONF_MAX_SHORT_STRING) {
name_value->type = NXT_CONF_VALUE_STRING; name_value->type = NXT_CONF_VALUE_STRING;
name_value->u.string = nxt_str_alloc(mp, 0); name_value->u.string.length = name->length;
name_value->u.string.start = name->start;
if (nxt_slow_path(name_value->u.string == NULL)) {
return NXT_ERROR;
}
*name_value->u.string = *name;
} else { } else {
name_value->type = NXT_CONF_VALUE_SHORT_STRING; name_value->type = NXT_CONF_VALUE_SHORT_STRING;
@@ -552,13 +554,9 @@ nxt_conf_op_compile(nxt_mp_t *mp, nxt_conf_op_t **ops, nxt_conf_value_t *root,
} }
if (token.length > NXT_CONF_MAX_SHORT_STRING) { if (token.length > NXT_CONF_MAX_SHORT_STRING) {
member->name.u.string.length = token.length;
member->name.u.string.start = token.start;
member->name.u.string = nxt_mp_get(mp, sizeof(nxt_str_t));
if (nxt_slow_path(member->name.u.string == NULL)) {
return NXT_ERROR;
}
*member->name.u.string = token;
member->name.type = NXT_CONF_VALUE_STRING; member->name.type = NXT_CONF_VALUE_STRING;
} else { } else {
@@ -621,12 +619,16 @@ nxt_conf_copy_value(nxt_mp_t *mp, nxt_conf_op_t *op, nxt_conf_value_t *dst,
case NXT_CONF_VALUE_STRING: case NXT_CONF_VALUE_STRING:
dst->u.string = nxt_str_dup(mp, NULL, src->u.string); dst->u.string.start = nxt_mp_nget(mp, src->u.string.length);
if (nxt_slow_path(dst->u.string.start == NULL)) {
if (nxt_slow_path(dst->u.string == NULL)) {
return NXT_ERROR; return NXT_ERROR;
} }
nxt_memcpy(dst->u.string.start, src->u.string.start,
src->u.string.length);
dst->u.string.length = src->u.string.length;
break; break;
case NXT_CONF_VALUE_ARRAY: case NXT_CONF_VALUE_ARRAY:
@@ -1289,14 +1291,21 @@ nxt_conf_json_parse_string(nxt_mp_t *mp, nxt_conf_value_t *value, u_char *start,
size = last - start - surplus; size = last - start - surplus;
if (size > NXT_CONF_MAX_SHORT_STRING) { if (size > NXT_CONF_MAX_SHORT_STRING) {
value->type = NXT_CONF_VALUE_STRING;
value->u.string = nxt_str_alloc(mp, size);
if (nxt_slow_path(value->u.string == NULL)) { if (nxt_slow_path(size > NXT_CONF_MAX_STRING)) {
return NULL; return NULL;
} }
s = value->u.string->start; value->type = NXT_CONF_VALUE_STRING;
value->u.string.start = nxt_mp_nget(mp, size);
if (nxt_slow_path(value->u.string.start == NULL)) {
return NULL;
}
value->u.string.length = size;
s = value->u.string.start;
} else { } else {
value->type = NXT_CONF_VALUE_SHORT_STRING; value->type = NXT_CONF_VALUE_SHORT_STRING;
@@ -1392,7 +1401,7 @@ nxt_conf_json_parse_string(nxt_mp_t *mp, nxt_conf_value_t *value, u_char *start,
} while (p != last); } while (p != last);
if (size > NXT_CONF_MAX_SHORT_STRING) { if (size > NXT_CONF_MAX_SHORT_STRING) {
value->u.string->length = s - value->u.string->start; value->u.string.length = s - value->u.string.start;
} else { } else {
value->u.str[0] = s - &value->u.str[1]; value->u.str[0] = s - &value->u.str[1];

4
src/nxt_conf.h
View File

@@ -82,8 +82,8 @@ void nxt_conf_get_string(nxt_conf_value_t *value, nxt_str_t *str);
// FIXME reimplement and reorder functions below // FIXME reimplement and reorder functions below
nxt_uint_t nxt_conf_object_members_count(nxt_conf_value_t *value); nxt_uint_t nxt_conf_object_members_count(nxt_conf_value_t *value);
nxt_conf_value_t *nxt_conf_create_object(nxt_mp_t *mp, nxt_uint_t count); nxt_conf_value_t *nxt_conf_create_object(nxt_mp_t *mp, nxt_uint_t count);
nxt_int_t nxt_conf_set_object_member(nxt_mp_t *mp, nxt_conf_value_t *object, nxt_int_t nxt_conf_set_object_member(nxt_conf_value_t *object, nxt_str_t *name,
nxt_str_t *name, nxt_conf_value_t *value, uint32_t index); nxt_conf_value_t *value, uint32_t index);
#endif /* _NXT_CONF_INCLUDED_ */ #endif /* _NXT_CONF_INCLUDED_ */