commit 22c08b5fd71091e84247f43bd36ce08184736f17
parent b220303691d627ca3cfe0d949c6aa2257b722c60
Author: silvioprog <silvioprog@gmail.com>
Date: Thu, 6 Dec 2018 13:26:39 -0300
Renamed all occurrences from _model(s)_ to _mode(s)_.
Diffstat:
25 files changed, 73 insertions(+), 70 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Thu Dec 6 13:25:08 BRT 2018
+ Renamed all occurrences from _model(s)_ to _mode(s)_. -SC
+
Thu Dec 6 12:50:11 BRT 2018
Optimized the function MHD_create_response_from_callback() for
Windows by increasing its internal buffer size and allowed to customize
@@ -1762,7 +1765,7 @@ Tue May 29 13:55:03 CEST 2012
Tue May 29 13:45:15 CEST 2012
Fixing bug where MHD failed to call connection termination callback
if a connection either was closed due to read errors or if MHD
- was terminated with certain threading models. Added new
+ was terminated with certain threading modes. Added new
termination code MHD_REQUEST_TERMINATED_READ_ERROR for the
read-termination cause. -CG
diff --git a/doc/libmicrohttpd.texi b/doc/libmicrohttpd.texi
@@ -938,10 +938,10 @@ with the "--disable-messages" flag.
@cindex performance
Number (unsigned int) of threads in thread pool. Enable
thread pooling by setting this value to to something
-greater than 1. Currently, thread model must be
+greater than 1. Currently, thread mode must be
MHD_USE_INTERNAL_POLLING_THREAD if thread pooling is enabled
(@code{MHD_start_daemon} returns @code{NULL} for an unsupported thread
-model).
+mode).
@item MHD_OPTION_ARRAY
@cindex options
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
@@ -1340,10 +1340,10 @@ enum MHD_OPTION
/**
* Number (`unsigned int`) of threads in thread pool. Enable
* thread pooling by setting this value to to something
- * greater than 1. Currently, thread model must be
+ * greater than 1. Currently, thread mode must be
* #MHD_USE_INTERNAL_POLLING_THREAD if thread pooling is enabled
* (#MHD_start_daemon returns NULL for an unsupported thread
- * model).
+ * mode).
*/
MHD_OPTION_THREAD_POOL_SIZE = 14,
diff --git a/src/include/microhttpd2.h b/src/include/microhttpd2.h
@@ -2266,9 +2266,9 @@ MHD_daemon_gnutls_key_and_cert_from_callback (struct MHD_Daemon *daemon,
/**
- * Which threading model should be used by MHD?
+ * Which threading mode should be used by MHD?
*/
-enum MHD_ThreadingModel
+enum MHD_ThreadingMode
{
/**
@@ -2306,21 +2306,21 @@ enum MHD_ThreadingModel
/**
* Use a thread pool of size @a n.
*
- * @return an `enum MHD_ThreadingModel` for a thread pool of size @a n
+ * @return an `enum MHD_ThreadingMode` for a thread pool of size @a n
*/
-#define MHD_TM_THREAD_POOL(n) ((enum MHD_ThreadingModel)(n))
+#define MHD_TM_THREAD_POOL(n) ((enum MHD_ThreadingMode)(n))
/**
- * Specify threading model to use.
+ * Specify threading mode to use.
*
* @param daemon daemon to configure
- * @param tm model to use (positive values indicate the
+ * @param tm mode to use (positive values indicate the
* number of worker threads to be used)
*/
_MHD_EXTERN void
-MHD_daemon_threading_model (struct MHD_Daemon *daemon,
- enum MHD_ThreadingModel tm)
+MHD_daemon_threading_mode (struct MHD_Daemon *daemon,
+ enum MHD_ThreadingMode tm)
MHD_NONNULL(1);
@@ -2470,7 +2470,7 @@ MHD_daemon_connection_memory_limit (struct MHD_Daemon *daemon,
/**
* Desired size of the stack for threads created by MHD. Use 0 for
- * system default. Only useful if the selected threading model
+ * system default. Only useful if the selected threading mode
* is not #MHD_TM_EXTERNAL_EVENT_LOOP.
*
* @param daemon daemon to configure
diff --git a/src/lib/action_suspend.c b/src/lib/action_suspend.c
@@ -49,7 +49,7 @@ suspend_action (void *cls,
MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
return MHD_SC_OK;
}
- if (daemon->threading_model != MHD_TM_THREAD_PER_CONNECTION)
+ if (daemon->threading_mode != MHD_TM_THREAD_PER_CONNECTION)
{
if (connection->connection_timeout ==
daemon->connection_default_timeout)
diff --git a/src/lib/connection_add.c b/src/lib/connection_add.c
@@ -798,7 +798,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
goto cleanup;
}
daemon->connections++;
- if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode)
{
XDLL_insert (daemon->normal_timeout_head,
daemon->normal_timeout_tail,
@@ -815,7 +815,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
MHD_CONNECTION_NOTIFY_STARTED);
/* attempt to create handler thread */
- if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode)
{
if (! MHD_create_named_thread_ (&connection->pid,
"MHD-connection",
@@ -876,7 +876,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
}
else /* This 'else' is combined with next 'if'. */
#endif
- if ( (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) &&
+ if ( (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) &&
(external_add) &&
(MHD_ITC_IS_VALID_(daemon->itc)) &&
(! MHD_itc_activate_ (daemon->itc,
@@ -906,7 +906,7 @@ internal_add_connection (struct MHD_Daemon *daemon,
addr,
addrlen);
MHD_mutex_lock_chk_ (&daemon->cleanup_connection_mutex);
- if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode)
{
XDLL_remove (daemon->normal_timeout_head,
daemon->normal_timeout_tail,
diff --git a/src/lib/connection_call_handlers.c b/src/lib/connection_call_handlers.c
@@ -379,7 +379,7 @@ sendfile_adapter (struct MHD_Connection *connection)
#ifdef HAVE_DARWIN_SENDFILE
off_t len;
#endif /* HAVE_DARWIN_SENDFILE */
- const bool used_thr_p_c = (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model);
+ const bool used_thr_p_c = (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode);
const size_t chunk_size = used_thr_p_c ? MHD_SENFILE_CHUNK_THR_P_C_ : MHD_SENFILE_CHUNK_;
size_t send_size = 0;
@@ -2754,7 +2754,7 @@ process_request_body (struct MHD_Request *request)
/* client did not process all upload data, complain if
the setup was incorrect, which may prevent us from
handling the rest of the request */
- if ( (MHD_TM_EXTERNAL_EVENT_LOOP == daemon->threading_model) &&
+ if ( (MHD_TM_EXTERNAL_EVENT_LOOP == daemon->threading_mode) &&
(! connection->suspended) )
MHD_DLOG (daemon,
MHD_SC_APPLICATION_HUNG_CONNECTION,
@@ -2810,7 +2810,7 @@ cleanup_connection (struct MHD_Connection *connection)
}
else
{
- if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode)
{
if (connection->connection_timeout ==
daemon->connection_default_timeout)
@@ -2832,7 +2832,7 @@ cleanup_connection (struct MHD_Connection *connection)
connection->resuming = false;
connection->request.in_idle = false;
MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
- if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode)
{
/* if we were at the connection limit before and are in
thread-per-connection mode, signal the main thread
@@ -2973,7 +2973,7 @@ connection_update_event_loop_info (struct MHD_Connection *connection)
if (request->read_buffer_offset == request->read_buffer_size)
{
if ( (! try_grow_read_buffer (request)) &&
- (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_model) )
+ (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode) )
{
/* failed to grow the read buffer, and the client
which is supposed to handle the received data in
@@ -3675,7 +3675,7 @@ MHD_connection_call_handlers_ (struct MHD_Connection *con,
* TLS read-ready connection in 'read info' state as connection
* without space in read buffer will be market as 'info block'. */
if ( (! daemon->data_already_pending) &&
- (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) )
+ (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) )
{
if (MHD_EVENT_LOOP_INFO_BLOCK ==
con->request.event_loop_info)
diff --git a/src/lib/connection_cleanup.c b/src/lib/connection_cleanup.c
@@ -85,7 +85,7 @@ MHD_connection_cleanup_ (struct MHD_Daemon *daemon)
pos);
MHD_mutex_unlock_chk_ (&daemon->cleanup_connection_mutex);
- if ( (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model) &&
+ if ( (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode) &&
(! pos->thread_joined) &&
(! MHD_join_thread_ (pos->pid.handle)) )
MHD_PANIC (_("Failed to join a thread\n"));
diff --git a/src/lib/connection_finish_forward.c b/src/lib/connection_finish_forward.c
@@ -45,7 +45,7 @@ MHD_connection_finish_forward_ (struct MHD_Connection *connection)
if (NULL == daemon->tls_api)
return; /* Nothing to do with non-TLS connection. */
- if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode)
DLL_remove (daemon->urh_head,
daemon->urh_tail,
urh);
diff --git a/src/lib/connection_options.c b/src/lib/connection_options.c
@@ -40,7 +40,7 @@ MHD_connection_set_timeout (struct MHD_Connection *connection,
struct MHD_Daemon *daemon = connection->daemon;
connection->last_activity = MHD_monotonic_sec_counter();
- if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode)
{
/* Simple case, no need to lock to update DLLs */
connection->connection_timeout = (time_t) timeout_s;
@@ -96,7 +96,7 @@ MHD_update_last_activity_ (struct MHD_Connection *connection)
return; /* no activity on suspended connections */
connection->last_activity = MHD_monotonic_sec_counter();
- if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode)
return; /* each connection has personal timeout */
if (connection->connection_timeout !=
diff --git a/src/lib/connection_update_last_activity.c b/src/lib/connection_update_last_activity.c
@@ -44,7 +44,7 @@ MHD_connection_update_last_activity_ (struct MHD_Connection *connection)
return; /* no activity on suspended connections */
connection->last_activity = MHD_monotonic_sec_counter();
- if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode)
return; /* each connection has personal timeout */
if (connection->connection_timeout != daemon->connection_default_timeout)
diff --git a/src/lib/daemon_close_all_connections.c b/src/lib/daemon_close_all_connections.c
@@ -44,7 +44,7 @@ close_connection (struct MHD_Connection *pos)
{
struct MHD_Daemon *daemon = pos->daemon;
- if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode)
{
MHD_connection_mark_closed_ (pos);
return; /* must let thread to do the rest */
@@ -89,7 +89,7 @@ void
MHD_daemon_close_all_connections_ (struct MHD_Daemon *daemon)
{
struct MHD_Connection *pos;
- const bool used_thr_p_c = (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model);
+ const bool used_thr_p_c = (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode);
#ifdef UPGRADE_SUPPORT
const bool upg_allowed = (! daemon->disallow_upgrade);
#endif /* UPGRADE_SUPPORT */
diff --git a/src/lib/daemon_destroy.c b/src/lib/daemon_destroy.c
@@ -39,7 +39,7 @@ stop_workers (struct MHD_Daemon *daemon)
unsigned int i;
mhd_assert (1 < daemon->worker_pool_size);
- mhd_assert (1 < daemon->threading_model);
+ mhd_assert (1 < daemon->threading_mode);
if (daemon->was_quiesced)
fd = MHD_INVALID_SOCKET; /* Do not use FD if daemon was quiesced */
else
@@ -111,7 +111,7 @@ MHD_daemon_destroy (struct MHD_Daemon *daemon)
{
mhd_assert (0 == daemon->worker_pool_size);
/* Worker daemon or single-thread daemon. */
- if (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_model)
+ if (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode)
{
/* Worker daemon or single daemon with internal thread(s). */
/* Separate thread(s) is used for polling sockets. */
diff --git a/src/lib/daemon_get_timeout.c b/src/lib/daemon_get_timeout.c
@@ -53,7 +53,7 @@ MHD_daemon_get_timeout (struct MHD_Daemon *daemon,
struct MHD_Connection *pos;
bool have_timeout;
- if (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_model)
+ if (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode)
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
diff --git a/src/lib/daemon_info.c b/src/lib/daemon_info.c
@@ -66,7 +66,7 @@ MHD_daemon_get_information_sz (struct MHD_Daemon *daemon,
#endif
case MHD_DAEMON_INFORMATION_CURRENT_CONNECTIONS:
CHECK_SIZE (unsigned int);
- if (MHD_TM_EXTERNAL_EVENT_LOOP == daemon->threading_model)
+ if (MHD_TM_EXTERNAL_EVENT_LOOP == daemon->threading_mode)
{
/* Assumes that MHD_run() in not called in other thread
(of the application) at the same time. */
diff --git a/src/lib/daemon_options.c b/src/lib/daemon_options.c
@@ -533,17 +533,17 @@ MHD_daemon_gnutls_key_and_cert_from_callback (struct MHD_Daemon *daemon,
/**
- * Specify threading model to use.
+ * Specify threading mode to use.
*
* @param daemon daemon to configure
- * @param tm model to use (positive values indicate the
+ * @param tm mode to use (positive values indicate the
* number of worker threads to be used)
*/
void
-MHD_daemon_threading_model (struct MHD_Daemon *daemon,
- enum MHD_ThreadingModel tm)
+MHD_daemon_threading_mode (struct MHD_Daemon *daemon,
+ enum MHD_ThreadingMode tm)
{
- daemon->threading_model = tm;
+ daemon->threading_mode = tm;
}
@@ -628,7 +628,7 @@ MHD_daemon_connection_memory_limit (struct MHD_Daemon *daemon,
/**
* Desired size of the stack for threads created by MHD. Use 0 for
- * system default. Only useful if the selected threading model
+ * system default. Only useful if the selected threading mode
* is not #MHD_TM_EXTERNAL_EVENT_LOOP.
*
* @param daemon daemon to configure
diff --git a/src/lib/daemon_poll.c b/src/lib/daemon_poll.c
@@ -207,7 +207,7 @@ MHD_daemon_poll_all_ (struct MHD_Daemon *daemon,
}
if (! may_block)
timeout = 0;
- else if ( (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model) ||
+ else if ( (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode) ||
(MHD_SC_OK != /* FIXME: distinguish between NO_TIMEOUT and errors! */
MHD_daemon_get_timeout (daemon,
<imeout)) )
@@ -444,7 +444,7 @@ MHD_daemon_poll_ (struct MHD_Daemon *daemon,
#ifdef HAVE_POLL
if (daemon->shutdown)
return MHD_SC_DAEMON_ALREADY_SHUTDOWN;
- if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode)
return MHD_daemon_poll_all_ (daemon,
may_block);
return MHD_daemon_poll_listen_socket_ (daemon,
diff --git a/src/lib/daemon_quiesce.c b/src/lib/daemon_quiesce.c
@@ -53,7 +53,7 @@ MHD_daemon_quiesce (struct MHD_Daemon *daemon)
if (MHD_INVALID_SOCKET == (listen_socket = daemon->listen_socket))
return MHD_INVALID_SOCKET;
if ( (daemon->disable_itc) &&
- (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_model) )
+ (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode) )
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
diff --git a/src/lib/daemon_run.c b/src/lib/daemon_run.c
@@ -54,7 +54,7 @@ MHD_daemon_run (struct MHD_Daemon *daemon)
if (daemon->shutdown)
return MHD_SC_DAEMON_ALREADY_SHUTDOWN;
- if (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_model)
+ if (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode)
return MHD_SC_CONFIGURATION_MISSMATCH_FOR_RUN_EXTERNAL;
switch (daemon->event_loop_syscall)
{
diff --git a/src/lib/daemon_select.c b/src/lib/daemon_select.c
@@ -319,7 +319,7 @@ MHD_daemon_get_fdset2 (struct MHD_Daemon *daemon,
MHD_socket *max_fd,
unsigned int fd_setsize)
{
- if ( (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_model) ||
+ if ( (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode) ||
(MHD_ELS_POLL == daemon->event_loop_syscall) )
return MHD_SC_CONFIGURATION_MISSMATCH_FOR_GET_FDSET;
@@ -437,7 +437,7 @@ internal_run_from_select (struct MHD_Daemon *daemon,
read_fd_set)) )
(void) MHD_accept_connection_ (daemon);
- if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode)
{
/* do not have a thread per connection, process all connections now */
prev = daemon->connections_tail;
@@ -608,7 +608,7 @@ MHD_daemon_run_from_select (struct MHD_Daemon *daemon,
const fd_set *write_fd_set,
const fd_set *except_fd_set)
{
- if ( (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_model) ||
+ if ( (MHD_TM_EXTERNAL_EVENT_LOOP != daemon->threading_mode) ||
(MHD_ELS_POLL == daemon->event_loop_syscall) )
return MHD_SC_CONFIGURATION_MISSMATCH_FOR_RUN_SELECT;
if (MHD_ELS_EPOLL == daemon->event_loop_syscall)
@@ -671,10 +671,10 @@ MHD_daemon_select_ (struct MHD_Daemon *daemon,
sc = MHD_SC_OK;
if ( (! daemon->disallow_suspend_resume) &&
(MHD_resume_suspended_connections_ (daemon)) &&
- (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) )
+ (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) )
may_block = MHD_NO;
- if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode)
{
/* single-threaded, go over everything */
@@ -766,7 +766,7 @@ MHD_daemon_select_ (struct MHD_Daemon *daemon,
timeout.tv_sec = 0;
tv = &timeout;
}
- else if ( (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) &&
+ else if ( (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) &&
(MHD_SC_OK ==
MHD_daemon_get_timeout (daemon,
<imeout)) )
diff --git a/src/lib/daemon_start.c b/src/lib/daemon_start.c
@@ -669,20 +669,20 @@ setup_thread_pool (struct MHD_Daemon *daemon)
* due to integer division). Also keep track of how many
* connections are leftover after an equal split. */
unsigned int conns_per_thread = daemon->global_connection_limit
- / daemon->threading_model;
+ / daemon->threading_mode;
unsigned int leftover_conns = daemon->global_connection_limit
- % daemon->threading_model;
+ % daemon->threading_mode;
int i;
enum MHD_StatusCode sc;
/* Allocate memory for pooled objects */
- daemon->worker_pool = MHD_calloc_ (daemon->threading_model,
+ daemon->worker_pool = MHD_calloc_ (daemon->threading_mode,
sizeof (struct MHD_Daemon));
if (NULL == daemon->worker_pool)
return MHD_SC_THREAD_POOL_MALLOC_FAILURE;
/* Start the workers in the pool */
- for (i = 0; i < daemon->threading_model; i++)
+ for (i = 0; i < daemon->threading_mode; i++)
{
/* Create copy of the Daemon object for each worker */
struct MHD_Daemon *d = &daemon->worker_pool[i];
@@ -691,7 +691,7 @@ setup_thread_pool (struct MHD_Daemon *daemon)
daemon,
sizeof (struct MHD_Daemon));
/* Adjust pooling params for worker daemons; note that memcpy()
- has already copied MHD_USE_INTERNAL_POLLING_THREAD thread model into
+ has already copied MHD_USE_INTERNAL_POLLING_THREAD thread mode into
the worker threads. */
d->master = daemon;
d->worker_pool_size = 0;
@@ -822,7 +822,7 @@ MHD_daemon_start (struct MHD_Daemon *daemon)
/* We do not support thread-per-connection in combination
with epoll, so use poll in this case, otherwise prefer
epoll. */
- if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model)
+ if (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode)
daemon->event_loop_syscall = MHD_ELS_POLL;
else
daemon->event_loop_syscall = MHD_ELS_EPOLL;
@@ -837,7 +837,7 @@ MHD_daemon_start (struct MHD_Daemon *daemon)
if ( (MHD_ELS_EPOLL == daemon->event_loop_syscall) &&
(0 == daemon->worker_pool_size) &&
(MHD_INVALID_SOCKET != daemon->listen_socket) &&
- (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model) )
+ (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode) )
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
@@ -927,11 +927,11 @@ MHD_daemon_start (struct MHD_Daemon *daemon)
/* Setup main listen thread (only if we have no thread pool or
external event loop and do have a listen socket) */
/* FIXME: why no worker thread if we have no listen socket? */
- if ( ( (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model) ||
- (1 == daemon->threading_model) ) &&
+ if ( ( (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode) ||
+ (1 == daemon->threading_mode) ) &&
(MHD_INVALID_SOCKET != daemon->listen_socket) &&
(! MHD_create_named_thread_ (&daemon->pid,
- (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model)
+ (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode)
? "MHD-listen"
: "MHD-single",
daemon->thread_stack_limit_b,
@@ -949,7 +949,7 @@ MHD_daemon_start (struct MHD_Daemon *daemon)
/* Setup worker threads */
/* FIXME: why no thread pool if we have no listen socket? */
- if ( (1 < daemon->threading_model) &&
+ if ( (1 < daemon->threading_mode) &&
(MHD_INVALID_SOCKET != daemon->listen_socket) &&
(MHD_SC_OK != (sc = setup_thread_pool (daemon))) )
return sc;
diff --git a/src/lib/internal.h b/src/lib/internal.h
@@ -1407,11 +1407,11 @@ struct MHD_Daemon
struct MHD_itc_ itc;
/**
- * Which threading model do we use? Postive
+ * Which threading mode do we use? Postive
* numbers indicate the number of worker threads to be used.
* Values larger than 1 imply a thread pool.
*/
- enum MHD_ThreadingModel threading_model;
+ enum MHD_ThreadingMode threading_mode;
/**
* When should we use TCP_FASTOPEN?
diff --git a/src/lib/request_resume.c b/src/lib/request_resume.c
@@ -80,7 +80,7 @@ MHD_resume_suspended_connections_ (struct MHD_Daemon *daemon)
struct MHD_Connection *pos;
struct MHD_Connection *prev = NULL;
bool ret;
- const bool used_thr_p_c = (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model);
+ const bool used_thr_p_c = (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_mode);
mhd_assert (NULL == daemon->worker_pool);
ret = false;
@@ -162,7 +162,7 @@ MHD_resume_suspended_connections_ (struct MHD_Daemon *daemon)
* application was closed upgraded connection.
* Insert connection into cleanup list. */
if ( (NULL != response) &&
- (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) &&
+ (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) &&
(NULL != response->termination_cb) )
response->termination_cb (response->termination_cb_cls,
MHD_REQUEST_TERMINATED_COMPLETED_OK,
diff --git a/src/lib/upgrade_process.c b/src/lib/upgrade_process.c
@@ -358,7 +358,7 @@ MHD_upgrade_response_handle_process_ (struct MHD_UpgradeResponseHandle *urh)
* and incoming forward buffer have some space. */
if ( (connection->tls_read_ready) &&
(urh->in_buffer_used < urh->in_buffer_size) &&
- (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_model) )
+ (MHD_TM_THREAD_PER_CONNECTION != daemon->threading_mode) )
daemon->data_already_pending = true;
if ( (daemon->shutdown) &&
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -5665,7 +5665,7 @@ MHD_start_daemon_va (unsigned int flags,
}
#endif
- /* Thread pooling currently works only with internal select thread model */
+ /* Thread pooling currently works only with internal select thread mode */
if ( (0 == (*pflags & MHD_USE_INTERNAL_POLLING_THREAD)) &&
(daemon->worker_pool_size > 0) )
{
@@ -6135,7 +6135,7 @@ MHD_start_daemon_va (unsigned int flags,
memcpy (d, daemon, sizeof (struct MHD_Daemon));
/* Adjust pooling params for worker daemons; note that memcpy()
- has already copied MHD_USE_INTERNAL_POLLING_THREAD thread model into
+ has already copied MHD_USE_INTERNAL_POLLING_THREAD thread mode into
the worker threads. */
d->master = daemon;
d->worker_pool_size = 0;
