X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_callback.c;h=6b0213f8ac5ed744ce58c4a685d419bcb5fd5149;hp=1a4a91731f166eefe6cbf96a6f3c5f1583e2cde1;hb=6e28a8741be3fccdaca960e492c31bc26837a4ed;hpb=4be7248e5507090aeb09ade52e3de372e2a11dd5

diff --git a/src/php_pq_callback.c b/src/php_pq_callback.c
index 1a4a917..6b0213f 100644
--- a/src/php_pq_callback.c
+++ b/src/php_pq_callback.c
@@ -15,46 +15,89 @@
 #endif
 
 #include <php.h>
+#include <Zend/zend_closures.h>
 
 #include "php_pq_callback.h"
 
 void php_pq_callback_dtor(php_pq_callback_t *cb)
 {
+	if (cb->recursion) {
+		php_pq_callback_dtor(cb->recursion);
+		efree(cb->recursion);
+		cb->recursion = NULL;
+	}
 	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) {
+			zend_objects_store_del(cb->fci.object);
 		}
+		cb->fci.size = 0;
 	}
-	cb->fci.size = 0;
 }
 
 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;
+}
+
+zend_bool php_pq_callback_is_locked(php_pq_callback_t *cb)
+{
+	/* TODO: fixed in php7?
+	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);
+
+		if (closure->type == ZEND_USER_FUNCTION) {
+			zend_execute_data *ex = EG(current_execute_data);
+
+			while (ex) {
+				if (ex->op_array == &closure->op_array) {
+					return 1;
+				}
+				ex = ex->prev_execute_data;
+			}
+		}
 	}
+	*/
+	return 0;
+}
 
-	return zcb;
+void php_pq_callback_recurse(php_pq_callback_t *old, php_pq_callback_t *new TSRMLS_DC)
+{
+	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) {
+		php_pq_callback_dtor(old);
+		php_pq_callback_addref(new);
+		memcpy(old, new, sizeof(*old));
+		new->fci.size = 0;
+	} else {
+		php_pq_callback_dtor(old);
+	}
 }
+
 /*
  * Local variables:
  * tab-width: 4