From 219db59d826ef33a0e41f538a28c5f03433e7ba7 Mon Sep 17 00:00:00 2001 From: Christian Thaeter Date: Sat, 8 Nov 2008 15:19:05 +0100 Subject: [PATCH] renamed backend config entries adding one level more, more descriptive --- doc/devel/config_guide.txt | 10 +++++++--- src/backend/backend.c | 10 +++++----- src/backend/mmap.c | 6 +++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/doc/devel/config_guide.txt b/doc/devel/config_guide.txt index 11959757a..af9cd8d30 100644 --- a/doc/devel/config_guide.txt +++ b/doc/devel/config_guide.txt @@ -87,7 +87,7 @@ File handling How many filehandles the backend shall use [approx 2/3 of all available] - backend.filehandles + backend.file.max_handles @@ -99,11 +99,15 @@ Defaults: 3GiB on 32 bit arch 192TiB on 64 bit arch - backend.as_limit + backend.mmap.as_limit Default start size for mmaping windows. 128MB on 32 bit arch 2GB on 64 bit arch - backend.mmap_window_size + backend.mmap.window_size +How many memory mappings shall be established at most +Default 60000 + + backend.mmap.max_maps diff --git a/src/backend/backend.c b/src/backend/backend.c index e3c88b484..36a0b80c3 100644 --- a/src/backend/backend.c +++ b/src/backend/backend.c @@ -61,20 +61,20 @@ lumiera_backend_init (void) const char* filehandles = lumiera_tmpbuf_snprintf (SIZE_MAX, - "backend.filehandles = %d", + "backend.file.max_handles = %d", /* roughly 2/3 of all availables filehandles are managed by the backend */ (sysconf (_SC_OPEN_MAX)-10)*2/3); lumiera_config_setdefault (filehandles); long long max_entries; - lumiera_config_number_get ("backend.filehandles", &max_entries); + lumiera_config_number_get ("backend.file.max_handles", &max_entries); lumiera_filehandlecache_new (max_entries); #if SIZE_MAX <= 4294967295UL - lumiera_config_setdefault ("backend.as_limit = 3221225469"); + lumiera_config_setdefault ("backend.mmap.as_limit = 3221225469"); #else - lumiera_config_setdefault ("backend.as_limit = 211106232532992"); + lumiera_config_setdefault ("backend.mmap.as_limit = 211106232532992"); #endif struct rlimit as_rlimit; @@ -83,7 +83,7 @@ lumiera_backend_init (void) long long as_limit = (long long)as_rlimit.rlim_cur; if (as_rlimit.rlim_cur == RLIM_INFINITY) { - lumiera_config_number_get ("backend.as_limit", &as_limit); + lumiera_config_number_get ("backend.mmap.as_limit", &as_limit); } else { diff --git a/src/backend/mmap.c b/src/backend/mmap.c index 7441f91ec..bf3263aff 100644 --- a/src/backend/mmap.c +++ b/src/backend/mmap.c @@ -70,14 +70,14 @@ lumiera_mmap_init (LumieraMMap self, LumieraFile file, LList acquirer, off_t sta * 2GB on 64 bit arch */ #if SIZE_MAX <= 4294967295U - lumiera_config_setdefault ("backend.mmap_window_size = 134217728"); + lumiera_config_setdefault ("backend.mmap.window_size = 134217728"); #else - lumiera_config_setdefault ("backend.mmap_window_size = 2147483648"); + lumiera_config_setdefault ("backend.mmap.window_size = 2147483648"); #endif } long long mmap_window_size = 0; - lumiera_config_number_get ("backend.mmap_window_size", &mmap_window_size); + lumiera_config_number_get ("backend.mmap.window_size", &mmap_window_size); LumieraFiledescriptor descriptor = file->descriptor;