Skip to content

Allocate array to known size #98

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

Open
JakubOnderka wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allocate array to known size #98

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c9d2be
Allocate array to known size
JakubOnderka Nov 26, 2024
72c4692
Use faster API for adding element to packed array
JakubOnderka Nov 28, 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
50 changes: 30 additions & 20 deletions src/simdjson_bindings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ extern "C" {
#define zend_string_release_ex(s, persistent) zend_string_release((s))
#endif

#ifndef ZVAL_EMPTY_ARRAY
#define ZVAL_EMPTY_ARRAY(value) array_init(value)
#endif

#define SIMDJSON_DEPTH_CHECK_THRESHOLD 100000

PHP_SIMDJSON_API const char* php_simdjson_error_msg(simdjson_php_error_code error)
Expand Down Expand Up @@ -54,6 +58,17 @@ get_key_with_optional_prefix(simdjson::dom::element &doc, std::string_view json_
return doc.at_pointer(std_pointer);
}

/** Init packed array with expected size */
static zend_always_inline zend_array* simdjson_init_packed_array(zval *zv, uint32_t size) {
zend_array *arr;
array_init_size(zv, size);
arr = Z_ARR_P(zv);
#if PHP_VERSION_ID >= 70300
zend_hash_real_init_packed(arr);
#endif
return arr;
}

static simdjson::error_code
build_parsed_json_cust(simdjson_php_parser* parser, simdjson::dom::element &doc, const char *buf, size_t len, bool realloc_if_needed,
size_t depth = simdjson::DEFAULT_MAX_DEPTH) {
Expand Down Expand Up @@ -163,41 +178,39 @@ static simdjson_php_error_code create_array(simdjson::dom::element element, zval
break;
case simdjson::dom::element_type::ARRAY : {
const auto json_array = element.get_array().value_unsafe();
#if PHP_VERSION_ID >= 70300
if (json_array.size() == 0) {
/* Reuse the immutable empty array to save memory */
ZVAL_EMPTY_ARRAY(return_value);
break;
}
#endif
zend_array *arr;
array_init(return_value);
arr = Z_ARR_P(return_value);

zend_array *arr = simdjson_init_packed_array(return_value, json_array.size());
#if PHP_VERSION_ID >= 80200
ZEND_HASH_FILL_PACKED(arr) {
for (simdjson::dom::element child : json_array) {
create_array(child, __fill_val);
ZEND_HASH_FILL_NEXT();
}
} ZEND_HASH_FILL_END();
#else
for (simdjson::dom::element child : json_array) {
zval array_element;
simdjson_php_error_code error = create_array(child, &array_element);
if (UNEXPECTED(error)) {
zval_ptr_dtor(return_value);
ZVAL_NULL(return_value);
return error;
}
zend_hash_next_index_insert(arr, &array_element);
zend_hash_next_index_insert_new(arr, &array_element);
}

#endif
break;
}
case simdjson::dom::element_type::OBJECT : {
const auto json_object = element.get_object().value_unsafe();
#if PHP_VERSION_ID >= 70300
if (json_object.size() == 0) {
/* Reuse the immutable empty array to save memory */
ZVAL_EMPTY_ARRAY(return_value);
break;
}
#endif

zend_array *arr;
array_init(return_value);
array_init_size(return_value, json_object.size());
arr = Z_ARR_P(return_value);

for (simdjson::dom::key_value_pair field : json_object) {
Expand Down Expand Up @@ -243,16 +256,13 @@ static simdjson_php_error_code create_object(simdjson::dom::element element, zva
break;
case simdjson::dom::element_type::ARRAY : {
const auto json_array = element.get_array().value_unsafe();
#if PHP_VERSION_ID >= 70300
if (json_array.size() == 0) {
/* Reuse the immutable empty array to save memory */
ZVAL_EMPTY_ARRAY(return_value);
return simdjson::SUCCESS;
}
#endif
zend_array *arr;
array_init(return_value);
arr = Z_ARR_P(return_value);

zend_array *arr = simdjson_init_packed_array(return_value, json_array.size());

for (simdjson::dom::element child : json_array) {
zval value;
Expand Down