Merge pull request #893 from sjinks/mm

[NFR] kernel/memory.c optimizations
phalcon · Jul 22, 2013 · 5331bbf · 5331bbf
2 parents c0378c0 + b646a02
commit 5331bbf
Show file tree

Hide file tree

Showing 7 changed files with 147 additions and 256 deletions.
diff --git a/ext/config.c b/ext/config.c
@@ -609,7 +609,6 @@ PHP_METHOD(Phalcon_Config, merge){
 	}
 
 	zval_ptr_dtor(&array_config);
-	PHALCON_MM_RESTORE();
 }
 
 /**

diff --git a/ext/kernel/main.c b/ext/kernel/main.c
@@ -52,19 +52,6 @@ void php_phalcon_init_globals(zend_phalcon_globals *phalcon_globals TSRMLS_DC) {
 	/* Recursive Lock */
 	phalcon_globals->recursive_lock = 0;
 
-	/* Stats options */
-	#ifndef PHALCON_RELEASE
-
-	phalcon_globals->phalcon_stack_stats = 0;
-	phalcon_globals->phalcon_number_grows = 0;
-
-	//int i;
-	//for (i = 0; i < PHALCON_MAX_MEMORY_STACK; i++) {
-	//	phalcon_globals->phalcon_stack_derivate[i] = 0;
-	//}
-
-	#endif
-
 	/* ORM options*/
 	phalcon_globals->orm.events = 1;
 	phalcon_globals->orm.virtual_foreign_keys = 1;