Skip to content

Commit

Permalink
Reduce memory overhead of DatePeriod via virtual properties
Browse files Browse the repository at this point in the history
Related to #11644 and #13988
  • Loading branch information
kocsismate committed Aug 27, 2024
1 parent 8487ddb commit c70de9d
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 61 deletions.
3 changes: 3 additions & 0 deletions UPGRADING
Original file line number Diff line number Diff line change
Expand Up @@ -1074,6 +1074,9 @@ PHP 8.4 UPGRADE NOTES
of functions as well as serialization functions such as `json_encode()`,
`serialize()`.

- Date:
. Reduced memory usage of DatePeriod.

- DOM:
. The performance of DOMNode::C14N() is greatly improved for the case without
an xpath query. This can give a time improvement of easily two order of
Expand Down
84 changes: 38 additions & 46 deletions ext/date/php_date.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ static zval *date_interval_get_property_ptr_ptr(zend_object *object, zend_string
static zval *date_period_read_property(zend_object *object, zend_string *name, int type, void **cache_slot, zval *rv);
static zval *date_period_write_property(zend_object *object, zend_string *name, zval *value, void **cache_slot);
static zval *date_period_get_property_ptr_ptr(zend_object *object, zend_string *name, int type, void **cache_slot);
static HashTable *date_period_get_debug_info(zend_object *object, int *is_temp);

static int date_object_compare_timezone(zval *tz1, zval *tz2);

Expand Down Expand Up @@ -1501,45 +1502,6 @@ static void create_date_period_interval(timelib_rel_time *interval, zval *zv)
}
}

static void write_date_period_property(zend_object *obj, const char *name, const size_t name_len, zval *zv)
{
zend_string *property_name = zend_string_init(name, name_len, 0);

zend_std_write_property(obj, property_name, zv, NULL);

zval_ptr_dtor(zv);
zend_string_release(property_name);
}

static void initialize_date_period_properties(php_period_obj *period_obj)
{
zval zv;

/* rebuild properties */
zend_std_get_properties_ex(&period_obj->std);

create_date_period_datetime(period_obj->start, period_obj->start_ce, &zv);
write_date_period_property(&period_obj->std, "start", sizeof("start") - 1, &zv);

create_date_period_datetime(period_obj->current, period_obj->start_ce, &zv);
write_date_period_property(&period_obj->std, "current", sizeof("current") - 1, &zv);

create_date_period_datetime(period_obj->end, period_obj->start_ce, &zv);
write_date_period_property(&period_obj->std, "end", sizeof("end") - 1, &zv);

create_date_period_interval(period_obj->interval, &zv);
write_date_period_property(&period_obj->std, "interval", sizeof("interval") - 1, &zv);

ZVAL_LONG(&zv, (zend_long) period_obj->recurrences);
write_date_period_property(&period_obj->std, "recurrences", sizeof("recurrences") - 1, &zv);

ZVAL_BOOL(&zv, period_obj->include_start_date);
write_date_period_property(&period_obj->std, "include_start_date", sizeof("include_start_date") - 1, &zv);

ZVAL_BOOL(&zv, period_obj->include_end_date);
write_date_period_property(&period_obj->std, "include_end_date", sizeof("include_end_date") - 1, &zv);
}

