From 47ad0ac7237b464e939fe54dd129a151944d9706 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Thu, 6 Aug 2020 15:09:59 -0700 Subject: Renames BEST-EFFORT to BEST_EFFORT for file locking env var --- release_docs/RELEASE.txt | 6 +++--- src/H5FDcore.c | 2 +- src/H5FDdirect.c | 2 +- src/H5FDlog.c | 2 +- src/H5FDsec2.c | 2 +- src/H5FDstdio.c | 2 +- src/H5Fint.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 6013603..7ccdbe9 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -556,15 +556,15 @@ New Features (DER - 2020/03/18, HDFFV-11057) - - Add BEST-EFFORT value to HDF5_USE_FILE_LOCKING environment variable + - Add BEST_EFFORT value to HDF5_USE_FILE_LOCKING environment variable - This change adds a BEST-EFFORT to the TRUE/FALSE, 1/0 settings that + This change adds a BEST_EFFORT to the TRUE/FALSE, 1/0 settings that were previously accepted. This option turns on file locking but ignores locking errors when the library detects that file locking has been disabled on a file system (useful on some HPC Lustre installations). - The capitalization of BEST-EFFORT is mandatory. + The capitalization of BEST_EFFORT is mandatory. See the configure option discussion for HDFFV-11092 (above) for more information on the file locking feature and how it's controlled. diff --git a/src/H5FDcore.c b/src/H5FDcore.c index 7a31fdf..9a82e2b 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -423,7 +423,7 @@ H5FD__init_package(void) /* Check the use disabled file locks environment variable */ lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING"); - if(lock_env_var && !HDstrcmp(lock_env_var, "BEST-EFFORT")) + if(lock_env_var && !HDstrcmp(lock_env_var, "BEST_EFFORT")) ignore_disabled_file_locks_s = TRUE; /* Override: Ignore disabled locks */ else if(lock_env_var && (!HDstrcmp(lock_env_var, "TRUE") || !HDstrcmp(lock_env_var, "1"))) ignore_disabled_file_locks_s = FALSE; /* Override: Don't ignore disabled locks */ diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c index 6494fff..9839269 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -204,7 +204,7 @@ H5FD__init_package(void) /* Check the use disabled file locks environment variable */ lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING"); - if(lock_env_var && !HDstrcmp(lock_env_var, "BEST-EFFORT")) + if(lock_env_var && !HDstrcmp(lock_env_var, "BEST_EFFORT")) ignore_disabled_file_locks_s = TRUE; /* Override: Ignore disabled locks */ else if(lock_env_var && (!HDstrcmp(lock_env_var, "TRUE") || !HDstrcmp(lock_env_var, "1"))) ignore_disabled_file_locks_s = FALSE; /* Override: Don't ignore disabled locks */ diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 045662a..c0506e9 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -245,7 +245,7 @@ H5FD__init_package(void) /* Check the use disabled file locks environment variable */ lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING"); - if(lock_env_var && !HDstrcmp(lock_env_var, "BEST-EFFORT")) + if(lock_env_var && !HDstrcmp(lock_env_var, "BEST_EFFORT")) ignore_disabled_file_locks_s = TRUE; /* Override: Ignore disabled locks */ else if(lock_env_var && (!HDstrcmp(lock_env_var, "TRUE") || !HDstrcmp(lock_env_var, "1"))) ignore_disabled_file_locks_s = FALSE; /* Override: Don't ignore disabled locks */ diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index eee554a..12e107f 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -201,7 +201,7 @@ H5FD__init_package(void) /* Check the use disabled file locks environment variable */ lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING"); - if(lock_env_var && !HDstrcmp(lock_env_var, "BEST-EFFORT")) + if(lock_env_var && !HDstrcmp(lock_env_var, "BEST_EFFORT")) ignore_disabled_file_locks_s = TRUE; /* Override: Ignore disabled locks */ else if(lock_env_var && (!HDstrcmp(lock_env_var, "TRUE") || !HDstrcmp(lock_env_var, "1"))) ignore_disabled_file_locks_s = FALSE; /* Override: Don't ignore disabled locks */ diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c index 574cd9d..a769e86 100644 --- a/src/H5FDstdio.c +++ b/src/H5FDstdio.c @@ -242,7 +242,7 @@ H5FD_stdio_init(void) /* Check the use disabled file locks environment variable */ lock_env_var = getenv("HDF5_USE_FILE_LOCKING"); - if(lock_env_var && !strcmp(lock_env_var, "BEST-EFFORT")) + if(lock_env_var && !strcmp(lock_env_var, "BEST_EFFORT")) ignore_disabled_file_locks_s = 1; /* Override: Ignore disabled locks */ else if(lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1"))) ignore_disabled_file_locks_s = 0; /* Override: Don't ignore disabled locks */ diff --git a/src/H5Fint.c b/src/H5Fint.c index 8b2d18f..7b1ea40 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -291,7 +291,7 @@ H5F__parse_file_lock_env_var(htri_t *use_locks) lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING"); if(lock_env_var && (!HDstrcmp(lock_env_var, "FALSE") || !HDstrcmp(lock_env_var, "0"))) *use_locks = FALSE; /* Override: Never use locks */ - else if(lock_env_var && (!HDstrcmp(lock_env_var, "TRUE") || !HDstrcmp(lock_env_var, "BEST-EFFORT") || !HDstrcmp(lock_env_var, "1"))) + else if(lock_env_var && (!HDstrcmp(lock_env_var, "TRUE") || !HDstrcmp(lock_env_var, "BEST_EFFORT") || !HDstrcmp(lock_env_var, "1"))) *use_locks = TRUE; /* Override: Always use locks */ else *use_locks = FAIL; /* Environment variable not set, or not set correctly */ -- cgit v0.12