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

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
Even more code deduplication
  • Loading branch information
@sjinks
sjinks committed Jul 14, 2013
commit 3a2206c50093c6fe31d0a2ceadfc5a056673b6e1
47 changes: 2 additions & 45 deletions ext/kernel/fcall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ int phalcon_call_user_func_array_noex(zval *return_value, zval *handler, zval *p
char *is_callable_error = NULL;
int status = FAILURE;

if (Z_TYPE_P(params) != IS_ARRAY) {
if (params && Z_TYPE_P(params) != IS_ARRAY) {
ZVAL_NULL(return_value);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid arguments supplied for phalcon_call_user_func_array_noex()");
phalcon_memory_restore_stack(TSRMLS_C);
Expand Down Expand Up @@ -668,50 +668,7 @@ int phalcon_call_user_func_array_noex(zval *return_value, zval *handler, zval *p
*/
int phalcon_call_user_func(zval *return_value, zval *handler TSRMLS_DC){

zval *retval_ptr = NULL;
zend_fcall_info fci;
zend_fcall_info_cache fci_cache;
char *is_callable_error = NULL;
int status = FAILURE;

if (zend_fcall_info_init(handler, 0, &fci, &fci_cache, NULL, &is_callable_error TSRMLS_CC) == SUCCESS) {
if (is_callable_error) {
zend_error(E_STRICT, "%s", is_callable_error);
efree(is_callable_error);
}
status = SUCCESS;
} else {
if (is_callable_error) {
zend_error(E_WARNING, "%s", is_callable_error);
efree(is_callable_error);
} else {
status = SUCCESS;
}
}

if (likely(status == SUCCESS)) {

fci.param_count = 0;
fci.retval_ptr_ptr = &retval_ptr;

if (zend_call_function(&fci, &fci_cache TSRMLS_CC) == SUCCESS && fci.retval_ptr_ptr && *fci.retval_ptr_ptr) {
COPY_PZVAL_TO_ZVAL(*return_value, *fci.retval_ptr_ptr);
}

if (fci.params) {
efree(fci.params);
}
}

if (EG(exception)) {
status = FAILURE;
}

if (status == FAILURE) {
phalcon_memory_restore_stack(TSRMLS_C);
}

return status;
return phalcon_call_user_func_array(return_value, handler, NULL TSRMLS_CC);
}

/**
Expand Down