summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zend/zend_builtin_functions.c6
-rw-r--r--Zend/zend_execute_API.c1
-rw-r--r--ext/opcache/zend_persist.c57
-rw-r--r--ext/opcache/zend_persist_calc.c59
-rw-r--r--ext/pcre/php_pcre.c12
-rw-r--r--ext/spl/spl_iterators.c2
-rw-r--r--ext/standard/array.c2
-rw-r--r--ext/standard/formatted_print.c16
8 files changed, 87 insertions, 68 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index f86b70465d..aebcb7436c 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -610,11 +610,13 @@ ZEND_FUNCTION(each)
if (Z_ISREF_P(entry)) {
ZVAL_DUP(&tmp, Z_REFVAL_P(entry));
entry = &tmp;
+ if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry);
+ } else {
+ if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry);
+ if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry);
}
zend_hash_index_update(Z_ARRVAL_P(return_value), 1, entry);
- if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry);
zend_hash_str_update(Z_ARRVAL_P(return_value), "value", sizeof("value")-1, entry);
- if (Z_REFCOUNTED_P(entry)) Z_ADDREF_P(entry);
/* add the key elements */
switch (zend_hash_get_current_key(target_hash, &key, &num_key, 0)) {
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 2db5fd397c..a72fb5dd6d 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -522,7 +522,6 @@ ZEND_API int zval_update_constant_ex(zval *p, void *arg, zend_class_entry *scope
actual_len -= (actual - Z_STRVAL_P(p));
if (inline_change) {
zend_string *s = STR_INIT(actual, actual_len, 0);
- STR_RELEASE(Z_STR_P(p));
Z_STR_P(p) = s;
Z_TYPE_FLAGS_P(p) = IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE;
}
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
index da9ec7dd87..eea260d53e 100644
--- a/ext/opcache/zend_persist.c
+++ b/ext/opcache/zend_persist.c
@@ -37,10 +37,11 @@
# define zend_accel_store_string(str) do { \
zend_string *new_str = zend_shared_alloc_get_xlat_entry(str); \
if (new_str) { \
+ STR_RELEASE(str); \
str = new_str; \
} else { \
new_str = _zend_shared_memdup((void*)str, sizeof(zend_string) + (str)->len, 0 TSRMLS_CC); \
- efree(str); \
+ STR_RELEASE(str); \
str = new_str; \
} \
} while (0)
@@ -172,6 +173,7 @@ static void zend_persist_zval(zval *z TSRMLS_DC)
static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_script* main_persistent_script TSRMLS_DC)
{
+ int already_stored = 0;
zend_op *persist_ptr;
#if ZEND_EXTENSION_API_NO < PHP_5_3_X_API_NO
int has_jmp = 0;
@@ -193,11 +195,6 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
}
op_array->refcount = NULL;
- if (op_array->filename) {
- /* do not free! PHP has centralized filename storage, compiler will free it */
- op_array->filename = zend_accel_memdup_string(op_array->filename);
- }
-
if (main_persistent_script) {
zend_bool orig_in_execution = EG(in_execution);
zend_op_array *orig_op_array = EG(active_op_array);
@@ -215,10 +212,20 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
EG(in_execution) = orig_in_execution;
}
+ if (op_array->static_variables) {
+ zend_hash_persist(op_array->static_variables, zend_persist_zval TSRMLS_CC);
+ zend_accel_store(op_array->static_variables, sizeof(HashTable));
+ }
+
+ if (zend_shared_alloc_get_xlat_entry(op_array->opcodes)) {
+ already_stored = 1;
+ }
+
#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
if (op_array->literals) {
- orig_literals = zend_shared_alloc_get_xlat_entry(op_array->literals);
- if (orig_literals) {
+ if (already_stored) {
+ orig_literals = zend_shared_alloc_get_xlat_entry(op_array->literals);
+ ZEND_ASSERT(orig_literals != NULL);
op_array->literals = orig_literals;
} else {
zend_literal *p = zend_accel_memdup(op_array->literals, sizeof(zend_literal) * op_array->last_literal);
@@ -234,7 +241,9 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
}
#endif
- if ((persist_ptr = zend_shared_alloc_get_xlat_entry(op_array->opcodes))) {
+ if (already_stored) {
+ persist_ptr = zend_shared_alloc_get_xlat_entry(op_array->opcodes);
+ ZEND_ASSERT(persist_ptr != NULL);
op_array->opcodes = persist_ptr;
} else {
zend_op *new_opcodes = zend_accel_memdup(op_array->opcodes, sizeof(zend_op) * op_array->last);
@@ -340,18 +349,26 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
#endif
}
- if (op_array->function_name) {
+ if (op_array->function_name && !IS_ACCEL_INTERNED(op_array->function_name)) {
zend_string *new_name;
- if ((new_name = zend_shared_alloc_get_xlat_entry(op_array->function_name))) {
+ if (already_stored) {
+ new_name = zend_shared_alloc_get_xlat_entry(op_array->function_name);
+ ZEND_ASSERT(new_name != NULL);
op_array->function_name = new_name;
} else {
- zend_accel_store_interned_string(op_array->function_name);
+ zend_accel_store_string(op_array->function_name);
}
}
+ if (op_array->filename) {
+ /* do not free! PHP has centralized filename storage, compiler will free it */
+ op_array->filename = zend_accel_memdup_string(op_array->filename);
+ }
+
if (op_array->arg_info) {
- zend_arg_info *new_ptr;
- if ((new_ptr = zend_shared_alloc_get_xlat_entry(op_array->arg_info))) {
+ if (already_stored) {
+ zend_arg_info *new_ptr = zend_shared_alloc_get_xlat_entry(op_array->arg_info);
+ ZEND_ASSERT(new_ptr != NULL);
op_array->arg_info = new_ptr;
} else {
zend_uint i;
@@ -374,11 +391,6 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
zend_accel_store(op_array->brk_cont_array, sizeof(zend_brk_cont_element) * op_array->last_brk_cont);
}
- if (op_array->static_variables) {
- zend_hash_persist(op_array->static_variables, zend_persist_zval TSRMLS_CC);
- zend_accel_store(op_array->static_variables, sizeof(HashTable));
- }
-
if (op_array->scope) {
op_array->scope = zend_shared_alloc_get_xlat_entry(op_array->scope);
}
@@ -387,8 +399,7 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
if (ZCG(accel_directives).save_comments) {
zend_accel_store_string(op_array->doc_comment);
} else {
- if (!zend_shared_alloc_get_xlat_entry(op_array->doc_comment)) {
- zend_shared_alloc_register_xlat_entry(op_array->doc_comment, op_array->doc_comment);
+ if (!already_stored) {
STR_RELEASE(op_array->doc_comment);
}
op_array->doc_comment = NULL;
@@ -400,7 +411,9 @@ static void zend_persist_op_array_ex(zend_op_array *op_array, zend_persistent_sc
}
if (op_array->vars) {
- if ((persist_ptr = zend_shared_alloc_get_xlat_entry(op_array->vars))) {
+ if (already_stored) {
+ persist_ptr = zend_shared_alloc_get_xlat_entry(op_array->vars);
+ ZEND_ASSERT(persist_ptr != NULL);
op_array->vars = (zend_string**)persist_ptr;
} else {
int i;
diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c
index f0fdd6281e..b9cf4240c1 100644
--- a/ext/opcache/zend_persist_calc.c
+++ b/ext/opcache/zend_persist_calc.c
@@ -156,18 +156,31 @@ static uint zend_persist_zval_calc(zval *z TSRMLS_DC)
static uint zend_persist_op_array_calc_ex(zend_op_array *op_array TSRMLS_DC)
{
+ zend_op *opline, *end;
START_SIZE();
if (op_array->type != ZEND_USER_FUNCTION) {
return 0;
}
- if (op_array->filename) {
- ADD_STRING(op_array->filename);
+ if (op_array->static_variables) {
+ ADD_DUP_SIZE(op_array->static_variables, sizeof(HashTable));
+ ADD_SIZE(zend_hash_persist_calc(op_array->static_variables, zend_persist_zval_calc TSRMLS_CC));
+ }
+
+ if (zend_shared_alloc_get_xlat_entry(op_array->opcodes)) {
+ /* already stored */
+ if (op_array->function_name) {
+ zend_string *new_name = zend_shared_alloc_get_xlat_entry(op_array->function_name);
+ if (IS_ACCEL_INTERNED(new_name)) {
+ op_array->function_name = new_name;
+ }
+ }
+ RETURN_SIZE();
}
#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
- if (op_array->literals && !zend_shared_alloc_get_xlat_entry(op_array->literals)) {
+ if (op_array->literals) {
zend_literal *p = op_array->literals;
zend_literal *end = p + op_array->last_literal;
ADD_DUP_SIZE(op_array->literals, sizeof(zend_literal) * op_array->last_literal);
@@ -178,25 +191,23 @@ static uint zend_persist_op_array_calc_ex(zend_op_array *op_array TSRMLS_DC)
}
#endif
- if (!zend_shared_alloc_get_xlat_entry(op_array->opcodes)) {
#if ZEND_EXTENSION_API_NO <= PHP_5_3_X_API_NO
- zend_op *opline = op_array->opcodes;
- zend_op *end = op_array->opcodes + op_array->last;
+ opline = op_array->opcodes;
+ end = op_array->opcodes + op_array->last;
- ADD_DUP_SIZE(op_array->opcodes, sizeof(zend_op) * op_array->last);
- while (opline<end) {
- if (opline->op1.op_type == IS_CONST) {
- ADD_SIZE(zend_persist_zval_calc(&opline->op1.u.constant TSRMLS_CC));
- }
- if (opline->op2.op_type == IS_CONST) {
- ADD_SIZE(zend_persist_zval_calc(&opline->op2.u.constant TSRMLS_CC));
- }
- opline++;
+ ADD_DUP_SIZE(op_array->opcodes, sizeof(zend_op) * op_array->last);
+ while (opline<end) {
+ if (opline->op1.op_type == IS_CONST) {
+ ADD_SIZE(zend_persist_zval_calc(&opline->op1.u.constant TSRMLS_CC));
}
+ if (opline->op2.op_type == IS_CONST) {
+ ADD_SIZE(zend_persist_zval_calc(&opline->op2.u.constant TSRMLS_CC));
+ }
+ opline++;
+ }
#else
- ADD_DUP_SIZE(op_array->opcodes, sizeof(zend_op) * op_array->last);
+ ADD_DUP_SIZE(op_array->opcodes, sizeof(zend_op) * op_array->last);
#endif
- }
if (op_array->function_name) {
zend_string *old_name = op_array->function_name;
@@ -210,8 +221,11 @@ static uint zend_persist_op_array_calc_ex(zend_op_array *op_array TSRMLS_DC)
}
}
- if (op_array->arg_info &&
- !zend_shared_alloc_get_xlat_entry(op_array->arg_info)) {
+ if (op_array->filename) {
+ ADD_STRING(op_array->filename);
+ }
+
+ if (op_array->arg_info) {
zend_uint i;
ADD_DUP_SIZE(op_array->arg_info, sizeof(zend_arg_info) * op_array->num_args);
@@ -232,11 +246,6 @@ static uint zend_persist_op_array_calc_ex(zend_op_array *op_array TSRMLS_DC)
ADD_DUP_SIZE(op_array->brk_cont_array, sizeof(zend_brk_cont_element) * op_array->last_brk_cont);
}
- if (op_array->static_variables) {
- ADD_DUP_SIZE(op_array->static_variables, sizeof(HashTable));
- ADD_SIZE(zend_hash_persist_calc(op_array->static_variables, zend_persist_zval_calc TSRMLS_CC));
- }
-
if (ZCG(accel_directives).save_comments && op_array->doc_comment) {
ADD_STRING(op_array->doc_comment);
}
@@ -245,7 +254,7 @@ static uint zend_persist_op_array_calc_ex(zend_op_array *op_array TSRMLS_DC)
ADD_DUP_SIZE(op_array->try_catch_array, sizeof(zend_try_catch_element) * op_array->last_try_catch);
}
- if (op_array->vars && !zend_shared_alloc_get_xlat_entry(op_array->vars)) {
+ if (op_array->vars) {
int i;
ADD_DUP_SIZE(op_array->vars, sizeof(zend_string*) * op_array->last_var);
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 1527fff30d..a38c5cdebd 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1783,10 +1783,9 @@ PHPAPI void php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval *return
/* Go through the input array */
zend_hash_internal_pointer_reset(Z_ARRVAL_P(input));
while ((entry = zend_hash_get_current_data(Z_ARRVAL_P(input))) != NULL) {
- zval subject, *ref_entry = NULL;
+ zval subject, *ref_entry = entry;
if (Z_ISREF_P(entry)) {
- ref_entry = entry;
entry = Z_REFVAL_P(entry);
}
@@ -1814,22 +1813,19 @@ PHPAPI void php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval *return
/* If the entry fits our requirements */
if ((count > 0 && !invert) || (count == PCRE_ERROR_NOMATCH && invert)) {
- if (ref_entry) {
+ if (Z_REFCOUNTED_P(ref_entry)) {
Z_ADDREF_P(ref_entry);
- entry = ref_entry;
- } else if (Z_REFCOUNTED_P(entry)) {
- Z_ADDREF_P(entry);
}
/* Add to return array */
switch (zend_hash_get_current_key(Z_ARRVAL_P(input), &string_key, &num_key, 0))
{
case HASH_KEY_IS_STRING:
- zend_hash_update(Z_ARRVAL_P(return_value), string_key, entry);
+ zend_hash_update(Z_ARRVAL_P(return_value), string_key, ref_entry);
break;
case HASH_KEY_IS_LONG:
- zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, entry);
+ zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, ref_entry);
break;
}
}
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index d99024273d..a227b82ffd 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -2262,7 +2262,7 @@ static void spl_dual_it_free_storage(zend_object *_object TSRMLS_DC)
}
}
- //???zend_object_std_dtor(&object->std TSRMLS_CC);
+ zend_object_std_dtor(&object->std TSRMLS_CC);
}
/* }}} */
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 9ddb234186..20ad3d9986 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1823,7 +1823,7 @@ static void php_array_data_shuffle(zval *array TSRMLS_DC) /* {{{ */
for (j = 0; j < n_elems; j++) {
p = hash->arData + j;
if (p->key && !IS_INTERNED(p->key)) {
- pefree((char*)p->key, hash->flags & HASH_FLAG_PERSISTENT);
+ STR_RELEASE(p->key);
}
p->h = j;
p->key = NULL;
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index 1f5a93fcb0..2e6e2f672b 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -393,23 +393,23 @@ php_formatted_print(int param_count, int use_array, int format_offset TSRMLS_DC)
if (use_array) {
int i = 1;
zval *zv;
- zval array;
+ zval *array;
z_format = &args[format_offset];
- ZVAL_DUP(&array, &args[1 + format_offset]);
- convert_to_array_ex(&array);
+ array = &args[1 + format_offset];
+ SEPARATE_ZVAL(array);
+ convert_to_array_ex(array);
- argc = 1 + zend_hash_num_elements(Z_ARRVAL(array));
+ argc = 1 + zend_hash_num_elements(Z_ARRVAL_P(array));
newargs = (zval *)safe_emalloc(argc, sizeof(zval), 0);
ZVAL_COPY_VALUE(&newargs[0], z_format);
- for (zend_hash_internal_pointer_reset(Z_ARRVAL(array));
- (zv = zend_hash_get_current_data(Z_ARRVAL(array))) != NULL;
- zend_hash_move_forward(Z_ARRVAL(array))) {
+ for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(array));
+ (zv = zend_hash_get_current_data(Z_ARRVAL_P(array))) != NULL;
+ zend_hash_move_forward(Z_ARRVAL_P(array))) {
ZVAL_COPY_VALUE(&newargs[i], zv);
i++;
}
- zval_dtor(&array);
args = newargs;
format_offset = 0;
}
View Lorry Controller Status