php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 23:48:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Introduced ZEND_COMPILE_IGNORE_OTHER_FILES compiler option, to allow "separate" file compilation (unaffected but previously compiled files), without CG(function_table)/CG(class_table) manipulation.

Browse Source
This commit is contained in:
Dmitry Stogov
2018-08-22 13:45:56 +03:00
parent 850b53df0e
commit fc8d6b6797
6 changed files with 27 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/opcache/ZendAccelerator.c
+11 -37
View File
@@ -1660,7 +1660,7 @@ static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handl
{
zend_persistent_script *new_persistent_script;
zend_op_array *orig_active_op_array;
HashTable *orig_function_table, *orig_class_table;
HashTable *orig_class_table;
zval orig_user_error_handler;
zend_op_array *op_array;
int do_bailout = 0;
@@ -1724,12 +1724,10 @@ static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handl
/* Save the original values for the op_array, function table and class table */
orig_active_op_array = CG(active_op_array);
orig_function_table = CG(function_table);
orig_class_table = CG(class_table);
ZVAL_COPY_VALUE(&orig_user_error_handler, &EG(user_error_handler));
/* Override them with ours */
CG(function_table) = &ZCG(function_table);
EG(class_table) = CG(class_table) = &new_persistent_script->script.class_table;
ZVAL_UNDEF(&EG(user_error_handler));
@@ -1739,6 +1737,7 @@ static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handl
CG(compiler_options) |= ZEND_COMPILE_IGNORE_INTERNAL_CLASSES;
CG(compiler_options) |= ZEND_COMPILE_DELAYED_BINDING;
CG(compiler_options) |= ZEND_COMPILE_NO_CONSTANT_SUBSTITUTION;
CG(compiler_options) |= ZEND_COMPILE_IGNORE_OTHER_FILES;
#ifdef HAVE_OPCACHE_FILE_CACHE
if (ZCG(accel_directives).file_cache) {
CG(compiler_options) |= ZEND_COMPILE_WITH_FILE_CACHE;
@@ -1754,14 +1753,12 @@ static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handl
/* Restore originals */
CG(active_op_array) = orig_active_op_array;
CG(function_table) = orig_function_table;
EG(class_table) = CG(class_table) = orig_class_table;
EG(user_error_handler) = orig_user_error_handler;
if (!op_array) {
/* compilation failed */
free_persistent_script(new_persistent_script, 1);
zend_accel_free_user_functions(&ZCG(function_table));
if (do_bailout) {
zend_bailout();
}
@@ -1772,12 +1769,12 @@ static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handl
Here we aren't sure we would store it, but we will need it
further anyway.
*/
zend_accel_move_user_functions(&ZCG(function_table), &new_persistent_script->script.function_table);
new_persistent_script->script.main_op_array = *op_array;
zend_accel_move_user_functions(CG(function_table), &new_persistent_script->script);
new_persistent_script->script.first_early_binding_opline =
(op_array->fn_flags & ZEND_ACC_EARLY_BINDING) ?
zend_build_delayed_early_binding_list(op_array) :
(uint32_t)-1;
new_persistent_script->script.main_op_array = *op_array;
efree(op_array); /* we have valid persistent_script, so it's safe to free op_array */
@@ -2304,11 +2301,6 @@ static void accel_activate(void)
return;
}
if (!ZCG(function_table).nTableSize) {
zend_hash_init(&ZCG(function_table), zend_hash_num_elements(CG(function_table)), NULL, ZEND_FUNCTION_DTOR, 1);
zend_accel_copy_internal_functions();
}
/* PHP-5.4 and above return "double", but we use 1 sec precision */
ZCG(auto_globals_mask) = 0;
ZCG(request_time) = (time_t)sapi_get_request_time();
@@ -2317,11 +2309,6 @@ static void accel_activate(void)
ZCG(include_path_key_len) = 0;
ZCG(include_path_check) = 1;
/* check if ZCG(function_table) wasn't somehow polluted on the way */
if (ZCG(internal_functions_count) != (zend_long)zend_hash_num_elements(&ZCG(function_table))) {
zend_accel_error(ACCEL_LOG_WARNING, "Internal functions count changed - was %d, now %d", ZCG(internal_functions_count), zend_hash_num_elements(&ZCG(function_table)));
}
ZCG(cwd) = NULL;
ZCG(cwd_key_len) = 0;
ZCG(cwd_check) = 1;
@@ -2605,14 +2592,6 @@ static void accel_globals_ctor(zend_accel_globals *accel_globals)
accel_gen_system_id();
}
static void accel_globals_dtor(zend_accel_globals *accel_globals)
{
if (accel_globals->function_table.nTableSize) {
accel_globals->function_table.pDestructor = NULL;
zend_hash_destroy(&accel_globals->function_table);
}
}
#define ZEND_BIN_ID "BIN_" ZEND_TOSTR(SIZEOF_CHAR) ZEND_TOSTR(SIZEOF_INT) ZEND_TOSTR(SIZEOF_LONG) ZEND_TOSTR(SIZEOF_SIZE_T) ZEND_TOSTR(SIZEOF_ZEND_LONG) ZEND_TOSTR(ZEND_MM_ALIGNMENT)
static void accel_gen_system_id(void)
@@ -2752,7 +2731,7 @@ static void accel_move_code_to_huge_pages(void)
static int accel_startup(zend_extension *extension)
{
#ifdef ZTS
accel_globals_id = ts_allocate_id(&accel_globals_id, sizeof(zend_accel_globals), (ts_allocate_ctor) accel_globals_ctor, (ts_allocate_dtor) accel_globals_dtor);
accel_globals_id = ts_allocate_id(&accel_globals_id, sizeof(zend_accel_globals), (ts_allocate_ctor) accel_globals_ctor, NULL);
#else
accel_globals_ctor(&accel_globals);
#endif
@@ -2941,15 +2920,6 @@ file_cache_fallback:
return SUCCESS;
}
static void accel_free_ts_resources()
{
#ifndef ZTS
accel_globals_dtor(&accel_globals);
#else
ts_free_id(accel_globals_id);
#endif
}
void accel_shutdown(void)
{
zend_ini_entry *ini_entry;
@@ -2960,7 +2930,9 @@ void accel_shutdown(void)
zend_accel_blacklist_shutdown(&accel_blacklist);
if (!ZCG(enabled) || !accel_startup_ok) {
accel_free_ts_resources();
#ifdef ZTS
ts_free_id(accel_globals_id);
#endif
return;
}
@@ -2970,7 +2942,9 @@ void accel_shutdown(void)
accel_reset_pcre_cache();
accel_free_ts_resources();
#ifdef ZTS
ts_free_id(accel_globals_id);
#endif
if (!_file_cache_only) {
zend_shared_alloc_shutdown();
ext/opcache/ZendAccelerator.h
-4
View File
@@ -215,10 +215,6 @@ typedef struct _zend_accel_directives {
} zend_accel_directives;
typedef struct _zend_accel_globals {
/* copy of CG(function_table) used for compilation scripts into cache */
/* initially it contains only internal functions */
HashTable function_table;
int internal_functions_count;
int counted; /* the process uses shared memory */
zend_bool enabled;
zend_bool locked; /* thread obtained exclusive lock */
ext/opcache/zend_accelerator_util_funcs.c
+5 -34
View File
@@ -72,27 +72,11 @@ void free_persistent_script(zend_persistent_script *persistent_script, int destr
efree(persistent_script);
}
void zend_accel_free_user_functions(HashTable *ht)
{
Bucket *p;
dtor_func_t orig_dtor = ht->pDestructor;
ht->pDestructor = NULL;
ZEND_HASH_REVERSE_FOREACH_BUCKET(ht, p) {
zend_function *function = Z_PTR(p->val);
if (EXPECTED(function->type == ZEND_USER_FUNCTION)) {
zend_hash_del_bucket(ht, p);
} else {
break;
}
} ZEND_HASH_FOREACH_END();
ht->pDestructor = orig_dtor;
}
void zend_accel_move_user_functions(HashTable *src, HashTable *dst)
void zend_accel_move_user_functions(HashTable *src, zend_script *script)
{
Bucket *p;
HashTable *dst = &script->function_table;
zend_string *filename = script->main_op_array.filename;
dtor_func_t orig_dtor = src->pDestructor;
src->pDestructor = NULL;
@@ -100,7 +84,8 @@ void zend_accel_move_user_functions(HashTable *src, HashTable *dst)
ZEND_HASH_REVERSE_FOREACH_BUCKET(src, p) {
zend_function *function = Z_PTR(p->val);
if (EXPECTED(function->type == ZEND_USER_FUNCTION)) {
if (EXPECTED(function->type == ZEND_USER_FUNCTION)
&& EXPECTED(function->op_array.filename == filename)) {
_zend_hash_append_ptr(dst, p->key, function);
zend_hash_del_bucket(src, p);
} else {
@@ -110,20 +95,6 @@ void zend_accel_move_user_functions(HashTable *src, HashTable *dst)
src->pDestructor = orig_dtor;
}
void zend_accel_copy_internal_functions(void)
{
zend_string *key;
zval *val;
ZEND_HASH_FOREACH_STR_KEY_VAL(CG(function_table), key, val) {
zend_internal_function *function = Z_PTR_P(val);
if (function->type == ZEND_INTERNAL_FUNCTION) {
zend_hash_add_new_ptr(&ZCG(function_table), key, function);
}
} ZEND_HASH_FOREACH_END();
ZCG(internal_functions_count) = zend_hash_num_elements(&ZCG(function_table));
}
static inline void zend_clone_zval(zval *src)
{
void *ptr;
ext/opcache/zend_accelerator_util_funcs.h
+1 -4
View File
@@ -25,13 +25,10 @@
#include "zend.h"
#include "ZendAccelerator.h"
void zend_accel_copy_internal_functions(void);
zend_persistent_script* create_persistent_script(void);
void free_persistent_script(zend_persistent_script *persistent_script, int destroy_elements);
void zend_accel_free_user_functions(HashTable *ht);
void zend_accel_move_user_functions(HashTable *str, HashTable *dst);
void zend_accel_move_user_functions(HashTable *str, zend_script *script);
zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script, int from_shared_memory);