Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel/fcall.c optimizations #843

Merged
merged 23 commits into from Jul 15, 2013
Merged

kernel/fcall.c optimizations #843

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
80df871
Keep clang happy
sjinks Jul 14, 2013
48252bd
Keep the compiler happy
sjinks Jul 14, 2013
7ff15ad
Added __func__ macro for MSVC
sjinks Jul 14, 2013
367438b
Map PHALCON_ALLOC_ZVAL to ALLOC_INIT_ZVAL
sjinks Jul 14, 2013
dd11807
Keep the compiler happy
sjinks Jul 14, 2013
ad4edad
Get rid of noreturn parameter, make the code C99 compatible, remove d…
sjinks Jul 14, 2013
36eacbc
Removed more duplicated code
sjinks Jul 14, 2013
5f346f6
Bug fixes
sjinks Jul 14, 2013
a17f3b2
Bug fixes
sjinks Jul 14, 2013
e994a1a
More deduplication
sjinks Jul 14, 2013
4ce7ba8
Bug fixes
sjinks Jul 14, 2013
38a25d2
Added -Wall to ext/install
sjinks Jul 14, 2013
4e10498
Updated build/*/php_phalcon.h
sjinks Jul 14, 2013
b4c4e7e
Bug fixes in scripts/gen-build.php
sjinks Jul 14, 2013
95837fd
Bug fixes
sjinks Jul 14, 2013
ff759f1
Removed not used functions
sjinks Jul 14, 2013
1285268
Make sure the code in build/ works
sjinks Jul 14, 2013
4b96ccc
Added phalcon_call_func_params_w() and phalcon_call_method_params_w()…
sjinks Jul 14, 2013
1ece18b
Use _w calls in recursive Phalcon\Config methods
sjinks Jul 14, 2013
2de0cc7
More code deduplication
sjinks Jul 14, 2013
3a2206c
Even more code deduplication
sjinks Jul 14, 2013
a92bdca
Removed dead code
sjinks Jul 14, 2013
84469ae
Updated build/ [ci skip]
sjinks Jul 14, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removed dead code
  • Loading branch information
@sjinks
sjinks committed Jul 14, 2013
commit a92bdcac74ca1b6da63d6bc02498706763fcc379
116 changes: 5 additions & 111 deletions ext/kernel/fcall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,7 @@ int phalcon_call_user_function(HashTable *function_table, zval **object_pp, zval

zval ***params_array = NULL;
zval **static_params_array[5];
zval ***params_ptr;
zend_uint i;
int ex_retval;
zval *local_retval_ptr = NULL;
Expand All @@ -704,10 +705,12 @@ int phalcon_call_user_function(HashTable *function_table, zval **object_pp, zval
}

if (unlikely(param_count > 5)) {
ex_retval = PHALCON_CALL_USER_FUNCTION_EX(function_table, object_pp, function_name, &local_retval_ptr, param_count, params_array, 1, NULL TSRMLS_CC);
params_ptr = params_array;
} else {
ex_retval = PHALCON_CALL_USER_FUNCTION_EX(function_table, object_pp, function_name, &local_retval_ptr, param_count, static_params_array, 1, NULL TSRMLS_CC);
params_ptr = static_params_array;
}

ex_retval = PHALCON_CALL_USER_FUNCTION_EX(function_table, object_pp, function_name, &local_retval_ptr, param_count, params_ptr, 1, NULL TSRMLS_CC);
}

phalcon_globals_ptr->recursive_lock--;
Expand Down Expand Up @@ -1038,113 +1041,4 @@ int phalcon_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache
return SUCCESS;
}

int phalcon_lookup_class_ex(const char *name, int name_length, int use_autoload, zend_class_entry ***ce TSRMLS_DC){

zval **args[1];
zval autoload_function;
zval *class_name_ptr;
zval *retval_ptr = NULL;
int retval, lc_length;
char *lc_name;
char *lc_free;
zend_fcall_info fcall_info;
zend_fcall_info_cache fcall_cache;
char dummy = 1;
ulong hash;
ALLOCA_FLAG(use_heap)

if (name == NULL || !name_length) {
return FAILURE;
}

lc_free = lc_name = do_alloca(name_length + 1, use_heap);
zend_str_tolower_copy(lc_name, name, name_length);
lc_length = name_length + 1;

if (lc_name[0] == '\\') {
lc_name += 1;
lc_length -= 1;
}

hash = zend_inline_hash_func(lc_name, lc_length);

if (zend_hash_quick_find(EG(class_table), lc_name, lc_length, hash, (void **) ce) == SUCCESS) {
free_alloca(lc_free, use_heap);
return SUCCESS;
}

/* The compiler is not-reentrant. Make sure we __autoload() only during run-time
* (doesn't impact fuctionality of __autoload()
*/
if (!use_autoload || zend_is_compiling(TSRMLS_C)) {
free_alloca(lc_free, use_heap);
return FAILURE;
}

