X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_callback.c;h=17d7e70efeff025b9d2e6fb3cd2ed402ea3fbfd7;hp=63f2edc4bab570523b133bcf027c1a4bb94e9b95;hb=c753ebfed3a4b21409cfa46212fd2c55227c809f;hpb=9255d2d54bca41644cf3588e4e4259a1855b58d7

diff --git a/src/php_pq_callback.c b/src/php_pq_callback.c
index 63f2edc..17d7e70 100644
--- a/src/php_pq_callback.c
+++ b/src/php_pq_callback.c
@@ -29,8 +29,11 @@ void php_pq_callback_dtor(php_pq_callback_t *cb)
 	if (cb->fci.size > 0) {
 		zend_fcall_info_args_clear(&cb->fci, 1);
 		zval_ptr_dtor(&cb->fci.function_name);
-		if (cb->fci.object_ptr) {
-			zval_ptr_dtor(&cb->fci.object_ptr);
+		if (cb->fci.object) {
+			zval tmp;
+
+			ZVAL_OBJ(&tmp, cb->fci.object);
+			zval_ptr_dtor(&tmp);
 		}
 		cb->fci.size = 0;
 	}
@@ -38,61 +41,122 @@ void php_pq_callback_dtor(php_pq_callback_t *cb)
 
 void php_pq_callback_addref(php_pq_callback_t *cb)
 {
-	Z_ADDREF_P(cb->fci.function_name);
-	if (cb->fci.object_ptr) {
-		Z_ADDREF_P(cb->fci.object_ptr);
+	Z_TRY_ADDREF(cb->fci.function_name);
+	if (cb->fci.object) {
+		++GC_REFCOUNT(cb->fci.object);
 	}
 }
 
-zval *php_pq_callback_to_zval(php_pq_callback_t *cb)
+zval *php_pq_callback_to_zval(php_pq_callback_t *cb, zval *tmp)
 {
-	zval *zcb;
-
 	php_pq_callback_addref(cb);
 
-	if (cb->fci.object_ptr) {
-		MAKE_STD_ZVAL(zcb);
-		array_init_size(zcb, 2);
-		add_next_index_zval(zcb, cb->fci.object_ptr);
-		add_next_index_zval(zcb, cb->fci.function_name);
-	} else {
-		zcb = cb->fci.function_name;
+	if (cb->fci.object) {
+		zval zo;
+
+		array_init_size(tmp, 2);
+		ZVAL_OBJ(&zo, cb->fci.object);
+		add_next_index_zval(tmp, &zo);
+		add_next_index_zval(tmp, &cb->fci.function_name);
+
+		return tmp;
+	}
+
+	return &cb->fci.function_name;
+}
+
+zval *php_pq_callback_to_zval_no_addref(php_pq_callback_t *cb, zval *tmp)
+{
+	if (cb->fci.object) {
+		zval zo;
+
+		array_init_size(tmp, 2);
+		ZVAL_OBJ(&zo, cb->fci.object);
+		add_next_index_zval(tmp, &zo);
+		add_next_index_zval(tmp, &cb->fci.function_name);
+
+		return tmp;
 	}
 
-	return zcb;
+	return &cb->fci.function_name;
 }
 
-zend_bool php_pq_callback_is_locked(php_pq_callback_t *cb TSRMLS_DC)
+zend_bool php_pq_callback_is_locked(php_pq_callback_t *cb)
 {
-	if (cb->fci.size > 0 && Z_TYPE_P(cb->fci.function_name) == IS_OBJECT) {
-		const zend_function *closure = zend_get_closure_method_def(cb->fci.function_name TSRMLS_CC);
+	/* TODO: fixed in php7?
+	if (php_pq_callback_is_enabled(cb)) {
+		const zend_function *closure;
+		const zend_execute_data *ex;
 
-		if (closure->type == ZEND_USER_FUNCTION) {
-			zend_execute_data *ex = EG(current_execute_data);
+		if (Z_TYPE_P(cb->fci.function_name) != IS_OBJECT) {
+			return 0;
+		}
 
-			while (ex) {
-				if (ex->op_array == &closure->op_array) {
-					return 1;
-				}
-				ex = ex->prev_execute_data;
+		closure = zend_get_closure_method_def(cb->fci.function_name);
+		if (closure->type != ZEND_USER_FUNCTION) {
+			return 0;
+		}
+
+		for (ex = EG(current_execute_data); ex; ex = ex->prev_execute_data) {
+			if (ex->op_array == &closure->op_array) {
+				return 1;
 			}
 		}
 	}
+	if (!php_pq_callback_is_recurrent(cb)) {
+		return 0;
+	}
+	return php_pq_callback_is_locked(cb->recursion);
+	*/
 	return 0;
 }
 
-void php_pq_callback_recurse(php_pq_callback_t *old, php_pq_callback_t *new TSRMLS_DC)
+void php_pq_callback_recurse(php_pq_callback_t *old, php_pq_callback_t *new)
 {
-	if (new && new->fci.size > 0 && php_pq_callback_is_locked(old TSRMLS_CC)) {
-		new->recursion = emalloc(sizeof(*old));
-		memcpy(new->recursion, old, sizeof(*old));
-	} else if (new && new->fci.size > 0) {
+	if (php_pq_callback_is_locked(old)) {
+		php_pq_callback_recurse_ex(old, new);
+	} else {
 		php_pq_callback_dtor(old);
-		php_pq_callback_addref(new);
+		if (php_pq_callback_is_enabled(new)) {
+			php_pq_callback_addref(new);
+			memcpy(old, new, sizeof(*old));
+			new->fci.size = 0;
+		}
+	}
+}
+
+extern zend_bool php_pq_callback_is_enabled(php_pq_callback_t *cb)
+{
+	return cb && cb->fci.size > 0;
+}
+
+extern zend_bool php_pq_callback_is_recurrent(php_pq_callback_t *cb)
+{
+	return cb && cb->recursion != NULL;
+}
+
+extern void php_pq_callback_disable(php_pq_callback_t *cb)
+{
+	if (php_pq_callback_is_enabled(cb)) {
+		php_pq_callback_recurse_ex(cb, NULL);
+	}
+}
+
+extern void php_pq_callback_recurse_ex(php_pq_callback_t *old, php_pq_callback_t *new)
+{
+	php_pq_callback_t *tmp = emalloc(sizeof(*tmp));
+
+	if (new) {
+		memcpy(tmp, old, sizeof(*tmp));
 		memcpy(old, new, sizeof(*old));
-		new->fci.size = 0;
+		old->recursion = tmp;
+
+		php_pq_callback_addref(old);
+		php_pq_callback_disable(tmp);
 	} else {
-		php_pq_callback_dtor(old);
+		memcpy(tmp, old, sizeof(*tmp));
+		memset(old, 0, sizeof(*old));
+		old->recursion = tmp;
 	}
 }