Merge pull request #1220 from sjinks/memory

PHALCON_INIT_NVAR(_PNULL) optimization
phalcon · Sep 12, 2013 · 5eebbe6 · 5eebbe6
2 parents 67dd2b2 + ca8348d
commit 5eebbe6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 68 deletions.
diff --git a/ext/kernel/memory.c b/ext/kernel/memory.c
@@ -48,62 +48,6 @@
  * Not all methods must grown/restore the phalcon_memory_entry.
  */
 
-/**
- * Initializes/Reinitializes a variable
- */
-inline void phalcon_init_nvar(zval **var TSRMLS_DC) {
-	if (*var) {
-		if (Z_REFCOUNT_PP(var) > 1) {
-			Z_DELREF_PP(var);
-			ALLOC_ZVAL(*var);
-			Z_SET_REFCOUNT_PP(var, 1);
-			Z_UNSET_ISREF_PP(var);
-		} else {
-			zval_ptr_dtor(var);
-			PHALCON_ALLOC_ZVAL(*var);
-		}
-	} else {
-		phalcon_memory_alloc(var TSRMLS_CC);
-	}
-}
-
-/**
- * Copy/Write variables caring of reference counting
- */
-inline void phalcon_cpy_wrt(zval **dest, zval *var TSRMLS_DC) {
-
-	if (*dest) {
-		if (Z_REFCOUNT_PP(dest) > 0) {
-			zval_ptr_dtor(dest);
-		}
-	} else {
-		phalcon_memory_observe(dest TSRMLS_CC);
-	}
-
-	Z_ADDREF_P(var);
-	*dest = var;
-}
-
-/**
- * Copy/Write variables caring of reference counting also duplicating the origin ctor
- */
-inline void phalcon_cpy_wrt_ctor(zval **dest, zval *var TSRMLS_DC) {
-
-	if (*dest) {
-		if (Z_REFCOUNT_PP(dest) > 0) {
-			zval_ptr_dtor(dest);
-		}
-	} else {
-		phalcon_memory_observe(dest TSRMLS_CC);
-	}
-
-	Z_ADDREF_P(var);
-	*dest = var;
-	zval_copy_ctor(*dest);
-	Z_SET_REFCOUNT_PP(dest, 1);
-	Z_UNSET_ISREF_PP(dest);
-}
-
 static phalcon_memory_entry* phalcon_memory_grow_stack_common(zend_phalcon_globals *phalcon_globals_ptr)
 {
 	assert(phalcon_globals_ptr->start_memory != NULL);

diff --git a/ext/kernel/memory.h b/ext/kernel/memory.h
@@ -17,11 +17,6 @@
   +------------------------------------------------------------------------+
 */
 
-/* Variable Tracking */
-extern void phalcon_init_nvar(zval **var TSRMLS_DC);
-extern void phalcon_cpy_wrt(zval **dest, zval *var TSRMLS_DC);
-extern void phalcon_cpy_wrt_ctor(zval **dest, zval *var TSRMLS_DC);
-
 /* Memory Frames */
 #ifndef PHALCON_RELEASE
 void PHALCON_FASTCALL phalcon_memory_grow_stack(const char *func TSRMLS_DC);
@@ -73,8 +68,8 @@ extern void PHALCON_FASTCALL phalcon_copy_ctor(zval *destiny, zval *origin);
 			Z_UNSET_ISREF_P(z); \
 			ZVAL_NULL(z); \
 		} else {\
-			zval_ptr_dtor(&z); \
-			PHALCON_ALLOC_ZVAL(z); \
+			zval_dtor(z); \
+			ZVAL_NULL(z); \
 		} \
 	} else { \
 		phalcon_memory_alloc(&z TSRMLS_CC); \
@@ -90,12 +85,8 @@ extern void PHALCON_FASTCALL phalcon_copy_ctor(zval *destiny, zval *origin);
 			ALLOC_ZVAL(z); \
 			Z_SET_REFCOUNT_P(z, 1); \
 			Z_UNSET_ISREF_P(z); \
-			ZVAL_NULL(z); \
-		} else {\
-			ZVAL_NULL(z); \
-			zval_ptr_dtor(&z); \
-			PHALCON_ALLOC_ZVAL(z); \
 		} \
+		ZVAL_NULL(z); \
 	} else { \
 		phalcon_memory_alloc_pnull(&z TSRMLS_CC); \
 	}