Skip to content

Commit 6558d18

Browse files
matyhtfmatyhtf
committed
optimize code
1 parent 0e855e7 commit 6558d18

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

‎ext-src/swoole_server.cc

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,8 +1309,7 @@ static void php_swoole_onPipeMessage(Server *serv, EventData *req) {
13091309
}
13101310

13111311
int php_swoole_server_onReceive(Server *serv, RecvData *req) {
1312-
zend_fcall_info_cache *fci_cache =
1313-
php_swoole_server_get_fci_cache(serv, req->info.server_fd, SW_SERVER_CB_onReceive);
1312+
auto fci_cache = php_swoole_server_get_fci_cache(serv, req->info.server_fd, SW_SERVER_CB_onReceive);
13141313

13151314
if (fci_cache) {
13161315
zval *zserv = (zval *) serv->private_data_2;
@@ -1430,8 +1429,7 @@ int php_swoole_server_onPacket(Server *serv, RecvData *req) {
14301429
argc = 3;
14311430
}
14321431

1433-
zend_fcall_info_cache *fci_cache =
1434-
php_swoole_server_get_fci_cache(serv, req->info.server_fd, SW_SERVER_CB_onPacket);
1432+
auto fci_cache = php_swoole_server_get_fci_cache(serv, req->info.server_fd, SW_SERVER_CB_onPacket);
14351433
if (UNEXPECTED(!zend::function::call(fci_cache, argc, args, nullptr, serv->enable_coroutine))) {
14361434
php_swoole_error(E_WARNING, "%s->onPipeMessage handler error", SW_Z_OBJCE_NAME_VAL_P(zserv));
14371435
}
@@ -1628,7 +1626,7 @@ static void php_swoole_onStart(Server *serv) {
16281626
serv->lock();
16291627
zval *zserv = (zval *) serv->private_data_2;
16301628
ServerObject *server_object = server_fetch_object(Z_OBJ_P(zserv));
1631-
zend_fcall_info_cache *fci_cache = server_object->property->callbacks[SW_SERVER_CB_onStart];
1629+
auto fci_cache = server_object->property->callbacks[SW_SERVER_CB_onStart];
16321630

16331631
zend_update_property_long(swoole_server_ce, SW_Z8_OBJ_P(zserv), ZEND_STRL("master_pid"), serv->gs->master_pid);
16341632
zend_update_property_long(swoole_server_ce, SW_Z8_OBJ_P(zserv), ZEND_STRL("manager_pid"), serv->gs->manager_pid);
@@ -1641,7 +1639,7 @@ static void php_swoole_onStart(Server *serv) {
16411639
static void php_swoole_server_onManagerStart(Server *serv) {
16421640
zval *zserv = (zval *) serv->private_data_2;
16431641
ServerObject *server_object = server_fetch_object(Z_OBJ_P(zserv));
1644-
zend_fcall_info_cache *fci_cache = server_object->property->callbacks[SW_SERVER_CB_onManagerStart];
1642+
auto fci_cache = server_object->property->callbacks[SW_SERVER_CB_onManagerStart];
16451643

16461644
zend_update_property_long(swoole_server_ce, SW_Z8_OBJ_P(zserv), ZEND_STRL("master_pid"), serv->gs->master_pid);
16471645
zend_update_property_long(swoole_server_ce, SW_Z8_OBJ_P(zserv), ZEND_STRL("manager_pid"), serv->gs->manager_pid);
@@ -1654,7 +1652,7 @@ static void php_swoole_server_onManagerStart(Server *serv) {
16541652
static void php_swoole_server_onManagerStop(Server *serv) {
16551653
zval *zserv = (zval *) serv->private_data_2;
16561654
ServerObject *server_object = server_fetch_object(Z_OBJ_P(zserv));
1657-
zend_fcall_info_cache *fci_cache = server_object->property->callbacks[SW_SERVER_CB_onManagerStop];
1655+
auto fci_cache = server_object->property->callbacks[SW_SERVER_CB_onManagerStop];
16581656

16591657
if (UNEXPECTED(!zend::function::call(fci_cache, 1, zserv, nullptr, false))) {
16601658
php_swoole_error(E_WARNING, "%s->onManagerStop handler error", SW_Z_OBJCE_NAME_VAL_P(zserv));
@@ -1665,7 +1663,7 @@ static void php_swoole_onShutdown(Server *serv) {
16651663
serv->lock();
16661664
zval *zserv = (zval *) serv->private_data_2;
16671665
ServerObject *server_object = server_fetch_object(Z_OBJ_P(zserv));
1668-
zend_fcall_info_cache *fci_cache = server_object->property->callbacks[SW_SERVER_CB_onShutdown];
1666+
auto fci_cache = server_object->property->callbacks[SW_SERVER_CB_onShutdown];
16691667

16701668
if (fci_cache != nullptr) {
16711669
if (UNEXPECTED(!zend::function::call(fci_cache, 1, zserv, nullptr, false))) {
@@ -1678,7 +1676,7 @@ static void php_swoole_onShutdown(Server *serv) {
16781676
static void php_swoole_server_onWorkerStart(Server *serv, int worker_id) {
16791677
zval *zserv = (zval *) serv->private_data_2;
16801678
ServerObject *server_object = server_fetch_object(Z_OBJ_P(zserv));
1681-
zend_fcall_info_cache *fci_cache = server_object->property->callbacks[SW_SERVER_CB_onWorkerStart];
1679+
auto fci_cache = server_object->property->callbacks[SW_SERVER_CB_onWorkerStart];
16821680

16831681
zend_update_property_long(swoole_server_ce, SW_Z8_OBJ_P(zserv), ZEND_STRL("master_pid"), serv->gs->master_pid);
16841682
zend_update_property_long(swoole_server_ce, SW_Z8_OBJ_P(zserv), ZEND_STRL("manager_pid"), serv->gs->manager_pid);
@@ -1708,7 +1706,7 @@ static void php_swoole_server_onWorkerStart(Server *serv, int worker_id) {
17081706
static void php_swoole_server_onBeforeReload(Server *serv) {
17091707
zval *zserv = (zval *) serv->private_data_2;
17101708
ServerObject *server_object = server_fetch_object(Z_OBJ_P(zserv));
1711-
zend_fcall_info_cache *fci_cache = server_object->property->callbacks[SW_SERVER_CB_onBeforeReload];
1709+
auto fci_cache = server_object->property->callbacks[SW_SERVER_CB_onBeforeReload];
17121710

17131711
if (fci_cache) {
17141712
zval args[1];
@@ -1722,7 +1720,7 @@ static void php_swoole_server_onBeforeReload(Server *serv) {
17221720
static void php_swoole_server_onAfterReload(Server *serv) {
17231721
zval *zserv = (zval *) serv->private_data_2;
17241722
ServerObject *server_object = server_fetch_object(Z_OBJ_P(zserv));
1725-
zend_fcall_info_cache *fci_cache = server_object->property->callbacks[SW_SERVER_CB_onAfterReload];
1723+
auto fci_cache = server_object->property->callbacks[SW_SERVER_CB_onAfterReload];
17261724

17271725
if (fci_cache) {
17281726
zval args[1];
@@ -1741,7 +1739,7 @@ static void php_swoole_server_onWorkerStop(Server *serv, int worker_id) {
17411739

17421740
zval *zserv = (zval *) serv->private_data_2;
17431741
ServerObject *server_object = server_fetch_object(Z_OBJ_P(zserv));
1744-
zend_fcall_info_cache *fci_cache = server_object->property->callbacks[SW_SERVER_CB_onWorkerStop];
1742+
auto fci_cache = server_object->property->callbacks[SW_SERVER_CB_onWorkerStop];
17451743
zval args[2];
17461744
args[0] = *zserv;
17471745
ZVAL_LONG(&args[1], worker_id);
@@ -1758,7 +1756,7 @@ static void php_swoole_server_onWorkerStop(Server *serv, int worker_id) {
17581756
static void php_swoole_server_onWorkerExit(Server *serv, int worker_id) {
17591757
zval *zserv = (zval *) serv->private_data_2;
17601758
ServerObject *server_object = server_fetch_object(Z_OBJ_P(zserv));
1761-
zend_fcall_info_cache *fci_cache = server_object->property->callbacks[SW_SERVER_CB_onWorkerExit];
1759+
auto fci_cache = server_object->property->callbacks[SW_SERVER_CB_onWorkerExit];
17621760

17631761
zval args[2];
17641762
args[0] = *zserv;
@@ -1789,7 +1787,7 @@ static void php_swoole_onUserWorkerStart(Server *serv, Worker *worker) {
17891787
static void php_swoole_server_onWorkerError(Server *serv, int worker_id, const ExitStatus &exit_status) {
17901788
zval *zserv = (zval *) serv->private_data_2;
17911789
ServerObject *server_object = server_fetch_object(Z_OBJ_P(zserv));
1792-
zend_fcall_info_cache *fci_cache = server_object->property->callbacks[SW_SERVER_CB_onWorkerError];
1790+
auto fci_cache = server_object->property->callbacks[SW_SERVER_CB_onWorkerError];
17931791

17941792
zval args[5];
17951793
int argc;
@@ -1826,7 +1824,7 @@ static void php_swoole_server_onWorkerError(Server *serv, int worker_id, const E
18261824
}
18271825

18281826
void php_swoole_server_onConnect(Server *serv, DataHead *info) {
1829-
zend_fcall_info_cache *fci_cache = php_swoole_server_get_fci_cache(serv, info->server_fd, SW_SERVER_CB_onConnect);
1827+
auto fci_cache = php_swoole_server_get_fci_cache(serv, info->server_fd, SW_SERVER_CB_onConnect);
18301828
if (fci_cache) {
18311829
zval *zserv = (zval *) serv->private_data_2;
18321830
zval args[3];
@@ -1880,7 +1878,7 @@ void php_swoole_server_onClose(Server *serv, DataHead *info) {
18801878
}
18811879
}
18821880

1883-
zend_fcall_info_cache *fci_cache = php_swoole_server_get_fci_cache(serv, info->server_fd, SW_SERVER_CB_onClose);
1881+
auto fci_cache = php_swoole_server_get_fci_cache(serv, info->server_fd, SW_SERVER_CB_onClose);
18841882
if (fci_cache) {
18851883
zval *zserv = (zval *) serv->private_data_2;
18861884
zval args[3];
@@ -1915,8 +1913,7 @@ void php_swoole_server_onClose(Server *serv, DataHead *info) {
19151913

19161914
void php_swoole_server_onBufferFull(Server *serv, DataHead *info) {
19171915
zval *zserv = (zval *) serv->private_data_2;
1918-
zend_fcall_info_cache *fci_cache =
1919-
php_swoole_server_get_fci_cache(serv, info->server_fd, SW_SERVER_CB_onBufferFull);
1916+
auto fci_cache = php_swoole_server_get_fci_cache(serv, info->server_fd, SW_SERVER_CB_onBufferFull);
19201917

19211918
if (fci_cache) {
19221919
zval args[2];
@@ -2023,7 +2020,7 @@ void php_swoole_server_send_yield(Server *serv, SessionId session_id, zval *zdat
20232020
static int php_swoole_server_dispatch_func(Server *serv, Connection *conn, SendData *data) {
20242021
serv->lock();
20252022

2026-
zend_fcall_info_cache *fci_cache = (zend_fcall_info_cache *) serv->private_data_3;
2023+
auto fci_cache = (zend_fcall_info_cache *) serv->private_data_3;
20272024
zval args[4];
20282025
zval *zserv = &args[0], *zfd = &args[1], *ztype = &args[2], *zdata = nullptr;
20292026
zval retval;

0 commit comments

Comments
 (0)