mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-02-23 16:20:57 +08:00
Renames BEST-EFFORT to BEST_EFFORT for file locking env var
This commit is contained in:
parent
7391f5f26c
commit
47ad0ac723
@ -556,15 +556,15 @@ New Features
|
|||||||
|
|
||||||
(DER - 2020/03/18, HDFFV-11057)
|
(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
|
were previously accepted. This option turns on file locking but
|
||||||
ignores locking errors when the library detects that file locking
|
ignores locking errors when the library detects that file locking
|
||||||
has been disabled on a file system (useful on some HPC Lustre
|
has been disabled on a file system (useful on some HPC Lustre
|
||||||
installations).
|
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
|
See the configure option discussion for HDFFV-11092 (above) for more
|
||||||
information on the file locking feature and how it's controlled.
|
information on the file locking feature and how it's controlled.
|
||||||
|
@ -423,7 +423,7 @@ H5FD__init_package(void)
|
|||||||
|
|
||||||
/* Check the use disabled file locks environment variable */
|
/* Check the use disabled file locks environment variable */
|
||||||
lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING");
|
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 */
|
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")))
|
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 */
|
ignore_disabled_file_locks_s = FALSE; /* Override: Don't ignore disabled locks */
|
||||||
|
@ -204,7 +204,7 @@ H5FD__init_package(void)
|
|||||||
|
|
||||||
/* Check the use disabled file locks environment variable */
|
/* Check the use disabled file locks environment variable */
|
||||||
lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING");
|
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 */
|
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")))
|
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 */
|
ignore_disabled_file_locks_s = FALSE; /* Override: Don't ignore disabled locks */
|
||||||
|
@ -245,7 +245,7 @@ H5FD__init_package(void)
|
|||||||
|
|
||||||
/* Check the use disabled file locks environment variable */
|
/* Check the use disabled file locks environment variable */
|
||||||
lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING");
|
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 */
|
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")))
|
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 */
|
ignore_disabled_file_locks_s = FALSE; /* Override: Don't ignore disabled locks */
|
||||||
|
@ -201,7 +201,7 @@ H5FD__init_package(void)
|
|||||||
|
|
||||||
/* Check the use disabled file locks environment variable */
|
/* Check the use disabled file locks environment variable */
|
||||||
lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING");
|
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 */
|
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")))
|
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 */
|
ignore_disabled_file_locks_s = FALSE; /* Override: Don't ignore disabled locks */
|
||||||
|
@ -242,7 +242,7 @@ H5FD_stdio_init(void)
|
|||||||
|
|
||||||
/* Check the use disabled file locks environment variable */
|
/* Check the use disabled file locks environment variable */
|
||||||
lock_env_var = getenv("HDF5_USE_FILE_LOCKING");
|
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 */
|
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")))
|
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 */
|
ignore_disabled_file_locks_s = 0; /* Override: Don't ignore disabled locks */
|
||||||
|
@ -291,7 +291,7 @@ H5F__parse_file_lock_env_var(htri_t *use_locks)
|
|||||||
lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING");
|
lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING");
|
||||||
if(lock_env_var && (!HDstrcmp(lock_env_var, "FALSE") || !HDstrcmp(lock_env_var, "0")))
|
if(lock_env_var && (!HDstrcmp(lock_env_var, "FALSE") || !HDstrcmp(lock_env_var, "0")))
|
||||||
*use_locks = FALSE; /* Override: Never use locks */
|
*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 */
|
*use_locks = TRUE; /* Override: Always use locks */
|
||||||
else
|
else
|
||||||
*use_locks = FAIL; /* Environment variable not set, or not set correctly */
|
*use_locks = FAIL; /* Environment variable not set, or not set correctly */
|
||||||
|
Loading…
Reference in New Issue
Block a user