summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-07-26 16:37:21 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-07-27 03:34:22 +0200
commit97a6447c06e1d4c55950005e2216ff785180187b (patch)
treee8b8714ff89c566a0c63e008525c7be74114f6d7
parentc5713acf5aa0f0a2a6ba93a4ac92ee474d734ec2 (diff)
downloadsamba-97a6447c06e1d4c55950005e2216ff785180187b.tar.gz
samba-97a6447c06e1d4c55950005e2216ff785180187b.tar.bz2
samba-97a6447c06e1d4c55950005e2216ff785180187b.zip
lib/param: Merge "Tuning Options" section from source3/param
This will reduced the weight of the eventual merge of all of source3/param. Andrew Bartlett
-rw-r--r--lib/param/loadparm.c256
1 files changed, 252 insertions, 4 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 14fcdbf049..96e4c79f77 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -88,6 +88,7 @@ static bool defaults_saved = false;
char *szIdmapUID; \
char *szIdmapGID; \
int winbindMaxDomainConnections; \
+ int ismb2_max_credits; \
char *tls_keyfile; \
char *tls_certfile; \
char *tls_cafile; \
@@ -738,6 +739,89 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL
},
+ {N_("Tuning Options"), P_SEP, P_SEPARATOR},
+
+ {
+ .label = "block size",
+ .type = P_BYTES,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(iBlock_size),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,
+ },
+ {
+ .label = "deadtime",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(deadtime),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "getwd cache",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(getwd_cache),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "keepalive",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(iKeepalive),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "change notify",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bChangeNotify),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
+ },
+ {
+ .label = "directory name cache size",
+ .type = P_INTEGER,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(iDirectoryNameCacheSize),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
+ },
+ {
+ .label = "kernel change notify",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bKernelChangeNotify),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
+ },
+ {
+ .label = "lpq cache time",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(lpqcachetime),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "max smbd processes",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(iMaxSmbdProcesses),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
{
.label = "max connections",
.type = P_INTEGER,
@@ -753,7 +837,35 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(paranoid_server_security),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "max disk size",
+ .type = P_BYTES,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(maxdisksize),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "max open files",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(max_open_files),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "min print space",
+ .type = P_INTEGER,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(iMinPrintSpace),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_PRINT,
},
{
.label = "socket options",
@@ -761,16 +873,35 @@ static struct parm_struct parm_table[] = {
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(socket_options),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "strict allocate",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bStrictAllocate),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
},
-
{
.label = "strict sync",
.type = P_BOOL,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(bStrictSync),
.special = NULL,
- .enum_list = NULL
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
+ },
+ {
+ .label = "sync always",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bSyncAlways),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
},
{
.label = "use mmap",
@@ -781,6 +912,123 @@ static struct parm_struct parm_table[] = {
.enum_list = NULL,
.flags = FLAG_ADVANCED,
},
+ {
+ .label = "use sendfile",
+ .type = P_BOOL,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(bUseSendfile),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
+ },
+ {
+ .label = "hostname lookups",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(bHostnameLookups),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "write cache size",
+ .type = P_BYTES,
+ .p_class = P_LOCAL,
+ .offset = LOCAL_VAR(iWriteCacheSize),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_SHARE,
+ },
+ {
+ .label = "name cache timeout",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(name_cache_timeout),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "ctdbd socket",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(ctdbdSocket),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_GLOBAL,
+ },
+ {
+ .label = "cluster addresses",
+ .type = P_LIST,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szClusterAddresses),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_GLOBAL,
+ },
+ {
+ .label = "clustering",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(clustering),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_GLOBAL,
+ },
+ {
+ .label = "ctdb timeout",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(ctdb_timeout),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_GLOBAL,
+ },
+ {
+ .label = "ctdb locktime warn threshold",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(ctdb_locktime_warn_threshold),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED | FLAG_GLOBAL,
+ },
+ {
+ .label = "smb2 max read",
+ .type = P_BYTES,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(ismb2_max_read),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "smb2 max write",
+ .type = P_BYTES,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(ismb2_max_write),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "smb2 max trans",
+ .type = P_BYTES,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(ismb2_max_trans),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
+ .label = "smb2 max credits",
+ .type = P_INTEGER,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(ismb2_max_credits),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
{N_("Printing Options"), P_SEP, P_SEPARATOR},