/* define an overloaded iterator structure */
typedef struct {
zend_object_iterator intern;
Expand Down Expand Up @@ -1659,10 +1621,7 @@ static void date_period_it_move_forward(zend_object_iterator *iter)
zend_std_get_properties_ex(&object->std);

create_date_period_datetime(object->current, object->start_ce, &current_zv);
zend_string *property_name = ZSTR_INIT_LITERAL("current", 0);
zend_std_write_property(&object->std, property_name, &current_zv, NULL);
zval_ptr_dtor(&current_zv);
zend_string_release(property_name);

iterator->current_index++;
date_period_it_invalidate_current(iter);
Expand Down Expand Up @@ -1835,6 +1794,7 @@ static void date_register_classes(void) /* {{{ */
date_object_handlers_period.get_property_ptr_ptr = date_period_get_property_ptr_ptr;
date_object_handlers_period.read_property = date_period_read_property;
date_object_handlers_period.write_property = date_period_write_property;
date_object_handlers_period.get_debug_info = date_period_get_debug_info;

date_ce_date_error = register_class_DateError(zend_ce_error);
date_ce_date_object_error = register_class_DateObjectError(date_ce_date_error);
Expand Down Expand Up @@ -5117,8 +5077,6 @@ static bool date_period_init_finish(php_period_obj *dpobj, zend_long options, ze

dpobj->initialized = 1;

initialize_date_period_properties(dpobj);

return true;
}

Expand Down Expand Up @@ -5822,8 +5780,6 @@ static bool php_date_period_initialize_from_hash(php_period_obj *period_obj, Has

period_obj->initialized = 1;

initialize_date_period_properties(period_obj);

return 1;
} /* }}} */

Expand Down Expand Up @@ -5976,3 +5932,39 @@ static zval *date_period_get_property_ptr_ptr(zend_object *object, zend_string *

return zend_std_get_property_ptr_ptr(object, name, type, cache_slot);
}

static HashTable *date_period_get_debug_info(zend_object *object, int *is_temp)
{
HashTable *ht, *props;
zval zv;
php_period_obj *period_obj;

period_obj = php_period_obj_from_obj(object);
props = zend_std_get_properties(object);

*is_temp = 1;
ht = zend_array_dup(props);

create_date_period_datetime(period_obj->start, period_obj->start_ce, &zv);
zend_hash_str_update(ht, "start", sizeof("start") - 1, &zv);

create_date_period_datetime(period_obj->current, period_obj->start_ce, &zv);
zend_hash_str_update(ht, "current", sizeof("current") - 1, &zv);

create_date_period_datetime(period_obj->end, period_obj->start_ce, &zv);
zend_hash_str_update(ht, "end", sizeof("end")-1, &zv);

create_date_period_interval(period_obj->interval, &zv);
zend_hash_str_update(ht, "interval", sizeof("interval")-1, &zv);

ZVAL_LONG(&zv, period_obj->recurrences);
zend_hash_str_update(ht, "recurrences", sizeof("recurrences")-1, &zv);

ZVAL_BOOL(&zv, period_obj->include_start_date);
zend_hash_str_update(ht, "include_start_date", sizeof("include_start_date")-1, &zv);

ZVAL_BOOL(&zv, period_obj->include_end_date);
zend_hash_str_update(ht, "include_end_date", sizeof("include_end_date")-1, &zv);

return ht;
}
35 changes: 28 additions & 7 deletions ext/date/php_date.stub.php
Original file line number Diff line number Diff line change
Expand Up @@ -673,19 +673,40 @@ class DatePeriod implements IteratorAggregate
/** @cvalue PHP_DATE_PERIOD_INCLUDE_END_DATE */
public const int INCLUDE_END_DATE = UNKNOWN;

/** @readonly */
/**
* @readonly
* @virtual
*/
public ?DateTimeInterface $start;
/** @readonly */
/**
* @readonly
* @virtual
*/
public ?DateTimeInterface $current;
/** @readonly */
/**
* @readonly
* @virtual
*/
public ?DateTimeInterface $end;
/** @readonly */
/**
* @readonly
* @virtual
*/
public ?DateInterval $interval;
/** @readonly */
/**
* @readonly
* @virtual
*/
public int $recurrences;
/** @readonly */
/**
* @readonly
* @virtual
*/
public bool $include_start_date;
/** @readonly */
/**
* @readonly
* @virtual
*/
public bool $include_end_date;

public static function createFromISO8601String(string $specification, int $options = 0): static {}
Expand Down
16 changes: 8 additions & 8 deletions ext/date/php_date_arginfo.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c70de9d

Please sign in to comment.