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

Jump to bottom

Avoid too much overhead in layout_init #6716

Merged
merged 10 commits into from Oct 29, 2019
Merged

Avoid too much overhead in layout_init #6716

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
895bca1
Avoid initializing primitive fields in layout_init
TeBoring Sep 30, 2019
ffd4beb
Avoid initializing string/bytes/message fields in layout_init
TeBoring Oct 1, 2019
022ed2a
Lazily create map when needed
TeBoring Oct 2, 2019
84eb246
Lazily create repeated fields
TeBoring Oct 2, 2019
dcc8581
Change layout_init to only do memcpy
TeBoring Oct 2, 2019
627d55b
Fix test for php-7.0
TeBoring Oct 2, 2019
b54d22e
Fix conformance test where default value of string/message map is not…
TeBoring Oct 2, 2019
d8b1fac
Fix test for zts
TeBoring Oct 2, 2019
e9012fc
Clean up
TeBoring Oct 10, 2019
edc3199
Fix comments
TeBoring Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -139,6 +139,8 @@ composer.lock
php/tests/generated/
php/tests/old_protoc
php/tests/protobuf/
php/tests/core
php/tests/vgcore*
php/ext/google/protobuf/.libs/
php/ext/google/protobuf/Makefile.fragments
php/ext/google/protobuf/Makefile.global
Expand Down
13 changes: 13 additions & 0 deletions php/ext/google/protobuf/array.c
View file
Open in desktop
Expand Up @@ -259,6 +259,19 @@ void repeated_field_push_native(RepeatedField *intern, void *value) {
}
}

void repeated_field_insure_created(
const upb_fielddef *field,
CACHED_VALUE *repeated_field PHP_PROTO_TSRMLS_DC) {
if (ZVAL_IS_NULL(CACHED_PTR_TO_ZVAL_PTR(repeated_field))) {
zval_ptr_dtor(repeated_field);
#if PHP_MAJOR_VERSION < 7
MAKE_STD_ZVAL(CACHED_PTR_TO_ZVAL_PTR(repeated_field));
#endif
repeated_field_create_with_field(repeated_field_type, field,
repeated_field PHP_PROTO_TSRMLS_CC);
}
}

void repeated_field_create_with_field(
zend_class_entry *ce, const upb_fielddef *field,
CACHED_VALUE *repeated_field PHP_PROTO_TSRMLS_DC) {
Expand Down