com php-src: Fixed support for arg_info and type hinfin g (TODO: names should be interned): ext/opc ache/zend_persist.c
ext/opcache/zend_persist_calc.c

From: Date: Tue, 01 Apr 2014 07:44:11 +0000
Subject: com php-src: Fixed support for arg_info and type hinfin g (TODO: names should be interned): ext/opc ache/zend_persist.c
ext/opcache/zend_persist_calc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77515@lists.php.net to get a copy of this message
Commit: ceecd31cb6d96cef0d8b924fb2f03932b53cf7e3 Author: Dmitry Stogov <dmitry@zend.com> Tue, 1 Apr 2014 11:44:11 +0400 Parents: 46647180ef05c797cf2d79b6a80b367028ccaa93 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ceecd31cb6d96cef0d8b924fb2f03932b53cf7e3 Log: Fixed support for arg_info and type hinfing (TODO: names should be interned) Changed paths: M ext/opcache/zend_persist.c M ext/opcache/zend_persist_calc.c Diff: diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c index 64833d0..5562f8c 100644 --- a/ext/opcache/zend_persist.c +++ b/ext/opcache/zend_persist.c @@ -354,13 +354,11 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc for (i = 0; i < op_array->num_args; i++) { if (op_array->arg_info[i].name) { //??? zend_accel_store_interned_string(op_array->arg_info[i].name, op_array->arg_info[i].name_len + 1); - efree((char*)op_array->arg_info[i].name); - op_array->arg_info[i].name = NULL; + zend_accel_store(op_array->arg_info[i].name, op_array->arg_info[i].name_len + 1); } if (op_array->arg_info[i].class_name) { //??? zend_accel_store_interned_string(op_array->arg_info[i].class_name, op_array->arg_info[i].class_name_len + 1); - efree((char*)op_array->arg_info[i].class_name); - op_array->arg_info[i].class_name = NULL; + zend_accel_store(op_array->arg_info[i].class_name, op_array->arg_info[i].class_name_len + 1); } } } diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c index 089b09b..5bd358d 100644 --- a/ext/opcache/zend_persist_calc.c +++ b/ext/opcache/zend_persist_calc.c @@ -209,9 +209,11 @@ static uint zend_persist_op_array_calc_ex(zend_op_array *op_array TSRMLS_DC) for (i = 0; i < op_array->num_args; i++) { if (op_array->arg_info[i].name) { //??? ADD_INTERNED_STRING(op_array->arg_info[i].name, op_array->arg_info[i].name_len + 1); + ADD_SIZE(op_array->arg_info[i].name_len + 1); } if (op_array->arg_info[i].class_name) { //??? ADD_INTERNED_STRING(op_array->arg_info[i].class_name, op_array->arg_info[i].class_name_len + 1); + ADD_SIZE(op_array->arg_info[i].class_name_len + 1); } }

« previous php.cvs (#77515) next »