Skip to content

Commit

Permalink
optimize code, fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@matyhtf
matyhtf committed Jul 3, 2024
1 parent 483f2b2 commit be6c2cc
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 41 deletions.
4 changes: 4 additions & 0 deletions ext-src/php_swoole_cxx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,10 @@ static inline void object_set(zval *obj, const char *name, size_t l_name, const
zend_update_property_string(Z_OBJCE_P(obj), Z_OBJ_P(obj), name, l_name, value);
}

static inline void object_set(zval *obj, const char *name, size_t l_name, zend_long value) {
zend_update_property_long(Z_OBJCE_P(obj), Z_OBJ_P(obj), name, l_name, value);
}

static inline zval *object_get(zval *obj, const char *name, size_t l_name) {
static zval rv;
return zend_read_property(Z_OBJCE_P(obj), Z_OBJ_P(obj), name, l_name, 1, &rv);
Expand Down
8 changes: 8 additions & 0 deletions ext-src/php_swoole_thread.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ typedef uint32_t ThreadResourceId;
struct ThreadResource;
struct ZendArray;

extern zend_class_entry *swoole_thread_ce;
extern zend_class_entry *swoole_thread_error_ce;
extern zend_class_entry *swoole_thread_arraylist_ce;
extern zend_class_entry *swoole_thread_atomic_ce;
extern zend_class_entry *swoole_thread_atomic_long_ce;
Expand Down Expand Up @@ -56,6 +58,12 @@ void php_swoole_thread_atomic_create(zval *return_value, ThreadResource *resourc
void php_swoole_thread_atomic_long_create(zval *return_value, ThreadResource *resource);
void php_swoole_thread_barrier_create(zval *return_value, ThreadResource *resource);

int php_swoole_thread_stream_cast(zval *zstream);
void php_swoole_thread_stream_create(zval *return_value, zend_long sockfd);

int php_swoole_thread_co_socket_cast(zval *zstream, swSocketType *type);
void php_swoole_thread_co_socket_create(zval *return_value, zend_long sockfd, swSocketType type);

#define EMSG_NO_RESOURCE "resource not found"
#define ECODE_NO_RESOURCE -2

Expand Down
92 changes: 55 additions & 37 deletions ext-src/swoole_thread.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ BEGIN_EXTERN_C()
#include "stubs/php_swoole_thread_arginfo.h"
END_EXTERN_C()

zend_class_entry *swoole_thread_ce;
static zend_object_handlers swoole_thread_handlers;
static zend_object_handlers swoole_thread_error_handlers;

static struct {
char *path_translated;
Expand All @@ -50,8 +50,6 @@ struct ThreadObject {
};

static void php_swoole_thread_join(zend_object *object);
static int php_swoole_thread_stream_fileno(zval *zstream);
static bool php_swoole_thread_stream_restore(zend_long sockfd, zval *return_value);
static void php_swoole_thread_register_stdio_file_handles(bool no_close);

static thread_local zval thread_argv;
Expand Down Expand Up @@ -117,6 +115,9 @@ void php_swoole_thread_minit(int module_number) {
zend_declare_property_long(swoole_thread_ce, ZEND_STRL("id"), 0, ZEND_ACC_PUBLIC | ZEND_ACC_READONLY);
zend_declare_class_constant_long(
swoole_thread_ce, ZEND_STRL("HARDWARE_CONCURRENCY"), std::thread::hardware_concurrency());

SW_INIT_CLASS_ENTRY_DATA_OBJECT(swoole_thread_error, "Swoole\\Thread\\Error");
zend_declare_property_long(swoole_thread_error_ce, ZEND_STRL("code"), 0, ZEND_ACC_PUBLIC | ZEND_ACC_READONLY);
}

static PHP_METHOD(swoole_thread, __construct) {
Expand Down Expand Up @@ -359,7 +360,7 @@ void php_swoole_thread_bailout(void) {
}
}

static int php_swoole_thread_stream_fileno(zval *zstream) {
int php_swoole_thread_stream_cast(zval *zstream) {
php_stream *stream;
int sockfd;
int cast_flags = PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL;
Expand All @@ -371,15 +372,49 @@ static int php_swoole_thread_stream_fileno(zval *zstream) {
return -1;
}

static bool php_swoole_thread_stream_restore(zend_long sockfd, zval *return_value) {
int php_swoole_thread_co_socket_cast(zval *zvalue, swSocketType *type) {
swoole::coroutine::Socket *socket = php_swoole_get_socket(zvalue);
if (!socket) {
return -1;
}
int sockfd = socket->get_fd();
if (sockfd < 0) {
return -1;
}
int newfd = dup(sockfd);
if (newfd < 0) {
return -1;
}
*type = socket->get_type();
return newfd;
}

void php_swoole_thread_stream_create(zval *return_value, zend_long sockfd) {
std::string path = "php://fd/" + std::to_string(sockfd);
// The file descriptor will be duplicated once here
php_stream *stream = php_stream_open_wrapper_ex(path.c_str(), "", 0, NULL, NULL);
if (stream) {
php_stream_to_zval(stream, return_value);
return true;
} else {
object_init_ex(return_value, swoole_thread_error_ce);
zend::object_set(return_value, ZEND_STRL("code"), errno);
}
}

void php_swoole_thread_co_socket_create(zval *return_value, zend_long sockfd, swSocketType type) {
int newfd = dup(sockfd);
if (newfd < 0) {
object_init_ex(return_value, swoole_thread_error_ce);
zend::object_set(return_value, ZEND_STRL("code"), errno);
return;
}
zend_object *sockobj = php_swoole_create_socket_from_fd(newfd, type);
if (sockobj) {
ZVAL_OBJ(return_value, sockobj);
} else {
// never here
abort();
}
return false;
}

static PHP_METHOD(swoole_thread, getTsrmInfo) {
Expand Down Expand Up @@ -415,35 +450,26 @@ void ArrayItem::store(zval *zvalue) {
case IS_NULL:
break;
case IS_RESOURCE: {
int sock_fd = php_swoole_thread_stream_fileno(zvalue);
if (sock_fd != -1) {
value.socket.fd = sock_fd;
type = IS_STREAM_SOCKET;
break;
value.socket.fd = php_swoole_thread_stream_cast(zvalue);
type = IS_STREAM_SOCKET;
if (value.socket.fd == -1) {
zend_throw_exception(swoole_exception_ce, "failed to convert to socket fd", errno);
}
break;
}
/* no break */
case IS_ARRAY: {
type = zend_array_is_list(Z_ARRVAL_P(zvalue)) ? IS_ARRAYLIST : IS_MAP;
value.resource = ZendArray::from(Z_ARRVAL_P(zvalue));
break;
}
case IS_OBJECT: {
if (instanceof_function(Z_OBJCE_P(zvalue), swoole_socket_coro_ce)) {
swoole::coroutine::Socket *socket = php_swoole_get_socket(zvalue);
if (socket) {
int sockfd = socket->get_fd();
if (sockfd < 0) {
break;
}
value.socket.fd = dup(sockfd);
if (value.socket.fd < 0) {
break;
}
value.socket.type = socket->get_type();
type = IS_CO_SOCKET;
break;
value.socket.fd = php_swoole_thread_co_socket_cast(zvalue, &value.socket.type);
type = IS_CO_SOCKET;
if (value.socket.fd == -1) {
zend_throw_exception(swoole_exception_ce, "failed to convert to socket fd", errno);
}
break;
}
CAST_OBJ_TO_RESOURCE(arraylist, IS_ARRAYLIST)
CAST_OBJ_TO_RESOURCE(map, IS_MAP)
Expand Down Expand Up @@ -514,19 +540,11 @@ void ArrayItem::fetch(zval *return_value) {
php_swoole_thread_atomic_long_create(return_value, value.resource);
break;
case IS_STREAM_SOCKET:
php_swoole_thread_stream_restore(value.socket.fd, return_value);
php_swoole_thread_stream_create(return_value, value.socket.fd);
break;
case IS_CO_SOCKET: {
int sockfd = dup(value.socket.fd);
if (sockfd < 0) {
break;
}
zend_object *sockobj = php_swoole_create_socket_from_fd(sockfd, value.socket.type);
if (sockobj) {
ZVAL_OBJ(return_value, sockobj);
}
case IS_CO_SOCKET:
php_swoole_thread_co_socket_create(return_value, value.socket.fd, value.socket.type);
break;
}
case IS_SERIALIZED_OBJECT:
php_swoole_unserialize(value.serialized_object, return_value);
break;
Expand Down
4 changes: 2 additions & 2 deletions tests/include/api/curl_multi.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function swoole_test_curl_multi_ex($mh, $options = []) {
curl_setopt($ch1, CURLOPT_HEADER, 0);
curl_setopt($ch1, CURLOPT_RETURNTRANSFER, 1);

curl_setopt($ch2, CURLOPT_URL, "https://www.taobao.com/");
curl_setopt($ch2, CURLOPT_URL, "https://www.gov.cn/");
curl_setopt($ch2, CURLOPT_HEADER, 0);
curl_setopt($ch2, CURLOPT_RETURNTRANSFER, 1);

Expand Down Expand Up @@ -61,7 +61,7 @@ function swoole_test_curl_multi_ex($mh, $options = []) {
Assert::eq($info3, false);

Assert::contains(curl_multi_getcontent($ch1), 'baidu.com');
Assert::contains(curl_multi_getcontent($ch2), 'taobao.com');
Assert::contains(curl_multi_getcontent($ch2), '中国政府网');

curl_multi_remove_handle($mh, $ch1);
curl_multi_remove_handle($mh, $ch2);
Expand Down
4 changes: 2 additions & 2 deletions tests/swoole_http2_client_coro/connect_twice.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ run(function () {
$client->send($req);
$chan->push(true);
$resp = $client->recv();
Assert::eq($resp->statusCode, 302);
Assert::contains($resp->data, '302 Found');
Assert::eq($resp->statusCode, 200);
Assert::contains($resp->data, '知乎');
$chan->pop();
});
go(function () use ($client, $chan) {
Expand Down

0 comments on commit be6c2cc

Please sign in to comment.