diff options
Diffstat (limited to 'ext/opcache/ZendAccelerator.h')
| -rw-r--r-- | ext/opcache/ZendAccelerator.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index 17b6f8da52..3183e58ee1 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -177,7 +177,6 @@ typedef struct _zend_accel_directives { zend_bool save_comments; zend_bool protect_memory; zend_bool file_override_enabled; - zend_bool inherited_hack; zend_bool enable_cli; zend_bool validate_permission; #ifndef ZEND_WIN32 @@ -251,6 +250,15 @@ typedef struct _zend_accel_globals { char key[MAXPATHLEN * 8]; } zend_accel_globals; +typedef struct _zend_string_table { + uint32_t nTableMask; + uint32_t nNumOfElements; + zend_string *start; + zend_string *top; + zend_string *end; + zend_string *saved_top; +} zend_string_table; + typedef struct _zend_accel_shared_globals { /* Cache Data Structures */ zend_ulong hits; @@ -274,12 +282,9 @@ typedef struct _zend_accel_shared_globals { LONGLONG restart_in; #endif zend_bool restart_in_progress; - /* Interned Strings Support */ - char *interned_strings_start; - char *interned_strings_top; - char *interned_strings_end; - char *interned_strings_saved_top; - HashTable interned_strings; + + /* Interned Strings Support (must be the last element) */ + zend_string_table interned_strings; } zend_accel_shared_globals; extern zend_bool accel_startup_ok; @@ -310,15 +315,15 @@ void zend_accel_schedule_restart_if_necessary(zend_accel_restart_reason reason); accel_time_t zend_get_file_handle_timestamp(zend_file_handle *file_handle, size_t *size); int validate_timestamp_and_record(zend_persistent_script *persistent_script, zend_file_handle *file_handle); int validate_timestamp_and_record_ex(zend_persistent_script *persistent_script, zend_file_handle *file_handle); -int zend_accel_invalidate(const char *filename, int filename_len, zend_bool force); +int zend_accel_invalidate(const char *filename, size_t filename_len, zend_bool force); int accelerator_shm_read_lock(void); void accelerator_shm_read_unlock(void); -char *accel_make_persistent_key(const char *path, int path_length, int *key_len); +char *accel_make_persistent_key(const char *path, size_t path_length, int *key_len); zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type); #define IS_ACCEL_INTERNED(str) \ - ((char*)(str) >= ZCSG(interned_strings_start) && (char*)(str) < ZCSG(interned_strings_end)) + ((char*)(str) >= (char*)ZCSG(interned_strings).start && (char*)(str) < (char*)ZCSG(interned_strings).top) zend_string *accel_new_interned_string(zend_string *str); |