Fix async error (#449)

dreamsxin · May 1, 2019 · 7437ae3 · 7437ae3
1 parent be6e4b7
commit 7437ae3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/ext/async/pipe.c b/ext/async/pipe.c
@@ -1159,18 +1159,18 @@ static ZEND_METHOD(PipeServer, accept)
 	RETURN_OBJ(&pipe->std);
 }
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_pipe_server_bind, 0, 1, Phalcon\\Async\\Network\\PipeServer, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_pipe_server_bind, 0, 1, Phalcon\\Async\\Network\\Pipe\\Server, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, ipc, _IS_BOOL, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_pipe_server_listen, 0, 1, Phalcon\\Async\\Network\\PipeServer, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_pipe_server_listen, 0, 1, Phalcon\\Async\\Network\\Pipe\\Server, 0)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, ipc, _IS_BOOL, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_pipe_server_import, 0, 1, Phalcon\\Async\\Network\\PipeServer, 0)
-	ZEND_ARG_OBJ_INFO(0, pipe, Phalcon\\Async\\Network\\PipeServer, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_pipe_server_import, 0, 1, Phalcon\\Async\\Network\\Pipe\\Server, 0)
+	ZEND_ARG_OBJ_INFO(0, pipe, Phalcon\\Async\\Network\\Pipe\\Server, 0)
 	ZEND_ARG_TYPE_INFO(0, ipc, _IS_BOOL, 1)
 ZEND_END_ARG_INFO()
 

diff --git a/ext/async/process/builder.c b/ext/async/process/builder.c
@@ -583,47 +583,47 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_fork, 0, 1, Phalc
 	ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_shell, 0, 0, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_shell, 0, 0, Phalcon\\Async\\Process\\Builder, 0)
 	ZEND_ARG_TYPE_INFO(0, interactive, _IS_BOOL, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_cwd, 0, 1, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_cwd, 0, 1, Phalcon\\Async\\Process\\Builder, 0)
 	ZEND_ARG_TYPE_INFO(0, directory, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_env, 0, 1, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_env, 0, 1, Phalcon\\Async\\Process\\Builder, 0)
 	ZEND_ARG_TYPE_INFO(0, env, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, inherit, _IS_BOOL, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stdin_pipe, 0, 0, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stdin_pipe, 0, 0, Phalcon\\Async\\Process\\Builder, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stdin_inherited, 0, 0, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stdin_inherited, 0, 0, Phalcon\\Async\\Process\\Builder, 0)
 	ZEND_ARG_TYPE_INFO(0, fd, IS_LONG, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_without_stdin, 0, 0, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_without_stdin, 0, 0, Phalcon\\Async\\Process\\Builder, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stdout_pipe, 0, 0, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stdout_pipe, 0, 0, Phalcon\\Async\\Process\\Builder, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stdout_inherited, 0, 0, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stdout_inherited, 0, 0, Phalcon\\Async\\Process\\Builder, 0)
 	ZEND_ARG_TYPE_INFO(0, fd, IS_LONG, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_without_stdout, 0, 0, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_without_stdout, 0, 0, Phalcon\\Async\\Process\\Builder, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stderr_pipe, 0, 0, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stderr_pipe, 0, 0, Phalcon\\Async\\Process\\Builder, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stderr_inherited, 0, 0, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_with_stderr_inherited, 0, 0, Phalcon\\Async\\Process\\Builder, 0)
 	ZEND_ARG_TYPE_INFO(0, fd, IS_LONG, 1)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_without_stderr, 0, 0, Phalcon\\Async\\Process\\ProcessBuilder, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_without_stderr, 0, 0, Phalcon\\Async\\Process\\Builder, 0)
 ZEND_END_ARG_INFO()
 
 
@@ -637,7 +637,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_process_builder_execute, 0, 0, I
 ZEND_END_ARG_INFO()
 #endif
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_start, 0, 0, Phalcon\\Async\\Process\\Process, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_process_builder_start, 0, 0, Phalcon\\Async\\Process, 0)
 	ZEND_ARG_VARIADIC_TYPE_INFO(0, arguments, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 

diff --git a/ext/config.m4 b/ext/config.m4
@@ -1325,7 +1325,9 @@ aop.c"
 		async_use_asm="no"
 	fi
 
+	AC_MSG_CHECKING(checking php version >= 7.1)
 	if test "$PHP_UV" = "yes" && test "$phalcon_php_version" -ge "7001000"; then
+		AC_MSG_RESULT(yes)
 		if test "$async_use_asm" = 'yes'; then
 			async_source_files="async/fiber/asm.c async/thirdparty/boost/asm/make_${async_asm_file} async/thirdparty/boost/asm/jump_${async_asm_file}"
 		elif test "$async_use_ucontext" = 'yes'; then
@@ -1337,8 +1339,8 @@ aop.c"
 		async_use_ucontext="no"
 	fi
 
+	AC_MSG_CHECKING([checking libuv support])
 	if test "$async_use_ucontext" = "yes" && test "$PHP_SOCKETS" = "yes"; then
-		AC_MSG_CHECKING(for static libuv)
 		DIR="${srcdir}/async/thirdparty"
 		if test "$async_os" = 'LINUX' && test ! -s "${DIR}/lib/libuv.a"; then
 			AC_MSG_RESULT(no)