diff options
| author | Mark Wielaard <mark@klomp.org> | 2022-05-06 00:29:28 +0200 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2022-05-12 00:58:22 +0200 |
| commit | 4b42d9ad28dc0820dc537b442e9dd88138a4b980 (patch) | |
| tree | 7ecf84168c88e91b974b603635809f8acabec115 | |
| parent | 51571ca7685fad821eb98eaa481f64de7f44bb07 (diff) | |
debuginfod: Use MHD_USE_EPOLL for libmicrohttpd version 0.9.51 or higher
Also disable MHD_USE_THREAD_PER_CONNECTION when using MHD_USE_EPOLL.
https://sourceware.org/bugzilla/show_bug.cgi?id=29123
Signed-off-by: Mark Wielaard <mark@klomp.org>
| -rw-r--r-- | debuginfod/ChangeLog | 6 | ||||
| -rw-r--r-- | debuginfod/debuginfod.cxx | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index 29480c9c..1c5cd4e2 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,5 +1,11 @@ 2022-05-05 Mark Wielaard <mark@klomp.org> + * debuginfod.cxx (main): Define use_epoll. Set to MHD_USE_EPOLL + based on MHD_VERSION. Don't use MHD_USE_THREAD_PER_CONNECTION + when use_poll is set. + +2022-05-05 Mark Wielaard <mark@klomp.org> + * debuginfod.cxx (main): Define mhd_flags. Use mhd_flags for MHD_start_daemon. Try again with MHD_USE_DUAL_STACK removed if that fails. Update clog to say either IPV4 or IPV4 and IPV6. diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx index 8692a424..e7ea356c 100644 --- a/debuginfod/debuginfod.cxx +++ b/debuginfod/debuginfod.cxx @@ -1,6 +1,6 @@ /* Debuginfo-over-http server. Copyright (C) 2019-2021 Red Hat, Inc. - Copyright (C) 2021 Mark J. Wielaard <mark@klomp.org> + Copyright (C) 2021, 2022 Mark J. Wielaard <mark@klomp.org> This file is part of elfutils. This file is free software; you can redistribute it and/or modify @@ -3906,7 +3906,14 @@ main (int argc, char *argv[]) } } - unsigned int mhd_flags = ((connection_pool + /* Note that MHD_USE_EPOLL and MHD_USE_THREAD_PER_CONNECTION don't + work together. */ + unsigned int use_epoll = 0; +#if MHD_VERSION >= 0x00095100 + use_epoll = MHD_USE_EPOLL; +#endif + + unsigned int mhd_flags = ((connection_pool || use_epoll ? 0 : MHD_USE_THREAD_PER_CONNECTION) #if MHD_VERSION >= 0x00095300 | MHD_USE_INTERNAL_POLLING_THREAD @@ -3914,9 +3921,7 @@ main (int argc, char *argv[]) | MHD_USE_SELECT_INTERNALLY #endif | MHD_USE_DUAL_STACK -#ifdef MHD_USE_EPOLL - | MHD_USE_EPOLL -#endif + | use_epoll #if MHD_VERSION >= 0x00095200 | MHD_USE_ITC #endif |