if (EG(in_autoload) == NULL) {
ALLOC_HASHTABLE(EG(in_autoload));
zend_hash_init(EG(in_autoload), 0, NULL, NULL, 0);
}

if (zend_hash_quick_add(EG(in_autoload), lc_name, lc_length, hash, (void**)&dummy, sizeof(char), NULL) == FAILURE) {
free_alloca(lc_free, use_heap);
return FAILURE;
}

ZVAL_STRINGL(&autoload_function, ZEND_AUTOLOAD_FUNC_NAME, sizeof(ZEND_AUTOLOAD_FUNC_NAME) - 1, 0);

ALLOC_ZVAL(class_name_ptr);
INIT_PZVAL(class_name_ptr);
if (name[0] == '\\') {
ZVAL_STRINGL(class_name_ptr, name + 1, name_length - 1, 1);
} else {
ZVAL_STRINGL(class_name_ptr, name, name_length, 1);
}

args[0] = &class_name_ptr;

fcall_info.size = sizeof(fcall_info);
fcall_info.function_table = EG(function_table);
fcall_info.function_name = &autoload_function;
fcall_info.symbol_table = NULL;
fcall_info.retval_ptr_ptr = &retval_ptr;
fcall_info.param_count = 1;
fcall_info.params = args;
fcall_info.object_ptr = NULL;
fcall_info.no_separation = 1;

fcall_cache.initialized = EG(autoload_func) ? 1 : 0;
fcall_cache.function_handler = EG(autoload_func);
fcall_cache.calling_scope = NULL;
fcall_cache.called_scope = NULL;
fcall_cache.object_ptr = NULL;

zend_exception_save(TSRMLS_C);
retval = phalcon_call_function(&fcall_info, &fcall_cache TSRMLS_CC);
zend_exception_restore(TSRMLS_C);

EG(autoload_func) = fcall_cache.function_handler;

zval_ptr_dtor(&class_name_ptr);

zend_hash_quick_del(EG(in_autoload), lc_name, lc_length, hash);

if (retval_ptr) {
zval_ptr_dtor(&retval_ptr);
}

if (retval == FAILURE) {
free_alloca(lc_free, use_heap);
return FAILURE;
}

retval = zend_hash_quick_find(EG(class_table), lc_name, lc_length, hash, (void **) ce);
free_alloca(lc_free, use_heap);
return retval;
}

int phalcon_lookup_class(const char *name, int name_length, zend_class_entry ***ce TSRMLS_DC){
return phalcon_lookup_class_ex(name, name_length, 1, ce TSRMLS_CC);
}

#endif
2 changes: 0 additions & 2 deletions ext/kernel/fcall.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,6 @@ int phalcon_call_user_function(HashTable *function_table, zval **object_pp, zval
#if PHP_VERSION_ID <= 50309
int phalcon_call_user_function_ex(HashTable *function_table, zval **object_pp, zval *function_name, zval **retval_ptr_ptr, zend_uint param_count, zval **params[], int no_separation, HashTable *symbol_table TSRMLS_DC);
int phalcon_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TSRMLS_DC);
int phalcon_lookup_class_ex(const char *name, int name_length, int use_autoload, zend_class_entry ***ce TSRMLS_DC);
int phalcon_lookup_class(const char *name, int name_length, zend_class_entry ***ce TSRMLS_DC);
#define PHALCON_CALL_USER_FUNCTION_EX phalcon_call_user_function_ex
#else
#define PHALCON_CALL_USER_FUNCTION_EX call_user_function_ex
Expand Down