commit 8a731a26ae3c5ed5387b933f039569a6f4a8e3e4
parent 669ddcc0a2bb288f800bc27313dc568d369c3b2d
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date: Sun, 20 Sep 2020 15:33:26 +0300
daemon.c: optimisation for MHD_YES/MHD_NO comparison
Diffstat:
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
@@ -462,7 +462,7 @@ MHD_ip_limit_add (struct MHD_Daemon *daemon,
/* Test if there is room for another connection; if so,
* increment count */
result = (key->count < daemon->per_ip_connection_limit) ? MHD_YES : MHD_NO;
- if (MHD_YES == result)
+ if (MHD_NO != result)
++key->count;
MHD_ip_count_unlock (daemon);
@@ -3716,7 +3716,7 @@ MHD_select (struct MHD_Daemon *daemon,
maxsock = MHD_INVALID_SOCKET;
err_state = MHD_NO;
if ( (0 != (daemon->options & MHD_TEST_ALLOW_SUSPEND_RESUME)) &&
- (MHD_YES == resume_suspended_connections (daemon)) &&
+ (MHD_NO != resume_suspended_connections (daemon)) &&
(0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) )
may_block = MHD_NO;
@@ -3804,7 +3804,7 @@ MHD_select (struct MHD_Daemon *daemon,
&rs);
}
tv = NULL;
- if (MHD_YES == err_state)
+ if (MHD_NO != err_state)
may_block = MHD_NO;
if (MHD_NO == may_block)
{
@@ -3813,7 +3813,7 @@ MHD_select (struct MHD_Daemon *daemon,
tv = &timeout;
}
else if ( (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
- (MHD_YES == MHD_get_timeout (daemon, <imeout)) )
+ (MHD_NO != MHD_get_timeout (daemon, <imeout)) )
{
/* ltimeout is in ms */
timeout.tv_usec = (ltimeout % 1000) * 1000;
@@ -3842,7 +3842,7 @@ MHD_select (struct MHD_Daemon *daemon,
#endif
return MHD_NO;
}
- if (MHD_YES == internal_run_from_select (daemon,
+ if (MHD_NO != internal_run_from_select (daemon,
&rs,
&ws,
&es))
@@ -3873,7 +3873,7 @@ MHD_poll_all (struct MHD_Daemon *daemon,
#endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
if ( (0 != (daemon->options & MHD_TEST_ALLOW_SUSPEND_RESUME)) &&
- (MHD_YES == resume_suspended_connections (daemon)) )
+ (MHD_NO != resume_suspended_connections (daemon)) )
may_block = MHD_NO;
/* count number of connections and thus determine poll set size */
@@ -3931,7 +3931,7 @@ MHD_poll_all (struct MHD_Daemon *daemon,
if (may_block == MHD_NO)
timeout = 0;
else if ( (0 != (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) ||
- (MHD_YES != MHD_get_timeout (daemon,
+ (MHD_NO == MHD_get_timeout (daemon,
<imeout)) )
timeout = -1;
else
@@ -4453,12 +4453,12 @@ MHD_epoll (struct MHD_Daemon *daemon,
}
if ( (0 != (daemon->options & MHD_TEST_ALLOW_SUSPEND_RESUME)) &&
- (MHD_YES == resume_suspended_connections (daemon)) )
+ (MHD_NO != resume_suspended_connections (daemon)) )
may_block = MHD_NO;
- if (MHD_YES == may_block)
+ if (MHD_NO != may_block)
{
- if (MHD_YES == MHD_get_timeout (daemon,
+ if (MHD_NO != MHD_get_timeout (daemon,
&timeout_ll))
{
if (timeout_ll >= (MHD_UNSIGNED_LONG_LONG) INT_MAX)
@@ -4534,7 +4534,7 @@ MHD_epoll (struct MHD_Daemon *daemon,
* Do not accept more then 10 connections at once. The rest will
* be accepted on next turn (level trigger is used for listen
* socket). */
- while ( (MHD_YES == MHD_accept_connection (daemon)) &&
+ while ( (MHD_NO != MHD_accept_connection (daemon)) &&
(series_length < 10) &&
(daemon->connections < daemon->connection_limit) &&
(! daemon->at_limit) )
@@ -5417,7 +5417,7 @@ parse_options_va (struct MHD_Daemon *daemon,
case MHD_OPTION_CONNECTION_MEMORY_LIMIT:
case MHD_OPTION_CONNECTION_MEMORY_INCREMENT:
case MHD_OPTION_THREAD_STACK_SIZE:
- if (MHD_YES != parse_options (daemon,
+ if (MHD_NO == parse_options (daemon,
servaddr,
opt,
(size_t) oa[i].value,
@@ -5434,7 +5434,7 @@ parse_options_va (struct MHD_Daemon *daemon,
case MHD_OPTION_LISTENING_ADDRESS_REUSE:
case MHD_OPTION_LISTEN_BACKLOG_SIZE:
case MHD_OPTION_SERVER_INSANITY:
- if (MHD_YES != parse_options (daemon,
+ if (MHD_NO == parse_options (daemon,
servaddr,
opt,
(unsigned int) oa[i].value,
@@ -5444,7 +5444,7 @@ parse_options_va (struct MHD_Daemon *daemon,
/* all options taking 'enum' */
#ifdef HTTPS_SUPPORT
case MHD_OPTION_HTTPS_CRED_TYPE:
- if (MHD_YES != parse_options (daemon,
+ if (MHD_NO == parse_options (daemon,
servaddr,
opt,
(gnutls_credentials_type_t) oa[i].value,
@@ -5454,7 +5454,7 @@ parse_options_va (struct MHD_Daemon *daemon,
#endif /* HTTPS_SUPPORT */
/* all options taking 'MHD_socket' */
case MHD_OPTION_LISTEN_SOCKET:
- if (MHD_YES != parse_options (daemon,
+ if (MHD_NO == parse_options (daemon,
servaddr,
opt,
(MHD_socket) oa[i].value,
@@ -5463,7 +5463,7 @@ parse_options_va (struct MHD_Daemon *daemon,
break;
/* all options taking 'int' */
case MHD_OPTION_STRICT_FOR_CLIENT:
- if (MHD_YES != parse_options (daemon,
+ if (MHD_NO == parse_options (daemon,
servaddr,
opt,
(int) oa[i].value,
@@ -5481,7 +5481,7 @@ parse_options_va (struct MHD_Daemon *daemon,
case MHD_OPTION_ARRAY:
case MHD_OPTION_HTTPS_CERT_CALLBACK:
case MHD_OPTION_HTTPS_CERT_CALLBACK2:
- if (MHD_YES != parse_options (daemon,
+ if (MHD_NO == parse_options (daemon,
servaddr,
opt,
oa[i].ptr_value,
@@ -5495,7 +5495,7 @@ parse_options_va (struct MHD_Daemon *daemon,
case MHD_OPTION_EXTERNAL_LOGGER:
case MHD_OPTION_UNESCAPE_CALLBACK:
case MHD_OPTION_GNUTLS_PSK_CRED_HANDLER:
- if (MHD_YES != parse_options (daemon,
+ if (MHD_NO == parse_options (daemon,
servaddr,
opt,
(void *) oa[i].value,
@@ -5505,7 +5505,7 @@ parse_options_va (struct MHD_Daemon *daemon,
break;
/* options taking size_t-number followed by pointer */
case MHD_OPTION_DIGEST_AUTH_RANDOM:
- if (MHD_YES != parse_options (daemon,
+ if (MHD_NO == parse_options (daemon,
servaddr,
opt,
(size_t) oa[i].value,
@@ -5877,7 +5877,7 @@ MHD_start_daemon_va (unsigned int flags,
#endif /* HTTPS_SUPPORT */
- if (MHD_YES != parse_options_va (daemon,
+ if (MHD_NO == parse_options_va (daemon,
&servaddr,
ap))
{
@@ -6388,7 +6388,7 @@ MHD_start_daemon_va (unsigned int flags,
#endif
goto free_and_fail;
}
- if (MHD_YES != setup_epoll_to_listen (daemon))
+ if (MHD_NO == setup_epoll_to_listen (daemon))
goto free_and_fail;
}
#endif /* EPOLL_SUPPORT */
@@ -6531,7 +6531,7 @@ MHD_start_daemon_va (unsigned int flags,
++d->connection_limit;
#ifdef EPOLL_SUPPORT
if ( (0 != (*pflags & MHD_USE_EPOLL)) &&
- (MHD_YES != setup_epoll_to_listen (d)) )
+ (MHD_NO == setup_epoll_to_listen (d)) )
goto thread_failed;
#endif
/* Must init cleanup connection mutex for each worker */
