commit 2475030dcbdb95f6843d251d6e4ee1b4be9f3f3b
parent a0de9d3310b337b7d2ac20e603fb4de9333ca46b
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date: Thu, 9 Nov 2023 16:53:28 +0300
Added use of the new internal macro MHD_D_IS_USING_THREAD_PER_CONN_
Diffstat:
4 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
@@ -1293,14 +1293,14 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
#ifdef MHD_USE_THREADS
mhd_assert ( (! MHD_D_IS_USING_THREADS_ (daemon)) || \
- (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || \
+ MHD_D_IS_USING_THREAD_PER_CONN_ (daemon) || \
MHD_thread_handle_ID_is_current_thread_ (daemon->tid) );
#endif /* MHD_USE_THREADS */
if (0 == (daemon->options & MHD_USE_TLS))
return; /* Nothing to do with non-TLS connection. */
- if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
DLL_remove (daemon->urh_head,
daemon->urh_tail,
urh);
@@ -6351,7 +6351,7 @@ MHD_update_last_activity_ (struct MHD_Connection *connection)
return; /* no activity on suspended connections */
connection->last_activity = MHD_monotonic_msec_counter ();
- if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
return; /* each connection has personal timeout */
if (connection->connection_timeout_ms != daemon->connection_timeout_ms)
@@ -6973,7 +6973,7 @@ cleanup_connection (struct MHD_Connection *connection)
}
else
{
- if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
if (connection->connection_timeout_ms == daemon->connection_timeout_ms)
XDLL_remove (daemon->normal_timeout_head,
@@ -6996,7 +6996,7 @@ cleanup_connection (struct MHD_Connection *connection)
#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
#endif
- if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
/* if we were at the connection limit before and are in
thread-per-connection mode, signal the main thread
@@ -7738,7 +7738,7 @@ MHD_set_connection_option (struct MHD_Connection *connection,
ui_val = UINT64_MAX / 4000 - 1;
}
#endif /* (SIZEOF_UINT64_T - 2) <= SIZEOF_UNSIGNED_INT */
- if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
#if defined(MHD_USE_THREADS)
MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -1333,7 +1333,7 @@ call_handlers (struct MHD_Connection *con,
* TLS read-ready connection in 'read info' state as connection
* without space in read buffer will be marked as 'info block'. */
if ( (! con->daemon->data_already_pending) &&
- (0 == (con->daemon->options & MHD_USE_THREAD_PER_CONNECTION)) )
+ (! MHD_D_IS_USING_THREAD_PER_CONN_ (con->daemon)) )
{
if (0 != (MHD_EVENT_LOOP_INFO_PROCESS & con->event_loop_info))
con->daemon->data_already_pending = true;
@@ -1708,7 +1708,7 @@ process_urh (struct MHD_UpgradeResponseHandle *urh)
* and incoming forward buffer have some space. */
if ( (connection->tls_read_ready) &&
(urh->in_buffer_used < urh->in_buffer_size) &&
- (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) )
+ (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon)) )
daemon->data_already_pending = true;
if ( (daemon->shutdown) &&
@@ -2875,7 +2875,7 @@ new_connection_process_ (struct MHD_Daemon *daemon,
DLL_insert (daemon->connections_head,
daemon->connections_tail,
connection);
- if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
XDLL_insert (daemon->normal_timeout_head,
daemon->normal_timeout_tail,
@@ -2891,7 +2891,7 @@ new_connection_process_ (struct MHD_Daemon *daemon,
&connection->socket_context,
MHD_CONNECTION_NOTIFY_STARTED);
#ifdef MHD_USE_THREADS
- if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
mhd_assert (! MHD_D_IS_USING_EPOLL_ (daemon));
if (! MHD_create_named_thread_ (&connection->tid,
@@ -2978,7 +2978,7 @@ new_connection_process_ (struct MHD_Daemon *daemon,
&connection->socket_context,
MHD_CONNECTION_NOTIFY_CLOSED);
MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
- if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
XDLL_remove (daemon->normal_timeout_head,
daemon->normal_timeout_tail,
@@ -3189,7 +3189,7 @@ internal_suspend_connection_ (struct MHD_Connection *connection)
#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
mhd_assert ( (! MHD_D_IS_USING_THREADS_ (daemon)) || \
- (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || \
+ MHD_D_IS_USING_THREAD_PER_CONN_ (daemon) || \
MHD_thread_handle_ID_is_current_thread_ (daemon->tid) );
MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
#endif
@@ -3202,7 +3202,7 @@ internal_suspend_connection_ (struct MHD_Connection *connection)
#endif
return;
}
- if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
if (connection->connection_timeout_ms == daemon->connection_timeout_ms)
XDLL_remove (daemon->normal_timeout_head,
@@ -3286,7 +3286,7 @@ MHD_suspend_connection (struct MHD_Connection *connection)
#ifdef MHD_USE_THREADS
mhd_assert ( (! MHD_D_IS_USING_THREADS_ (daemon)) || \
- (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || \
+ MHD_D_IS_USING_THREAD_PER_CONN_ (daemon) || \
MHD_thread_handle_ID_is_current_thread_ (daemon->tid) );
#endif /* MHD_USE_THREADS */
@@ -3496,7 +3496,7 @@ resume_suspended_connections (struct MHD_Daemon *daemon)
* Insert connection into cleanup list. */
if ( (NULL != daemon->notify_completed) &&
- (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
+ (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon)) &&
(pos->rq.client_aware) )
{
daemon->notify_completed (daemon->notify_completed_cls,
@@ -3988,9 +3988,9 @@ MHD_cleanup_connections (struct MHD_Daemon *daemon)
pos);
#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
- if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
- (! pos->thread_joined) &&
- (! MHD_thread_handle_ID_join_thread_ (pos->tid)) )
+ if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon) &&
+ (! pos->thread_joined) &&
+ (! MHD_thread_handle_ID_join_thread_ (pos->tid)) )
MHD_PANIC (_ ("Failed to join a thread.\n"));
#endif
#ifdef UPGRADE_SUPPORT
@@ -4166,7 +4166,7 @@ MHD_get_timeout64 (struct MHD_Daemon *daemon,
MHD_thread_handle_ID_is_current_thread_ (daemon->tid) );
#endif /* MHD_USE_THREADS */
- if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
@@ -4741,10 +4741,10 @@ MHD_select (struct MHD_Daemon *daemon,
err_state = MHD_NO;
if ( (0 != (daemon->options & MHD_TEST_ALLOW_SUSPEND_RESUME)) &&
(MHD_NO != resume_suspended_connections (daemon)) &&
- (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) )
+ (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon)) )
millisec = 0;
- if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
/* single-threaded, go over everything */
if (MHD_NO ==
@@ -4842,7 +4842,7 @@ MHD_select (struct MHD_Daemon *daemon,
uint64_t mhd_tmo;
uint64_t select_tmo;
- if ( (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
+ if ( (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon)) &&
(MHD_NO != MHD_get_timeout64 (daemon, &mhd_tmo)) )
{
if ( (0 < millisec) &&
@@ -5234,7 +5234,7 @@ static enum MHD_Result
MHD_poll (struct MHD_Daemon *daemon,
int may_block)
{
- if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
return MHD_poll_all (daemon,
may_block ? -1 : 0);
return MHD_poll_listen_socket (daemon,
@@ -5886,7 +5886,7 @@ close_connection (struct MHD_Connection *pos)
mhd_assert (NULL == daemon->worker_pool);
#endif /* MHD_USE_THREADS */
- if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
MHD_connection_mark_closed_ (pos);
return; /* must let thread to do the rest */
@@ -6671,7 +6671,7 @@ parse_options_va (struct MHD_Daemon *daemon,
#endif
return MHD_NO;
}
- if (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
+ if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
@@ -7665,9 +7665,9 @@ MHD_start_daemon_va (unsigned int flags,
}
#endif
- if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION))
- && ((NULL != daemon->notify_completed)
- || (NULL != daemon->notify_connection)) )
+ if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon)
+ && ((NULL != daemon->notify_completed)
+ || (NULL != daemon->notify_connection)) )
*pflags |= MHD_USE_ITC; /* requires ITC */
#ifdef _DEBUG
@@ -8185,7 +8185,7 @@ MHD_start_daemon_va (unsigned int flags,
#endif
)
{
- if (0 != (*pflags & MHD_USE_THREAD_PER_CONNECTION))
+ if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
@@ -8271,8 +8271,7 @@ MHD_start_daemon_va (unsigned int flags,
goto free_and_fail;
}
if (! MHD_create_named_thread_ (&daemon->tid,
- (*pflags
- & MHD_USE_THREAD_PER_CONNECTION) ?
+ MHD_D_IS_USING_THREAD_PER_CONN_ (daemon) ?
"MHD-listen" : "MHD-single",
daemon->thread_stack_size,
&MHD_polling_thread,
@@ -8569,8 +8568,7 @@ static void
close_all_connections (struct MHD_Daemon *daemon)
{
struct MHD_Connection *pos;
- const bool used_thr_p_c = (0 != (daemon->options
- & MHD_USE_THREAD_PER_CONNECTION));
+ const bool used_thr_p_c = MHD_D_IS_USING_THREAD_PER_CONN_ (daemon);
#ifdef UPGRADE_SUPPORT
const bool upg_allowed = (0 != (daemon->options & MHD_ALLOW_UPGRADE));
#endif /* UPGRADE_SUPPORT */
@@ -8582,7 +8580,7 @@ close_all_connections (struct MHD_Daemon *daemon)
#ifdef MHD_USE_THREADS
mhd_assert ( (! MHD_D_IS_USING_THREADS_ (daemon)) || \
- (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) || \
+ MHD_D_IS_USING_THREAD_PER_CONN_ (daemon) || \
MHD_thread_handle_ID_is_current_thread_ (daemon->tid) );
mhd_assert (NULL == daemon->worker_pool);
#endif /* MHD_USE_THREADS */
@@ -8710,9 +8708,9 @@ close_all_connections (struct MHD_Daemon *daemon)
shutdown (pos->socket_fd,
SHUT_RDWR);
#ifdef MHD_WINSOCK_SOCKETS
- if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
- (MHD_ITC_IS_VALID_ (daemon->itc)) &&
- (! MHD_itc_activate_ (daemon->itc, "e")) )
+ if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon) &&
+ (MHD_ITC_IS_VALID_ (daemon->itc)) &&
+ (! MHD_itc_activate_ (daemon->itc, "e")) )
MHD_PANIC (_ ("Failed to signal shutdown via inter-thread " \
"communication channel.\n"));
#endif
@@ -8760,8 +8758,8 @@ close_all_connections (struct MHD_Daemon *daemon)
while (NULL != (pos = daemon->connections_tail))
{
#if defined(MHD_USE_POSIX_THREADS) || defined(MHD_USE_W32_THREADS)
- if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
- (! pos->thread_joined) )
+ if (MHD_D_IS_USING_THREAD_PER_CONN_ (daemon) &&
+ (! pos->thread_joined) )
MHD_PANIC (_ ("Failed to join a thread.\n"));
#endif
close_connection (pos);
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
@@ -1201,8 +1201,7 @@ MHD_send_sendfile_ (struct MHD_Connection *connection)
#ifdef HAVE_DARWIN_SENDFILE
off_t len;
#endif /* HAVE_DARWIN_SENDFILE */
- const bool used_thr_p_c = (0 != (connection->daemon->options
- & MHD_USE_THREAD_PER_CONNECTION));
+ const bool used_thr_p_c = MHD_D_IS_USING_THREAD_PER_CONN_ (daemon);
const size_t chunk_size = used_thr_p_c ? MHD_SENFILE_CHUNK_THR_P_C_ :
MHD_SENFILE_CHUNK_;
size_t send_size = 0;
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c
@@ -2112,7 +2112,7 @@ MHD_response_execute_upgrade_ (struct MHD_Response *response,
urh->in_eready_list = true;
}
#endif /* EPOLL_SUPPORT */
- if (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION) )
+ if (! MHD_D_IS_USING_THREAD_PER_CONN_ (daemon))
{
/* This takes care of further processing for most event loops:
simply add to DLL for bi-direcitonal processing */
