mirrors/libmicrohttpd
2
0
Fork 0
mirror of https://git.gnunet.org/libmicrohttpd.git synced 2026-09-27 04:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

internal_add_connection(): improved thread safety in epoll mode with 'external' add

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k)
2017-06-04 14:26:46 +03:00
parent 44a92f9f53
commit 5c28c2ffcb
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microhttpd/daemon.c
+13 -12
View File
@@ -2625,21 +2625,11 @@ internal_add_connection (struct MHD_Daemon *daemon,
goto cleanup;
}
}
else
if ( (external_add) &&
(MHD_ITC_IS_VALID_(daemon->itc)) &&
(! MHD_itc_activate_ (daemon->itc, "n")) )
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
_("Failed to signal new connection via inter-thread communication channel."));
#endif
}
#ifdef EPOLL_SUPPORT
if (0 != (daemon->options & MHD_USE_EPOLL))
{
if (0 == (daemon->options & MHD_USE_TURBO))
{
if ((0 == (daemon->options & MHD_USE_TURBO)) || (external_add))
{ /* Do not manipulate EReady DL-list in 'external_add' mode. */
struct epoll_event event;
event.events = EPOLLIN | EPOLLOUT | EPOLLPRI | EPOLLET;
@@ -2668,7 +2658,18 @@ internal_add_connection (struct MHD_Daemon *daemon,
connection);
}
}
else /* This 'else' is combined with next 'if'. */
#endif
if ( (0 == (daemon->options & MHD_USE_THREAD_PER_CONNECTION)) &&
(external_add) &&
(MHD_ITC_IS_VALID_(daemon->itc)) &&
(! MHD_itc_activate_ (daemon->itc, "n")) )
{
#ifdef HAVE_MESSAGES
MHD_DLOG (daemon,
_("Failed to signal new connection via inter-thread communication channel."));
#endif
}
daemon->connections++;
return MHD_YES;
cleanup: