You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/08/05 16:38:27 UTC
svn commit: r1694236 - /subversion/trunk/subversion/svnserve/svnserve.c
Author: stefan2
Date: Wed Aug 5 14:38:27 2015
New Revision: 1694236
URL: http://svn.apache.org/r1694236
Log:
Make the --min-threads and --max-threads options in svndamin available
whenever the server may be threaded. In particular when --threads is
implied and cannot be activated via command line.
* subversion/svnserve/svnserve.c
(svnserve__options): Enable min/max threads options whenever we
support APR threads. Make them reference the
--threads option only if that is available.
Modified:
subversion/trunk/subversion/svnserve/svnserve.c
Modified: subversion/trunk/subversion/svnserve/svnserve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/svnserve.c?rev=1694236&r1=1694235&r2=1694236&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/svnserve.c (original)
+++ subversion/trunk/subversion/svnserve/svnserve.c Wed Aug 5 14:38:27 2015
@@ -317,22 +317,32 @@ static const apr_getopt_option_t svnserv
* ### this option never exists when --service exists. */
{"threads", 'T', 0, N_("use threads instead of fork "
"[mode: daemon]")},
+#endif
+#ifdef APR_HAS_THREADS
{"min-threads", SVNSERVE_OPT_MIN_THREADS, 1,
N_("Minimum number of server threads, even if idle.\n"
" "
"Capped to max-threads; minimum value is 0.\n"
" "
- "Default is 1.\n"
+ "Default is 1."
+#ifdef CONNECTION_HAVE_THREAD_OPTION
+ "\n"
" "
- "[used only with --threads]")},
+ "[used only with --threads]"
+#endif
+ )},
{"max-threads", SVNSERVE_OPT_MAX_THREADS, 1,
N_("Maximum number of server threads, even if there\n"
" "
"are more connections. Minimum value is 1.\n"
" "
- "Default is " APR_STRINGIFY(THREADPOOL_MAX_SIZE) ".\n"
+ "Default is " APR_STRINGIFY(THREADPOOL_MAX_SIZE)
+#ifdef CONNECTION_HAVE_THREAD_OPTION
+ ".\n"
" "
- "[used only with --threads]")},
+ "[used only with --threads]"
+#endif
+ )},
#endif
{"foreground", SVNSERVE_OPT_FOREGROUND, 0,
N_("run in foreground (useful for debugging)\n"