Skip to content

[WIP]Make the FTP extension coroutine-enabled #5899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+51 −0
Open

[WIP]Make the FTP extension coroutine-enabled #5899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ext-src/php_swoole_coroutine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ class PHPCoroutine {
HOOK_PDO_ODBC = 1u << 17,
HOOK_PDO_ORACLE = 1u << 18,
HOOK_PDO_SQLITE = 1u << 19,
#if PHP_VERSION_ID >= 80328
HOOK_FTP = 1u << 20,
#endif
#ifdef SW_USE_CURL
HOOK_ALL = 0x7fffffff ^ HOOK_CURL,
#else
Expand Down
48 changes: 48 additions & 0 deletions ext-src/swoole_runtime.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
#include "swoole_socket.h"
#include "swoole_util.h"

#if PHP_VERSION_ID >= 80328
#include "ftp/php_ftp.h"
#endif

#include "thirdparty/php/standard/proc_open.h"

#ifdef SW_USE_CURL
Expand Down Expand Up @@ -62,6 +66,9 @@ END_EXTERN_C()
#endif

using swoole::Coroutine;
#if PHP_VERSION_ID >= 80328
using swoole::EventType;
#endif
using swoole::PHPCoroutine;
using swoole::coroutine::PollSocket;
using swoole::coroutine::Socket;
Expand Down Expand Up @@ -163,6 +170,9 @@ static void hook_func(const char *name,
zif_handler handler = nullptr,
zend_internal_arg_info *arg_info = nullptr);
static void unhook_func(const char *name, size_t l_name);
#if PHP_VERSION_ID >= 80328
static int (*original_php_ftp_pollfd_for_ms)(php_socket_t, int, int) = nullptr;
#endif

static zend_internal_arg_info *get_arginfo(const char *name, size_t l_name) {
auto *zf = static_cast<zend_function *>(zend_hash_str_find_ptr(EG(function_table), name, l_name));
Expand Down Expand Up @@ -262,6 +272,9 @@ void php_swoole_runtime_minit(int module_number) {
SW_REGISTER_LONG_CONSTANT("SWOOLE_HOOK_NATIVE_CURL", PHPCoroutine::HOOK_NATIVE_CURL);
SW_REGISTER_LONG_CONSTANT("SWOOLE_HOOK_BLOCKING_FUNCTION", PHPCoroutine::HOOK_BLOCKING_FUNCTION);
SW_REGISTER_LONG_CONSTANT("SWOOLE_HOOK_SOCKETS", PHPCoroutine::HOOK_SOCKETS);
#if PHP_VERSION_ID >= 80328
SW_REGISTER_LONG_CONSTANT("SWOOLE_HOOK_FTP", PHPCoroutine::HOOK_FTP);
#endif
#ifdef SW_USE_PGSQL
SW_REGISTER_LONG_CONSTANT("SWOOLE_HOOK_PDO_PGSQL", PHPCoroutine::HOOK_PDO_PGSQL);
#endif
Expand Down Expand Up @@ -1496,6 +1509,38 @@ static void hook_pdo_driver(uint32_t flags) {
#endif
}

#if PHP_VERSION_ID >= 80328
static int swoole_ftp_pollfd_for_ms(php_socket_t fd, int poll_events, int timeout) {
Socket socket(fd, SW_SOCK_RAW);
socket.get_socket()->nonblock = 1;

int events = 0;
if (poll_events == POLLOUT) {
events |= SW_EVENT_WRITE;
}
if (poll_events == PHP_POLLREADABLE) {
events |= SW_EVENT_READ;
}

bool result = socket.poll((EventType) events, (double) timeout);
socket.move_fd();
return result ? 1 : socket.errCode == ETIMEDOUT ? 0 : -1;
}

static void hook_ftp(uint32_t flags) {
if (flags & PHPCoroutine::HOOK_FTP) {
if (!(runtime_hook_flags & PHPCoroutine::HOOK_STREAM_FUNCTION)) {
original_php_ftp_pollfd_for_ms = php_ftp_pollfd_for_ms;
php_ftp_pollfd_for_ms = swoole_ftp_pollfd_for_ms;
}
} else {
if (runtime_hook_flags & PHPCoroutine::HOOK_FTP) {
php_ftp_pollfd_for_ms = original_php_ftp_pollfd_for_ms;
}
}
}
#endif

static void hook_all_func(uint32_t flags) {
// stream func
if (flags & PHPCoroutine::HOOK_STREAM_FUNCTION) {
Expand Down Expand Up @@ -1739,6 +1784,9 @@ bool PHPCoroutine::enable_hook(uint32_t flags) {
hook_stream_factory(&flags);
hook_stream_ops(flags);
hook_pdo_driver(flags);
#if PHP_VERSION_ID >= 80328
hook_ftp(flags);
#endif
hook_all_func(flags);

if (swoole_isset_hook((swGlobalHookType) PHP_SWOOLE_HOOK_AFTER_ENABLE_HOOK)) {
Expand Down
Loading