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

test_upgrade_large: fixed data race

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k)
2021-04-14 19:44:40 +03:00
parent 9ce7aa953a
commit 726b9c4731
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microhttpd/test_upgrade_large.c
+11 -8
View File
@@ -1085,8 +1085,6 @@ run_mhd_select_loop (struct MHD_Daemon *daemon)
MHD_UNSIGNED_LONG_LONG to;
struct timeval tv;
if (! MHD_itc_init_ (kicker))
abort ();
while (! done)
{
FD_ZERO (&rs);
@@ -1122,8 +1120,6 @@ run_mhd_select_loop (struct MHD_Daemon *daemon)
&ws,
&es);
}
(void) MHD_itc_destroy_ (kicker);
MHD_itc_set_invalid_ (kicker);
}
@@ -1164,8 +1160,6 @@ run_mhd_epoll_loop (struct MHD_Daemon *daemon)
di = MHD_get_daemon_info (daemon,
MHD_DAEMON_INFO_EPOLL_FD);
ep = di->listen_fd;
if (! MHD_itc_init_ (kicker))
abort ();
while (! done)
{
FD_ZERO (&rs);
@@ -1191,8 +1185,6 @@ run_mhd_epoll_loop (struct MHD_Daemon *daemon)
MHD_itc_clear_ (kicker);
MHD_run (daemon);
}
(void) MHD_itc_destroy_ (kicker);
MHD_itc_set_invalid_ (kicker);
}
@@ -1329,6 +1321,12 @@ test_upgrade (int flags,
#endif /* !HTTPS_SUPPORT || !HAVE_FORK || !HAVE_WAITPID */
}
if (0 == (flags & MHD_USE_INTERNAL_POLLING_THREAD) )
{
if (! MHD_itc_init_ (kicker))
abort ();
}
if (0 != pthread_create (&pt_client,
NULL,
&run_usock_client,
@@ -1352,6 +1350,11 @@ test_upgrade (int flags,
if (test_tls && (TLS_LIB_GNUTLS != use_tls_tool))
waitpid (pid, NULL, 0);
#endif /* HTTPS_SUPPORT && HAVE_FORK && HAVE_WAITPID */
if (0 == (flags & MHD_USE_INTERNAL_POLLING_THREAD) )
{
(void) MHD_itc_destroy_ (kicker);
MHD_itc_set_invalid_ (kicker);
}
MHD_stop_daemon (d);
return 0;
}