archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1' into PHP-8.2

Browse source
This commit is contained in:
George Wang 2022-11-20 19:30:47 -05:00
commit aef96600d3
1 changed files with 43 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

78
sapi/litespeed/lsapilib.c
View file

@ -441,9 +441,10 @@ static void lsapi_close_connection(LSAPI_Request *pReq)
lsapi_close(pReq->m_fd); lsapi_close(pReq->m_fd);
pReq->m_fd = -1; pReq->m_fd = -1;
if (s_busy_workers) if (s_busy_workers)
__sync_fetch_and_sub(s_busy_workers, 1); __atomic_fetch_sub(s_busy_workers, 1, __ATOMIC_SEQ_CST);
if (s_worker_status) if (s_worker_status)
__sync_lock_test_and_set(&s_worker_status->m_state, LSAPI_STATE_IDLE); __atomic_store_n(&s_worker_status->m_state, LSAPI_STATE_IDLE,
__ATOMIC_SEQ_CST);
} }
@ -1587,10 +1588,10 @@ int LSAPI_Accept_r( LSAPI_Request * pReq )
else else
{ {
if (s_worker_status) if (s_worker_status)
__sync_lock_test_and_set(&s_worker_status->m_state, __atomic_store_n(&s_worker_status->m_state,
LSAPI_STATE_CONNECTED); LSAPI_STATE_CONNECTED, __ATOMIC_SEQ_CST);
if (s_busy_workers) if (s_busy_workers)
__sync_fetch_and_add(s_busy_workers, 1); __atomic_fetch_add(s_busy_workers, 1, __ATOMIC_SEQ_CST);
lsapi_set_nblock( pReq->m_fd , 0 ); lsapi_set_nblock( pReq->m_fd , 0 );
if (((struct sockaddr *)&achPeer)->sa_family == AF_INET ) if (((struct sockaddr *)&achPeer)->sa_family == AF_INET )
{ {
@ -2918,9 +2919,9 @@ void LSAPI_reset_server_state( void )
++pStatus; ++pStatus;
} }
if (s_busy_workers) if (s_busy_workers)
__sync_lock_release(s_busy_workers); __atomic_store_n(s_busy_workers, 0, __ATOMIC_SEQ_CST);
if (s_accepting_workers) if (s_accepting_workers)
__sync_lock_release(s_accepting_workers); __atomic_store_n(s_accepting_workers, 0, __ATOMIC_SEQ_CST);
} }
@ -2928,6 +2929,8 @@ void LSAPI_reset_server_state( void )
static void lsapi_sigchild( int signal ) static void lsapi_sigchild( int signal )
{ {
int status, pid; int status, pid;
char expect_connected = LSAPI_STATE_CONNECTED;
char expect_accepting = LSAPI_STATE_ACCEPTING;
lsapi_child_status * child_status; lsapi_child_status * child_status;
if (g_prefork_server == NULL) if (g_prefork_server == NULL)
return; return;
@ -2964,19 +2967,23 @@ static void lsapi_sigchild( int signal )
child_status = find_child_status( pid ); child_status = find_child_status( pid );
if ( child_status ) if ( child_status )
{ {
if (__sync_bool_compare_and_swap(&child_status->m_state, if (__atomic_compare_exchange_n(&child_status->m_state,
LSAPI_STATE_CONNECTED, &expect_connected,
LSAPI_STATE_IDLE)) LSAPI_STATE_IDLE, 1,
__ATOMIC_SEQ_CST,
__ATOMIC_SEQ_CST))
{ {
if (s_busy_workers) if (s_busy_workers)
__sync_fetch_and_sub(s_busy_workers, 1); __atomic_fetch_sub(s_busy_workers, 1, __ATOMIC_SEQ_CST);
} }
else if (__sync_bool_compare_and_swap(&child_status->m_state, else if (__atomic_compare_exchange_n(&child_status->m_state,
LSAPI_STATE_ACCEPTING, &expect_accepting,
LSAPI_STATE_IDLE)) LSAPI_STATE_IDLE, 1,
__ATOMIC_SEQ_CST,
__ATOMIC_SEQ_CST))
{ {
if (s_accepting_workers) if (s_accepting_workers)
__sync_fetch_and_sub(s_accepting_workers, 1); __atomic_fetch_sub(s_accepting_workers, 1, __ATOMIC_SEQ_CST);
} }
child_status->m_pid = 0; child_status->m_pid = 0;
--g_prefork_server->m_iCurChildren; --g_prefork_server->m_iCurChildren;
@ -3249,7 +3256,7 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer,
{ {
int accepting = 0; int accepting = 0;
if (s_accepting_workers) if (s_accepting_workers)
accepting = __sync_add_and_fetch(s_accepting_workers, 0); accepting = __atomic_load_n(s_accepting_workers, __ATOMIC_SEQ_CST);
if (pServer->m_iCurChildren > 0 if (pServer->m_iCurChildren > 0
&& accepting > 0) && accepting > 0)
@ -3315,10 +3322,10 @@ static int lsapi_prefork_server_accept( lsapi_prefork_server * pServer,
if (pthread_atfork_func) if (pthread_atfork_func)
(*pthread_atfork_func)(NULL, NULL, set_skip_write); (*pthread_atfork_func)(NULL, NULL, set_skip_write);
__sync_lock_test_and_set(&s_worker_status->m_state, __atomic_store_n(&s_worker_status->m_state,
LSAPI_STATE_CONNECTED); LSAPI_STATE_CONNECTED, __ATOMIC_SEQ_CST);
if (s_busy_workers) if (s_busy_workers)
__sync_add_and_fetch(s_busy_workers, 1); __atomic_add_fetch(s_busy_workers, 1, __ATOMIC_SEQ_CST);
lsapi_set_nblock( pReq->m_fd, 0 ); lsapi_set_nblock( pReq->m_fd, 0 );
//keep it open if busy_count is used. //keep it open if busy_count is used.
if (!s_keep_listener && s_busy_workers if (!s_keep_listener && s_busy_workers
@ -3390,7 +3397,7 @@ int LSAPI_Postfork_Child(LSAPI_Request * pReq)
{ {
int max_children = g_prefork_server->m_iMaxChildren; int max_children = g_prefork_server->m_iMaxChildren;
s_pid = getpid(); s_pid = getpid();
__sync_lock_test_and_set(&pReq->child_status->m_pid, s_pid); __atomic_store_n(&pReq->child_status->m_pid, s_pid, __ATOMIC_SEQ_CST);
s_worker_status = pReq->child_status; s_worker_status = pReq->child_status;
setsid(); setsid();
@ -3402,10 +3409,10 @@ int LSAPI_Postfork_Child(LSAPI_Request * pReq)
if (pthread_atfork_func) if (pthread_atfork_func)
(*pthread_atfork_func)(NULL, NULL, set_skip_write); (*pthread_atfork_func)(NULL, NULL, set_skip_write);
__sync_lock_test_and_set(&s_worker_status->m_state, __atomic_store_n(&s_worker_status->m_state,
LSAPI_STATE_CONNECTED); LSAPI_STATE_CONNECTED, __ATOMIC_SEQ_CST);
if (s_busy_workers) if (s_busy_workers)
__sync_add_and_fetch(s_busy_workers, 1); __atomic_add_fetch(s_busy_workers, 1, __ATOMIC_SEQ_CST);
lsapi_set_nblock( pReq->m_fd, 0 ); lsapi_set_nblock( pReq->m_fd, 0 );
//keep it open if busy_count is used. //keep it open if busy_count is used.
if (!s_keep_listener && s_busy_workers if (!s_keep_listener && s_busy_workers
@ -3522,7 +3529,7 @@ int LSAPI_Accept_Before_Fork(LSAPI_Request * pReq)
{ {
int accepting = 0; int accepting = 0;
if (s_accepting_workers) if (s_accepting_workers)
accepting = __sync_add_and_fetch(s_accepting_workers, 0); accepting = __atomic_load_n(s_accepting_workers, __ATOMIC_SEQ_CST);
if (pServer->m_iCurChildren > 0 if (pServer->m_iCurChildren > 0
&& accepting > 0) && accepting > 0)
@ -3607,7 +3614,7 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
} }
else if (s_req_processed > 0 && s_max_busy_workers > 0 && s_busy_workers) else if (s_req_processed > 0 && s_max_busy_workers > 0 && s_busy_workers)
{ {
ret = __sync_fetch_and_add(s_busy_workers, 0); ret = __atomic_load_n(s_busy_workers, __ATOMIC_SEQ_CST);
if (ret >= s_max_busy_workers) if (ret >= s_max_busy_workers)
{ {
send_conn_close_notification(pReq->m_fd); send_conn_close_notification(pReq->m_fd);
@ -3651,19 +3658,19 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
if (fd == pReq->m_fdListen) if (fd == pReq->m_fdListen)
{ {
if (s_worker_status) if (s_worker_status)
__sync_lock_test_and_set(&s_worker_status->m_state, __atomic_store_n(&s_worker_status->m_state,
LSAPI_STATE_ACCEPTING); LSAPI_STATE_ACCEPTING, __ATOMIC_SEQ_CST);
if (s_accepting_workers) if (s_accepting_workers)
__sync_fetch_and_add(s_accepting_workers, 1); __atomic_fetch_add(s_accepting_workers, 1, __ATOMIC_SEQ_CST);
} }
ret = (*g_fnSelect)(fd+1, &readfds, NULL, NULL, &timeout); ret = (*g_fnSelect)(fd+1, &readfds, NULL, NULL, &timeout);
if (fd == pReq->m_fdListen) if (fd == pReq->m_fdListen)
{ {
if (s_accepting_workers) if (s_accepting_workers)
__sync_fetch_and_sub(s_accepting_workers, 1); __atomic_fetch_sub(s_accepting_workers, 1, __ATOMIC_SEQ_CST);
if (s_worker_status) if (s_worker_status)
__sync_lock_test_and_set(&s_worker_status->m_state, __atomic_store_n(&s_worker_status->m_state,
LSAPI_STATE_IDLE); LSAPI_STATE_IDLE, __ATOMIC_SEQ_CST);
} }
if ( ret == 0 ) if ( ret == 0 )
@ -3711,10 +3718,11 @@ int LSAPI_Prefork_Accept_r( LSAPI_Request * pReq )
if ( pReq->m_fd != -1 ) if ( pReq->m_fd != -1 )
{ {
if (s_worker_status) if (s_worker_status)
__sync_lock_test_and_set(&s_worker_status->m_state, __atomic_store_n(&s_worker_status->m_state,
LSAPI_STATE_CONNECTED); LSAPI_STATE_CONNECTED,
__ATOMIC_SEQ_CST);
if (s_busy_workers) if (s_busy_workers)
__sync_fetch_and_add(s_busy_workers, 1); __atomic_fetch_add(s_busy_workers, 1, __ATOMIC_SEQ_CST);
fd = pReq->m_fd; fd = pReq->m_fd;
@ -4385,5 +4393,5 @@ int LSAPI_Set_Restored_Parent_Pid(int pid)
int LSAPI_Inc_Req_Processed(int cnt) int LSAPI_Inc_Req_Processed(int cnt)
{ {
return __sync_add_and_fetch(s_global_counter, cnt); return __atomic_add_fetch(s_global_counter, cnt, __ATOMIC_SEQ_CST);
} }