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/array.c optimization #822

Merged
merged 9 commits into from Jul 11, 2013
Merged

kernel/array.c optimization #822

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5fe588d
Faster phalcon_array_isset()
sjinks Jul 11, 2013
af2298c
Use SEPARATE_ZVAL
sjinks Jul 11, 2013
6da7fb8
Faster phalcon_array_unset()
sjinks Jul 11, 2013
e63c1ab
Faster phalcon_array_update_zval()
sjinks Jul 11, 2013
821adc5
phalcon_array_fetch() is more consistent with PHP's behavior
sjinks Jul 11, 2013
6f8d778
Optimized phalcon_array_fetch_quick_string()
sjinks Jul 11, 2013
bc4ef9e
Optimized phalcon_array_fetch_long()
sjinks Jul 11, 2013
0d640f7
Doxygen comments, part 1 [ci skip]
sjinks Jul 11, 2013
4ca4f03
Doxygen comments, part 2 [ci skip]
sjinks Jul 11, 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
Faster phalcon_array_unset()
  • Loading branch information
@sjinks
sjinks committed Jul 11, 2013
commit 6da7fb86c453a64e10aba193227d99ede0ebbd2a
58 changes: 31 additions & 27 deletions ext/kernel/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,46 +117,50 @@ int PHALCON_FASTCALL phalcon_array_isset_long(const zval *arr, unsigned long ind
/**
* Unsets zval index from array
*/
/**
* @brief Unsets @a index from array @a arr
* @param arr Array
* @param index Index
* @param flags Flags (@c PH_SEPARATE: separate array if its reference count is greater than 1)
* @return Whether the operation succeeded
* @retval 0 Failure, @a arr is not an array or @a index is of not supported type
* @retval 1 Success
* @note @c NULL is treated as an empty string, @c double values are cast to @c integer, @c bool or @c resource are treated as @c integer
* @throw E_WARNING if @a offset is not a scalar
*/
int PHALCON_FASTCALL phalcon_array_unset(zval **arr, zval *index, int flags) {

zval *copy;
int exists, copied = 0;
HashTable *ht;

if (Z_TYPE_PP(arr) != IS_ARRAY) {
return 0;
}

if (Z_TYPE_P(index) == IS_NULL) {
ALLOC_INIT_ZVAL(copy);
ZVAL_ZVAL(copy, index, 1, 0);
convert_to_string(copy);
index = copy;
copied = 1;
} else {
if (Z_TYPE_P(index) == IS_BOOL || Z_TYPE_P(index) == IS_DOUBLE) {
ALLOC_INIT_ZVAL(copy);
ZVAL_ZVAL(copy, index, 1, 0);
convert_to_long(copy);
index = copy;
copied = 1;
}
}

if ((flags & PH_SEPARATE) == PH_SEPARATE) {
SEPARATE_ZVAL(arr);
}

if (Z_TYPE_P(index) == IS_STRING) {
exists = zend_hash_del(Z_ARRVAL_PP(arr), Z_STRVAL_P(index), Z_STRLEN_P(index) + 1);
} else {
exists = zend_hash_index_del(Z_ARRVAL_PP(arr), Z_LVAL_P(index));
}
ht = Z_ARRVAL_PP(arr);

if (copied) {
zval_ptr_dtor(&copy);
}
switch (Z_TYPE_P(index)) {
case IS_NULL:
return (zend_hash_del(ht, "", 1) == SUCCESS);

case IS_DOUBLE:
return (zend_hash_index_del(ht, (ulong)Z_DVAL_P(index)) == SUCCESS);

case IS_LONG:
case IS_BOOL:
case IS_RESOURCE:
return (zend_hash_index_del(ht, Z_LVAL_P(index)) == SUCCESS);

case IS_STRING:
return (zend_symtable_del(ht, Z_STRVAL_P(index), Z_STRLEN_P(index)+1) == SUCCESS);

return exists;
default:
zend_error(E_WARNING, "Illegal offset type");
return 0;
}
}

/**
Expand Down