walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add --disable-threads option for configure 

This allows users of OS X 10.9 to run nghttpd (and friends) with
threading entirely disabled, to avoid crashes on startup related to
std::mutex.
This commit is contained in:
Nicholas Hurley 2014-04-23 08:47:26 -07:00
parent 9ca63de9e8
commit f3f9210dae
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -58,6 +58,11 @@ AC_ARG_ENABLE([debug],
[Turn on debug output])], [Turn on debug output])],
[debug=$enableval], [debug=no]) [debug=$enableval], [debug=no])
AC_ARG_ENABLE([threads],
[AS_HELP_STRING([--disable-threads],
[Turn off threading in apps])],
[threads=$enableval], [threads=yes])
AC_ARG_ENABLE([app], AC_ARG_ENABLE([app],
[AS_HELP_STRING([--enable-app], [AS_HELP_STRING([--enable-app],
[Build applications (nghttp, nghttpd and nghttpx) [default=check]])], [Build applications (nghttp, nghttpd and nghttpx) [default=check]])],
@ -431,6 +436,10 @@ if test "x$debug" != "xno"; then
AC_DEFINE([DEBUGBUILD], [1], [Define to 1 to enable debug output.]) AC_DEFINE([DEBUGBUILD], [1], [Define to 1 to enable debug output.])
fi fi
if test "x$threads" != "xyes"; then
AC_DEFINE([NOTHREADS], [1], [Define to 1 if you want to disable threads.])
fi
AC_SUBST([TESTS_LIBS]) AC_SUBST([TESTS_LIBS])
AC_SUBST([SRC_LIBS]) AC_SUBST([SRC_LIBS])

7
src/h2load.cc
View File

@ -666,7 +666,12 @@ int main(int argc, char **argv)
config.nclients = strtoul(optarg, nullptr, 10); config.nclients = strtoul(optarg, nullptr, 10);
break; break;
case 't': case 't':
#ifdef NOTHREADS
std::cerr << "-t: WARNING: Threading disabled at build time, " <<
"no threads created." << std::endl;
#else
config.nthreads = strtoul(optarg, nullptr, 10); config.nthreads = strtoul(optarg, nullptr, 10);
#endif /* NOTHREADS */
break; break;
case 'm': case 'm':
if(util::strieq("auto", optarg)) { if(util::strieq("auto", optarg)) {
@ -776,7 +781,9 @@ int main(int argc, char **argv)
SSL_load_error_strings(); SSL_load_error_strings();
SSL_library_init(); SSL_library_init();
#ifndef NOTHREADS
ssl::LibsslGlobalLock(); ssl::LibsslGlobalLock();
#endif /* NOTHREADS */
auto ssl_ctx = SSL_CTX_new(SSLv23_client_method()); auto ssl_ctx = SSL_CTX_new(SSLv23_client_method());
if(!ssl_ctx) { if(!ssl_ctx) {

7
src/nghttpd.cc
View File

@ -185,12 +185,17 @@ int main(int argc, char **argv)
config.error_gzip = true; config.error_gzip = true;
break; break;
case 'n': case 'n':
#ifdef NOTHREADS
std::cerr << "-n: WARNING: Threading disabled at build time, " <<
"no threads created." << std::endl;
#else
errno = 0; errno = 0;
config.num_worker = strtoul(optarg, &end, 10); config.num_worker = strtoul(optarg, &end, 10);
if(errno == ERANGE || *end != '\0' || config.num_worker == 0) { if(errno == ERANGE || *end != '\0' || config.num_worker == 0) {
std::cerr << "-n: Bad option value: " << optarg << std::endl; std::cerr << "-n: Bad option value: " << optarg << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#endif /* NOTHREADS */
break; break;
case 'h': case 'h':
print_help(std::cout); print_help(std::cout);
@ -271,7 +276,9 @@ int main(int argc, char **argv)
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
SSL_load_error_strings(); SSL_load_error_strings();
SSL_library_init(); SSL_library_init();
#ifndef NOTHREADS
ssl::LibsslGlobalLock(); ssl::LibsslGlobalLock();
#endif /* NOTHREADS */
reset_timer(); reset_timer();

6
src/shrpx.cc
View File

@ -910,7 +910,11 @@ int main(int argc, char **argv)
cmdcfgs.emplace_back(SHRPX_OPT_INSECURE, "yes"); cmdcfgs.emplace_back(SHRPX_OPT_INSECURE, "yes");
break; break;
case 'n': case 'n':
#ifdef NOTHREADS
LOG(WARNING) << "Threading disabled at build time, no threads created.";
#else
cmdcfgs.emplace_back(SHRPX_OPT_WORKERS, optarg); cmdcfgs.emplace_back(SHRPX_OPT_WORKERS, optarg);
#endif /* NOTHREADS */
break; break;
case 'o': case 'o':
cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_FRAME_DEBUG, "yes"); cmdcfgs.emplace_back(SHRPX_OPT_FRONTEND_FRAME_DEBUG, "yes");
@ -1156,7 +1160,9 @@ int main(int argc, char **argv)
OpenSSL_add_all_algorithms(); OpenSSL_add_all_algorithms();
SSL_load_error_strings(); SSL_load_error_strings();
SSL_library_init(); SSL_library_init();
#ifndef NOTHREADS
nghttp2::ssl::LibsslGlobalLock(); nghttp2::ssl::LibsslGlobalLock();
#endif /* NOTHREADS */
if(conf_exists(get_config()->conf_path)) { if(conf_exists(get_config()->conf_path)) {
if(load_config(get_config()->conf_path) == -1) { if(load_config(get_config()->conf_path) == -1) {