Browse Source
closes #342: object caching
closes #342: object caching
git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1558 c26eb9a1-5813-0410-bd6c-c2e55f420ca7master
Xuefer
7 years ago
16 changed files with 285 additions and 24 deletions
-
1ChangeLog
-
2Makefile.frag.deps
-
1NEWS
-
8mod_cacher/xc_cache.h
-
21mod_cacher/xc_cacher.c
-
15processor/class-helper.h
-
2processor/class-helper.m4
-
33processor/foot.m4
-
5processor/head.m4
-
1processor/process.m4
-
1processor/processor-t.h
-
129processor/processor.m4
-
10processor/var-helper-t.h
-
72processor/var-helper.h
-
3processor/var-helper.m4
-
5util/xc_vector.h
@ -0,0 +1,15 @@ |
|||
static zend_class_entry *xc_lookup_class(const char *class_name, int class_name_len TSRMLS_DC) /* {{{ */ |
|||
{ |
|||
xc_cest_t *cest; |
|||
#ifdef ZEND_ENGINE_2 |
|||
if (zend_lookup_class_ex(class_name, class_name_len, NULL, 0, &cest TSRMLS_CC) != SUCCESS) { |
|||
return NULL; |
|||
} |
|||
#else |
|||
if (zend_hash_find(EG(class_table), class_name, class_name_len, (void **) &cest) != SUCCESS) { |
|||
return NULL; |
|||
} |
|||
#endif |
|||
return CestToCePtr(*cest); |
|||
} |
|||
/* }}} */ |
|||
@ -0,0 +1,10 @@ |
|||
/* {{{ var object helpers */ |
|||
zend_bool have_objects; |
|||
xc_vector_t objects; /* in calc only */ |
|||
HashTable handle_to_index; /* in calc/store only */ |
|||
zend_object_handle *object_handles; /* in restore only */ |
|||
const xc_entry_var_t *entry_var_src; /* in restore */ |
|||
|
|||
xc_vector_t class_names; /* in calc only */ |
|||
HashTable class_name_to_index; /* in calc/store only */ |
|||
/* }}} */ |
|||
@ -0,0 +1,72 @@ |
|||
#ifdef ZEND_ENGINE_2 |
|||
static void xc_var_collect_object(xc_processor_t *processor, zend_object_handle handle TSRMLS_DC) /* {{{ */ |
|||
{ |
|||
size_t next_index = xc_vector_size(&processor->objects); |
|||
|
|||
if (!xc_vector_initialized(&processor->objects)) { |
|||
xc_vector_init(zend_object, &processor->objects, 0); |
|||
zend_hash_init(&processor->handle_to_index, 0, NULL, NULL, 0); |
|||
} |
|||
|
|||
if (_zend_hash_index_update_or_next_insert(&processor->handle_to_index, handle, (void *) &next_index, sizeof(next_index), NULL, HASH_ADD ZEND_FILE_LINE_CC) == SUCCESS) { |
|||
zend_object *object = zend_object_store_get_object_by_handle(handle TSRMLS_CC); |
|||
xc_vector_push_back(&processor->objects, object); |
|||
} |
|||
} |
|||
/* }}} */ |
|||
static size_t xc_var_store_handle(xc_processor_t *processor, zend_object_handle handle TSRMLS_DC) /* {{{ */ |
|||
{ |
|||
size_t *index; |
|||
|
|||
if (zend_hash_index_find(&processor->handle_to_index, handle, (void **) &index) != SUCCESS) { |
|||
php_error_docref(NULL TSRMLS_CC, E_CORE_ERROR, "Internal error: handle not found in objects"); |
|||
return (size_t) -1; |
|||
} |
|||
|
|||
return *index; |
|||
} |
|||
/* }}} */ |
|||
static zend_object_handle xc_var_restore_handle(xc_processor_t *processor, size_t index TSRMLS_DC) /* {{{ */ |
|||
{ |
|||
zend_object_handle handle = processor->object_handles[index]; |
|||
zend_objects_store_add_ref_by_handle(handle TSRMLS_CC); |
|||
return handle; |
|||
} |
|||
/* }}} */ |
|||
#endif |
|||
static void xc_var_collect_class(xc_processor_t *processor, zend_class_entry *ce TSRMLS_DC) /* {{{ */ |
|||
{ |
|||
size_t next_index = xc_vector_size(&processor->class_names); |
|||
|
|||
if (zend_hash_add(&processor->class_name_to_index, ce->name, ce->name_length, (void *) &next_index, sizeof(next_index), NULL) == SUCCESS) { |
|||
xc_constant_string_t class_name = { ce->name, ce->name_length }; |
|||
xc_vector_push_back(&processor->class_names, &class_name); |
|||
} |
|||
} |
|||
/* }}} */ |
|||
/* on store */ |
|||
static size_t xc_var_ce_to_index(xc_processor_t *processor, zend_class_entry *ce TSRMLS_DC) /* {{{ */ |
|||
{ |
|||
size_t *index; |
|||
|
|||
if (zend_hash_find(&processor->class_name_to_index, ce->name, ce->name_length, (void **) &index) != SUCCESS) { |
|||
php_error_docref(NULL TSRMLS_CC, E_CORE_ERROR, "Internal error: class name not found in class names"); |
|||
return (size_t) -1; |
|||
} |
|||
|
|||
return *index; |
|||
} |
|||
/* }}} */ |
|||
/* on restore */ |
|||
static zend_class_entry *xc_var_index_to_ec(xc_processor_t *processor, size_t index TSRMLS_DC) /* {{{ */ |
|||
{ |
|||
xc_constant_string_t *name = &processor->entry_var_src->class_names[index]; |
|||
zend_class_entry *ce; |
|||
|
|||
if (!(ce = xc_lookup_class(name->str, name->len+1 TSRMLS_CC))) { |
|||
ce = zend_standard_class_def; |
|||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Class %s not found when restroing variable", name->str); |
|||
} |
|||
return ce; |
|||
} |
|||
/* }}} */ |
|||
@ -0,0 +1,3 @@ |
|||
define(`xc_collect_object', `IFCALC(``xc_collect_object'($@)',``xc_collect_object' can be use in calc only')') |
|||
define(`xc_var_store_handle', `IFSTORE(``xc_var_store_handle'($@)',``xc_var_store_handle' can be use in store only')') |
|||
define(`xc_var_restore_handle', `IFRESTORE(``xc_var_restore_handle'($@)',``xc_var_restore_handle' can be use in restore only')') |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue