Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
orbea -
OpenLDAP
Commits
32443106
Commit
32443106
authored
Mar 20, 2006
by
Pierangelo Masarati
Browse files
refuse illegal values for "threads" (ITS#4433)
parent
8c9f0712
Changes
2
Hide whitespace changes
Inline
Side-by-side
doc/man/man5/slapd.conf.5
View file @
32443106
...
...
@@ -893,7 +893,7 @@ The default is 4194303.
.TP
.B threads <integer>
Specify the maximum size of the primary thread pool.
The default is 16.
The default is 16
; the minimum value is 2
.
.TP
.B timelimit {<integer>|unlimited}
.TP
...
...
servers/slapd/bconfig.c
View file @
32443106
...
...
@@ -510,8 +510,13 @@ static ConfigTable config_back_cf_table[] = {
{
"syncrepl"
,
NULL
,
0
,
0
,
0
,
ARG_DB
|
ARG_MAGIC
,
&
syncrepl_config
,
"( OLcfgDbAt:0.11 NAME 'olcSyncrepl' "
"SYNTAX OMsDirectoryString SINGLE-VALUE )"
,
NULL
,
NULL
},
{
"threads"
,
"count"
,
2
,
2
,
0
,
ARG_INT
|
ARG_MAGIC
|
CFG_THREADS
,
&
config_generic
,
"( OLcfgGlAt:66 NAME 'olcThreads' "
{
"threads"
,
"count"
,
2
,
2
,
0
,
#ifdef NO_THREADS
ARG_IGNORED
,
NULL
,
#else
ARG_INT
|
ARG_MAGIC
|
CFG_THREADS
,
&
config_generic
,
#endif
"( OLcfgGlAt:66 NAME 'olcThreads' "
"SYNTAX OMsInteger SINGLE-VALUE )"
,
NULL
,
NULL
},
{
"timelimit"
,
"limit"
,
2
,
0
,
0
,
ARG_MAY_DB
|
ARG_MAGIC
,
&
config_timelimit
,
"( OLcfgGlAt:67 NAME 'olcTimeLimit' "
...
...
@@ -1111,7 +1116,15 @@ config_generic(ConfigArgs *c) {
break
;
case
CFG_THREADS
:
if
(
c
->
value_int
>
2
*
SLAP_MAX_WORKER_THREADS
)
{
if
(
c
->
value_int
<
2
)
{
snprintf
(
c
->
msg
,
sizeof
(
c
->
msg
),
"threads=%d smaller than minimum value 2"
,
c
->
value_int
);
Debug
(
LDAP_DEBUG_ANY
,
"%s: %s.
\n
"
,
c
->
log
,
c
->
msg
,
0
);
return
1
;
}
else
if
(
c
->
value_int
>
2
*
SLAP_MAX_WORKER_THREADS
)
{
snprintf
(
c
->
msg
,
sizeof
(
c
->
msg
),
"warning, threads=%d larger than twice the default (2*%d=%d); YMMV"
,
c
->
value_int
,
SLAP_MAX_WORKER_THREADS
,
2
*
SLAP_MAX_WORKER_THREADS
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment