mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor H5FD and package initialization (#4934)

Browse Source 
- Reverts PR#1024, which (unnecessarily) switched from deferred
  package initialization to centralized initialization of all packages
  and introduced H5FDperform_init() to wrap an internal routine
  to initialize VFD plugins.
- Went back to deferred package initialization (primarily), to
  eliminate unnecessary resource use. (Performance has been
  verified to be the same either way)
- Switched VFD plugins to use “#define (H5OPEN, )” pattern,
  with registration of internal VFD plugins at library initialization
  time. Eliminates calling API routine (H5FDperform_init) from
  within the library, which was deadlocking threadsafe concurrency.
  And also eliminates exposing internal library routines in a public
  header file.
- Removed copy-and-paste replicas of the H5OPEN macro and put
  a (better) single definition in H5public.h
- Separated API and internal routine calls in stdio and multi VFD
  plugins into separate source files, so that the library doesn’t
  invoke API routines internally (also a deadlock problem for
  threadsafe concurrency). Also needed a “private” header for these
  plugins.
- Separated registering/unregistering a VFD plugin from initializing
  /finalizing the plugin, instead of blurring those ideas together.
  Defers the VFD plugin init to when it’s actually used, which reduces
  resource usage, especially for the MPI-based plugins like the subfiling,
  etc.
- Refactored the copy-and-pasted check for locking into a central
  location in the H5FD.c code.
- Fixed a bunch of compiler warnings, especially ones that trigger CI
  failures with -Werror
This commit is contained in:
Quincey Koziol 2024-10-24 08:28:40 -05:00 committed by GitHub
parent 26cf1640b2
commit 2c58357b8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
163 changed files with 3573 additions and 2484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/netcdf.yml vendored
View File

@ -77,7 +77,8 @@ jobs:
run: |
cd netcdf-c
autoreconf -if
CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --enable-hdf5 --enable-dap --disable-dap-remote-tests --enable-external-server-tests
# NOTE: --disable-byterange should be removed when the HTTP VFD has been updated
CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --enable-hdf5 --enable-dap --disable-dap-remote-tests --disable-byterange --enable-external-server-tests
cat config.log
cat libnetcdf.settings
CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j

30
release_docs/RELEASE.txt
View File

@ -47,6 +47,18 @@ New Features
Configuration:
-------------
- Added a configuration option for internal threading/concurrency support:
CMake: HDF5_ENABLE_THREADS (ON/OFF) (Default: ON)
Autotools: --enable-threads (yes/no) (Default: yes)
This option enables support for threading and concurrency algorithms
within the HDF5 library. It is required for, but separate from, the
'threadsafe' configure option, which makes the HDF5 API safe to call from
multiple threads. It is possible to enable the 'threads' option and
disable the 'threadsafe' option, but not vice versa. The 'threads' option
must be on to enable the subfiling VFD.
- Added support for native zlib-ng compression.
Changed the zlib-ng CMake logic to prefer the native zlib-ng library. Added
@ -54,7 +66,7 @@ New Features
header file with the same #ifdef.
- Renamed remaining HDF5 library CMake options except for CMake BUILD* variables
DEFAULT_API_VERSION to HDF5_DEFAULT_API_VERSION
DISABLE_PDB_FILES to HDF5_DISABLE_PDB_FILES
ONLY_SHARED_LIBS to HDF5_ONLY_SHARED_LIBS
@ -62,6 +74,7 @@ New Features
TEST_SHELL_SCRIPTS to HDF5_TEST_SHELL_SCRIPTS
All other HDF5 library CMake options are prefixed with HDF5_
- bin/cmakehdf5 has been removed
This was an unsupported build script that made building HDF5 via CMake
@ -104,21 +117,14 @@ New Features
We have updated the build files to set the C standard to C11, though
some platforms use gnu11 to get some GNU things to work.
- Added configuration option for internal threading/concurrency support:
CMake: HDF5_ENABLE_THREADS (ON/OFF) (Default: ON)
Autotools: --enable-threads (yes/no) (Default: yes)
This option enables support for threading and concurrency algorithms
within the HDF5 library. It is required for, but separate from, the
'threadsafe' configure option, which makes the HDF5 API safe to call from
multiple threads. It is possible to enable the 'threads' option and
disable the 'threadsafe' option, but not vice versa. The 'threads' option
must be on to enable the subfiling VFD.
Library:
--------
- Removed H5FDperform_init API routine. Virtual File Driver (VFD)
developers who wish to provide an ID for their driver should create
a routine specific to their individual implementation.
- H5Pset_external() now uses HDoff_t, which is always a 64-bit type
The H5Pset_external() call took an off_t parameter in HDF5 1.14.x and

4
src/CMakeLists.txt
View File

@ -236,17 +236,18 @@ set (H5FD_SOURCES
${HDF5_SRC_DIR}/H5FDmpi.c
${HDF5_SRC_DIR}/H5FDmpio.c
${HDF5_SRC_DIR}/H5FDmulti.c
${HDF5_SRC_DIR}/H5FDmulti_int.c
${HDF5_SRC_DIR}/H5FDonion.c
${HDF5_SRC_DIR}/H5FDonion_header.c
${HDF5_SRC_DIR}/H5FDonion_history.c
${HDF5_SRC_DIR}/H5FDonion_index.c
${HDF5_SRC_DIR}/H5FDperform.c
${HDF5_SRC_DIR}/H5FDros3.c
${HDF5_SRC_DIR}/H5FDs3comms.c
${HDF5_SRC_DIR}/H5FDsec2.c
${HDF5_SRC_DIR}/H5FDspace.c
${HDF5_SRC_DIR}/H5FDsplitter.c
${HDF5_SRC_DIR}/H5FDstdio.c
${HDF5_SRC_DIR}/H5FDstdio_int.c
${HDF5_SRC_DIR}/H5FDtest.c
${HDF5_SRC_DIR}/H5FDwindows.c
)
@ -754,7 +755,6 @@ set (H5_MODULE_HEADERS
${HDF5_SRC_DIR}/H5ESmodule.h
${HDF5_SRC_DIR}/H5Fmodule.h
${HDF5_SRC_DIR}/H5FAmodule.h
${HDF5_SRC_DIR}/H5FDdrvr_module.h
${HDF5_SRC_DIR}/H5FDmodule.h
${HDF5_SRC_DIR}/H5FLmodule.h
${HDF5_SRC_DIR}/H5FSmodule.h

389
src/H5.c
View File

@ -32,8 +32,6 @@
#include "H5SLprivate.h" /* Skip lists */
#include "H5Tprivate.h" /* Datatypes */
#include "H5FDsec2.h" /* for H5FD_sec2_init() */
/****************/
/* Local Macros */
/****************/
@ -60,11 +58,15 @@ static void H5__debug_mask(const char *);
#ifdef H5_HAVE_PARALLEL
static int H5__mpi_delete_cb(MPI_Comm comm, int keyval, void *attr_val, int *flag);
#endif /*H5_HAVE_PARALLEL*/
static herr_t H5_check_version(unsigned majnum, unsigned minnum, unsigned relnum);
/*********************/
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/*****************************/
/* Library Private Variables */
/*****************************/
@ -91,30 +93,31 @@ static H5_atclose_node_t *H5_atclose_head = NULL;
/* Declare a free list to manage the H5_atclose_node_t struct */
H5FL_DEFINE_STATIC(H5_atclose_node_t);
/*-------------------------------------------------------------------------
* Function: H5_default_vfd_init
*
* Purpose: Initialize the default VFD.
*
* Return: Success: non-negative
* Failure: negative
*-------------------------------------------------------------------------
*/
static herr_t
H5_default_vfd_init(void)
/*--------------------------------------------------------------------------
NAME
H5__init_package -- Initialize interface-specific information
USAGE
herr_t H5__init_package()
RETURNS
Non-negative on success/Negative on failure
DESCRIPTION
Initializes any interface-specific data or routines.
--------------------------------------------------------------------------*/
herr_t
H5__init_package(void)
{
herr_t ret_value = SUCCEED;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT
/* Run the library initialization routine, if it hasn't already ran */
if (!H5_INIT_GLOBAL && !H5_TERM_GLOBAL)
if (H5_init_library() < 0)
HGOTO_ERROR(H5E_LIB, H5E_CANTINIT, FAIL, "unable to initialize library");
FUNC_ENTER_NOAPI(FAIL)
/* Load the hid_t for the default VFD for the side effect
* it has of initializing the default VFD.
*/
if (H5FD_sec2_init() == H5I_INVALID_HID) {
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to load default VFD ID");
}
done:
FUNC_LEAVE_NOAPI(ret_value)
}
} /* end H5__init_package() */
/*--------------------------------------------------------------------------
* NAME
@ -133,7 +136,6 @@ done:
herr_t
H5_init_library(void)
{
size_t i;
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(FAIL)
@ -142,6 +144,10 @@ H5_init_library(void)
if (H5_INIT_GLOBAL || H5_TERM_GLOBAL)
HGOTO_DONE(SUCCEED);
/* Check library version */
/* (Will abort() on failure) */
H5_check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);
/* Set the 'library initialized' flag as early as possible, to avoid
* possible re-entrancy.
*/
@ -224,50 +230,53 @@ H5_init_library(void)
} /* end if */
/*
* Initialize interfaces that might not be able to initialize themselves
* soon enough. The file & dataset interfaces must be initialized because
* calling H5P_create() might require the file/dataset property classes to be
* initialized. The property interface must be initialized before the file
* & dataset interfaces though, in order to provide them with the proper
* property classes.
* The link interface needs to be initialized so that link property lists
* have their properties registered.
* Initialize interfaces that use macros of the form "(H5OPEN <var>)", so
* that the variable returned through the macros has been initialized.
* Also initialize some interfaces that might not be able to initialize
* themselves soon enough.
*
* Interfaces returning variables through a macro: H5E, H5FD, H5O, H5P, H5T
*
* The link interface needs to be initialized so that the external link
* class is registered.
*
* The FS module needs to be initialized as a result of the fix for HDFFV-10160:
* It might not be initialized during normal file open.
* When the application does not close the file, routines in the module might
* be called via H5_term_library() when shutting down the file.
*
* The dataspace interface needs to be initialized so that future IDs for
* dataspaces work.
*
* The VFD & VOL interfaces need to be initialized before the H5P interface
* so that the default VFD and default VOL connector are ready for the
* default FAPL.
*
*/
{
/* clang-format off */
struct {
herr_t (*func)(void);
const char *descr;
} initializer[] = {
{H5E_init, "error"}
, {H5VL_init_phase1, "VOL"}
, {H5SL_init, "skip lists"}
, {H5FD_init, "VFD"}
, {H5_default_vfd_init, "default VFD"}
, {H5P_init_phase1, "property list"}
, {H5AC_init, "metadata caching"}
, {H5L_init, "link"}
, {H5S_init, "dataspace"}
, {H5PL_init, "plugins"}
/* Finish initializing interfaces that depend on the interfaces above */
, {H5P_init_phase2, "property list"}
, {H5VL_init_phase2, "VOL"}
};
if (H5E_init() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize error interface");
if (H5FD_init() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize VFL interface");
if (H5VL_init_phase1() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize vol interface");
if (H5P_init_phase1() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize property list interface");
if (H5L_init() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize link interface");
if (H5O_init() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize object interface");
if (H5FS_init() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize FS interface");
if (H5S_init() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize dataspace interface");
if (H5T_init() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize datatype interface");
for (i = 0; i < NELMTS(initializer); i++) {
if (initializer[i].func() < 0) {
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL,
"unable to initialize %s interface", initializer[i].descr);
}
}
/* clang-format on */
}
/* Finish initializing interfaces that depend on the interfaces above */
if (H5P_init_phase2() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize property list interface");
if (H5VL_init_phase2() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize vol interface");
/* Debugging? */
H5__debug_mask("-all");
@ -291,11 +300,9 @@ done:
void
H5_term_library(void)
{
int pending, ntries = 0;
char loop[1024], *next = loop;
size_t i;
size_t nleft = sizeof(loop);
int nprinted;
int pending, ntries = 0, n;
size_t at = 0;
char loop[1024];
H5E_auto2_t func;
/* Acquire the API lock */
@ -337,147 +344,114 @@ H5_term_library(void)
H5_atclose_head = NULL;
} /* end if */
/* clang-format off */
/*
* Terminate each interface. The termination functions return a positive
* value if they do something that might affect some other interface in a
* way that would necessitate some cleanup work in the other interface.
*/
#define DOWN(F) \
(((n = H5##F##_term_package()) && (at + 8) < sizeof loop) \
? (sprintf(loop + at, "%s%s", (at ? "," : ""), #F), at += strlen(loop + at), n) \
: ((n > 0 && (at + 5) < sizeof loop) ? (sprintf(loop + at, "..."), at += strlen(loop + at), n) \
: n))
{
#define TERMINATOR(module, wait) { \
.func = H5##module##_term_package \
, .name = #module \
, .completed = false \
, .await_prior = wait \
}
do {
pending = 0;
/*
* Termination is ordered by the `terminator` table so the "higher" level
* packages are shut down before "lower" level packages that they
* rely on:
/* Try to organize these so the "higher" level components get shut
* down before "lower" level components that they might rely on. -QAK
*/
struct {
int (*func)(void); /* function to terminate the module; returns 0
* on success, >0 if termination was not
* completed and we should try to terminate
* some dependent modules, first.
*/
const char *name; /* name of the module */
bool completed; /* true iff this terminator was already
* completed
*/
const bool await_prior; /* true iff all prior terminators in the
* list must complete before this
* terminator is attempted
*/
} terminator[] = {
/* Close the event sets first, so that all asynchronous operations
* complete before anything else attempts to shut down.
*/
TERMINATOR(ES, false)
/* Do not attempt to close down package L until after event sets
* have finished closing down.
*/
, TERMINATOR(L, true)
/* Close the event sets first, so that all asynchronous operations
* complete before anything else attempts to shut down.
*/
pending += DOWN(ES);
/* Close down the user-facing interfaces, after the event sets */
if (pending == 0) {
/* Close the interfaces dependent on others */
pending += DOWN(L);
/* Close the "top" of various interfaces (IDs, etc) but don't shut
* down the whole interface yet, so that the object header messages
* get serialized correctly for entries in the metadata cache and the
* symbol table entry in the superblock gets serialized correctly, etc.
* all of which is performed in the 'F' shutdown.
*
* The tops of packages A, D, G, M, S, T do not need to wait for L
* or previous packages to finish closing down.
*/
, TERMINATOR(A_top, false)
, TERMINATOR(D_top, false)
, TERMINATOR(G_top, false)
, TERMINATOR(M_top, false)
, TERMINATOR(S_top, false)
, TERMINATOR(T_top, false)
/* Don't shut down the file code until objects in files are shut down */
, TERMINATOR(F, true)
/* Don't shut down the property list code until all objects that might
* use property lists are shut down
*/
, TERMINATOR(P, true)
/* Wait to shut down the "bottom" of various interfaces until the
* files are closed, so pieces of the file can be serialized
* correctly.
*
* Shut down the "bottom" of the attribute, dataset, group,
* reference, dataspace, and datatype interfaces, fully closing
pending += DOWN(A_top);
pending += DOWN(D_top);
pending += DOWN(G_top);
pending += DOWN(M_top);
pending += DOWN(S_top);
pending += DOWN(T_top);
} /* end if */
/* Don't shut down the file code until objects in files are shut down */
if (pending == 0)
pending += DOWN(F);
/* Don't shut down the property list code until all objects that might
* use property lists are shut down */
if (pending == 0)
pending += DOWN(P);
/* Wait to shut down the "bottom" of various interfaces until the
* files are closed, so pieces of the file can be serialized
* correctly.
*/
if (pending == 0) {
/* Shut down the "bottom" of the attribute, dataset, group,
* dataspace, and datatype interfaces, fully closing
* out the interfaces now.
*/
, TERMINATOR(A, true)
, TERMINATOR(D, false)
, TERMINATOR(G, false)
, TERMINATOR(M, false)
, TERMINATOR(S, false)
, TERMINATOR(T, false)
/* Wait to shut down low-level packages like AC until after
* the preceding high-level packages have shut down. This prevents
* low-level objects from closing "out from underneath" their
* reliant high-level objects.
*/
, TERMINATOR(AC, true)
pending += DOWN(A);
pending += DOWN(D);
pending += DOWN(G);
pending += DOWN(M);
pending += DOWN(S);
pending += DOWN(T);
} /* end if */
/* Don't shut down "low-level" components until "high-level" components
* have successfully shut down. This prevents property lists and IDs
* from being closed "out from underneath" of the high-level objects
* that depend on them. -QAK
*/
if (pending == 0) {
pending += DOWN(AC);
/* Shut down the "pluggable" interfaces, before the plugin framework */
, TERMINATOR(Z, false)
, TERMINATOR(FD, false)
, TERMINATOR(VL, false)
/* Don't shut down the plugin code until all "pluggable" interfaces
* (Z, FD, PL) are shut down
*/
, TERMINATOR(PL, true)
/* Shut down the following packages in strictly the order given
* by the table.
*/
, TERMINATOR(E, true)
, TERMINATOR(I, true)
, TERMINATOR(SL, true)
, TERMINATOR(FL, true)
, TERMINATOR(CX, true)
};
pending += DOWN(Z);
pending += DOWN(FD);
pending += DOWN(VL);
/* Don't shut down the plugin code until all "pluggable" interfaces (Z, FD, PL) are shut down */
if (pending == 0)
pending += DOWN(PL);
/* Don't shut down the error code until other APIs which use it are shut down */
if (pending == 0)
pending += DOWN(E);
/* Don't shut down the ID code until other APIs which use them are shut down */
if (pending == 0)
pending += DOWN(I);
/* Don't shut down the skip list code until everything that uses it is down */
if (pending == 0)
pending += DOWN(SL);
/* Don't shut down the free list code until everything that uses it is down */
if (pending == 0)
pending += DOWN(FL);
/* Don't shut down the API context code until _everything_ else is down */
if (pending == 0)
pending += DOWN(CX);
} /* end if */
} while (pending && ntries++ < 100);
do {
pending = 0;
for (i = 0; i < NELMTS(terminator); i++) {
if (terminator[i].completed)
continue;
if (pending != 0 && terminator[i].await_prior)
break;
if (terminator[i].func() == 0) {
terminator[i].completed = true;
continue;
}
/* log a package when its terminator needs to be retried */
pending++;
nprinted = snprintf(next, nleft, "%s%s",
(next != loop) ? "," : "", terminator[i].name);
if (nprinted < 0)
continue;
if ((size_t)nprinted >= nleft)
nprinted = snprintf(next, nleft, "...");
if (nprinted < 0 || (size_t)nprinted >= nleft)
continue;
nleft -= (size_t)nprinted;
next += nprinted;
}
} while (pending && ntries++ < 100);
/* clang-format on */
if (pending) {
/* Only display the error message if the user is interested in them. */
if (func) {
fprintf(stderr, "HDF5: infinite loop closing library\n");
fprintf(stderr, " %s\n", loop);
if (pending) {
/* Only display the error message if the user is interested in them. */
if (func) {
fprintf(stderr, "HDF5: infinite loop closing library\n");
fprintf(stderr, " %s\n", loop);
#ifndef NDEBUG
abort();
abort();
#endif
}
}
}
@ -531,14 +505,14 @@ H5dont_atexit(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API_NOINIT_NOERR_NOFS
FUNC_ENTER_API_NOINIT_NOERR
if (H5_dont_atexit_g)
ret_value = FAIL;
else
H5_dont_atexit_g = true;
FUNC_LEAVE_API_NOFS(ret_value)
FUNC_LEAVE_API_NOERR(ret_value)
} /* end H5dont_atexit() */
/*-------------------------------------------------------------------------
@ -816,13 +790,10 @@ done:
} /* end H5get_libversion() */
/*-------------------------------------------------------------------------
* Function: H5check_version
* Function: H5__check_version
*
* Purpose: Verifies that the arguments match the version numbers
* compiled into the library. This function is intended to be
* called from user to verify that the versions of header files
* compiled into the application match the version of the hdf5
* library.
* Purpose: Internal routine which Verifies that the arguments match the
* version numbers compiled into the library.
*
* Within major.minor.release version, the expectation
* is that all release versions are compatible, exceptions to
@ -852,18 +823,18 @@ done:
"You should recompile the application or check your shared library related\n" \
"settings such as 'LD_LIBRARY_PATH'.\n"
herr_t
H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
static herr_t
H5_check_version(unsigned majnum, unsigned minnum, unsigned relnum)
{
char lib_str[256];
char substr[] = H5_VERS_SUBRELEASE;
static int checked = 0; /* If we've already checked the version info */
static unsigned int disable_version_check = 0; /* Set if the version check should be disabled */
static bool checked = false; /* If we've already checked the version info */
static unsigned int disable_version_check = 0; /* Set if the version check should be disabled */
static const char *version_mismatch_warning = VERSION_MISMATCH_WARNING;
static const char *release_mismatch_warning = RELEASE_MISMATCH_WARNING;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API_NOINIT_NOERR_NOFS
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Don't check again, if we already have */
if (checked)
@ -960,7 +931,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
} /* end if (H5_VERS_RELEASE != relnum) */
/* Indicate that the version check has been performed */
checked = 1;
checked = true;
if (!disable_version_check) {
/*
@ -988,7 +959,21 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
}
done:
FUNC_LEAVE_API_NOFS(ret_value)
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5__check_version() */
herr_t
H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API_NOINIT_NOERR
/* Call internal routine */
/* (Will abort() on failure) */
H5_check_version(majnum, minnum, relnum);
FUNC_LEAVE_API_NOERR(ret_value)
} /* end H5check_version() */
/*-------------------------------------------------------------------------
@ -1071,11 +1056,11 @@ H5close(void)
* whole library just to release it all right away. It is safe to call
* this function for an uninitialized library.
*/
FUNC_ENTER_API_NOINIT_NOERR_NOFS
FUNC_ENTER_API_NOINIT_NOERR
H5_term_library();
FUNC_LEAVE_API_NOFS(SUCCEED)
FUNC_LEAVE_API_NOERR(SUCCEED)
} /* end H5close() */
/*-------------------------------------------------------------------------

32
src/H5AC.c
View File

@ -67,6 +67,9 @@ static herr_t H5AC__verify_tag(const H5AC_class_t *type);
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/*****************************/
/* Library Private Variables */
/*****************************/
@ -134,7 +137,26 @@ H5AC_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5AC_init() */
/*-------------------------------------------------------------------------
* Function: H5AC__init_package
*
* Purpose: Initialize interface-specific information
*
* Return: Non-negative on success/Negative on failure
*
*-------------------------------------------------------------------------
*/
herr_t
H5AC__init_package(void)
{
FUNC_ENTER_PACKAGE_NOERR
#ifdef H5_HAVE_PARALLEL
/* check whether to enable strict collective function calling
@ -151,8 +173,8 @@ H5AC_init(void)
}
#endif /* H5_HAVE_PARALLEL */
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5AC_init() */
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5AC__init_package() */
/*-------------------------------------------------------------------------
* Function: H5AC_term_package
@ -170,6 +192,10 @@ H5AC_term_package(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOERR
if (H5_PKG_INIT_VAR)
/* Reset interface initialization flag */
H5_PKG_INIT_VAR = false;
FUNC_LEAVE_NOAPI(0)
} /* end H5AC_term_package() */

5
src/H5ACmodule.h
View File

@ -22,7 +22,8 @@
* reporting macros.
*/
#define H5AC_MODULE
#define H5_MY_PKG H5AC
#define H5_MY_PKG_ERR H5E_CACHE
#define H5_MY_PKG H5AC
#define H5_MY_PKG_ERR H5E_CACHE
#define H5_MY_PKG_INIT YES
#endif /* H5ACmodule_H */

3
src/H5ACproxy_entry.c
View File

@ -399,7 +399,7 @@ H5AC_proxy_entry_dest(H5AC_proxy_entry_t *pentry)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
assert(pentry);
@ -411,6 +411,7 @@ H5AC_proxy_entry_dest(H5AC_proxy_entry_t *pentry)
/* Free the proxy entry object */
pentry = H5FL_FREE(H5AC_proxy_entry_t, pentry);
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5AC_proxy_entry_dest() */

80
src/H5Aint.c
View File

@ -88,6 +88,9 @@ static herr_t H5A__iterate_common(hid_t loc_id, H5_index_t idx_type, H5_iter_ord
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/* Format version bounds for attribute */
const unsigned H5O_attr_ver_bounds[] = {
H5O_ATTR_VERSION_1, /* H5F_LIBVER_EARLIEST */
@ -128,6 +131,9 @@ static const H5I_class_t H5I_ATTR_CLS[1] = {{
(H5I_free_t)H5A__close_cb /* Callback routine for closing objects of this class */
}};
/* Flag indicating "top" of interface has been initialized */
static hbool_t H5A_top_package_initialize_s = false;
/*-------------------------------------------------------------------------
* Function: H5A_init
*
@ -144,6 +150,30 @@ H5A_init(void)
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5A_init() */
/*--------------------------------------------------------------------------
NAME
H5A__init_package -- Initialize interface-specific information
USAGE
herr_t H5A__init_package()
RETURNS
Non-negative on success/Negative on failure
DESCRIPTION
Initializes any interface-specific data or routines.
--------------------------------------------------------------------------*/
herr_t
H5A__init_package(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE
/*
* Create attribute ID type.
@ -151,9 +181,12 @@ H5A_init(void)
if (H5I_register_type(H5I_ATTR_CLS) < 0)
HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to initialize interface");
/* Mark "top" of interface as initialized, too */
H5A_top_package_initialize_s = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5A_init() */
} /* end H5A__init_package() */
/*--------------------------------------------------------------------------
NAME
@ -179,10 +212,16 @@ H5A_top_term_package(void)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if (H5I_nmembers(H5I_ATTR) > 0) {
(void)H5I_clear_type(H5I_ATTR, false, false);
n++; /*H5I*/
} /* end if */
if (H5A_top_package_initialize_s) {
if (H5I_nmembers(H5I_ATTR) > 0) {
(void)H5I_clear_type(H5I_ATTR, false, false);
n++; /*H5I*/
} /* end if */
/* Mark closed */
if (0 == n)
H5A_top_package_initialize_s = false;
} /* end if */
FUNC_LEAVE_NOAPI(n)
} /* H5A_top_term_package() */
@ -213,11 +252,18 @@ H5A_term_package(void)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
assert(0 == H5I_nmembers(H5I_ATTR));
if (H5_PKG_INIT_VAR) {
/* Sanity checks */
assert(0 == H5I_nmembers(H5I_ATTR));
assert(false == H5A_top_package_initialize_s);
/* Destroy the attribute object id group */
n += (H5I_dec_type_ref(H5I_ATTR) > 0);
/* Destroy the attribute object id group */
n += (H5I_dec_type_ref(H5I_ATTR) > 0);
/* Mark closed */
if (0 == n)
H5_PKG_INIT_VAR = false;
} /* end if */
FUNC_LEAVE_NOAPI(n)
} /* H5A_term_package() */
@ -1095,9 +1141,7 @@ done:
herr_t
H5A__get_info(const H5A_t *attr, H5A_info_t *ainfo)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_PACKAGE_NOERR
/* Check args */
assert(attr);
@ -1115,7 +1159,7 @@ H5A__get_info(const H5A_t *attr, H5A_info_t *ainfo)
ainfo->corder = attr->shared->crt_idx;
} /* end else */
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5A__get_info() */
/*-------------------------------------------------------------------------
@ -1319,13 +1363,14 @@ H5A_oloc(H5A_t *attr)
{
H5O_loc_t *ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(NULL)
assert(attr);
/* Set return value */
ret_value = &(attr->oloc);
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5A_oloc() */
@ -1346,13 +1391,14 @@ H5A_nameof(H5A_t *attr)
{
H5G_name_t *ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(NULL)
assert(attr);
/* Set return value */
ret_value = &(attr->path);
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5A_nameof() */
@ -1371,13 +1417,14 @@ H5A_type(const H5A_t *attr)
{
H5T_t *ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(NULL)
assert(attr);
/* Set return value */
ret_value = attr->shared->dt;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5A_type() */
@ -1435,6 +1482,7 @@ done:
* into table.
*
* Return: Non-negative on success/Negative on failure
*
*-------------------------------------------------------------------------
*/
static herr_t

5
src/H5Amodule.h
View File

@ -22,8 +22,9 @@
* reporting macros.
*/
#define H5A_MODULE
#define H5_MY_PKG H5A
#define H5_MY_PKG_ERR H5E_ATTR
#define H5_MY_PKG H5A
#define H5_MY_PKG_ERR H5E_ATTR
#define H5_MY_PKG_INIT YES
/** \page H5A_UG HDF5 Attributes
*

3
src/H5B.c
View File

@ -153,6 +153,9 @@ static H5B_t *H5B__copy(const H5B_t *old_bt);
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/* Declare a free list to manage the haddr_t sequence information */
H5FL_SEQ_DEFINE(haddr_t);

3
src/H5B2.c
View File

@ -59,6 +59,9 @@
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/* v2 B-tree client ID to class mapping */
/* Remember to add client ID to H5B2_subid_t in H5B2private.h when adding a new

5
src/H5B2module.h
View File

@ -22,7 +22,8 @@
* reporting macros.
*/
#define H5B2_MODULE
#define H5_MY_PKG H5B2
#define H5_MY_PKG_ERR H5E_BTREE
#define H5_MY_PKG H5B2
#define H5_MY_PKG_ERR H5E_BTREE
#define H5_MY_PKG_INIT NO
#endif /* H5B2module_H */

5
src/H5Bmodule.h
View File

@ -22,7 +22,8 @@
* reporting macros.
*/
#define H5B_MODULE
#define H5_MY_PKG H5B
#define H5_MY_PKG_ERR H5E_BTREE
#define H5_MY_PKG H5B
#define H5_MY_PKG_ERR H5E_BTREE
#define H5_MY_PKG_INIT NO
#endif /* H5Bmodule_H */

3
src/H5C.c
View File

@ -84,6 +84,9 @@
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/* Declare a free list to manage the tag info struct */
H5FL_DEFINE(H5C_tag_info_t);

94
src/H5CX.c
View File

@ -449,6 +449,9 @@ static H5CX_node_t *H5CX__pop_common(bool update_dxpl_props);
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/*******************/
/* Local Variables */
/*******************/
@ -481,17 +484,18 @@ H5FL_DEFINE_STATIC(H5CX_node_t);
/* Declare a static free list to manage H5CX_state_t structs */
H5FL_DEFINE_STATIC(H5CX_state_t);
/*-------------------------------------------------------------------------
* Function: H5CX_init
*
* Purpose: Initialize the interface from some other layer.
*
* Return: Success: non-negative
* Failure: negative
*-------------------------------------------------------------------------
*/
/*--------------------------------------------------------------------------
NAME
H5CX__init_package -- Initialize interface-specific information
USAGE
herr_t H5CX__init_package()
RETURNS
Non-negative on success/Negative on failure
DESCRIPTION
Initializes any interface-specific data or routines.
--------------------------------------------------------------------------*/
herr_t
H5CX_init(void)
H5CX__init_package(void)
{
H5P_genplist_t *dx_plist; /* Data transfer property list */
H5P_genplist_t *lc_plist; /* Link creation property list */
@ -501,7 +505,7 @@ H5CX_init(void)
H5P_genplist_t *fa_plist; /* File access property list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
FUNC_ENTER_PACKAGE
/* Reset the "default DXPL cache" information */
memset(&H5CX_def_dxpl_cache, 0, sizeof(H5CX_dxpl_cache_t));
@ -685,9 +689,10 @@ H5CX_init(void)
if (H5P_get(fa_plist, H5F_ACS_LIBVER_HIGH_BOUND_NAME, &H5CX_def_fapl_cache.high_bound) < 0)
HGOTO_ERROR(H5E_CONTEXT, H5E_CANTGET, FAIL, "Can't retrieve dataset minimize flag");
done:
FUNC_LEAVE_NOAPI(ret_value)
}
} /* end H5CX__init_package() */
/*-------------------------------------------------------------------------
* Function: H5CX_term_package
@ -705,20 +710,24 @@ H5CX_term_package(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOERR
H5CX_node_t *cnode; /* Context node */
if (H5_PKG_INIT_VAR) {
H5CX_node_t *cnode; /* Context node */
/* Pop the top context node from the stack */
/* (Can't check for errors, as rest of library is shut down) */
cnode = H5CX__pop_common(false);
/* Pop the top context node from the stack */
/* (Can't check for errors, as rest of library is shut down) */
cnode = H5CX__pop_common(false);
/* Free the context node */
/* (Allocated with malloc() in H5CX_push_special() ) */
free(cnode);
/* Free the context node */
/* (Allocated with malloc() in H5CX_push_special() ) */
free(cnode);
#ifndef H5_HAVE_THREADSAFE
H5CX_head_g = NULL;
H5CX_head_g = NULL;
#endif /* H5_HAVE_THREADSAFE */
H5_PKG_INIT_VAR = false;
} /* end if */
FUNC_LEAVE_NOAPI(0)
} /* end H5CX_term_package() */
@ -734,14 +743,18 @@ H5CX_term_package(void)
bool
H5CX_pushed(void)
{
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
bool is_pushed = false; /* Flag to indicate context is pushed */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI_NOINIT_NOERR
head = H5CX_get_my_context(); /* Get the pointer to the head of the API context, for this thread */
assert(head);
FUNC_LEAVE_NOAPI(*head != NULL);
/* Set return value */
is_pushed = (*head != NULL);
FUNC_LEAVE_NOAPI(is_pushed)
}
/*-------------------------------------------------------------------------
@ -1196,7 +1209,7 @@ H5CX_set_libver_bounds(H5F_t *f)
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
head = H5CX_get_my_context(); /* Get the pointer to the head of the API context, for this thread */
@ -1210,6 +1223,7 @@ H5CX_set_libver_bounds(H5F_t *f)
(*head)->ctx.low_bound_valid = true;
(*head)->ctx.high_bound_valid = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5CX_set_libver_bounds() */
@ -1458,7 +1472,7 @@ H5CX_set_vol_wrap_ctx(void *vol_wrap_ctx)
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
head = H5CX_get_my_context(); /* Get the pointer to the head of the API context, for this thread */
@ -1470,6 +1484,7 @@ H5CX_set_vol_wrap_ctx(void *vol_wrap_ctx)
/* Mark the value as valid */
(*head)->ctx.vol_wrap_ctx_valid = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5CX_set_vol_wrap_ctx() */
@ -1488,7 +1503,7 @@ H5CX_set_vol_connector_prop(const H5VL_connector_prop_t *vol_connector_prop)
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
head = H5CX_get_my_context(); /* Get the pointer to the head of the API context, for this thread */
@ -1500,6 +1515,7 @@ H5CX_set_vol_connector_prop(const H5VL_connector_prop_t *vol_connector_prop)
/* Mark the value as valid */
(*head)->ctx.vol_connector_prop_valid = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5CX_set_vol_connector_prop() */
@ -1613,7 +1629,7 @@ H5CX_get_vol_connector_prop(H5VL_connector_prop_t *vol_connector_prop)
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
assert(vol_connector_prop);
@ -1627,6 +1643,7 @@ H5CX_get_vol_connector_prop(H5VL_connector_prop_t *vol_connector_prop)
else
memset(vol_connector_prop, 0, sizeof(H5VL_connector_prop_t));
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5CX_get_vol_connector_prop() */
@ -1729,7 +1746,7 @@ H5CX_get_mpi_coll_datatypes(MPI_Datatype *btype, MPI_Datatype *ftype)
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
assert(btype);
@ -1741,6 +1758,7 @@ H5CX_get_mpi_coll_datatypes(MPI_Datatype *btype, MPI_Datatype *ftype)
*btype = (*head)->ctx.btype;
*ftype = (*head)->ctx.ftype;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5CX_get_mpi_coll_datatypes() */
@ -2948,11 +2966,10 @@ H5CX_set_coll_metadata_read(bool cmdr)
herr_t
H5CX_set_mpi_coll_datatypes(MPI_Datatype btype, MPI_Datatype ftype)
{
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
herr_t ret_value = SUCCEED; /* Return value */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
head = H5CX_get_my_context(); /* Get the pointer to the head of the API context, for this thread */
@ -2962,6 +2979,7 @@ H5CX_set_mpi_coll_datatypes(MPI_Datatype btype, MPI_Datatype ftype)
(*head)->ctx.btype = btype;
(*head)->ctx.ftype = ftype;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5CX_set_mpi_coll_datatypes() */
@ -2980,7 +2998,7 @@ H5CX_set_io_xfer_mode(H5FD_mpio_xfer_t io_xfer_mode)
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
head = H5CX_get_my_context(); /* Get the pointer to the head of the API context, for this thread */
@ -2992,6 +3010,7 @@ H5CX_set_io_xfer_mode(H5FD_mpio_xfer_t io_xfer_mode)
/* Mark the value as valid */
(*head)->ctx.io_xfer_mode_valid = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5CX_set_io_xfer_mode() */
@ -3010,7 +3029,7 @@ H5CX_set_mpio_coll_opt(H5FD_mpio_collective_opt_t mpio_coll_opt)
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
head = H5CX_get_my_context(); /* Get the pointer to the head of the API context, for this thread */
@ -3022,6 +3041,7 @@ H5CX_set_mpio_coll_opt(H5FD_mpio_collective_opt_t mpio_coll_opt)
/* Mark the value as valid */
(*head)->ctx.mpio_coll_opt_valid = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5CX_set_mpio_coll_opt() */
@ -3092,7 +3112,7 @@ H5CX_set_vlen_alloc_info(H5MM_allocate_t alloc_func, void *alloc_info, H5MM_free
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
head = H5CX_get_my_context(); /* Get the pointer to the head of the API context, for this thread */
@ -3107,6 +3127,7 @@ H5CX_set_vlen_alloc_info(H5MM_allocate_t alloc_func, void *alloc_info, H5MM_free
/* Mark the value as valid */
(*head)->ctx.vl_alloc_info_valid = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5CX_set_vlen_alloc_info() */
@ -3125,7 +3146,7 @@ H5CX_set_nlinks(size_t nlinks)
H5CX_node_t **head = NULL; /* Pointer to head of API context list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
head = H5CX_get_my_context(); /* Get the pointer to the head of the API context, for this thread */
@ -3137,6 +3158,7 @@ H5CX_set_nlinks(size_t nlinks)
/* Mark the value as valid */
(*head)->ctx.nlinks_valid = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5CX_set_nlinks() */

5
src/H5CXmodule.h
View File

@ -22,7 +22,8 @@
* reporting macros.
*/
#define H5CX_MODULE
#define H5_MY_PKG H5CX
#define H5_MY_PKG_ERR H5E_CONTEXT
#define H5_MY_PKG H5CX
#define H5_MY_PKG_ERR H5E_CONTEXT
#define H5_MY_PKG_INIT YES
#endif /* H5CXmodule_H */

2
src/H5CXprivate.h
View File

@ -159,8 +159,6 @@ H5_DLL herr_t H5CX_set_vlen_alloc_info(H5MM_allocate_t alloc_func, void *alloc_i
/* "Setter" routines for LAPL properties cached in API context */
H5_DLL herr_t H5CX_set_nlinks(size_t nlinks);
H5_DLL herr_t H5CX_init(void);
/* "Setter" routines for cached DXPL properties that must be returned to application */
H5_DLL void H5CX_set_no_selection_io_cause(uint32_t no_selection_io_cause);

5
src/H5Cmodule.h
View File

@ -22,7 +22,8 @@
* reporting macros.
*/
#define H5C_MODULE
#define H5_MY_PKG H5C
#define H5_MY_PKG_ERR H5E_CACHE
#define H5_MY_PKG H5C
#define H5_MY_PKG_ERR H5E_CACHE
#define H5_MY_PKG_INIT NO
#endif /* H5Cmodule_H */

3
src/H5D.c
View File

@ -63,6 +63,9 @@ static herr_t H5D__set_extent_api_common(hid_t dset_id, const hsize_t size[], vo
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/*****************************/
/* Library Private Variables */
/*****************************/

29
src/H5Dchunk.c
View File

@ -43,21 +43,21 @@
/***********/
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5private.h" /* Generic Functions */
#ifdef H5_HAVE_PARALLEL
#include "H5ACprivate.h" /* Metadata cache */
#include "H5ACprivate.h" /* Metadata cache */
#endif /* H5_HAVE_PARALLEL */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Dpkg.h" /* Dataset functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File functions */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5MFprivate.h" /* File memory management */
#include "H5PBprivate.h" /* Page Buffer */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Dpkg.h" /* Dataset functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File functions */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5MFprivate.h" /* File memory management */
#include "H5PBprivate.h" /* Page Buffer */
#include "H5SLprivate.h" /* Skip Lists */
#include "H5VMprivate.h" /* Vector and array functions */
#include "H5VMprivate.h" /* Vector and array functions */
/****************/
/* Local Macros */
@ -5728,13 +5728,16 @@ H5D__chunk_cmp_coll_fill_info(const void *_entry1, const void *_entry2)
{
const struct chunk_coll_fill_info *entry1;
const struct chunk_coll_fill_info *entry2;
int ret_value = 0;
FUNC_ENTER_PACKAGE_NOERR
entry1 = (const struct chunk_coll_fill_info *)_entry1;
entry2 = (const struct chunk_coll_fill_info *)_entry2;
FUNC_LEAVE_NOAPI(H5_addr_cmp(entry1->addr, entry2->addr))
ret_value = H5_addr_cmp(entry1->addr, entry2->addr);
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__chunk_cmp_coll_fill_info() */
#endif /* H5_HAVE_PARALLEL */

110
src/H5Dint.c
View File

@ -140,6 +140,9 @@ static const H5I_class_t H5I_DATASET_CLS[1] = {{
(H5I_free_t)H5D__close_cb /* Callback routine for closing objects of this class */
}};
/* Flag indicating "top" of interface has been initialized */
static bool H5D_top_package_initialize_s = false;
/* Prefixes of VDS and external file from the environment variables
* HDF5_EXTFILE_PREFIX and HDF5_VDS_PREFIX */
static const char *H5D_prefix_ext_env = NULL;
@ -157,11 +160,38 @@ static const char *H5D_prefix_vds_env = NULL;
*/
herr_t
H5D_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D_init() */
/*--------------------------------------------------------------------------
NAME
H5D__init_package -- Initialize interface-specific information
USAGE
herr_t H5D__init_package()
RETURNS
Non-negative on success/Negative on failure
DESCRIPTION
Initializes any interface-specific data or routines.
NOTES
Care must be taken when using the H5P functions, since they can cause
a deadlock in the library when the library is attempting to terminate -QAK
--------------------------------------------------------------------------*/
herr_t
H5D__init_package(void)
{
H5P_genplist_t *def_dcpl; /* Default Dataset Creation Property list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
FUNC_ENTER_PACKAGE
/* Initialize the ID group for the dataset IDs */
if (H5I_register_type(H5I_DATASET_CLS) < 0)
@ -191,13 +221,16 @@ H5D_init(void)
if (H5P_get(def_dcpl, H5O_CRT_PIPELINE_NAME, &H5D_def_dset.dcpl_cache.pline) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve pipeline filter");
/* Mark "top" of interface as initialized, too */
H5D_top_package_initialize_s = true;
/* Retrieve the prefixes of VDS and external file from the environment variable */
H5D_prefix_vds_env = getenv("HDF5_VDS_PREFIX");
H5D_prefix_ext_env = getenv("HDF5_EXTFILE_PREFIX");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D_init() */
} /* end H5D__init_package() */
/*-------------------------------------------------------------------------
* Function: H5D_top_term_package
@ -216,32 +249,38 @@ H5D_top_term_package(void)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if (H5I_nmembers(H5I_DATASET) > 0) {
/* The dataset API uses the "force" flag set to true because it
* is using the "file objects" (H5FO) API functions to track open
* objects in the file. Using the H5FO code means that dataset
* IDs can have reference counts >1, when an existing dataset is
* opened more than once. However, the H5I code does not attempt
* to close objects with reference counts>1 unless the "force" flag
* is set to true.
*
* At some point (probably after the group and datatypes use the
* the H5FO code), the H5FO code might need to be switched around
* to storing pointers to the objects being tracked (H5D_t, H5G_t,
* etc) and reference count those itself instead of relying on the
* reference counting in the H5I layer. Then, the "force" flag can
* be put back to false.
*
* Setting the "force" flag to true for all the interfaces won't
* work because the "file driver" (H5FD) APIs use the H5I reference
* counting to avoid closing a file driver out from underneath an
* open file...
*
* QAK - 5/13/03
*/
(void)H5I_clear_type(H5I_DATASET, true, false);
n++; /*H5I*/
}
if (H5D_top_package_initialize_s) {
if (H5I_nmembers(H5I_DATASET) > 0) {
/* The dataset API uses the "force" flag set to true because it
* is using the "file objects" (H5FO) API functions to track open
* objects in the file. Using the H5FO code means that dataset
* IDs can have reference counts >1, when an existing dataset is
* opened more than once. However, the H5I code does not attempt
* to close objects with reference counts>1 unless the "force" flag
* is set to true.
*
* At some point (probably after the group and datatypes use the
* the H5FO code), the H5FO code might need to be switched around
* to storing pointers to the objects being tracked (H5D_t, H5G_t,
* etc) and reference count those itself instead of relying on the
* reference counting in the H5I layer. Then, the "force" flag can
* be put back to false.
*
* Setting the "force" flag to true for all the interfaces won't
* work because the "file driver" (H5FD) APIs use the H5I reference
* counting to avoid closing a file driver out from underneath an
* open file...
*
* QAK - 5/13/03
*/
(void)H5I_clear_type(H5I_DATASET, true, false);
n++; /*H5I*/
} /* end if */
/* Mark closed */
if (0 == n)
H5D_top_package_initialize_s = false;
} /* end if */
FUNC_LEAVE_NOAPI(n)
} /* end H5D_top_term_package() */
@ -266,11 +305,18 @@ H5D_term_package(void)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
assert(0 == H5I_nmembers(H5I_DATASET));
if (H5_PKG_INIT_VAR) {
/* Sanity checks */
assert(0 == H5I_nmembers(H5I_DATASET));
assert(false == H5D_top_package_initialize_s);
/* Destroy the dataset object id group */
n += (H5I_dec_type_ref(H5I_DATASET) > 0);
/* Destroy the dataset object id group */
n += (H5I_dec_type_ref(H5I_DATASET) > 0);
/* Mark closed */
if (0 == n)
H5_PKG_INIT_VAR = false;
} /* end if */
FUNC_LEAVE_NOAPI(n)
} /* end H5D_term_package() */

5
src/H5Dmodule.h
View File

@ -22,8 +22,9 @@
* reporting macros.
*/
#define H5D_MODULE
#define H5_MY_PKG H5D
#define H5_MY_PKG_ERR H5E_DATASET
#define H5_MY_PKG H5D
#define H5_MY_PKG_ERR H5E_DATASET
#define H5_MY_PKG_INIT YES
/** \page H5D_UG HDF5 Datasets
*

19
src/H5Dmpio.c
View File

@ -2716,13 +2716,16 @@ H5D__cmp_piece_addr(const void *piece_info1, const void *piece_info2)
{
haddr_t addr1;
haddr_t addr2;
int ret_value = 0;
FUNC_ENTER_PACKAGE_NOERR
addr1 = (*((const H5D_piece_info_t *const *)piece_info1))->faddr;
addr2 = (*((const H5D_piece_info_t *const *)piece_info2))->faddr;
FUNC_LEAVE_NOAPI(H5_addr_cmp(addr1, addr2))
ret_value = H5_addr_cmp(addr1, addr2);
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D__cmp_chunk_addr() */
/*-------------------------------------------------------------------------
@ -2744,9 +2747,9 @@ H5D__cmp_filtered_collective_io_info_entry(const void *filtered_collective_io_in
{
const H5D_filtered_collective_chunk_info_t *entry1;
const H5D_filtered_collective_chunk_info_t *entry2;
haddr_t addr1 = HADDR_UNDEF;
haddr_t addr2 = HADDR_UNDEF;
int ret_value;
haddr_t addr1 = HADDR_UNDEF;
haddr_t addr2 = HADDR_UNDEF;
int ret_value = 0;
FUNC_ENTER_PACKAGE_NOERR
@ -2803,7 +2806,7 @@ H5D__cmp_chunk_redistribute_info(const void *_entry1, const void *_entry2)
const H5D_chunk_redistribute_info_t *entry2;
haddr_t oloc_addr1;
haddr_t oloc_addr2;
int ret_value;
int ret_value = 0;
FUNC_ENTER_PACKAGE_NOERR
@ -2863,9 +2866,9 @@ H5D__cmp_chunk_redistribute_info_orig_owner(const void *_entry1, const void *_en
{
const H5D_chunk_redistribute_info_t *entry1;
const H5D_chunk_redistribute_info_t *entry2;
int owner1 = -1;
int owner2 = -1;
int ret_value;
int owner1 = -1;
int owner2 = -1;
int ret_value = 0;
FUNC_ENTER_PACKAGE_NOERR

3
src/H5Dvirtual.c
View File

@ -1264,7 +1264,7 @@ H5D_virtual_free_parsed_name(H5O_storage_virtual_name_seg_t *name_seg)
H5O_storage_virtual_name_seg_t *next_seg;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Walk name segments, freeing them */
while (name_seg) {
@ -1274,6 +1274,7 @@ H5D_virtual_free_parsed_name(H5O_storage_virtual_name_seg_t *name_seg)
name_seg = next_seg;
} /* end while */
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5D_virtual_free_parsed_name() */

3
src/H5E.c
View File

@ -73,6 +73,9 @@
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/* Declare extern the free list to manage the H5E_stack_t struct */
H5FL_EXTERN(H5E_stack_t);

3
src/H5EA.c
View File

@ -72,6 +72,9 @@ static H5EA_t *H5EA__new(H5F_t *f, haddr_t ea_addr, bool from_open, void *ctx_ud
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/* Extensible array client ID to class mapping */
/* Remember to add client ID to H5EA_cls_id_t in H5EAprivate.h when adding a new

5
src/H5EAmodule.h
View File

@ -22,7 +22,8 @@
* reporting macros.
*/
#define H5EA_MODULE
#define H5_MY_PKG H5EA
#define H5_MY_PKG_ERR H5E_EARRAY
#define H5_MY_PKG H5EA
#define H5_MY_PKG_ERR H5E_EARRAY
#define H5_MY_PKG_INIT NO
#endif /* H5EAmodule_H */

27
src/H5ESint.c
View File

@ -103,6 +103,9 @@ static int H5ES__close_failed_cb(H5ES_event_t *ev, void *_ctx);
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/*****************************/
/* Library Private Variables */
/*****************************/
@ -123,20 +126,22 @@ static const H5I_class_t H5I_EVENTSET_CLS[1] = {{
H5FL_DEFINE_STATIC(H5ES_t);
/*-------------------------------------------------------------------------
* Function: H5ES_init
* Function: H5ES__init_package
*
* Purpose: Initializes any interface-specific data or routines.
*
* Return: Non-negative on success / Negative on failure
*
* Purpose: Initialize the interface from some other layer.
*
* Return: Success: non-negative
* Failure: negative
*-------------------------------------------------------------------------
*/
herr_t
H5ES_init(void)
H5ES__init_package(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
FUNC_ENTER_PACKAGE
/* Initialize the ID group for the event set IDs */
if (H5I_register_type(H5I_EVENTSET_CLS) < 0)
@ -144,7 +149,7 @@ H5ES_init(void)
done:
FUNC_LEAVE_NOAPI(ret_value)
}
} /* end H5ES__init_package() */
/*-------------------------------------------------------------------------
* Function: H5ES_term_package
@ -164,8 +169,14 @@ H5ES_term_package(void)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Destroy the event set ID group */
n += (H5I_dec_type_ref(H5I_EVENTSET) > 0);
if (H5_PKG_INIT_VAR) {
/* Destroy the event set ID group */
n += (H5I_dec_type_ref(H5I_EVENTSET) > 0);
/* Mark closed */
if (0 == n)
H5_PKG_INIT_VAR = false;
} /* end if */
FUNC_LEAVE_NOAPI(n)
} /* end H5ES_term_package() */

5
src/H5ESmodule.h
View File

@ -22,8 +22,9 @@
* reporting macros.
*/
#define H5ES_MODULE
#define H5_MY_PKG H5ES
#define H5_MY_PKG_ERR H5E_EVENTSET
#define H5_MY_PKG H5ES
#define H5_MY_PKG_ERR H5E_EVENTSET
#define H5_MY_PKG_INIT YES
/** \page H5ES_UG HDF5 Event Set
* @todo Under Construction

5
src/H5ESprivate.h
View File

@ -47,8 +47,7 @@ typedef struct H5ES_t H5ES_t;
/***************************************/
/* Library-private Function Prototypes */
/***************************************/
herr_t H5ES_insert(hid_t es_id, H5VL_connector_t *connector, void *token, const char *caller,
const char *caller_args, ...);
H5_DLL herr_t H5ES_init(void);
herr_t H5ES_insert(hid_t es_id, H5VL_connector_t *connector, void *token, const char *caller,
const char *caller_args, ...);
#endif /* H5ESprivate_H */

126
src/H5Eint.c
View File

@ -228,6 +228,30 @@ H5E_init(void)
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5E_init() */
/*--------------------------------------------------------------------------
* Function: H5E__init_package
*
* Purpose: Initialize interface-specific information
*
* Return: SUCCEED/FAIL
*
* Programmer: Raymond Lu
* Friday, July 11, 2003
*
*--------------------------------------------------------------------------
*/
herr_t
H5E__init_package(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE
/* Initialize the ID group for the error class IDs */
if (H5I_register_type(H5I_ERRCLS_CLS) < 0)
@ -254,7 +278,7 @@ H5E_init(void)
done:
FUNC_LEAVE_NOAPI(ret_value)
}
} /* end H5E__init_package() */
/*-------------------------------------------------------------------------
* Function: H5E_term_package
@ -275,61 +299,66 @@ H5E_term_package(void)
FUNC_ENTER_NOAPI_NOINIT_NOERR
int64_t ncls, nmsg, nstk;
if (H5_PKG_INIT_VAR) {
int64_t ncls, nmsg, nstk;
/* Check if there are any open error stacks, classes or messages */
ncls = H5I_nmembers(H5I_ERROR_CLASS);
nmsg = H5I_nmembers(H5I_ERROR_MSG);
nstk = H5I_nmembers(H5I_ERROR_STACK);
/* Check if there are any open error stacks, classes or messages */
ncls = H5I_nmembers(H5I_ERROR_CLASS);
nmsg = H5I_nmembers(H5I_ERROR_MSG);
nstk = H5I_nmembers(H5I_ERROR_STACK);
if ((ncls + nmsg + nstk) > 0) {
/* Clear the default error stack. Note that
* the following H5I_clear_type calls do not
* force the clears and will not be able to
* clear any error message IDs that are still
* in use by the default error stack unless we
* clear that stack manually.
*
* Error message IDs will typically still be
* in use by the default error stack when the
* application does H5E_BEGIN/END_TRY cleanup
* at the very end.
*/
H5E_clear_stack();
if ((ncls + nmsg + nstk) > 0) {
/* Clear the default error stack. Note that
* the following H5I_clear_type calls do not
* force the clears and will not be able to
* clear any error message IDs that are still
* in use by the default error stack unless we
* clear that stack manually.
*
* Error message IDs will typically still be
* in use by the default error stack when the
* application does H5E_BEGIN/END_TRY cleanup
* at the very end.
*/
H5E_clear_stack();
/* Clear any outstanding error stacks */
if (nstk > 0)
(void)H5I_clear_type(H5I_ERROR_STACK, false, false);
/* Clear any outstanding error stacks */
if (nstk > 0)
(void)H5I_clear_type(H5I_ERROR_STACK, false, false);
/* Clear all the error classes */
if (ncls > 0) {
(void)H5I_clear_type(H5I_ERROR_CLASS, false, false);
/* Clear all the error classes */
if (ncls > 0) {
(void)H5I_clear_type(H5I_ERROR_CLASS, false, false);
/* Reset the HDF5 error class, if its been closed */
if (H5I_nmembers(H5I_ERROR_CLASS) == 0)
H5E_ERR_CLS_g = H5I_INVALID_HID;
} /* end if */
/* Reset the HDF5 error class, if its been closed */
if (H5I_nmembers(H5I_ERROR_CLASS) == 0)
H5E_ERR_CLS_g = H5I_INVALID_HID;
} /* end if */
/* Clear all the error messages */
if (nmsg > 0) {
(void)H5I_clear_type(H5I_ERROR_MSG, false, false);
/* Clear all the error messages */
if (nmsg > 0) {
(void)H5I_clear_type(H5I_ERROR_MSG, false, false);
/* Reset the HDF5 error messages, if they've been closed */
if (H5I_nmembers(H5I_ERROR_MSG) == 0) {
/* Reset the HDF5 error messages, if they've been closed */
if (H5I_nmembers(H5I_ERROR_MSG) == 0) {
/* Include the automatically generated error code termination */
#include "H5Eterm.h"
} /* end if */
} /* end if */
} /* end if */
} /* end if */
n++; /*H5I*/
} /* end if */
else {
/* Destroy the error class, message, and stack id groups */
n += (H5I_dec_type_ref(H5I_ERROR_STACK) > 0);
n += (H5I_dec_type_ref(H5I_ERROR_CLASS) > 0);
n += (H5I_dec_type_ref(H5I_ERROR_MSG) > 0);
n++; /*H5I*/
} /* end if */
else {
/* Destroy the error class, message, and stack id groups */
n += (H5I_dec_type_ref(H5I_ERROR_STACK) > 0);
n += (H5I_dec_type_ref(H5I_ERROR_CLASS) > 0);
n += (H5I_dec_type_ref(H5I_ERROR_MSG) > 0);
} /* end else */
/* Mark closed */
if (0 == n)
H5_PKG_INIT_VAR = false;
} /* end else */
} /* end if */
FUNC_LEAVE_NOAPI(n)
} /* end H5E_term_package() */
@ -1787,7 +1816,7 @@ H5E_dump_api_stack(void)
H5E_stack_t *estack = H5E__get_my_stack();
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
assert(estack);
@ -1805,6 +1834,7 @@ H5E_dump_api_stack(void)
} /* end else */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5E_dump_api_stack() */
@ -1836,7 +1866,7 @@ H5E_pause_stack(void)
{
H5E_stack_t *estack = H5E__get_my_stack();
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(estack);
@ -1874,7 +1904,7 @@ H5E_resume_stack(void)
{
H5E_stack_t *estack = H5E__get_my_stack();
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(estack);
assert(estack->paused);

5
src/H5Emodule.h
View File

@ -22,8 +22,9 @@
* reporting macros.
*/
#define H5E_MODULE
#define H5_MY_PKG H5E
#define H5_MY_PKG_ERR H5E_ERROR
#define H5_MY_PKG H5E
#define H5_MY_PKG_ERR H5E_ERROR
#define H5_MY_PKG_INIT YES
/** \page H5E_UG HDF5 Error Handling
*

8
src/H5Epublic.h
View File

@ -49,14 +49,6 @@ typedef struct H5E_error2_t {
/**< Optional supplied description */
} H5E_error2_t;
/* When this header is included from a private header, don't make calls to H5open() */
#undef H5OPEN
#ifndef H5private_H
#define H5OPEN H5open(),
#else /* H5private_H */
#define H5OPEN
#endif /* H5private_H */
/* HDF5 error class */
/* Extern "C" block needed to compile C++ filter plugins with some compilers */
#ifdef __cplusplus

3
src/H5FA.c
View File

@ -61,6 +61,9 @@ static H5FA_t *H5FA__new(H5F_t *f, haddr_t fa_addr, bool from_open, void *ctx_ud
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/* Fixed array client ID to class mapping */
/* Remember to add client ID to H5FA_cls_id_t in H5FAprivate.h when adding a new

5
src/H5FAmodule.h
View File

@ -22,7 +22,8 @@
* reporting macros.
*/
#define H5FA_MODULE
#define H5_MY_PKG H5FA
#define H5_MY_PKG_ERR H5E_FARRAY
#define H5_MY_PKG H5FA
#define H5_MY_PKG_ERR H5E_FARRAY
#define H5_MY_PKG_INIT NO
#endif /* H5FAmodule_H */

159
src/H5FD.c
View File

@ -59,6 +59,12 @@ static herr_t H5FD__query(const H5FD_t *f, unsigned long *flags /*out*/);
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/* Whether to ignore file locks when disabled (env var value) */
htri_t H5FD_ignore_disabled_file_locks_p = FAIL;
/*****************************/
/* Library Private Variables */
/*****************************/
@ -92,10 +98,11 @@ static const H5I_class_t H5I_VFL_CLS[1] = {{
/*-------------------------------------------------------------------------
* Function: H5FD_init
*
* Purpose: Initialize the interface from some other layer.
* Purpose: Initialize the interface from some other package.
*
* Return: Success: non-negative
* Failure: negative
*
* Return: Success: non-negative
* Failure: negative
*-------------------------------------------------------------------------
*/
herr_t
@ -104,6 +111,28 @@ H5FD_init(void)
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_init() */
/*-------------------------------------------------------------------------
* Function: H5FD__init_package
*
* Purpose: Initialize the virtual file layer.
*
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
herr_t
H5FD__init_package(void)
{
char *lock_env_var = NULL; /* Environment variable pointer */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE
if (H5I_register_type(H5I_VFL_CLS) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize interface");
@ -111,9 +140,64 @@ H5FD_init(void)
/* Reset the file serial numbers */
H5FD_file_serial_no_g = 0;
/* 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"))
H5FD_ignore_disabled_file_locks_p = true; /* Override: Ignore disabled locks */
else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1")))
H5FD_ignore_disabled_file_locks_p = false; /* Override: Don't ignore disabled locks */
else
H5FD_ignore_disabled_file_locks_p = FAIL; /* Environment variable not set, or not set correctly */
/* Initialize all internal VFD drivers, so their driver IDs are set up */
if (H5FD__core_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register core VFD");
#ifdef H5_HAVE_DIRECT
if (H5FD__direct_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register direct VFD");
#endif
if (H5FD__family_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register family VFD");
#ifdef H5_HAVE_LIBHDFS
if (H5FD__hdfs_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register hdfs VFD");
#endif
#ifdef H5_HAVE_IOC_VFD
if (H5FD__ioc_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register ioc VFD");
#endif
if (H5FD__log_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register log VFD");
#ifdef H5_HAVE_MIRROR_VFD
if (H5FD__mirror_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register mirror VFD");
#endif
#ifdef H5_HAVE_PARALLEL
if (H5FD__mpio_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register mpio VFD");
#endif
if (H5FD__multi_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register multi VFD");
if (H5FD__onion_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register onion VFD");
#ifdef H5_HAVE_ROS3_VFD
if (H5FD__ros3_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register ros3 VFD");
#endif
if (H5FD__sec2_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register sec2 VFD");
if (H5FD__splitter_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register splitter VFD");
if (H5FD__stdio_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register stdio VFD");
#ifdef H5_HAVE_SUBFILING_VFD
if (H5FD__subfiling_register() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register subfiling VFD");
#endif
done:
FUNC_LEAVE_NOAPI(ret_value)
}
} /* end H5FD__init_package() */
/*-------------------------------------------------------------------------
* Function: H5FD_term_package
@ -137,14 +221,52 @@ H5FD_term_package(void)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if (H5I_nmembers(H5I_VFL) > 0) {
(void)H5I_clear_type(H5I_VFL, false, false);
n++; /*H5I*/
} /* end if */
else {
/* Destroy the VFL driver ID group */
n += (H5I_dec_type_ref(H5I_VFL) > 0);
} /* end else */
if (H5_PKG_INIT_VAR) {
if (H5I_nmembers(H5I_VFL) > 0) {
(void)H5I_clear_type(H5I_VFL, false, false);
/* Reset all internal VFD driver IDs */
H5FD__core_unregister();
#ifdef H5_HAVE_DIRECT
H5FD__direct_unregister();
#endif
H5FD__family_unregister();
#ifdef H5_HAVE_LIBHDFS
H5FD__hdfs_unregister();
#endif
#ifdef H5_HAVE_IOC_VFD
H5FD__ioc_unregister();
#endif
H5FD__log_unregister();
#ifdef H5_HAVE_MIRROR_VFD
H5FD__mirror_unregister();
#endif
#ifdef H5_HAVE_PARALLEL
H5FD__mpio_unregister();
#endif
H5FD__multi_unregister();
H5FD__onion_unregister();
#ifdef H5_HAVE_ROS3_VFD
H5FD__ros3_unregister();
#endif
H5FD__sec2_unregister();
H5FD__splitter_unregister();
H5FD__stdio_unregister();
#ifdef H5_HAVE_SUBFILING_VFD
H5FD__subfiling_unregister();
#endif
n++; /*H5I*/
} /* end if */
else {
/* Destroy the VFL driver ID group */
n += (H5I_dec_type_ref(H5I_VFL) > 0);
/* Mark closed */
if (0 == n)
H5_PKG_INIT_VAR = false;
} /* end else */
} /* end if */
FUNC_LEAVE_NOAPI(n)
} /* end H5FD_term_package() */
@ -154,7 +276,7 @@ H5FD_term_package(void)
*
* Purpose: Frees a file driver class struct and returns an indication of
* success. This function is used as the free callback for the
* virtual file layer object identifiers (cf H5FD_init).
* virtual file layer object identifiers (cf H5FD__init_package).
*
* Return: SUCCEED/FAIL
*
@ -441,7 +563,7 @@ H5FD_sb_size(H5FD_t *file)
{
hsize_t ret_value = 0;
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(0)
/* Sanity checks */
assert(file);
@ -451,6 +573,7 @@ H5FD_sb_size(H5FD_t *file)
if (file->cls->sb_size)
ret_value = (file->cls->sb_size)(file);
done:
FUNC_LEAVE_NOAPI(ret_value)
}
@ -578,7 +701,7 @@ H5FD_fapl_get(H5FD_t *file)
{
void *ret_value = NULL;
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(NULL)
/* Sanity checks */
assert(file);
@ -588,6 +711,7 @@ H5FD_fapl_get(H5FD_t *file)
if (file->cls->fapl_get)
ret_value = (file->cls->fapl_get)(file);
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_fapl_get() */
@ -945,7 +1069,7 @@ H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2)
{
int ret_value = -1; /* Return value */
FUNC_ENTER_NOAPI_NOERR /* return value is arbitrary */
FUNC_ENTER_NOAPI(-1) /* return value is arbitrary */
if ((!f1 || !f1->cls) && (!f2 || !f2->cls))
HGOTO_DONE(0);
@ -1299,7 +1423,7 @@ H5FD_get_maxaddr(const H5FD_t *file)
{
haddr_t ret_value = HADDR_UNDEF; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(HADDR_UNDEF)
/* Sanity checks */
assert(file);
@ -1307,6 +1431,7 @@ H5FD_get_maxaddr(const H5FD_t *file)
/* Set return value */
ret_value = file->maxaddr;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_get_maxaddr() */

65
src/H5FDcore.c
View File

@ -16,13 +16,13 @@
* access to small, temporary hdf5 files.
*/
#include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDcore.h" /* Core file driver */
#include "H5FDpkg.h" /* File drivers */
#include "H5FLprivate.h" /* Free lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
@ -30,10 +30,7 @@
#include "H5SLprivate.h" /* Skip lists */
/* The driver identification number, initialized at runtime */
static hid_t H5FD_CORE_g = 0;
/* Whether to ignore file locks when disabled (env var value) */
static htri_t ignore_disabled_file_locks_s = FAIL;
hid_t H5FD_CORE_id_g = H5I_INVALID_HID;
/* The skip list node type. Represents a region in the file. */
typedef struct H5FD_core_region_t {
@ -126,7 +123,6 @@ typedef struct H5FD_core_fapl_t {
static herr_t H5FD__core_add_dirty_region(H5FD_core_t *file, haddr_t start, haddr_t end);
static herr_t H5FD__core_destroy_dirty_list(H5FD_core_t *file);
static herr_t H5FD__core_write_to_bstore(H5FD_core_t *file, haddr_t addr, size_t size);
static herr_t H5FD__core_term(void);
static void *H5FD__core_fapl_get(H5FD_t *_file);
static H5FD_t *H5FD__core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
static herr_t H5FD__core_close(H5FD_t *_file);
@ -153,7 +149,7 @@ static const H5FD_class_t H5FD_core_g = {
"core", /* name */
MAXADDR, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD__core_term, /* terminate */
NULL, /* terminate */
NULL, /* sb_size */
NULL, /* sb_encode */
NULL, /* sb_decode */
@ -443,61 +439,48 @@ H5FD__core_get_default_config(void)
} /* end H5FD__core_get_default_config() */
/*-------------------------------------------------------------------------
* Function: H5FD_core_init
* Function: H5FD__core_register
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Register the driver with the library.
*
* Return: Success: The driver ID for the core driver
* Failure: H5I_INVALID_HID
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
hid_t
H5FD_core_init(void)
herr_t
H5FD__core_register(void)
{
char *lock_env_var = NULL; /* Environment variable pointer */
hid_t ret_value = H5I_INVALID_HID; /* Return value */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_PACKAGE
/* 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"))
ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */
else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1")))
ignore_disabled_file_locks_s = false; /* Override: Don't ignore disabled locks */
else
ignore_disabled_file_locks_s = FAIL; /* Environment variable not set, or not set correctly */
if (H5I_VFL != H5I_get_type(H5FD_CORE_g))
H5FD_CORE_g = H5FD_register(&H5FD_core_g, sizeof(H5FD_class_t), false);
/* Set return value */
ret_value = H5FD_CORE_g;
if (H5I_VFL != H5I_get_type(H5FD_CORE_id_g))
if ((H5FD_CORE_id_g = H5FD_register(&H5FD_core_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register core driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_core_init() */
} /* end H5FD__core_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__core_term
* Function: H5FD__core_unregister
*
* Purpose: Shut down the VFD
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
*---------------------------------------------------------------------------
*/
static herr_t
H5FD__core_term(void)
herr_t
H5FD__core_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_CORE_g = 0;
H5FD_CORE_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__core_term() */
} /* end H5FD__core_unregister() */
/*-------------------------------------------------------------------------
* Function: H5Pset_core_write_tracking
@ -798,9 +781,9 @@ H5FD__core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
file->fi_callbacks = file_image_info.callbacks;
/* Check the file locking flags in the fapl */
if (ignore_disabled_file_locks_s != FAIL)
if (H5FD_ignore_disabled_file_locks_p != FAIL)
/* The environment variable was set, so use that preferentially */
file->ignore_disabled_file_locks = ignore_disabled_file_locks_s;
file->ignore_disabled_file_locks = H5FD_ignore_disabled_file_locks_p;
else {
/* Use the value in the property list */
if (H5P_get(plist, H5F_ACS_IGNORE_DISABLED_FILE_LOCKS_NAME, &file->ignore_disabled_file_locks) < 0)

11
src/H5FDcore.h
View File

@ -16,8 +16,11 @@
#ifndef H5FDcore_H
#define H5FDcore_H
/** Initializer for the core VFD */
#define H5FD_CORE (H5FDperform_init(H5FD_core_init))
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
/** ID for the core VFD */
#define H5FD_CORE (H5OPEN H5FD_CORE_id_g)
/** Identifier for the core VFD */
#define H5FD_CORE_VALUE H5_VFD_CORE
@ -28,9 +31,9 @@ extern "C" {
/** @private
*
* \brief Private initializer for the core VFD
* \brief ID for the core VFD
*/
H5_DLL hid_t H5FD_core_init(void);
H5_DLLVAR hid_t H5FD_CORE_id_g;
/**
* \ingroup FAPL

1
src/H5FDdevelop.h
View File

@ -359,7 +359,6 @@ typedef hid_t (*H5FD_init_t)(void);
extern "C" {
#endif
H5_DLL hid_t H5FDperform_init(H5FD_init_t op);
H5_DLL hid_t H5FDregister(const H5FD_class_t *cls);
H5_DLL htri_t H5FDis_driver_registered_by_name(const char *driver_name);
H5_DLL htri_t H5FDis_driver_registered_by_value(H5FD_class_value_t driver_value);

69
src/H5FDdirect.c
View File

@ -16,13 +16,13 @@
* buffer. The main system support this feature is Linux.
*/
#include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDdirect.h" /* Direct file driver */
#include "H5FDpkg.h" /* File drivers */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
@ -31,10 +31,7 @@
#ifdef H5_HAVE_DIRECT
/* The driver identification number, initialized at runtime */
static hid_t H5FD_DIRECT_g = 0;
/* Whether to ignore file locks when disabled (env var value) */
static htri_t ignore_disabled_file_locks_s = FAIL;
hid_t H5FD_DIRECT_id_g = H5I_INVALID_HID;
/* File operations */
#define OP_UNKNOWN 0
@ -115,7 +112,6 @@ typedef struct H5FD_direct_t {
(ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || HADDR_UNDEF == (A) + (Z) || (HDoff_t)((A) + (Z)) < (HDoff_t)(A))
/* Prototypes */
static herr_t H5FD__direct_term(void);
static herr_t H5FD__direct_populate_config(size_t boundary, size_t block_size, size_t cbuf_size,
H5FD_direct_fapl_t *fa_out);
static void *H5FD__direct_fapl_get(H5FD_t *file);
@ -143,7 +139,7 @@ static const H5FD_class_t H5FD_direct_g = {
"direct", /* name */
MAXADDR, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD__direct_term, /* terminate */
NULL, /* terminate */
NULL, /* sb_size */
NULL, /* sb_encode */
NULL, /* sb_decode */
@ -184,65 +180,48 @@ static const H5FD_class_t H5FD_direct_g = {
H5FL_DEFINE_STATIC(H5FD_direct_t);
/*-------------------------------------------------------------------------
* Function: H5FD_direct_init
* Function: H5FD__direct_register
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Register the driver with the library.
*
* Return: Success: The driver ID for the direct driver
* Failure: H5I_INVALID_HID
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
hid_t
H5FD_direct_init(void)
herr_t
H5FD__direct_register(void)
{
char *lock_env_var = NULL; /* Environment variable pointer */
hid_t ret_value = H5I_INVALID_HID; /* Return value */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_PACKAGE
/* 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"))
ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */
else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1")))
ignore_disabled_file_locks_s = false; /* Override: Don't ignore disabled locks */
else
ignore_disabled_file_locks_s = FAIL; /* Environment variable not set, or not set correctly */
if (H5I_VFL != H5I_get_type(H5FD_DIRECT_g)) {
H5FD_DIRECT_g = H5FD_register(&H5FD_direct_g, sizeof(H5FD_class_t), false);
if (H5I_INVALID_HID == H5FD_DIRECT_g)
HGOTO_ERROR(H5E_ID, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register direct");
}
/* Set return value */
ret_value = H5FD_DIRECT_g;
if (H5I_VFL != H5I_get_type(H5FD_DIRECT_id_g))
if ((H5FD_DIRECT_id_g = H5FD_register(&H5FD_direct_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register direct driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_direct_init() */
} /* end H5FD__direct_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__direct_term
* Function: H5FD__direct_unregister
*
* Purpose: Shut down the VFD
* Purpose: Reset library driver info.
*
* Returns: Non-negative on success or negative on failure
*
*---------------------------------------------------------------------------
*/
static herr_t
H5FD__direct_term(void)
herr_t
H5FD__direct_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_DIRECT_g = 0;
H5FD_DIRECT_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__direct_term() */
} /* end H5FD__direct_unregister() */
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_direct
@ -437,7 +416,7 @@ H5FD__direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxad
int fd = (-1);
H5FD_direct_t *file = NULL;
const H5FD_direct_fapl_t *fa;
H5FD_direct_fapl_t default_fa;
H5FD_direct_fapl_t default_fa = {0};
#ifdef H5_HAVE_WIN32_API
HFILE filehandle;
struct _BY_HANDLE_FILE_INFORMATION fileinfo;
@ -511,9 +490,9 @@ H5FD__direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxad
file->fa.cbsize = fa->cbsize;
/* Check the file locking flags in the fapl */
if (ignore_disabled_file_locks_s != FAIL)
if (H5FD_ignore_disabled_file_locks_p != FAIL)
/* The environment variable was set, so use that preferentially */
file->ignore_disabled_file_locks = ignore_disabled_file_locks_s;
file->ignore_disabled_file_locks = H5FD_ignore_disabled_file_locks_p;
else {
/* Use the value in the property list */
if (H5P_get(plist, H5F_ACS_IGNORE_DISABLED_FILE_LOCKS_NAME, &file->ignore_disabled_file_locks) < 0)

11
src/H5FDdirect.h
View File

@ -16,10 +16,13 @@
#ifndef H5FDdirect_H
#define H5FDdirect_H
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
#ifdef H5_HAVE_DIRECT
/** Initializer for the direct VFD */
#define H5FD_DIRECT (H5FDperform_init(H5FD_direct_init))
/** ID for the direct VFD */
#define H5FD_DIRECT (H5OPEN H5FD_DIRECT_id_g)
/** Identifier for the direct VFD */
#define H5FD_DIRECT_VALUE H5_VFD_DIRECT
@ -50,9 +53,9 @@ extern "C" {
/** @private
*
* \brief Private initializer for the direct VFD
* \brief ID for the direct VFD
*/
H5_DLL hid_t H5FD_direct_init(void);
H5_DLLVAR hid_t H5FD_DIRECT_id_g;
/**
* \ingroup FAPL

48
src/H5FDfamily.c
View File

@ -28,13 +28,13 @@
*
*/
#include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDfamily.h" /* Family file driver */
#include "H5FDpkg.h" /* File drivers */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
@ -46,7 +46,7 @@
#define H5FD_FAM_DEF_MEM_SIZE ((hsize_t)(100 * H5_MB))
/* The driver identification number, initialized at runtime */
static hid_t H5FD_FAMILY_g = 0;
hid_t H5FD_FAMILY_id_g = H5I_INVALID_HID;
/* The description of a file belonging to this driver. */
typedef struct H5FD_family_t {
@ -80,7 +80,6 @@ static herr_t H5FD__family_get_default_config(H5FD_family_fapl_t *fa_out);
static char *H5FD__family_get_default_printf_filename(const char *old_filename);
/* Callback prototypes */
static herr_t H5FD__family_term(void);
static void *H5FD__family_fapl_get(H5FD_t *_file);
static void *H5FD__family_fapl_copy(const void *_old_fa);
static herr_t H5FD__family_fapl_free(void *_fa);
@ -112,7 +111,7 @@ static const H5FD_class_t H5FD_family_g = {
"family", /* name */
HADDR_MAX, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD__family_term, /* terminate */
NULL, /* terminate */
H5FD__family_sb_size, /* sb_size */
H5FD__family_sb_encode, /* sb_encode */
H5FD__family_sb_decode, /* sb_decode */
@ -267,51 +266,48 @@ done:
} /* end H5FD__family_get_default_printf_filename() */
/*-------------------------------------------------------------------------
* Function: H5FD_family_init
* Function: H5FD__family_register
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Register the driver with the library.
*
* Return: Success: The driver ID for the family driver
* Failure: H5I_INVALID_HID
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
hid_t
H5FD_family_init(void)
herr_t
H5FD__family_register(void)
{
hid_t ret_value = H5I_INVALID_HID;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_PACKAGE
if (H5I_VFL != H5I_get_type(H5FD_FAMILY_g))
H5FD_FAMILY_g = H5FD_register(&H5FD_family_g, sizeof(H5FD_class_t), false);
/* Set return value */
ret_value = H5FD_FAMILY_g;
if (H5I_VFL != H5I_get_type(H5FD_FAMILY_id_g))
if ((H5FD_FAMILY_id_g = H5FD_register(&H5FD_family_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register family driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5FD_family_init() */
} /* H5FD__family_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__family_term
* Function: H5FD__family_unregister
*
* Purpose: Shut down the VFD
* Purpose: Reset library driver info.
*
* Returns: Non-negative on success or negative on failure
*
*---------------------------------------------------------------------------
*/
static herr_t
H5FD__family_term(void)
herr_t
H5FD__family_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_FAMILY_g = 0;
H5FD_FAMILY_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__family_term() */
} /* end H5FD__family_unregister() */
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_family

11
src/H5FDfamily.h
View File

@ -16,8 +16,11 @@
#ifndef H5FDfamily_H
#define H5FDfamily_H
/** Initializer for the family VFD */
#define H5FD_FAMILY (H5FDperform_init(H5FD_family_init))
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
/** ID for the family VFD */
#define H5FD_FAMILY (H5OPEN H5FD_FAMILY_id_g)
/** Identifier for the family VFD */
#define H5FD_FAMILY_VALUE H5_VFD_FAMILY
@ -28,9 +31,9 @@ extern "C" {
/** @private
*
* \brief Private initializer for the family VFD
* \brief ID for the family VFD
*/
H5_DLL hid_t H5FD_family_init(void);
H5_DLLVAR hid_t H5FD_FAMILY_id_g;
/**
* \ingroup FAPL

118
src/H5FDhdfs.c
View File

@ -15,21 +15,19 @@
* File System (HDFS).
*/
#ifdef H5_HAVE_LIBHDFS
/* This source code file is part of the H5FD driver module */
#include "H5FDdrvr_module.h"
#endif
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#ifdef H5_HAVE_LIBHDFS
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDhdfs.h" /* hdfs file driver */
#include "H5FDpkg.h" /* File drivers */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#ifdef H5_HAVE_LIBHDFS
/* HDFS routines */
#include "hdfs.h"
@ -40,7 +38,12 @@
#define HDFS_STATS 0
/* The driver identification number, initialized at runtime */
static hid_t H5FD_HDFS_g = 0;
hid_t H5FD_HDFS_id_g = H5I_INVALID_HID;
/* Flag to indicate whether global driver resources & settings have been
* initialized.
*/
static bool H5FD_hdfs_init_s = false;
#if HDFS_STATS
@ -241,7 +244,6 @@ typedef struct H5FD_hdfs_t {
#define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR))
/* Prototypes */
static herr_t H5FD__hdfs_term(void);
static void *H5FD__hdfs_fapl_get(H5FD_t *_file);
static void *H5FD__hdfs_fapl_copy(const void *_old_fa);
static herr_t H5FD__hdfs_fapl_free(void *_fa);
@ -267,7 +269,7 @@ static const H5FD_class_t H5FD_hdfs_g = {
"hdfs", /* name */
MAXADDR, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD__hdfs_term, /* terminate */
NULL, /* terminate */
NULL, /* sb_size */
NULL, /* sb_encode */
NULL, /* sb_decode */
@ -308,61 +310,44 @@ static const H5FD_class_t H5FD_hdfs_g = {
H5FL_DEFINE_STATIC(H5FD_hdfs_t);
/*-------------------------------------------------------------------------
* Function: H5FD_hdfs_init
* Function: H5FD__hdfs_register
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Register the driver with the library.
*
* Return: Success: The driver ID for the hdfs driver.
* Failure: Negative
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
hid_t
H5FD_hdfs_init(void)
herr_t
H5FD__hdfs_register(void)
{
hid_t ret_value = H5I_INVALID_HID;
#if HDFS_STATS
unsigned int bin_i;
#endif
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_PACKAGE
#if HDFS_DEBUG
fprintf(stdout, "called %s.\n", __func__);
#endif
if (H5I_VFL != H5I_get_type(H5FD_HDFS_g))
H5FD_HDFS_g = H5FD_register(&H5FD_hdfs_g, sizeof(H5FD_class_t), false);
#if HDFS_STATS
/* pre-compute statsbin boundaries
*/
for (bin_i = 0; bin_i < HDFS_STATS_BIN_COUNT; bin_i++) {
unsigned long long value = 0;
HDFS_STATS_POW(bin_i, &value)
hdfs_stats_boundaries[bin_i] = value;
}
#endif
ret_value = H5FD_HDFS_g;
if (H5I_VFL != H5I_get_type(H5FD_HDFS_id_g))
if ((H5FD_HDFS_id_g = H5FD_register(&H5FD_hdfs_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register hdfs driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_hdfs_init() */
} /* end H5FD__hdfs_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__hdfs_term
* Function: H5FD__hdfs_unregister
*
* Purpose: Shut down the VFD
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
*---------------------------------------------------------------------------
*/
static herr_t
H5FD__hdfs_term(void)
herr_t
H5FD__hdfs_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
@ -371,10 +356,48 @@ H5FD__hdfs_term(void)
#endif
/* Reset VFL ID */
H5FD_HDFS_g = 0;
H5FD_HDFS_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__hdfs_term() */
} /* end H5FD__hdfs_unregister() */
/*-------------------------------------------------------------------------
* Function: H5FD__hdfs_init
*
* Purpose: Singleton to initialize global driver settings & resources.
*
* Return: Non-negative on success/Negative on failure
*
*-------------------------------------------------------------------------
*/
static herr_t
H5FD__hdfs_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE
#if HDFS_DEBUG
fprintf(stdout, "called %s.\n", __func__);
#endif
#if HDFS_STATS
/* pre-compute statsbin boundaries
*/
for (unsigned bin_i = 0; bin_i < HDFS_STATS_BIN_COUNT; bin_i++) {
unsigned long long value = 0;
HDFS_STATS_POW(bin_i, &value)
hdfs_stats_boundaries[bin_i] = value;
}
#endif
/* Indicate that driver is set up */
H5FD_hdfs_init_s = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__hdfs_init() */
/*--------------------------------------------------------------------------
* Function: H5FD__hdfs_handle_open
@ -401,6 +424,11 @@ H5FD__hdfs_handle_open(const char *path, const char *namenode_name, const int32_
fprintf(stdout, "called %s.\n", __func__);
#endif
/* Initialize driver, if it's not yet */
if (!H5FD_hdfs_init_s)
if (H5FD__hdfs_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "can't initialize driver");
if (path == NULL || path[0] == '\0')
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "path cannot be null");
if (namenode_name == NULL)

18
src/H5FDhdfs.h
View File

@ -18,10 +18,13 @@
#ifndef H5FDhdfs_H
#define H5FDhdfs_H
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
#ifdef H5_HAVE_LIBHDFS
/** Initializer for the hdfs VFD */
#define H5FD_HDFS (H5FDperform_init(H5FD_hdfs_init))
/** ID for the HDFS VFD */
#define H5FD_HDFS (H5OPEN H5FD_HDFS_id_g)
/** Identifier for the hdfs VFD */
#define H5FD_HDFS_VALUE H5_VFD_HDFS
@ -37,9 +40,6 @@
#endif /* H5_HAVE_LIBHDFS */
#ifdef H5_HAVE_LIBHDFS
#ifdef __cplusplus
extern "C" {
#endif
/**
* The version number of the H5FD_hdfs_fapl_t configuration
@ -93,11 +93,15 @@ typedef struct H5FD_hdfs_fapl_t {
int32_t stream_buffer_size;
} H5FD_hdfs_fapl_t;
#ifdef __cplusplus
extern "C" {
#endif
/** @private
*
* \brief Private initializer for the hdfs VFD
* \brief ID for the HDFS VFD
*/
H5_DLL hid_t H5FD_hdfs_init(void);
H5_DLLVAR hid_t H5FD_HDFS_id_g;
/**
* \ingroup FAPL

3
src/H5FDint.c
View File

@ -3044,7 +3044,7 @@ H5FD_check_plugin_load(const H5FD_class_t *cls, const H5PL_key_t *key, bool *suc
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
assert(cls);
@ -3066,6 +3066,7 @@ H5FD_check_plugin_load(const H5FD_class_t *cls, const H5PL_key_t *key, bool *suc
*success = true;
}
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_check_plugin_load() */

65
src/H5FDlog.c
View File

@ -20,23 +20,20 @@
* With custom modifications...
*/
#include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDlog.h" /* Logging file driver */
#include "H5FDpkg.h" /* File drivers */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
/* The driver identification number, initialized at runtime */
static hid_t H5FD_LOG_g = 0;
/* Whether to ignore file locks when disabled (env var value) */
static htri_t ignore_disabled_file_locks_s = FAIL;
hid_t H5FD_LOG_id_g = H5I_INVALID_HID;
/* Driver-specific file access properties */
typedef struct H5FD_log_fapl_t {
@ -154,7 +151,6 @@ typedef struct H5FD_log_t {
(ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || HADDR_UNDEF == (A) + (Z) || (HDoff_t)((A) + (Z)) < (HDoff_t)(A))
/* Prototypes */
static herr_t H5FD__log_term(void);
static void *H5FD__log_fapl_get(H5FD_t *file);
static void *H5FD__log_fapl_copy(const void *_old_fa);
static herr_t H5FD__log_fapl_free(void *_fa);
@ -183,7 +179,7 @@ static const H5FD_class_t H5FD_log_g = {
"log", /* name */
MAXADDR, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD__log_term, /* terminate */
NULL, /* terminate */
NULL, /* sb_size */
NULL, /* sb_encode */
NULL, /* sb_decode */
@ -227,61 +223,48 @@ static const H5FD_log_fapl_t H5FD_log_default_config_g = {NULL, H5FD_LOG_LOC_IO
H5FL_DEFINE_STATIC(H5FD_log_t);
/*-------------------------------------------------------------------------
* Function: H5FD_log_init
* Function: H5FD__log_register
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Register the driver with the library.
*
* Return: Success: The driver ID for the log driver
* Failure: H5I_INVALID_HID
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
hid_t
H5FD_log_init(void)
herr_t
H5FD__log_register(void)
{
char *lock_env_var = NULL; /* Environment variable pointer */
hid_t ret_value = H5I_INVALID_HID; /* Return value */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_PACKAGE
/* 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"))
ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */
else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1")))
ignore_disabled_file_locks_s = false; /* Override: Don't ignore disabled locks */
else
ignore_disabled_file_locks_s = FAIL; /* Environment variable not set, or not set correctly */
if (H5I_VFL != H5I_get_type(H5FD_LOG_g))
H5FD_LOG_g = H5FD_register(&H5FD_log_g, sizeof(H5FD_class_t), false);
/* Set return value */
ret_value = H5FD_LOG_g;
if (H5I_VFL != H5I_get_type(H5FD_LOG_id_g))
if ((H5FD_LOG_id_g = H5FD_register(&H5FD_log_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register log driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_log_init() */
} /* end H5FD__log_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__log_term
* Function: H5FD__log_unregister
*
* Purpose: Shut down the VFD
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
*---------------------------------------------------------------------------
*/
static herr_t
H5FD__log_term(void)
herr_t
H5FD__log_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_LOG_g = 0;
H5FD_LOG_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__log_term() */
} /* end H5FD__log_unregister() */
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_log
@ -599,9 +582,9 @@ H5FD__log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
}
/* Check the file locking flags in the fapl */
if (ignore_disabled_file_locks_s != FAIL)
if (H5FD_ignore_disabled_file_locks_p != FAIL)
/* The environment variable was set, so use that preferentially */
file->ignore_disabled_file_locks = ignore_disabled_file_locks_s;
file->ignore_disabled_file_locks = H5FD_ignore_disabled_file_locks_p;
else {
/* Use the value in the property list */
if (H5P_get(plist, H5F_ACS_IGNORE_DISABLED_FILE_LOCKS_NAME, &file->ignore_disabled_file_locks) < 0)

10
src/H5FDlog.h
View File

@ -17,7 +17,11 @@
#define H5FDlog_H
/** Initializer for the log VFD */
#define H5FD_LOG (H5FDperform_init(H5FD_log_init))
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
/** ID for the log VFD */
#define H5FD_LOG (H5OPEN H5FD_LOG_id_g)
/** Identifier for the log VFD */
#define H5FD_LOG_VALUE H5_VFD_LOG
@ -67,9 +71,9 @@ extern "C" {
/** @private
*
* \brief Private initializer for the log VFD
* \brief ID for the log VFD
*/
H5_DLL hid_t H5FD_log_init(void);
H5_DLLVAR hid_t H5FD_LOG_id_g;
/**
* \ingroup FAPL

56
src/H5FDmirror.c
View File

@ -15,24 +15,24 @@
* a remote host.
*/
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#ifdef H5_HAVE_MIRROR_VFD
#include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDmirror.h" /* "Mirror" definitions */
#include "H5FDmirror_priv.h" /* Private header for the mirror VFD */
#include "H5FDpkg.h" /* File drivers */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
/* The driver identification number, initialized at runtime */
static hid_t H5FD_MIRROR_g = 0;
hid_t H5FD_MIRROR_id_g = H5I_INVALID_HID;
/* Virtual file structure for a Mirror Driver */
typedef struct H5FD_mirror_t {
@ -139,7 +139,6 @@ typedef struct H5FD_mirror_t {
#endif /* MIRROR_DEBUG_OP_CALLS */
/* Prototypes */
static herr_t H5FD__mirror_term(void);
static void *H5FD__mirror_fapl_get(H5FD_t *_file);
static void *H5FD__mirror_fapl_copy(const void *_old_fa);
static herr_t H5FD__mirror_fapl_free(void *_fa);
@ -165,7 +164,7 @@ static const H5FD_class_t H5FD_mirror_g = {
"mirror", /* name */
MAXADDR, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD__mirror_term, /* terminate */
NULL, /* terminate */
NULL, /* sb_size */
NULL, /* sb_encode */
NULL, /* sb_decode */
@ -212,55 +211,52 @@ H5FL_DEFINE_STATIC(H5FD_mirror_t);
H5FL_DEFINE_STATIC(H5FD_mirror_xmit_open_t);
/* -------------------------------------------------------------------------
* Function: H5FD_mirror_init
* Function: H5FD__mirror_register
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Register the driver with the library.
*
* Return: SUCCEED/FAIL
*
* Return: Success: The driver ID for the mirror driver.
* Failure: Negative
* -------------------------------------------------------------------------
*/
hid_t
H5FD_mirror_init(void)
herr_t
H5FD__mirror_register(void)
{
hid_t ret_value = H5I_INVALID_HID;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_PACKAGE
LOG_OP_CALL(__func__);
if (H5I_VFL != H5I_get_type(H5FD_MIRROR_g)) {
H5FD_MIRROR_g = H5FD_register(&H5FD_mirror_g, sizeof(H5FD_class_t), false);
if (H5I_INVALID_HID == H5FD_MIRROR_g)
HGOTO_ERROR(H5E_ID, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register mirror");
}
ret_value = H5FD_MIRROR_g;
if (H5I_VFL != H5I_get_type(H5FD_MIRROR_id_g))
if ((H5FD_MIRROR_id_g = H5FD_register(&H5FD_mirror_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register mirror driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_mirror_init() */
} /* end H5FD__mirror_register() */
/* ---------------------------------------------------------------------------
* Function: H5FD__mirror_term
* Function: H5FD__mirror_unregister
*
* Purpose: Shut down the VFD
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
* ---------------------------------------------------------------------------
*/
static herr_t
H5FD__mirror_term(void)
herr_t
H5FD__mirror_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_MIRROR_g = 0;
LOG_OP_CALL(__func__);
/* Reset VFL ID */
H5FD_MIRROR_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__mirror_term() */
} /* end H5FD__mirror_unregister() */
/* ---------------------------------------------------------------------------
* Function: H5FD__mirror_xmit_decode_uint16

11
src/H5FDmirror.h
View File

@ -17,10 +17,13 @@
#ifndef H5FDmirror_H
#define H5FDmirror_H
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
#ifdef H5_HAVE_MIRROR_VFD
/** Initializer for the mirror VFD */
#define H5FD_MIRROR (H5FDperform_init(H5FD_mirror_init))
/** ID for the mirror VFD */
#define H5FD_MIRROR (H5OPEN H5FD_MIRROR_id_g)
/** Identifier for the mirror VFD */
#define H5FD_MIRROR_VALUE H5_VFD_MIRROR
@ -75,9 +78,9 @@ extern "C" {
/** @private
*
* \brief Private initializer for the mirror VFD
* \brief ID for the mirror VFD
*/
H5_DLL hid_t H5FD_mirror_init(void);
H5_DLLVAR hid_t H5FD_MIRROR_id_g;
/**
* \ingroup FAPL

5
src/H5FDmodule.h
View File

@ -22,7 +22,8 @@
* reporting macros.
*/
#define H5FD_MODULE
#define H5_MY_PKG H5FD
#define H5_MY_PKG_ERR H5E_VFL
#define H5_MY_PKG H5FD
#define H5_MY_PKG_ERR H5E_VFL
#define H5_MY_PKG_INIT YES
#endif /* H5FDmodule_H */

43
src/H5FDmpi.c
View File

@ -14,13 +14,16 @@
* Purpose: Common routines for all MPI-based VFL drivers.
*/
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDmpi.h" /* Common MPI file driver */
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#ifdef H5_HAVE_PARALLEL
#include "H5Eprivate.h" /* Error handling */
#include "H5FDmpi.h" /* Common MPI file driver */
#include "H5FDpkg.h" /* File drivers */
/*-------------------------------------------------------------------------
* Function: H5FD_mpi_get_rank
*
@ -36,10 +39,10 @@ int
H5FD_mpi_get_rank(H5FD_t *file)
{
const H5FD_class_t *cls;
uint64_t flags = H5FD_CTL_FAIL_IF_UNKNOWN_FLAG | H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG;
int rank = -1;
void *rank_ptr = (void *)(&rank);
int ret_value;
uint64_t flags = H5FD_CTL_FAIL_IF_UNKNOWN_FLAG | H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG;
int rank = -1;
void *rank_ptr = (void *)(&rank);
int ret_value = -1;
FUNC_ENTER_NOAPI(FAIL)
@ -75,10 +78,10 @@ int
H5FD_mpi_get_size(H5FD_t *file)
{
const H5FD_class_t *cls;
uint64_t flags = H5FD_CTL_FAIL_IF_UNKNOWN_FLAG | H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG;
int size = 0;
void *size_ptr = (void *)(&size);
int ret_value;
uint64_t flags = H5FD_CTL_FAIL_IF_UNKNOWN_FLAG | H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG;
int size = 0;
void *size_ptr = (void *)(&size);
int ret_value = 0;
FUNC_ENTER_NOAPI(FAIL)
@ -114,10 +117,10 @@ MPI_Comm
H5FD_mpi_get_comm(H5FD_t *file)
{
const H5FD_class_t *cls;
uint64_t flags = H5FD_CTL_FAIL_IF_UNKNOWN_FLAG | H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG;
MPI_Comm comm = MPI_COMM_NULL;
void *comm_ptr = (void *)(&comm);
MPI_Comm ret_value;
uint64_t flags = H5FD_CTL_FAIL_IF_UNKNOWN_FLAG | H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG;
MPI_Comm comm = MPI_COMM_NULL;
void *comm_ptr = (void *)(&comm);
MPI_Comm ret_value = MPI_COMM_NULL;
FUNC_ENTER_NOAPI(MPI_COMM_NULL)
@ -153,10 +156,10 @@ MPI_Info
H5FD_mpi_get_info(H5FD_t *file)
{
const H5FD_class_t *cls;
uint64_t flags = H5FD_CTL_FAIL_IF_UNKNOWN_FLAG | H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG;
MPI_Info info = MPI_INFO_NULL;
void *info_ptr = (void *)(&info);
MPI_Info ret_value;
uint64_t flags = H5FD_CTL_FAIL_IF_UNKNOWN_FLAG | H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG;
MPI_Info info = MPI_INFO_NULL;
void *info_ptr = (void *)(&info);
MPI_Info ret_value = MPI_INFO_NULL;
FUNC_ENTER_NOAPI(MPI_INFO_NULL)

222
src/H5FDmpio.c
View File

@ -14,34 +14,40 @@
* Purpose: This is the MPI I/O driver.
*/
#include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#ifdef H5_HAVE_PARALLEL
#include "H5private.h" /* Generic Functions */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Dprivate.h" /* Dataset functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDmpi.h" /* MPI-based file drivers */
#include "H5FDpkg.h" /* File drivers */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
#ifdef H5_HAVE_PARALLEL
/*
* The driver identification number, initialized at runtime if H5_HAVE_PARALLEL
* is defined. This allows applications to still have the H5FD_MPIO
* "constants" in their source code.
*/
static hid_t H5FD_MPIO_g = 0;
hid_t H5FD_MPIO_id_g = H5I_INVALID_HID;
/* Flag to indicate whether global driver resources & settings have been
* initialized.
*/
static bool H5FD_mpio_init_s = false;
/* Whether to allow collective I/O operations */
/* (Can be changed by setting "HDF5_MPI_OPT_TYPES" environment variable to '0' or '1') */
bool H5FD_mpi_opt_types_g = true;
/* Whether the driver initialized MPI on its own */
static bool H5FD_mpi_self_initialized = false;
static bool H5FD_mpi_self_initialized_s = false;
/*
* The view is set to this value
@ -256,79 +262,110 @@ H5FD__mem_t_to_str(H5FD_mem_t mem_type)
#endif /* H5FDmpio_DEBUG */
/*-------------------------------------------------------------------------
* Function: H5FD_mpio_init
* Function: H5FD__mpio_register
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Register the driver with the library.
*
* Return: Success: The driver ID for the mpio driver
* Failure: H5I_INVALID_HID
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
hid_t
H5FD_mpio_init(void)
herr_t
H5FD__mpio_register(void)
{
static int H5FD_mpio_Debug_inited = 0;
char *env = NULL;
hid_t ret_value = H5I_INVALID_HID; /* Return value */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_PACKAGE
/* Register the MPI-IO VFD, if it isn't already */
if (H5I_VFL != H5I_get_type(H5FD_MPIO_g)) {
H5FD_MPIO_g = H5FD_register((const H5FD_class_t *)&H5FD_mpio_g, sizeof(H5FD_class_t), false);
/* Check if MPI driver has been loaded dynamically */
env = getenv(HDF5_DRIVER);
if (env && !strcmp(env, "mpio")) {
int mpi_initialized = 0;
/* Initialize MPI if not already initialized */
if (MPI_SUCCESS != MPI_Initialized(&mpi_initialized))
HGOTO_ERROR(H5E_VFL, H5E_UNINITIALIZED, H5I_INVALID_HID, "can't check if MPI is initialized");
if (!mpi_initialized) {
if (MPI_SUCCESS != MPI_Init(NULL, NULL))
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID, "can't initialize MPI");
H5FD_mpi_self_initialized = true;
}
}
}
if (!H5FD_mpio_Debug_inited) {
const char *s; /* String for environment variables */
/* Allow MPI buf-and-file-type optimizations? */
s = getenv("HDF5_MPI_OPT_TYPES");
if (s && isdigit(*s))
H5FD_mpi_opt_types_g = (0 == strtol(s, NULL, 0)) ? false : true;
#ifdef H5FDmpio_DEBUG
/* Clear the flag buffer */
memset(H5FD_mpio_debug_flags_s, 0, sizeof(H5FD_mpio_debug_flags_s));
/* Retrieve MPI-IO debugging environment variable */
s = getenv("H5FD_mpio_Debug");
if (s)
H5FD__mpio_parse_debug_str(s);
#endif /* H5FDmpio_DEBUG */
H5FD_mpio_Debug_inited++;
} /* end if */
/* Set return value */
ret_value = H5FD_MPIO_g;
if (H5I_VFL != H5I_get_type(H5FD_MPIO_id_g))
if ((H5FD_MPIO_id_g = H5FD_register(&H5FD_mpio_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register mpio driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_mpio_init() */
} /* end H5FD__mpio_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__mpio_unregister
*
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
*---------------------------------------------------------------------------
*/
herr_t
H5FD__mpio_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_MPIO_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__mpio_unregister() */
/*-------------------------------------------------------------------------
* Function: H5FD__mpio_init
*
* Purpose: Singleton to initialize global driver settings & resources.
*
* Return: Non-negative on success/Negative on failure
*
*-------------------------------------------------------------------------
*/
static herr_t
H5FD__mpio_init(void)
{
char *env = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE
/* Check if MPI driver has been loaded dynamically */
env = getenv(HDF5_DRIVER);
if (env && !strcmp(env, "mpio")) {
int mpi_initialized = 0;
/* Initialize MPI if not already initialized */
if (MPI_SUCCESS != MPI_Initialized(&mpi_initialized))
HGOTO_ERROR(H5E_VFL, H5E_UNINITIALIZED, FAIL, "can't check if MPI is initialized");
if (!mpi_initialized) {
if (MPI_SUCCESS != MPI_Init(NULL, NULL))
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize MPI");
H5FD_mpi_self_initialized_s = true;
}
}
/* Allow MPI buf-and-file-type optimizations? */
env = getenv("HDF5_MPI_OPT_TYPES");
if (env && isdigit(*env))
H5FD_mpi_opt_types_g = (0 == strtol(env, NULL, 0)) ? false : true;
#ifdef H5FDmpio_DEBUG
/* Clear the flag buffer */
memset(H5FD_mpio_debug_flags_s, 0, sizeof(H5FD_mpio_debug_flags_s));
/* Retrieve MPI-IO debugging environment variable */
env = getenv("H5FD_mpio_Debug");
if (env)
H5FD__mpio_parse_debug_str(env);
#endif /* H5FDmpio_DEBUG */
/* Indicate that driver is set up */
H5FD_mpio_init_s = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__mpio_init() */
/*---------------------------------------------------------------------------
* Function: H5FD__mpio_term
*
* Purpose: Shut down the VFD
*
* Returns: Non-negative on success or negative on failure
* Returns: SUCCEED (Can't fail)
*
*---------------------------------------------------------------------------
*/
@ -338,19 +375,16 @@ H5FD__mpio_term(void)
FUNC_ENTER_PACKAGE_NOERR
/* Terminate MPI if the driver initialized it */
if (H5FD_mpi_self_initialized) {
if (H5FD_mpi_self_initialized_s) {
int mpi_finalized = 0;
MPI_Finalized(&mpi_finalized);
if (!mpi_finalized)
MPI_Finalize();
H5FD_mpi_self_initialized = false;
H5FD_mpi_self_initialized_s = false;
}
/* Reset VFL ID */
H5FD_MPIO_g = 0;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__mpio_term() */
@ -398,6 +432,11 @@ H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
if (MPI_COMM_NULL == comm)
HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "MPI_COMM_NULL is not a valid communicator");
/* Initialize driver, if it's not yet */
if (!H5FD_mpio_init_s)
if (H5FD__mpio_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
/* Set the MPI communicator and info object */
if (H5P_set(plist, H5F_ACS_MPI_PARAMS_COMM_NAME, &comm) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI communicator");
@ -451,6 +490,11 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm /*out*/, MPI_Info *info /*out*/)
if (H5FD_MPIO != H5P_peek_driver(plist))
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "VFL driver is not MPI-I/O");
/* Initialize driver, if it's not yet */
if (!H5FD_mpio_init_s)
if (H5FD__mpio_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
/* Get the MPI communicator and info object */
if (comm)
if (H5P_get(plist, H5F_ACS_MPI_PARAMS_COMM_NAME, comm) < 0)
@ -510,6 +554,11 @@ H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode)
if (H5FD_MPIO_INDEPENDENT != xfer_mode && H5FD_MPIO_COLLECTIVE != xfer_mode)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "incorrect xfer_mode");
/* Initialize driver, if it's not yet */
if (!H5FD_mpio_init_s)
if (H5FD__mpio_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
/* Set the transfer mode */
if (H5P_set(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value");
@ -543,6 +592,11 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode /*out*/)
if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl");
/* Initialize driver, if it's not yet */
if (!H5FD_mpio_init_s)
if (H5FD__mpio_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
/* Get the transfer mode */
if (xfer_mode)
if (H5P_get(plist, H5D_XFER_IO_XFER_MODE_NAME, xfer_mode) < 0)
@ -582,6 +636,11 @@ H5Pset_dxpl_mpio_collective_opt(hid_t dxpl_id, H5FD_mpio_collective_opt_t opt_mo
if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl");
/* Initialize driver, if it's not yet */
if (!H5FD_mpio_init_s)
if (H5FD__mpio_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
/* Set the transfer mode */
if (H5P_set(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &opt_mode) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value");
@ -620,6 +679,11 @@ H5Pset_dxpl_mpio_chunk_opt(hid_t dxpl_id, H5FD_mpio_chunk_opt_t opt_mode)
if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl");
/* Initialize driver, if it's not yet */
if (!H5FD_mpio_init_s)
if (H5FD__mpio_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
/* Set the transfer mode */
if (H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME, &opt_mode) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value");
@ -656,6 +720,11 @@ H5Pset_dxpl_mpio_chunk_opt_num(hid_t dxpl_id, unsigned num_chunk_per_proc)
if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl");
/* Initialize driver, if it's not yet */
if (!H5FD_mpio_init_s)
if (H5FD__mpio_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
/* Set the transfer mode */
if (H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME, &num_chunk_per_proc) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value");
@ -695,6 +764,11 @@ H5Pset_dxpl_mpio_chunk_opt_ratio(hid_t dxpl_id, unsigned percent_num_proc_per_ch
if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl");
/* Initialize driver, if it's not yet */
if (!H5FD_mpio_init_s)
if (H5FD__mpio_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
/* Set the transfer mode */
if (H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME, &percent_num_proc_per_chunk) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value");
@ -824,11 +898,16 @@ H5FD__mpio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t H5_ATTR
FUNC_ENTER_PACKAGE
/* Initialize driver, if it's not yet */
if (!H5FD_mpio_init_s)
if (H5FD__mpio_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "can't initialize driver");
/* Get a pointer to the fapl */
if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list");
if (H5FD_mpi_self_initialized) {
if (H5FD_mpi_self_initialized_s) {
comm = MPI_COMM_WORLD;
}
else {
@ -3738,11 +3817,16 @@ H5FD__mpio_delete(const char *filename, hid_t fapl_id)
assert(filename);
/* Initialize driver, if it's not yet */
if (!H5FD_mpio_init_s)
if (H5FD__mpio_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
assert(H5FD_MPIO == H5P_peek_driver(plist));
if (H5FD_mpi_self_initialized) {
if (H5FD_mpi_self_initialized_s) {
comm = MPI_COMM_WORLD;
}
else {

19
src/H5FDmpio.h
View File

@ -16,10 +16,13 @@
#ifndef H5FDmpio_H
#define H5FDmpio_H
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
#ifdef H5_HAVE_PARALLEL
/** Initializer for the mpio VFD */
#define H5FD_MPIO (H5FDperform_init(H5FD_mpio_init))
/** ID for the mpio VFD */
#define H5FD_MPIO (H5OPEN H5FD_MPIO_id_g)
#else
@ -35,19 +38,19 @@
#define H5FDmpio_DEBUG
#endif
/* Global var whose value comes from environment variable */
/* (Defined in H5FDmpio.c) */
H5_DLLVAR hbool_t H5FD_mpi_opt_types_g;
#ifdef __cplusplus
extern "C" {
#endif
/* Global var whose value comes from environment variable */
/* (Defined in H5FDmpio.c) */
H5_DLLVAR hbool_t H5FD_mpi_opt_types_g;
/** @private
*
* \brief Private initializer for the mpio VFD
* \brief ID for the mpio VFD
*/
H5_DLL hid_t H5FD_mpio_init(void);
H5_DLLVAR hid_t H5FD_MPIO_id_g;
/**
* \ingroup FAPL

339
src/H5FDmulti.c
View File

@ -72,9 +72,6 @@
#define H5FD_MULT_MAX_FILE_NAME_LEN 1024
/* The driver identification number, initialized at runtime */
static hid_t H5FD_MULTI_g = 0;
/* Driver-specific file access properties */
typedef struct H5FD_multi_fapl_t {
H5FD_mem_t memb_map[H5FD_MEM_NTYPES]; /*memory usage map */
@ -119,7 +116,6 @@ static int compute_next(H5FD_multi_t *file);
static int open_members(H5FD_multi_t *file);
/* Callback prototypes */
static herr_t H5FD_multi_term(void);
static hsize_t H5FD_multi_sb_size(H5FD_t *file);
static herr_t H5FD_multi_sb_encode(H5FD_t *file, char *name /*out*/, unsigned char *buf /*out*/);
static herr_t H5FD_multi_sb_decode(H5FD_t *file, const char *name, const unsigned char *buf);
@ -150,13 +146,13 @@ static herr_t H5FD_multi_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, c
void **output);
/* The class struct */
static const H5FD_class_t H5FD_multi_g = {
const H5FD_class_t H5FD_multi_g = {
H5FD_CLASS_VERSION, /* struct version */
H5_VFD_MULTI, /* value */
"multi", /* name */
HADDR_MAX, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD_multi_term, /* terminate */
NULL, /* terminate */
H5FD_multi_sb_size, /* sb_size */
H5FD_multi_sb_encode, /* sb_encode */
H5FD_multi_sb_decode, /* sb_decode */
@ -193,47 +189,6 @@ static const H5FD_class_t H5FD_multi_g = {
H5FD_FLMAP_DEFAULT /* fl_map */
};
/*-------------------------------------------------------------------------
* Function: H5FD_multi_init
*
* Purpose: Initialize this driver by registering the driver with the
* library.
*
* Return: Success: The driver ID for the multi driver
* Failure: H5I_INVALID_HID
*
*-------------------------------------------------------------------------
*/
hid_t
H5FD_multi_init(void)
{
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
if (H5I_VFL != H5Iget_type(H5FD_MULTI_g))
H5FD_MULTI_g = H5FDregister(&H5FD_multi_g);
return H5FD_MULTI_g;
} /* end H5FD_multi_init() */
/*---------------------------------------------------------------------------
* Function: H5FD_multi_term
*
* Purpose: Shut down the VFD
*
* Returns: Non-negative on success or negative on failure
*
*---------------------------------------------------------------------------
*/
static herr_t
H5FD_multi_term(void)
{
/* Reset VFL ID */
H5FD_MULTI_g = 0;
return 0;
} /* end H5FD_multi_term() */
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_split
*
@ -251,15 +206,14 @@ herr_t
H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, const char *raw_ext,
hid_t raw_plist_id)
{
H5FD_multi_fapl_t fa;
static const char *func = "H5Pset_fapl_split"; /* Function Name for error reporting */
H5FD_multi_fapl_t fa;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
if (H5FD_split_populate_config(meta_ext, meta_plist_id, raw_ext, raw_plist_id, true, &fa) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET, "can't setup split driver configuration",
-1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET,
"can't setup split driver configuration", -1);
return H5Pset_driver(fapl, H5FD_MULTI, &fa);
}
@ -341,17 +295,16 @@ herr_t
H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, const hid_t *memb_fapl,
const char *const *memb_name, const haddr_t *memb_addr, hbool_t relax)
{
H5FD_multi_fapl_t fa;
static const char *func = "H5FDset_fapl_multi"; /* Function Name for error reporting */
H5FD_multi_fapl_t fa;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
/* Check arguments and supply default values */
if (H5I_GENPROP_LST != H5Iget_type(fapl_id) || true != H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "not an access list", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "not an access list", -1);
if (H5FD_multi_populate_config(memb_map, memb_fapl, memb_name, memb_addr, relax, &fa) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET, "can't setup driver configuration", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET, "can't setup driver configuration", -1);
return H5Pset_driver(fapl_id, H5FD_MULTI, &fa);
}
@ -376,15 +329,14 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl
const H5FD_multi_fapl_t *fa;
H5FD_multi_fapl_t default_fa;
H5FD_mem_t mt;
static const char *func = "H5FDget_fapl_multi"; /* Function Name for error reporting */
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
if (H5I_GENPROP_LST != H5Iget_type(fapl_id) || true != H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not an access list", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not an access list", -1);
if (H5FD_MULTI != H5Pget_driver(fapl_id))
H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "incorrect VFL driver", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_PLIST, H5E_BADVALUE, "incorrect VFL driver", -1);
H5E_BEGIN_TRY
{
fa = (const H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id);
@ -392,8 +344,8 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl
H5E_END_TRY
if (!fa || (H5P_FILE_ACCESS_DEFAULT == fapl_id)) {
if (H5FD_multi_populate_config(NULL, NULL, NULL, NULL, true, &default_fa) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTSET, "can't setup default driver configuration",
-1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_CANTSET,
"can't setup default driver configuration", -1);
fa = &default_fa;
}
@ -438,7 +390,6 @@ static herr_t
H5FD_split_populate_config(const char *meta_ext, hid_t meta_plist_id, const char *raw_ext, hid_t raw_plist_id,
bool relax, H5FD_multi_fapl_t *fa_out)
{
static const char *func = "H5FD_split_populate_config"; /* Function Name for error reporting */
static char
meta_name_g[H5FD_MULT_MAX_FILE_NAME_LEN]; /* Static scratch buffer to store metadata member name */
static char
@ -510,18 +461,20 @@ H5FD_split_populate_config(const char *meta_ext, hid_t meta_plist_id, const char
/* Map usage type */
H5FD_mem_t mmt = _memb_map[mt];
if (mmt < 0 || mmt >= H5FD_MEM_NTYPES)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADRANGE, "file resource type out of range", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADRANGE, "file resource type out of range",
-1);
/*
* All members of MEMB_FAPL must be either defaults or actual file
* access property lists.
*/
if (H5P_DEFAULT != _memb_fapl[mmt] && true != H5Pisa_class(_memb_fapl[mmt], H5P_FILE_ACCESS))
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type incorrect", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type incorrect",
-1);
/* All names must be defined */
if (!_memb_name[mmt] || !_memb_name[mmt][0])
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type not set", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type not set", -1);
}
END_MEMBERS
@ -541,7 +494,7 @@ H5FD_split_populate_config(const char *meta_ext, hid_t meta_plist_id, const char
if (fa_out->memb_fapl[mt] == H5P_DEFAULT) {
fa_out->memb_fapl[mt] = H5Pcreate(H5P_FILE_ACCESS);
if (H5Pset_fapl_sec2(fa_out->memb_fapl[mt]) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET,
"can't set sec2 driver on member FAPL", -1);
}
}
@ -564,7 +517,6 @@ static herr_t
H5FD_multi_populate_config(const H5FD_mem_t *memb_map, const hid_t *memb_fapl, const char *const *memb_name,
const haddr_t *memb_addr, bool relax, H5FD_multi_fapl_t *fa_out)
{
static const char *func = "H5FD_multi_populate_config"; /* Function Name for error reporting */
static const char *letters = "Xsbrglo";
static char _memb_name_g[H5FD_MEM_NTYPES][16]; /* Static scratch buffer to store member names */
H5FD_mem_t mt, mmt;
@ -585,7 +537,7 @@ H5FD_multi_populate_config(const H5FD_mem_t *memb_map, const hid_t *memb_fapl, c
for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt = (H5FD_mem_t)(mt + 1)) {
_memb_fapl[mt] = H5Pcreate(H5P_FILE_ACCESS);
if (H5Pset_fapl_sec2(_memb_fapl[mt]) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET,
"can't set sec2 driver on member FAPL", -1);
}
memb_fapl = _memb_fapl;
@ -608,7 +560,8 @@ H5FD_multi_populate_config(const H5FD_mem_t *memb_map, const hid_t *memb_fapl, c
/* Map usage type */
mmt = memb_map[mt];
if (mmt < 0 || mmt >= H5FD_MEM_NTYPES)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADRANGE, "file resource type out of range", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADRANGE, "file resource type out of range",
-1);
if (H5FD_MEM_DEFAULT == mmt)
mmt = mt;
@ -617,11 +570,12 @@ H5FD_multi_populate_config(const H5FD_mem_t *memb_map, const hid_t *memb_fapl, c
* access property lists.
*/
if (H5P_DEFAULT != memb_fapl[mmt] && true != H5Pisa_class(memb_fapl[mmt], H5P_FILE_ACCESS))
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type incorrect", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type incorrect",
-1);
/* All names must be defined */
if (!memb_name[mmt] || !memb_name[mmt][0])
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type not set", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "file resource type not set", -1);
}
/*
@ -640,7 +594,7 @@ H5FD_multi_populate_config(const H5FD_mem_t *memb_map, const hid_t *memb_fapl, c
if (fa_out->memb_fapl[mt] == H5P_DEFAULT) {
fa_out->memb_fapl[mt] = H5Pcreate(H5P_FILE_ACCESS);
if (H5Pset_fapl_sec2(fa_out->memb_fapl[mt]) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET,
"can't set sec2 driver on member FAPL", -1);
}
}
@ -712,13 +666,12 @@ H5FD_multi_sb_size(H5FD_t *_file)
static herr_t
H5FD_multi_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out*/)
{
H5FD_multi_t *file = (H5FD_multi_t *)_file;
haddr_t memb_eoa;
unsigned char *p;
size_t nseen;
size_t i;
H5FD_mem_t m;
static const char *func = "H5FD_multi_sb_encode"; /* Function Name for error reporting */
H5FD_multi_t *file = (H5FD_multi_t *)_file;
haddr_t memb_eoa;
unsigned char *p;
size_t nseen;
size_t i;
H5FD_mem_t m;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -754,7 +707,8 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out
}
END_MEMBERS
if (H5Tconvert(H5T_NATIVE_HADDR, H5T_STD_U64LE, nseen * 2, buf + 8, NULL, H5P_DEFAULT) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info",
-1);
/* Encode all name templates */
p = buf + 8 + nseen * 2 * 8;
@ -790,25 +744,24 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name /*out*/, unsigned char *buf /*out
static herr_t
H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
{
H5FD_multi_t *file = (H5FD_multi_t *)_file;
char x[2 * H5FD_MEM_NTYPES * 8];
H5FD_mem_t map[H5FD_MEM_NTYPES];
int i;
size_t nseen = 0;
bool map_changed = false;
bool in_use[H5FD_MEM_NTYPES];
const char *memb_name[H5FD_MEM_NTYPES];
haddr_t memb_addr[H5FD_MEM_NTYPES];
haddr_t memb_eoa[H5FD_MEM_NTYPES];
haddr_t *ap;
static const char *func = "H5FD_multi_sb_decode"; /* Function Name for error reporting */
H5FD_multi_t *file = (H5FD_multi_t *)_file;
char x[2 * H5FD_MEM_NTYPES * 8];
H5FD_mem_t map[H5FD_MEM_NTYPES];
int i;
size_t nseen = 0;
bool map_changed = false;
bool in_use[H5FD_MEM_NTYPES];
const char *memb_name[H5FD_MEM_NTYPES];
haddr_t memb_addr[H5FD_MEM_NTYPES];
haddr_t memb_eoa[H5FD_MEM_NTYPES];
haddr_t *ap;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
/* Make sure the name/version number is correct */
if (strcmp(name, "NCSAmult") != 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid multi superblock", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "invalid multi superblock", -1);
/* Set default values */
ALL_MEMBERS (mt) {
@ -840,7 +793,8 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
memcpy(x, buf, (nseen * 2 * 8));
buf += nseen * 2 * 8;
if (H5Tconvert(H5T_STD_U64LE, H5T_NATIVE_HADDR, nseen * 2, x, NULL, H5P_DEFAULT) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_DATATYPE, H5E_CANTCONVERT, "can't convert superblock info",
-1);
ap = (haddr_t *)((void *)x); /* Extra (void *) cast to quiet "cast to create alignment" warning -
2019/07/05, QAK */
UNIQUE_MEMBERS (map, mt) {
@ -897,17 +851,17 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
}
END_MEMBERS
if (compute_next(file) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "compute_next() failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "compute_next() failed", -1);
/* Open all necessary files */
if (open_members(file) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "open_members() failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "open_members() failed", -1);
/* Set the EOA marker for all open files */
UNIQUE_MEMBERS (file->fa.memb_map, mt) {
if (file->memb[mt])
if (H5FDset_eoa(file->memb[mt], mt, memb_eoa[mt]) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET, "set_eoa() failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_CANTSET, "set_eoa() failed", -1);
/* Save the individual EOAs in one place for later comparison (in H5FD_multi_set_eoa)
*/
@ -960,7 +914,6 @@ H5FD_multi_fapl_copy(const void *_old_fa)
const H5FD_multi_fapl_t *old_fa = (const H5FD_multi_fapl_t *)_old_fa;
H5FD_multi_fapl_t *new_fa = (H5FD_multi_fapl_t *)calloc(1, sizeof(H5FD_multi_fapl_t));
int nerrors = 0;
static const char *func = "H5FD_multi_fapl_copy"; /* Function Name for error reporting */
assert(new_fa);
@ -995,7 +948,7 @@ H5FD_multi_fapl_copy(const void *_old_fa)
}
END_MEMBERS
free(new_fa);
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "can't release object on error", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "can't release object on error", NULL);
}
return new_fa;
}
@ -1014,8 +967,7 @@ H5FD_multi_fapl_copy(const void *_old_fa)
static herr_t
H5FD_multi_fapl_free(void *_fa)
{
H5FD_multi_fapl_t *fa = (H5FD_multi_fapl_t *)_fa;
static const char *func = "H5FD_multi_fapl_free"; /* Function Name for error reporting */
H5FD_multi_fapl_t *fa = (H5FD_multi_fapl_t *)_fa;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -1023,7 +975,8 @@ H5FD_multi_fapl_free(void *_fa)
ALL_MEMBERS (mt) {
if (fa->memb_fapl[mt] >= 0)
if (H5Idec_ref(fa->memb_fapl[mt]) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTCLOSEOBJ, "can't close property list", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_FILE, H5E_CANTCLOSEOBJ, "can't close property list",
-1);
if (fa->memb_name[mt])
free(fa->memb_name[mt]);
}
@ -1053,16 +1006,15 @@ H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
hid_t close_fapl = -1;
const H5FD_multi_fapl_t *fa;
H5FD_mem_t m;
static const char *func = "H5FD_multi_open"; /* Function Name for error reporting */
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
/* Check arguments */
if (!name || !*name)
H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADVALUE, "invalid file name", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_ARGS, H5E_BADVALUE, "invalid file name", NULL);
if (0 == maxaddr || HADDR_UNDEF == maxaddr)
H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADRANGE, "bogus maxaddr", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_ARGS, H5E_BADRANGE, "bogus maxaddr", NULL);
/*
* Initialize the file from the file access properties, using default
@ -1071,7 +1023,7 @@ H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
* in H5FD_multi_t.
*/
if (NULL == (file = (H5FD_multi_t *)calloc((size_t)1, sizeof(H5FD_multi_t))))
H5Epush_ret(func, H5E_ERR_CLS, H5E_RESOURCE, H5E_NOSPACE, "memory allocation failed", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_RESOURCE, H5E_NOSPACE, "memory allocation failed", NULL);
H5E_BEGIN_TRY
{
fa = (const H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id);
@ -1083,11 +1035,11 @@ H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
close_fapl = fapl_id = H5Pcreate(H5P_FILE_ACCESS);
if (env && !strcmp(env, "split")) {
if (H5Pset_fapl_split(fapl_id, NULL, H5P_DEFAULT, NULL, H5P_DEFAULT) < 0)
H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTSET, "can't set property value", error);
H5Epush_goto(__func__, H5E_ERR_CLS, H5E_FILE, H5E_CANTSET, "can't set property value", error);
}
else {
if (H5Pset_fapl_multi(fapl_id, NULL, NULL, NULL, NULL, true) < 0)
H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTSET, "can't set property value", error);
H5Epush_goto(__func__, H5E_ERR_CLS, H5E_FILE, H5E_CANTSET, "can't set property value", error);
}
fa = (const H5FD_multi_fapl_t *)H5Pget_driver_info(fapl_id);
@ -1110,13 +1062,14 @@ H5FD_multi_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
file->name = my_strdup(name);
if (close_fapl >= 0)
if (H5Pclose(close_fapl) < 0)
H5Epush_goto(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTCLOSEOBJ, "can't close property list", error);
H5Epush_goto(__func__, H5E_ERR_CLS, H5E_FILE, H5E_CANTCLOSEOBJ, "can't close property list",
error);
/* Compute derived properties and open member files */
if (compute_next(file) < 0)
H5Epush_goto(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "compute_next() failed", error);
H5Epush_goto(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "compute_next() failed", error);
if (open_members(file) < 0)
H5Epush_goto(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "open_members() failed", error);
H5Epush_goto(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "open_members() failed", error);
/* We must have opened at least the superblock file */
if (H5FD_MEM_DEFAULT == (m = file->fa.memb_map[H5FD_MEM_SUPER]))
@ -1161,9 +1114,8 @@ error:
static herr_t
H5FD_multi_close(H5FD_t *_file)
{
H5FD_multi_t *file = (H5FD_multi_t *)_file;
int nerrors = 0;
static const char *func = "H5FD_multi_close"; /* Function Name for error reporting */
H5FD_multi_t *file = (H5FD_multi_t *)_file;
int nerrors = 0;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -1181,7 +1133,7 @@ H5FD_multi_close(H5FD_t *_file)
}
END_MEMBERS
if (nerrors)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error closing member files", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error closing member files", -1);
/* Clean up other stuff */
ALL_MEMBERS (mt) {
@ -1311,7 +1263,6 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
{
const H5FD_multi_t *file = (const H5FD_multi_t *)_file;
haddr_t eoa = 0;
static const char *func = "H5FD_multi_get_eoa"; /* Function Name for error reporting */
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -1335,8 +1286,8 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
H5E_END_TRY
if (HADDR_UNDEF == memb_eoa)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa",
HADDR_UNDEF);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE,
"member file has unknown eoa", HADDR_UNDEF);
if (memb_eoa > 0)
memb_eoa += file->fa.memb_addr[mt];
}
@ -1349,7 +1300,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
assert(HADDR_UNDEF != memb_eoa);
}
else {
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eoa", HADDR_UNDEF);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eoa", HADDR_UNDEF);
}
if (memb_eoa > eoa)
@ -1371,7 +1322,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
H5E_END_TRY
if (HADDR_UNDEF == eoa)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa",
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa",
HADDR_UNDEF);
if (eoa > 0)
eoa += file->fa.memb_addr[mmt];
@ -1385,7 +1336,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
assert(HADDR_UNDEF != eoa);
}
else {
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eoa", HADDR_UNDEF);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eoa", HADDR_UNDEF);
}
}
@ -1409,10 +1360,9 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
static herr_t
H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa)
{
H5FD_multi_t *file = (H5FD_multi_t *)_file;
H5FD_mem_t mmt;
herr_t status;
static const char *func = "H5FD_multi_set_eoa"; /* Function Name for error reporting */
H5FD_multi_t *file = (H5FD_multi_t *)_file;
H5FD_mem_t mmt;
herr_t status;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -1448,7 +1398,7 @@ H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa)
}
H5E_END_TRY
if (status < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "member H5FDset_eoa failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_FILE, H5E_BADVALUE, "member H5FDset_eoa failed", -1);
return 0;
} /* end H5FD_multi_set_eoa() */
@ -1472,7 +1422,6 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
{
const H5FD_multi_t *file = (const H5FD_multi_t *)_file;
haddr_t eof = 0;
static const char *func = "H5FD_multi_get_eof"; /* Function Name for error reporting */
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -1490,8 +1439,8 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
H5E_END_TRY
if (HADDR_UNDEF == tmp_eof)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eof",
HADDR_UNDEF);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE,
"member file has unknown eof", HADDR_UNDEF);
if (tmp_eof > 0)
tmp_eof += file->fa.memb_addr[mt];
}
@ -1504,7 +1453,7 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
assert(HADDR_UNDEF != tmp_eof);
}
else {
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eof", HADDR_UNDEF);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eof", HADDR_UNDEF);
}
if (tmp_eof > eof)
eof = tmp_eof;
@ -1526,7 +1475,7 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
H5E_END_TRY
if (HADDR_UNDEF == eof)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eof",
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eof",
HADDR_UNDEF);
if (eof > 0)
eof += file->fa.memb_addr[mmt];
@ -1540,7 +1489,7 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
assert(HADDR_UNDEF != eof);
}
else {
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eof", HADDR_UNDEF);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eof", HADDR_UNDEF);
}
}
return eof;
@ -1558,16 +1507,15 @@ H5FD_multi_get_eof(const H5FD_t *_file, H5FD_mem_t type)
static herr_t
H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
{
H5FD_multi_t *file = (H5FD_multi_t *)_file;
H5FD_mem_t type, mmt;
static const char *func = "H5FD_multi_get_handle"; /* Function Name for error reporting */
H5FD_multi_t *file = (H5FD_multi_t *)_file;
H5FD_mem_t type, mmt;
/* Get data type for multi driver */
if (H5Pget_multi_type(fapl, &type) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "can't get data type for multi driver",
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "can't get data type for multi driver",
-1);
if (type < H5FD_MEM_DEFAULT || type >= H5FD_MEM_NTYPES)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "data type is out of range", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "data type is out of range", -1);
mmt = file->fa.memb_map[type];
if (H5FD_MEM_DEFAULT == mmt)
mmt = type;
@ -1589,10 +1537,9 @@ H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
static haddr_t
H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
{
H5FD_multi_t *file = (H5FD_multi_t *)_file;
H5FD_mem_t mmt;
haddr_t addr;
static const char *func = "H5FD_multi_alloc"; /* Function Name for error reporting */
H5FD_multi_t *file = (H5FD_multi_t *)_file;
H5FD_mem_t mmt;
haddr_t addr;
mmt = file->fa.memb_map[type];
if (H5FD_MEM_DEFAULT == mmt)
@ -1608,23 +1555,10 @@ H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
}
if (HADDR_UNDEF == (addr = H5FDalloc(file->memb[mmt], mmt, dxpl_id, size)))
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file can't alloc", HADDR_UNDEF);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file can't alloc",
HADDR_UNDEF);
addr += file->fa.memb_addr[mmt];
/*#ifdef TMP
if ( addr + size > file->eoa ) {
if ( H5FD_multi_set_eoa(_file, addr + size) < 0 ) {
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, \
"can't set eoa", HADDR_UNDEF);
}
}
#else
if ( addr + size > file->eoa )
file->eoa = addr + size;
#endif */
return addr;
}
@ -1758,42 +1692,9 @@ H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
static herr_t
H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, bool closing)
{
H5FD_multi_t *file = (H5FD_multi_t *)_file;
H5FD_mem_t mt;
int nerrors = 0;
static const char *func = "H5FD_multi_flush"; /* Function Name for error reporting */
#if 0
H5FD_mem_t mmt;
/* Debugging stuff... */
fprintf(stderr, "multifile access information:\n");
/* print the map */
fprintf(stderr, " map=");
for (mt=1; mt<H5FD_MEM_NTYPES; mt++) {
mmt = file->memb_map[mt];
if (H5FD_MEM_DEFAULT==mmt) mmt = mt;
fprintf(stderr, "%s%d", 1==mt?"":",", (int)mmt);
}
fprintf(stderr, "\n");
/* print info about each file */
fprintf(stderr, " File Starting Allocated Next Member\n");
fprintf(stderr, " Number Address Size Address Name\n");
fprintf(stderr, " ------ -------------------- -------------------- -------------------- ------------------------------\n");
for (mt=1; mt<H5FD_MEM_NTYPES; mt++) {
if (HADDR_UNDEF!=file->memb_addr[mt]) {
haddr_t eoa = H5FDget_eoa(file->memb[mt], mt);
fprintf(stderr, " %6d %20llu %20llu %20llu %s\n",
(int)mt, (unsigned long long)(file->memb_addr[mt]),
(unsigned long long)eoa,
(unsigned long long)(file->memb_next[mt]),
file->memb_name[mt]);
}
}
#endif
H5FD_multi_t *file = (H5FD_multi_t *)_file;
H5FD_mem_t mt;
int nerrors = 0;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -1810,7 +1711,7 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, bool closing)
}
}
if (nerrors)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error flushing member files", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error flushing member files", -1);
return 0;
}
@ -1828,10 +1729,9 @@ H5FD_multi_flush(H5FD_t *_file, hid_t dxpl_id, bool closing)
static herr_t
H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, bool closing)
{
H5FD_multi_t *file = (H5FD_multi_t *)_file;
H5FD_mem_t mt;
int nerrors = 0;
static const char *func = "H5FD_multi_truncate"; /* Function Name for error reporting */
H5FD_multi_t *file = (H5FD_multi_t *)_file;
H5FD_mem_t mt;
int nerrors = 0;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -1848,7 +1748,7 @@ H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, bool closing)
}
}
if (nerrors)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error truncating member files", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error truncating member files", -1);
return 0;
} /* end H5FD_multi_truncate() */
@ -1869,10 +1769,9 @@ H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, bool closing)
static herr_t
H5FD_multi_lock(H5FD_t *_file, bool rw)
{
H5FD_multi_t *file = (H5FD_multi_t *)_file;
int nerrors = 0;
H5FD_mem_t out_mt = H5FD_MEM_DEFAULT;
static const char *func = "H5FD_multi_unlock"; /* Function Name for error reporting */
H5FD_multi_t *file = (H5FD_multi_t *)_file;
int nerrors = 0;
H5FD_mem_t out_mt = H5FD_MEM_DEFAULT;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -1908,7 +1807,7 @@ H5FD_multi_lock(H5FD_t *_file, bool rw)
} /* end if */
if (nerrors)
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTLOCKFILE, "error locking member files", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_CANTLOCKFILE, "error locking member files", -1);
return 0;
} /* H5FD_multi_lock() */
@ -1928,9 +1827,8 @@ H5FD_multi_lock(H5FD_t *_file, bool rw)
static herr_t
H5FD_multi_unlock(H5FD_t *_file)
{
H5FD_multi_t *file = (H5FD_multi_t *)_file;
int nerrors = 0;
static const char *func = "H5FD_multi_unlock"; /* Function Name for error reporting */
H5FD_multi_t *file = (H5FD_multi_t *)_file;
int nerrors = 0;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -1943,7 +1841,7 @@ H5FD_multi_unlock(H5FD_t *_file)
END_MEMBERS
if (nerrors)
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTUNLOCKFILE, "error unlocking member files", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_CANTUNLOCKFILE, "error unlocking member files", -1);
return 0;
} /* H5FD_multi_unlock() */
@ -2010,10 +1908,9 @@ H5_GCC_CLANG_DIAG_OFF("format-nonliteral")
static int
open_members(H5FD_multi_t *file)
{
char tmp[H5FD_MULT_MAX_FILE_NAME_LEN];
int nerrors = 0;
int nchars;
static const char *func = "(H5FD_multi)open_members"; /* Function Name for error reporting */
char tmp[H5FD_MULT_MAX_FILE_NAME_LEN];
int nerrors = 0;
int nchars;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -2025,7 +1922,7 @@ open_members(H5FD_multi_t *file)
nchars = snprintf(tmp, sizeof(tmp), file->fa.memb_name[mt], file->name);
if (nchars < 0 || nchars >= (int)sizeof(tmp))
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_BADVALUE,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_BADVALUE,
"filename is too long and would be truncated", -1);
H5E_BEGIN_TRY
@ -2040,7 +1937,7 @@ open_members(H5FD_multi_t *file)
}
END_MEMBERS
if (nerrors)
H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error opening member files", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "error opening member files", -1);
return 0;
}
@ -2063,7 +1960,6 @@ H5FD_multi_delete(const char *filename, hid_t fapl_id)
int nchars;
const H5FD_multi_fapl_t *fa;
H5FD_multi_fapl_t default_fa;
static const char *func = "H5FD_multi_delete"; /* Function Name for error reporting */
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -2081,11 +1977,13 @@ H5FD_multi_delete(const char *filename, hid_t fapl_id)
if (env && !strcmp(env, "split")) {
if (H5FD_split_populate_config(NULL, H5P_DEFAULT, NULL, H5P_DEFAULT, true, &default_fa) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTSET, "can't setup driver configuration", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_CANTSET, "can't setup driver configuration",
-1);
}
else {
if (H5FD_multi_populate_config(NULL, NULL, NULL, NULL, true, &default_fa) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTSET, "can't setup driver configuration", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_CANTSET, "can't setup driver configuration",
-1);
}
fa = &default_fa;
@ -2099,11 +1997,11 @@ H5FD_multi_delete(const char *filename, hid_t fapl_id)
nchars = snprintf(full_filename, sizeof(full_filename), fa->memb_name[mt], filename);
if (nchars < 0 || nchars >= (int)sizeof(full_filename))
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_BADVALUE,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_BADVALUE,
"filename is too long and would be truncated", -1);
if (H5FDdelete(full_filename, fa->memb_fapl[mt]) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_BADVALUE, "error deleting member files", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_BADVALUE, "error deleting member files", -1);
}
END_MEMBERS
@ -2134,9 +2032,8 @@ H5_GCC_CLANG_DIAG_ON("format-nonliteral")
static herr_t
H5FD_multi_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, const void *input, void **output)
{
H5FD_multi_t *file = (H5FD_multi_t *)_file;
static const char *func = "H5FD_multi_ctl"; /* Function Name for error reporting */
herr_t ret_value = 0;
H5FD_multi_t *file = (H5FD_multi_t *)_file;
herr_t ret_value = 0;
/* Silence compiler */
(void)file;
@ -2150,7 +2047,7 @@ H5FD_multi_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, const void *inpu
/* Unknown op code */
default:
if (flags & H5FD_CTL_FAIL_IF_UNKNOWN_FLAG)
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_FCNTL,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_FCNTL,
"VFD ctl request failed (unknown op code and fail if unknown flag is set)", -1);
break;

11
src/H5FDmulti.h
View File

@ -16,8 +16,11 @@
#ifndef H5FDmulti_H
#define H5FDmulti_H
/** Initializer for the multi VFD */
#define H5FD_MULTI (H5FDperform_init(H5FD_multi_init))
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
/** ID for the multi VFD */
#define H5FD_MULTI (H5OPEN H5FD_MULTI_id_g)
#ifdef __cplusplus
extern "C" {
@ -25,9 +28,9 @@ extern "C" {
/** @private
*
* \brief Private initializer for the multi VFD
* \brief ID for the multi VFD
*/
H5_DLL hid_t H5FD_multi_init(void);
H5_DLLVAR hid_t H5FD_MULTI_id_g;
/**
* \ingroup FAPL

83
src/H5FDmulti_int.c Normal file
View File

@ -0,0 +1,83 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the COPYING file, which can be found at the root of the source code *
* distribution tree, or in https://www.hdfgroup.org/licenses. *
* If you do not have access to either file, you may request a copy from *
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Purpose: Private routines for the multi VFD.
*
* Necessary for using internal library routines, which are
* disallowed within the actual multi VFD code.
*
*/
/****************/
/* Module Setup */
/****************/
#define H5FD_FRIEND /* Suppress error about including H5FDpkg */
/***********/
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDmulti_private.h" /* multi VFD */
/* The driver identification number, initialized at runtime */
hid_t H5FD_MULTI_id_g = H5I_INVALID_HID;
/*-------------------------------------------------------------------------
* Function: H5FD__multi_register
*
* Purpose: Register the driver with the library.
*
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
herr_t
H5FD__multi_register(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE
if (H5I_VFL != H5I_get_type(H5FD_MULTI_id_g))
if ((H5FD_MULTI_id_g = H5FD_register(&H5FD_multi_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register multi driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__multi_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__multi_unregister
*
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
*---------------------------------------------------------------------------
*/
herr_t
H5FD__multi_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_MULTI_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_multi_unregister() */

40
src/H5FDdrvr_module.h → src/H5FDmulti_private.h
View File

@ -11,17 +11,35 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Purpose: This file contains declarations which define macros for the
* H5FD driver package. Including this header means that the source file
* is part of the H5FD driver package.
* Purpose: The private header file for the multi VFD
*/
#ifndef H5FDdrvr_module_H
#define H5FDdrvr_module_H
/* Define the proper control macros for the generic FUNC_ENTER/LEAVE and error
* reporting macros.
*/
#define H5_MY_PKG H5FD
#define H5_MY_PKG_ERR H5E_FILE
#ifndef H5FDmulti_private_H
#define H5FDmulti_private_H
#endif /* H5FDdrvr_module_H */
/* Include VFD's public header */
#include "H5FDmulti.h" /* multi VFD */
/* Private headers needed by this file */
#include "H5FDprivate.h" /* File drivers */
/**************************/
/* Library Private Macros */
/**************************/
/****************************/
/* Library Private Typedefs */
/****************************/
/*****************************/
/* Library Private Variables */
/*****************************/
/* multi VFD's class struct */
H5_DLLVAR const H5FD_class_t H5FD_multi_g;
/******************************/
/* Library Private Prototypes */
/******************************/
#endif /* H5FDmulti_private_H */

55
src/H5FDonion.c
View File

@ -16,22 +16,20 @@
* Purpose: Provide in-file provenance and revision/version control.
*/
/* This source code file is part of the H5FD driver module */
#include "H5FDdrvr_module.h"
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* Files */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDonion.h" /* Onion file driver */
#include "H5FDsec2.h" /* Sec2 file driver */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDonion_priv.h" /* Onion file driver internals */
#include "H5FDsec2.h" /* Sec2 file driver */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
/* The driver identification number, initialized at runtime */
static hid_t H5FD_ONION_g = 0;
hid_t H5FD_ONION_id_g = H5I_INVALID_HID;
/******************************************************************************
*
@ -160,7 +158,6 @@ static haddr_t H5FD__onion_get_eof(const H5FD_t *, H5FD_mem_t);
static H5FD_t *H5FD__onion_open(const char *, unsigned int, hid_t, haddr_t);
static herr_t H5FD__onion_read(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, void *);
static herr_t H5FD__onion_set_eoa(H5FD_t *, H5FD_mem_t, haddr_t);
static herr_t H5FD__onion_term(void);
static herr_t H5FD__onion_write(H5FD_t *, H5FD_mem_t, hid_t, haddr_t, size_t, const void *);
static herr_t H5FD__onion_open_rw(H5FD_onion_t *, unsigned int, haddr_t, bool new_open);
@ -180,7 +177,7 @@ static const H5FD_class_t H5FD_onion_g = {
"onion", /* name */
MAXADDR, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD__onion_term, /* terminate */
NULL, /* terminate */
H5FD__onion_sb_size, /* sb_size */
H5FD__onion_sb_encode, /* sb_encode */
H5FD__onion_sb_decode, /* sb_decode */
@ -218,50 +215,48 @@ static const H5FD_class_t H5FD_onion_g = {
};
/*-----------------------------------------------------------------------------
* Function: H5FD_onion_init
* Function: H5FD__onion_register
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Register the driver with the library.
*
* Return: SUCCEED/FAIL
*
* Return: Success: The driver ID for the onion driver.
* Failure: Negative
*-----------------------------------------------------------------------------
*/
hid_t
H5FD_onion_init(void)
herr_t
H5FD__onion_register(void)
{
hid_t ret_value = H5I_INVALID_HID;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_PACKAGE
if (H5I_VFL != H5I_get_type(H5FD_ONION_g))
H5FD_ONION_g = H5FD_register(&H5FD_onion_g, sizeof(H5FD_class_t), false);
/* Set return value */
ret_value = H5FD_ONION_g;
if (H5I_VFL != H5I_get_type(H5FD_ONION_id_g))
if ((H5FD_ONION_id_g = H5FD_register(&H5FD_onion_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register onion driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_onion_init() */
} /* end H5FD__onion_register() */
/*-----------------------------------------------------------------------------
* Function: H5FD__onion_term
* Function: H5FD__onion_unregister
*
* Purpose: Shut down the Onion VFD.
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
*-----------------------------------------------------------------------------
*/
static herr_t
H5FD__onion_term(void)
herr_t
H5FD__onion_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_ONION_g = 0;
H5FD_ONION_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__onion_term() */
} /* end H5FD__onion_unregister() */
/*-----------------------------------------------------------------------------
* Function: H5Pget_fapl_onion

11
src/H5FDonion.h
View File

@ -16,8 +16,11 @@
#ifndef H5FDonion_H
#define H5FDonion_H
/** Initializer for the onion VFD */
#define H5FD_ONION (H5FDperform_init(H5FD_onion_init))
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
/** ID for the onion VFD */
#define H5FD_ONION (H5OPEN H5FD_ONION_id_g)
/** Identifier for the onion VFD */
#define H5FD_ONION_VALUE H5_VFD_ONION
@ -115,9 +118,9 @@ extern "C" {
/** @private
*
* \brief Private initializer for the onion VFD
* \brief ID for the onion VFD
*/
H5_DLL hid_t H5FD_onion_init(void);
H5_DLLVAR hid_t H5FD_ONION_id_g;
/**
* --------------------------------------------------------------------------

6
src/H5FDonion_header.c
View File

@ -16,13 +16,11 @@
* Purpose: Code for the onion file's header
*/
/* This source code file is part of the H5FD driver module */
#include "H5FDdrvr_module.h"
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDonion.h" /* Onion file driver */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDonion_priv.h" /* Onion file driver internals */
#include "H5MMprivate.h" /* Memory management */

6
src/H5FDonion_history.c
View File

@ -16,13 +16,11 @@
* Purpose: Code for the onion file's history
*/
/* This source code file is part of the H5FD driver module */
#include "H5FDdrvr_module.h"
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDonion.h" /* Onion file driver */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDonion_priv.h" /* Onion file driver internals */
#include "H5MMprivate.h" /* Memory management */

6
src/H5FDonion_index.c
View File

@ -16,13 +16,11 @@
* Purpose: Code for the archival and revision indexes
*/
/* This source code file is part of the H5FD driver module */
#include "H5FDdrvr_module.h"
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDonion.h" /* Onion file driver */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDonion_priv.h" /* Onion file driver internals */
#include "H5MMprivate.h" /* Memory management */

4
src/H5FDonion_priv.h
View File

@ -21,6 +21,10 @@
#ifndef H5FDonion_priv_H
#define H5FDonion_priv_H
/* Public headers */
#include "H5FDonion.h"
/* Private headers */
#include "H5FDonion_header.h"
#include "H5FDonion_history.h"
#include "H5FDonion_index.h"

57
src/H5FDperform.c
View File

@ -1,57 +0,0 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the LICENSE file, which can be found at the root of the source code *
* distribution tree, or in https://www.hdfgroup.org/licenses. *
* If you do not have access to either file, you may request a copy from *
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/****************/
/* Module Setup */
/****************/
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
/***********/
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDpkg.h" /* File Drivers */
#include "H5Iprivate.h" /* IDs */
/*-------------------------------------------------------------------------
* Function: H5FDperform_init
*
* Purpose: Ensure that the library is initialized and then call
* the provided VFD initializer
*
* Return: Success: Identifier for the VFD just initialized
* Failure: H5I_INVALID_HID
*-------------------------------------------------------------------------
*/
hid_t
H5FDperform_init(H5FD_init_t op)
{
hid_t ret_value = H5I_INVALID_HID; /* Return value */
FUNC_ENTER_API_NOINIT
/* It is possible that an application will evaluate an
* `H5FD_*` symbol (`H5FD_FAMILY`, `H5FD_MULTI`, `H5FD_SEC2`, etc.
* before the library has had an opportunity to initialize. Call
* H5_init_library() to make sure that the library has been initialized
* before `init` is run.
*/
if (H5_init_library() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, H5I_INVALID_HID, "library initialization failed");
ret_value = op();
done:
FUNC_LEAVE_API_NOINIT(ret_value)
}

49
src/H5FDpkg.h
View File

@ -39,6 +39,9 @@
/* Package Private Variables */
/*****************************/
/* Whether to ignore file locks when disabled (env var value) */
H5_DLLVAR htri_t H5FD_ignore_disabled_file_locks_p;
/******************************/
/* Package Private Prototypes */
/******************************/
@ -46,6 +49,52 @@ H5_DLL haddr_t H5FD__alloc_real(H5FD_t *file, H5FD_mem_t type, hsize_t size, had
hsize_t *align_size);
H5_DLL herr_t H5FD__free_real(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size);
/* Internal VFD init/term routines */
H5_DLL herr_t H5FD__core_register(void);
H5_DLL herr_t H5FD__core_unregister(void);
#ifdef H5_HAVE_DIRECT
H5_DLL herr_t H5FD__direct_register(void);
H5_DLL herr_t H5FD__direct_unregister(void);
#endif
H5_DLL herr_t H5FD__family_register(void);
H5_DLL herr_t H5FD__family_unregister(void);
#ifdef H5_HAVE_LIBHDFS
H5_DLL herr_t H5FD__hdfs_register(void);
H5_DLL herr_t H5FD__hdfs_unregister(void);
#endif
#ifdef H5_HAVE_IOC_VFD
H5_DLL herr_t H5FD__ioc_register(void);
H5_DLL herr_t H5FD__ioc_unregister(void);
#endif
H5_DLL herr_t H5FD__log_register(void);
H5_DLL herr_t H5FD__log_unregister(void);
#ifdef H5_HAVE_MIRROR_VFD
H5_DLL herr_t H5FD__mirror_register(void);
H5_DLL herr_t H5FD__mirror_unregister(void);
#endif
#ifdef H5_HAVE_PARALLEL
H5_DLL herr_t H5FD__mpio_register(void);
H5_DLL herr_t H5FD__mpio_unregister(void);
#endif
H5_DLL herr_t H5FD__multi_register(void);
H5_DLL herr_t H5FD__multi_unregister(void);
H5_DLL herr_t H5FD__onion_register(void);
H5_DLL herr_t H5FD__onion_unregister(void);
#ifdef H5_HAVE_ROS3_VFD
H5_DLL herr_t H5FD__ros3_register(void);
H5_DLL herr_t H5FD__ros3_unregister(void);
#endif
H5_DLL herr_t H5FD__sec2_register(void);
H5_DLL herr_t H5FD__sec2_unregister(void);
H5_DLL herr_t H5FD__splitter_register(void);
H5_DLL herr_t H5FD__splitter_unregister(void);
H5_DLL herr_t H5FD__stdio_register(void);
H5_DLL herr_t H5FD__stdio_unregister(void);
#ifdef H5_HAVE_SUBFILING_VFD
H5_DLL herr_t H5FD__subfiling_register(void);
H5_DLL herr_t H5FD__subfiling_unregister(void);
#endif
/* Testing functions */
#ifdef H5FD_TESTING
H5_DLL bool H5FD__supports_swmr_test(const char *vfd_name);

2
src/H5FDprivate.h
View File

@ -109,6 +109,7 @@ struct H5S_t;
struct H5F_t;
union H5PL_key_t;
H5_DLL herr_t H5FD_init(void);
H5_DLL int H5FD_term_interface(void);
H5_DLL herr_t H5FD_locate_signature(H5FD_t *file, haddr_t *sig_addr);
H5_DLL H5FD_class_t *H5FD_get_class(hid_t id);
@ -197,7 +198,6 @@ H5_DLL herr_t H5FD_sort_selection_io_req(bool *selection_was_sorted, size_t coun
H5_flexible_const_ptr_t bufs[], hid_t **s_mem_space_ids,
hid_t **s_file_space_ids, haddr_t **s_offsets_ptr,
size_t **s_element_sizes_ptr, H5_flexible_const_ptr_t **s_bufs_ptr);
H5_DLL herr_t H5FD_init(void);
/* Function prototypes for MPI based VFDs*/
#ifdef H5_HAVE_PARALLEL

106
src/H5FDros3.c
View File

@ -17,21 +17,19 @@
* Relies on "s3comms" utility layer to implement the AWS REST API.
*/
#ifdef H5_HAVE_ROS3_VFD
/* This source code file is part of the H5FD driver module */
#include "H5FDdrvr_module.h"
#endif
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#ifdef H5_HAVE_ROS3_VFD
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDros3.h" /* ros3 file driver */
#include "H5FDs3comms.h" /* S3 Communications */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5FDs3comms.h" /* S3 Communications */
#ifdef H5_HAVE_ROS3_VFD
/* Define to turn on stats collection and reporting */
/* #define ROS3_STATS */
@ -40,7 +38,12 @@
#define ROS3_MAX_CACHE_SIZE 16777216
/* The driver identification number, initialized at runtime */
static hid_t H5FD_ROS3_g = 0;
hid_t H5FD_ROS3_id_g = H5I_INVALID_HID;
/* Flag to indicate whether global driver resources & settings have been
* initialized.
*/
static bool H5FD_ros3_init_s = false;
/* Session/security token property name */
#define ROS3_TOKEN_PROP_NAME "ros3_token_prop"
@ -139,7 +142,6 @@ typedef struct H5FD_ros3_t {
#define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR))
/* Prototypes */
static herr_t H5FD__ros3_term(void);
static void *H5FD__ros3_fapl_get(H5FD_t *_file);
static void *H5FD__ros3_fapl_copy(const void *_old_fa);
static herr_t H5FD__ros3_fapl_free(void *_fa);
@ -176,7 +178,7 @@ static const H5FD_class_t H5FD_ros3_g = {
"ros3", /* name */
MAXADDR, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD__ros3_term, /* terminate */
NULL, /* terminate */
NULL, /* sb_size */
NULL, /* sb_encode */
NULL, /* sb_decode */
@ -217,59 +219,74 @@ static const H5FD_class_t H5FD_ros3_g = {
H5FL_DEFINE_STATIC(H5FD_ros3_t);
/*-------------------------------------------------------------------------
* Function: H5FD_ros3_init
* Function: H5FD__ros3_register
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Register the driver with the library.
*
* Return: SUCCEED/FAIL
*
* Return: Success: The driver ID for the ros3 driver
* Failure: H5I_INVALID_HID
*-------------------------------------------------------------------------
*/
hid_t
H5FD_ros3_init(void)
herr_t
H5FD__ros3_register(void)
{
hid_t ret_value = H5I_INVALID_HID;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_PACKAGE
if (H5I_VFL != H5I_get_type(H5FD_ROS3_g)) {
H5FD_ROS3_g = H5FD_register(&H5FD_ros3_g, sizeof(H5FD_class_t), false);
if (H5I_INVALID_HID == H5FD_ROS3_g) {
HGOTO_ERROR(H5E_ID, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register ros3");
}
#ifdef ROS3_STATS
/* Pre-compute stats bin boundaries on powers of 2 >= 10 */
for (int i = 0; i < ROS3_STATS_BIN_COUNT; i++)
ros3_stats_boundaries_g[i] = 1 << (10 + i);
#endif
}
ret_value = H5FD_ROS3_g;
if (H5I_VFL != H5I_get_type(H5FD_ROS3_id_g))
if ((H5FD_ROS3_id_g = H5FD_register(&H5FD_ros3_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register ros3 driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_ros3_init() */
} /* end H5FD__ros3_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__ros3_term
* Function: H5FD__ros3_unregister
*
* Purpose: Shut down the VFD
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
*---------------------------------------------------------------------------
*/
static herr_t
H5FD__ros3_term(void)
herr_t
H5FD__ros3_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_ROS3_g = 0;
H5FD_ROS3_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__ros3_term() */
} /* end H5FD__ros3_unregister() */
/*-------------------------------------------------------------------------
* Function: H5FD__ros3_init
*
* Purpose: Singleton to initialize global driver settings & resources.
*
* Return: Non-negative on success/Negative on failure
*
*-------------------------------------------------------------------------
*/
static herr_t
H5FD__ros3_init(void)
{
FUNC_ENTER_PACKAGE_NOERR
#ifdef ROS3_STATS
/* Pre-compute stats bin boundaries on powers of 2 >= 10 */
for (int i = 0; i < ROS3_STATS_BIN_COUNT; i++)
ros3_stats_boundaries_g[i] = 1 << (10 + i);
#endif
/* Indicate that driver is set up */
H5FD_ros3_init_s = true;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__ros3_init() */
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_ros3
@ -715,6 +732,11 @@ H5FD__ros3_open(const char *url, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list");
/* Initialize driver, if it's not yet */
if (!H5FD_ros3_init_s)
if (H5FD__ros3_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "can't initialize driver");
/* Init curl */
if (CURLE_OK != curl_global_init(CURL_GLOBAL_DEFAULT))
HGOTO_ERROR(H5E_VFL, H5E_BADVALUE, NULL, "unable to initialize curl global (placeholder flags)");

59
src/H5FDros3.h
View File

@ -16,12 +16,17 @@
#ifndef H5FDros3_H
#define H5FDros3_H
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
#ifdef H5_HAVE_ROS3_VFD
/** Initializer for the ros3 VFD */
#define H5FD_ROS3 (H5FDperform_init(H5FD_ros3_init))
/** ID for the ros3 VFD */
#define H5FD_ROS3 (H5OPEN H5FD_ROS3_id_g)
/** Identifier for the ros3 VFD */
#define H5FD_ROS3_VALUE H5_VFD_ROS3
#else
/** Initializer for the ros3 VFD (disabled) */
#define H5FD_ROS3 (H5I_INVALID_HID)
@ -32,48 +37,6 @@
#ifdef H5_HAVE_ROS3_VFD
/****************************************************************************
*
* Structure: H5FD_ros3_fapl_t
*
* Purpose:
*
* H5FD_ros3_fapl_t is a public structure that is used to pass S3
* authentication data to the appropriate S3 VFD via the FAPL. A pointer
* to an instance of this structure is a parameter to H5Pset_fapl_ros3()
* and H5Pget_fapl_ros3().
*
*
*
* `version` (int32_t)
*
* Version number of the H5FD_ros3_fapl_t structure. Any instance passed
* to the above calls must have a recognized version number, or an error
* will be flagged.
*
* This field should be set to H5FD_CURR_ROS3_FAPL_T_VERSION.
*
* `authenticate` (hbool_t)
*
* Flag true or false whether or not requests are to be authenticated
* with the AWS4 algorithm.
* If true, `aws_region`, `secret_id`, and `secret_key` must be populated.
* If false, those three components are unused.
*
* `aws_region` (char[])
*
* String: name of the AWS "region" of the host, e.g. "us-east-1".
*
* `secret_id` (char[])
*
* String: "Access ID" for the resource.
*
* `secret_key` (char[])
*
* String: "Secret Access Key" associated with the ID and resource.
*
****************************************************************************/
/**
* \def H5FD_CURR_ROS3_FAPL_T_VERSION
* The version number of the H5FD_ros3_fapl_t configuration
@ -120,9 +83,11 @@
* \var hbool_t H5FD_ros3_fapl_t::authenticate
* A Boolean which specifies if security credentials should be used for
* accessing a S3 bucket.
* If true, `aws_region`, `secret_id`, and `secret_key` must be populated.
* If false, those three components are unused.
*
* \var char H5FD_ros3_fapl_t::aws_region[H5FD_ROS3_MAX_REGION_LEN + 1]
* A string which specifies the AWS region of the S3 bucket.
* A string which specifies the AWS region of the S3 bucket, e.g. "us-east-1".
*
* \var char H5FD_ros3_fapl_t::secret_id[H5FD_ROS3_MAX_SECRET_ID_LEN + 1]
* A string which specifies the security ID.
@ -145,9 +110,9 @@ extern "C" {
/** @private
*
* \brief Private initializer for the ros3 VFD
* \brief ID for the ros3 VFD
*/
H5_DLL hid_t H5FD_ros3_init(void);
H5_DLLVAR hid_t H5FD_ROS3_id_g;
/**
* \ingroup FAPL

65
src/H5FDsec2.c
View File

@ -19,22 +19,19 @@
* application to the same file).
*/
#include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDsec2.h" /* Sec2 file driver */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5Pprivate.h" /* Property lists */
/* The driver identification number, initialized at runtime */
static hid_t H5FD_SEC2_g = 0;
/* Whether to ignore file locks when disabled (env var value) */
static htri_t ignore_disabled_file_locks_s = FAIL;
hid_t H5FD_SEC2_id_g = H5I_INVALID_HID;
/* The description of a file belonging to this driver. The 'eoa' and 'eof'
* determine the amount of hdf5 address space in use and the high-water mark
@ -119,7 +116,6 @@ typedef struct H5FD_sec2_t {
(ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || HADDR_UNDEF == (A) + (Z) || (HDoff_t)((A) + (Z)) < (HDoff_t)(A))
/* Prototypes */
static herr_t H5FD__sec2_term(void);
static H5FD_t *H5FD__sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
static herr_t H5FD__sec2_close(H5FD_t *_file);
static int H5FD__sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
@ -145,7 +141,7 @@ static const H5FD_class_t H5FD_sec2_g = {
"sec2", /* name */
MAXADDR, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD__sec2_term, /* terminate */
NULL, /* terminate */
NULL, /* sb_size */
NULL, /* sb_encode */
NULL, /* sb_decode */
@ -186,61 +182,48 @@ static const H5FD_class_t H5FD_sec2_g = {
H5FL_DEFINE_STATIC(H5FD_sec2_t);
/*-------------------------------------------------------------------------
* Function: H5FD_sec2_init
* Function: H5FD__sec2_register
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Register the driver with the library.
*
* Return: Success: The driver ID for the sec2 driver
* Failure: H5I_INVALID_HID
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
hid_t
H5FD_sec2_init(void)
herr_t
H5FD__sec2_register(void)
{
char *lock_env_var = NULL; /* Environment variable pointer */
hid_t ret_value = H5I_INVALID_HID; /* Return value */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_PACKAGE
/* 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"))
ignore_disabled_file_locks_s = true; /* Override: Ignore disabled locks */
else if (lock_env_var && (!strcmp(lock_env_var, "TRUE") || !strcmp(lock_env_var, "1")))
ignore_disabled_file_locks_s = false; /* Override: Don't ignore disabled locks */
else
ignore_disabled_file_locks_s = FAIL; /* Environment variable not set, or not set correctly */
if (H5I_VFL != H5I_get_type(H5FD_SEC2_g))
H5FD_SEC2_g = H5FD_register(&H5FD_sec2_g, sizeof(H5FD_class_t), false);
/* Set return value */
ret_value = H5FD_SEC2_g;
if (H5I_VFL != H5I_get_type(H5FD_SEC2_id_g))
if ((H5FD_SEC2_id_g = H5FD_register(&H5FD_sec2_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register sec2 driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_sec2_init() */
} /* end H5FD__sec2_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__sec2_term
* Function: H5FD__sec2_unregister
*
* Purpose: Shut down the VFD
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
*---------------------------------------------------------------------------
*/
static herr_t
H5FD__sec2_term(void)
herr_t
H5FD__sec2_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_SEC2_g = 0;
H5FD_SEC2_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__sec2_term() */
} /* end H5FD__sec2_unregister() */
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_sec2
@ -361,9 +344,9 @@ H5FD__sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
HGOTO_ERROR(H5E_VFL, H5E_BADTYPE, NULL, "not a file access property list");
/* Check the file locking flags in the fapl */
if (ignore_disabled_file_locks_s != FAIL)
if (H5FD_ignore_disabled_file_locks_p != FAIL)
/* The environment variable was set, so use that preferentially */
file->ignore_disabled_file_locks = ignore_disabled_file_locks_s;
file->ignore_disabled_file_locks = H5FD_ignore_disabled_file_locks_p;
else {
/* Use the value in the property list */
if (H5P_get(plist, H5F_ACS_IGNORE_DISABLED_FILE_LOCKS_NAME, &file->ignore_disabled_file_locks) < 0)

11
src/H5FDsec2.h
View File

@ -17,8 +17,11 @@
#ifndef H5FDsec2_H
#define H5FDsec2_H
/** Initializer for the sec2 VFD */
#define H5FD_SEC2 (H5FDperform_init(H5FD_sec2_init))
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
/** ID for the sec2 VFD */
#define H5FD_SEC2 (H5OPEN H5FD_SEC2_id_g)
/** Identifier for the sec2 VFD */
#define H5FD_SEC2_VALUE H5_VFD_SEC2
@ -29,9 +32,9 @@ extern "C" {
/** @private
*
* \brief Private initializer for the sec2 VFD
* \brief ID for the sec2 VFD
*/
H5_DLL hid_t H5FD_sec2_init(void);
H5_DLLVAR hid_t H5FD_SEC2_id_g;
/**
* \ingroup FAPL

50
src/H5FDsplitter.c
View File

@ -16,13 +16,12 @@
* another underlying VFD. Maintains two files simultaneously.
*/
/* This source code file is part of the H5FD driver module */
#include "H5FDdrvr_module.h"
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDsplitter.h" /* Splitter file driver */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
@ -30,7 +29,7 @@
#include "H5Pprivate.h" /* Property lists */
/* The driver identification number, initialized at runtime */
static hid_t H5FD_SPLITTER_g = 0;
hid_t H5FD_SPLITTER_id_g = H5I_INVALID_HID;
/* Driver-specific file access properties */
typedef struct H5FD_splitter_fapl_t {
@ -103,7 +102,6 @@ static herr_t H5FD__splitter_log_error(const H5FD_splitter_t *file, const char *
static int H5FD__copy_plist(hid_t fapl_id, hid_t *id_out_ptr);
/* Prototypes */
static herr_t H5FD__splitter_term(void);
static herr_t H5FD__splitter_populate_config(H5FD_splitter_vfd_config_t *vfd_config,
H5FD_splitter_fapl_t *fapl_out);
static herr_t H5FD__splitter_get_default_wo_path(char *new_path, size_t new_path_len,
@ -143,7 +141,7 @@ static const H5FD_class_t H5FD_splitter_g = {
"splitter", /* name */
MAXADDR, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD__splitter_term, /* terminate */
NULL, /* terminate */
H5FD__splitter_sb_size, /* sb_size */
H5FD__splitter_sb_encode, /* sb_encode */
H5FD__splitter_sb_decode, /* sb_decode */
@ -187,52 +185,52 @@ H5FL_DEFINE_STATIC(H5FD_splitter_t);
H5FL_DEFINE_STATIC(H5FD_splitter_fapl_t);
/*-------------------------------------------------------------------------
* Function: H5FD_splitter_init
* Function: H5FD__splitter_register
*
* Purpose: Initialize the splitter driver by registering it with the
* library.
* Purpose: Register the driver with the library.
*
* Return: SUCCEED/FAIL
*
* Return: Success: The driver ID for the splitter driver.
* Failure: Negative
*-------------------------------------------------------------------------
*/
hid_t
H5FD_splitter_init(void)
herr_t
H5FD__splitter_register(void)
{
hid_t ret_value = H5I_INVALID_HID;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_PACKAGE
H5FD_SPLITTER_LOG_CALL(__func__);
if (H5I_VFL != H5I_get_type(H5FD_SPLITTER_g))
H5FD_SPLITTER_g = H5FDregister(&H5FD_splitter_g);
ret_value = H5FD_SPLITTER_g;
if (H5I_VFL != H5I_get_type(H5FD_SPLITTER_id_g))
if ((H5FD_SPLITTER_id_g = H5FD_register(&H5FD_splitter_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register splitter driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_splitter_init() */
} /* end H5FD__splitter_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__splitter_term
* Function: H5FD__splitter_unregister
*
* Purpose: Shut down the splitter VFD.
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
*---------------------------------------------------------------------------
*/
static herr_t
H5FD__splitter_term(void)
herr_t
H5FD__splitter_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
H5FD_SPLITTER_LOG_CALL(__func__);
/* Reset VFL ID */
H5FD_SPLITTER_g = 0;
H5FD_SPLITTER_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__splitter_term() */
} /* end H5FD__splitter_unregister() */
/*-------------------------------------------------------------------------
* Function: H5FD__copy_plist

11
src/H5FDsplitter.h
View File

@ -17,8 +17,11 @@
#ifndef H5FDsplitter_H
#define H5FDsplitter_H
/** Initializer for the splitter VFD */
#define H5FD_SPLITTER (H5FDperform_init(H5FD_splitter_init))
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
/** ID for the splitter VFD */
#define H5FD_SPLITTER (H5OPEN H5FD_SPLITTER_id_g)
/** Identifier for the splitter VFD */
#define H5FD_SPLITTER_VALUE H5_VFD_SPLITTER
@ -61,9 +64,9 @@ extern "C" {
/** @private
*
* \brief Private initializer for the splitter VFD
* \brief ID for the splitter VFD
*/
H5_DLL hid_t H5FD_splitter_init(void);
H5_DLLVAR hid_t H5FD_SPLITTER_id_g;
/**
* \ingroup FAPL

170
src/H5FDstdio.c
View File

@ -47,8 +47,10 @@
#endif /* H5_HAVE_WIN32_API */
/* The driver identification number, initialized at runtime */
static hid_t H5FD_STDIO_g = 0;
/* Flag to indicate whether global driver resources & settings have been
* initialized.
*/
static bool H5FD_stdio_init_s = false;
/* Whether to ignore file locks when disabled (env var value) */
static htri_t ignore_disabled_file_locks_s = -1;
@ -160,7 +162,6 @@ typedef struct H5FD_stdio_t {
(file_offset_t)((A) + (Z)) < (file_offset_t)(A))
/* Prototypes */
static herr_t H5FD_stdio_term(void);
static H5FD_t *H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
static herr_t H5FD_stdio_close(H5FD_t *lf);
static int H5FD_stdio_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
@ -180,13 +181,13 @@ static herr_t H5FD_stdio_lock(H5FD_t *_file, bool rw);
static herr_t H5FD_stdio_unlock(H5FD_t *_file);
static herr_t H5FD_stdio_delete(const char *filename, hid_t fapl_id);
static const H5FD_class_t H5FD_stdio_g = {
const H5FD_class_t H5FD_stdio_g = {
H5FD_CLASS_VERSION, /* struct version */
H5_VFD_STDIO, /* value */
"stdio", /* name */
MAXADDR, /* maxaddr */
H5F_CLOSE_WEAK, /* fc_degree */
H5FD_stdio_term, /* terminate */
NULL, /* terminate */
NULL, /* sb_size */
NULL, /* sb_encode */
NULL, /* sb_decode */
@ -224,25 +225,19 @@ static const H5FD_class_t H5FD_stdio_g = {
};
/*-------------------------------------------------------------------------
* Function: H5FD_stdio_init
* Function: H5FD__stdio_init
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Singleton to initialize global driver settings & resources.
*
* Return: Success: The driver ID for the stdio driver.
*
* Failure: Negative.
* Return: Non-negative on success/Negative on failure
*
*-------------------------------------------------------------------------
*/
hid_t
H5FD_stdio_init(void)
static herr_t
H5FD__stdio_init(void)
{
char *lock_env_var = NULL; /* Environment variable pointer */
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
/* 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"))
@ -252,29 +247,11 @@ H5FD_stdio_init(void)
else
ignore_disabled_file_locks_s = -1; /* Environment variable not set, or not set correctly */
if (H5I_VFL != H5Iget_type(H5FD_STDIO_g))
H5FD_STDIO_g = H5FDregister(&H5FD_stdio_g);
return H5FD_STDIO_g;
} /* end H5FD_stdio_init() */
/*---------------------------------------------------------------------------
* Function: H5FD_stdio_term
*
* Purpose: Shut down the VFD
*
* Returns: Non-negative on success or negative on failure
*
*---------------------------------------------------------------------------
*/
static herr_t
H5FD_stdio_term(void)
{
/* Reset VFL ID */
H5FD_STDIO_g = 0;
/* Indicate that driver is set up */
H5FD_stdio_init_s = true;
return 0;
} /* end H5FD_stdio_term() */
} /* end H5FD__stdio_init() */
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_stdio
@ -290,13 +267,12 @@ H5FD_stdio_term(void)
herr_t
H5Pset_fapl_stdio(hid_t fapl_id)
{
static const char *func = "H5FDset_fapl_stdio"; /*for error reporting*/
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
if (0 == H5Pisa_class(fapl_id, H5P_FILE_ACCESS))
H5Epush_ret(func, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not a file access property list", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_PLIST, H5E_BADTYPE, "not a file access property list", -1);
return H5Pset_driver(fapl_id, H5FD_STDIO, NULL);
} /* end H5Pset_fapl_stdio() */
@ -325,10 +301,9 @@ H5Pset_fapl_stdio(hid_t fapl_id)
static H5FD_t *
H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
{
FILE *f = NULL;
unsigned write_access = 0; /* File opened with write access? */
H5FD_stdio_t *file = NULL;
static const char *func = "H5FD_stdio_open"; /* Function Name for error reporting */
FILE *f = NULL;
unsigned write_access = 0; /* File opened with write access? */
H5FD_stdio_t *file = NULL;
#ifdef H5_HAVE_WIN32_API
struct _BY_HANDLE_FILE_INFORMATION fileinfo;
#else /* H5_HAVE_WIN32_API */
@ -344,13 +319,18 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
/* Initialize driver, if it's not yet */
if (!H5FD_stdio_init_s)
if (H5FD__stdio_init() < 0)
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_CANTINIT, "can't initialize driver", NULL);
/* Check arguments */
if (!name || !*name)
H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADVALUE, "invalid file name", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_ARGS, H5E_BADVALUE, "invalid file name", NULL);
if (0 == maxaddr || HADDR_UNDEF == maxaddr)
H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_BADRANGE, "bogus maxaddr", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_ARGS, H5E_BADRANGE, "bogus maxaddr", NULL);
if (ADDR_OVERFLOW(maxaddr))
H5Epush_ret(func, H5E_ERR_CLS, H5E_ARGS, H5E_OVERFLOW, "maxaddr too large", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_ARGS, H5E_OVERFLOW, "maxaddr too large", NULL);
/* Tentatively open file in read-only mode, to check for existence */
if (flags & H5F_ACC_RDWR)
@ -366,14 +346,14 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
write_access = 1; /* Note the write access */
}
else
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_CANTOPENFILE,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_CANTOPENFILE,
"file doesn't exist and CREAT wasn't specified", NULL);
}
else if (flags & H5F_ACC_EXCL) {
/* File exists, but EXCL is passed. Fail. */
assert(flags & H5F_ACC_CREAT);
fclose(f);
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_FILEEXISTS,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_FILEEXISTS,
"file exists but CREAT and EXCL were specified", NULL);
}
else if (flags & H5F_ACC_RDWR) {
@ -385,12 +365,12 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
* as the tentative open will work */
if (!f)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_CANTOPENFILE, "fopen failed", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_CANTOPENFILE, "fopen failed", NULL);
/* Build the return value */
if (NULL == (file = (H5FD_stdio_t *)calloc((size_t)1, sizeof(H5FD_stdio_t)))) {
fclose(f);
H5Epush_ret(func, H5E_ERR_CLS, H5E_RESOURCE, H5E_NOSPACE, "memory allocation failed", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_RESOURCE, H5E_NOSPACE, "memory allocation failed", NULL);
} /* end if */
file->fp = f;
file->op = H5FD_STDIO_OP_SEEK;
@ -416,7 +396,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
if (H5Pget_file_locking(fapl_id, &unused, &file->ignore_disabled_file_locks) < 0) {
free(file);
fclose(f);
H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTGET,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_FILE, H5E_CANTGET,
"unable to get use disabled file locks property", NULL);
}
}
@ -430,7 +410,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
if (file->fd < 0) {
free(file);
fclose(f);
H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTOPENFILE, "unable to get file descriptor", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_FILE, H5E_CANTOPENFILE, "unable to get file descriptor", NULL);
} /* end if */
#ifdef H5_HAVE_WIN32_API
@ -438,13 +418,14 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
if (INVALID_HANDLE_VALUE == file->hFile) {
free(file);
fclose(f);
H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTOPENFILE, "unable to get Windows file handle", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_FILE, H5E_CANTOPENFILE, "unable to get Windows file handle",
NULL);
} /* end if */
if (!GetFileInformationByHandle((HANDLE)file->hFile, &fileinfo)) {
free(file);
fclose(f);
H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_CANTOPENFILE,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_FILE, H5E_CANTOPENFILE,
"unable to get Windows file descriptor information", NULL);
} /* end if */
@ -455,7 +436,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
if (fstat(file->fd, &sb) < 0) {
free(file);
fclose(f);
H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_BADFILE, "unable to fstat file", NULL);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_FILE, H5E_BADFILE, "unable to fstat file", NULL);
} /* end if */
file->device = sb.st_dev;
file->inode = sb.st_ino;
@ -479,14 +460,13 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
static herr_t
H5FD_stdio_close(H5FD_t *_file)
{
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
static const char *func = "H5FD_stdio_close"; /* Function Name for error reporting */
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
if (fclose(file->fp) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_CLOSEERROR, "fclose failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_CLOSEERROR, "fclose failed", -1);
free(file);
@ -727,8 +707,7 @@ H5FD_stdio_get_eof(const H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type)
static herr_t
H5FD_stdio_get_handle(H5FD_t *_file, hid_t /*UNUSED*/ fapl, void **file_handle)
{
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
static const char *func = "H5FD_stdio_get_handle"; /* Function Name for error reporting */
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
/* Quiet the compiler */
(void)fapl;
@ -738,7 +717,7 @@ H5FD_stdio_get_handle(H5FD_t *_file, hid_t /*UNUSED*/ fapl, void **file_handle)
*file_handle = &(file->fp);
if (*file_handle == NULL)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "get handle failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "get handle failed", -1);
return 0;
} /* end H5FD_stdio_get_handle() */
@ -762,8 +741,7 @@ static herr_t
H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxpl_id, haddr_t addr,
size_t size, void /*OUT*/ *buf)
{
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
static const char *func = "H5FD_stdio_read"; /* Function Name for error reporting */
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
/* Quiet the compiler */
(void)type;
@ -774,9 +752,9 @@ H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxpl
/* Check for overflow */
if (HADDR_UNDEF == addr)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1);
if (REGION_OVERFLOW(addr, size))
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1);
/* Check easy cases */
if (0 == size)
@ -791,7 +769,7 @@ H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxpl
if (file_fseek(file->fp, (file_offset_t)addr, SEEK_SET) < 0) {
file->op = H5FD_STDIO_OP_UNKNOWN;
file->pos = HADDR_UNDEF;
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "fseek failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "fseek failed", -1);
}
file->pos = addr;
}
@ -823,7 +801,7 @@ H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxpl
if (0 == bytes_read && ferror(file->fp)) { /* error */
file->op = H5FD_STDIO_OP_UNKNOWN;
file->pos = HADDR_UNDEF;
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_READERROR, "fread failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_READERROR, "fread failed", -1);
} /* end if */
if (0 == bytes_read && feof(file->fp)) {
@ -862,8 +840,7 @@ static herr_t
H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxpl_id, haddr_t addr,
size_t size, const void *buf)
{
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
static const char *func = "H5FD_stdio_write"; /* Function Name for error reporting */
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
/* Quiet the compiler */
(void)dxpl_id;
@ -874,16 +851,16 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxp
/* Check for overflow conditions */
if (HADDR_UNDEF == addr)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1);
if (REGION_OVERFLOW(addr, size))
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_OVERFLOW, "file address overflowed", -1);
/* Seek to the correct file position. */
if ((file->op != H5FD_STDIO_OP_WRITE && file->op != H5FD_STDIO_OP_SEEK) || file->pos != addr) {
if (file_fseek(file->fp, (file_offset_t)addr, SEEK_SET) < 0) {
file->op = H5FD_STDIO_OP_UNKNOWN;
file->pos = HADDR_UNDEF;
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "fseek failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "fseek failed", -1);
}
file->pos = addr;
}
@ -908,7 +885,7 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxp
if (bytes_wrote != bytes_in || (0 == bytes_wrote && ferror(file->fp))) { /* error */
file->op = H5FD_STDIO_OP_UNKNOWN;
file->pos = HADDR_UNDEF;
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "fwrite failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "fwrite failed", -1);
} /* end if */
assert(bytes_wrote > 0);
@ -946,8 +923,7 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxp
static herr_t
H5FD_stdio_flush(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, bool closing)
{
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
static const char *func = "H5FD_stdio_flush"; /* Function Name for error reporting */
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
/* Quiet the compiler */
(void)dxpl_id;
@ -959,7 +935,7 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, bool closing)
if (file->write_access) {
if (!closing) {
if (fflush(file->fp) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "fflush failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "fflush failed", -1);
/* Reset last file I/O information */
file->pos = HADDR_UNDEF;
@ -987,8 +963,7 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, bool closing)
static herr_t
H5FD_stdio_truncate(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, bool /*UNUSED*/ closing)
{
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
static const char *func = "H5FD_stdio_truncate"; /* Function Name for error reporting */
H5FD_stdio_t *file = (H5FD_stdio_t *)_file;
/* Quiet the compiler */
(void)dxpl_id;
@ -1025,12 +1000,13 @@ H5FD_stdio_truncate(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, bool /*UNUSED*/ clo
if (INVALID_SET_FILE_POINTER == dwPtrLow) {
dwError = GetLastError();
if (dwError != NO_ERROR)
H5Epush_ret(func, H5E_ERR_CLS, H5E_FILE, H5E_FILEOPEN, "unable to set file pointer", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_FILE, H5E_FILEOPEN, "unable to set file pointer",
-1);
}
bError = SetEndOfFile(file->hFile);
if (0 == bError)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR,
"unable to truncate/extend file properly", -1);
#else /* H5_HAVE_WIN32_API */
/* Reset seek offset to beginning of file, so that file isn't re-extended later */
@ -1038,7 +1014,7 @@ H5FD_stdio_truncate(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, bool /*UNUSED*/ clo
/* Truncate file to proper length */
if (-1 == file_ftruncate(file->fd, (file_offset_t)file->eoa))
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR,
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR,
"unable to truncate/extend file properly", -1);
#endif /* H5_HAVE_WIN32_API */
@ -1053,7 +1029,7 @@ H5FD_stdio_truncate(H5FD_t *_file, hid_t /*UNUSED*/ dxpl_id, bool /*UNUSED*/ clo
else {
/* Double-check for problems */
if (file->eoa > file->eof)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_TRUNCATED, "eoa > eof!", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_TRUNCATED, "eoa > eof!", -1);
} /* end else */
return 0;
@ -1076,9 +1052,8 @@ static herr_t
H5FD_stdio_lock(H5FD_t *_file, bool rw)
{
#ifdef H5_HAVE_FLOCK
H5FD_stdio_t *file = (H5FD_stdio_t *)_file; /* VFD file struct */
int lock_flags; /* file locking flags */
static const char *func = "H5FD_stdio_lock"; /* Function Name for error reporting */
H5FD_stdio_t *file = (H5FD_stdio_t *)_file; /* VFD file struct */
int lock_flags; /* file locking flags */
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -1096,12 +1071,12 @@ H5FD_stdio_lock(H5FD_t *_file, bool rw)
*/
errno = 0;
else
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTLOCKFILE, "file lock failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_CANTLOCKFILE, "file lock failed", -1);
} /* end if */
/* Flush the stream */
if (fflush(file->fp) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "fflush failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "fflush failed", -1);
#endif /* H5_HAVE_FLOCK */
@ -1125,8 +1100,7 @@ static herr_t
H5FD_stdio_unlock(H5FD_t *_file)
{
#ifdef H5_HAVE_FLOCK
H5FD_stdio_t *file = (H5FD_stdio_t *)_file; /* VFD file struct */
static const char *func = "H5FD_stdio_unlock"; /* Function Name for error reporting */
H5FD_stdio_t *file = (H5FD_stdio_t *)_file; /* VFD file struct */
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@ -1135,7 +1109,7 @@ H5FD_stdio_unlock(H5FD_t *_file)
/* Flush the stream */
if (fflush(file->fp) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "fflush failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_IO, H5E_WRITEERROR, "fflush failed", -1);
/* Place a non-blocking lock on the file */
if (flock(file->fd, LOCK_UN) < 0) {
@ -1145,7 +1119,7 @@ H5FD_stdio_unlock(H5FD_t *_file)
*/
errno = 0;
else
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTUNLOCKFILE, "file unlock failed", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_CANTUNLOCKFILE, "file unlock failed", -1);
} /* end if */
#endif /* H5_HAVE_FLOCK */
@ -1165,18 +1139,22 @@ H5FD_stdio_unlock(H5FD_t *_file)
static herr_t
H5FD_stdio_delete(const char *filename, hid_t /*UNUSED*/ fapl_id)
{
static const char *func = "H5FD_stdio_delete"; /* Function Name for error reporting */
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
assert(filename);
/* Quiet compiler */
(void)fapl_id;
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
/* Initialize driver, if it's not yet */
if (!H5FD_stdio_init_s)
if (H5FD__stdio_init() < 0)
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_CANTINIT, "can't initialize driver", -1);
if (remove(filename) < 0)
H5Epush_ret(func, H5E_ERR_CLS, H5E_VFL, H5E_CANTDELETEFILE, "can't delete file)", -1);
H5Epush_ret(__func__, H5E_ERR_CLS, H5E_VFL, H5E_CANTDELETEFILE, "can't delete file)", -1);
return 0;
} /* end H5FD_stdio_delete() */

11
src/H5FDstdio.h
View File

@ -16,10 +16,11 @@
#ifndef H5FDstdio_H
#define H5FDstdio_H
#include "H5Ipublic.h"
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
/** Initializer for the stdio VFD */
#define H5FD_STDIO (H5FDperform_init(H5FD_stdio_init))
/** ID for the stdio VFD */
#define H5FD_STDIO (H5OPEN H5FD_STDIO_id_g)
#ifdef __cplusplus
extern "C" {
@ -27,9 +28,9 @@ extern "C" {
/** @private
*
* \brief Private initializer for the stdio VFD
* \brief ID for the stdio VFD
*/
H5_DLL hid_t H5FD_stdio_init(void);
H5_DLLVAR hid_t H5FD_STDIO_id_g;
/**
* \ingroup FAPL

83
src/H5FDstdio_int.c Normal file
View File

@ -0,0 +1,83 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the COPYING file, which can be found at the root of the source code *
* distribution tree, or in https://www.hdfgroup.org/licenses. *
* If you do not have access to either file, you may request a copy from *
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Purpose: Private routines for the stdio VFD.
*
* Necessary for using internal library routines, which are
* disallowed within the actual stdio VFD code.
*
*/
/****************/
/* Module Setup */
/****************/
#define H5FD_FRIEND /* Suppress error about including H5FDpkg */
/***********/
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5Iprivate.h" /* IDs */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDstdio_private.h" /* stdio VFD */
/* The driver identification number, initialized at runtime */
hid_t H5FD_STDIO_id_g = H5I_INVALID_HID;
/*-------------------------------------------------------------------------
* Function: H5FD__stdio_register
*
* Purpose: Register the driver with the library.
*
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
herr_t
H5FD__stdio_register(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE
if (H5I_VFL != H5I_get_type(H5FD_STDIO_id_g))
if ((H5FD_STDIO_id_g = H5FD_register(&H5FD_stdio_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "unable to register stdio driver");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__stdio_register() */
/*---------------------------------------------------------------------------
* Function: H5FD_stdio_unregister
*
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
*---------------------------------------------------------------------------
*/
herr_t
H5FD__stdio_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_STDIO_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_stdio_unregister() */

45
src/H5FDstdio_private.h Normal file
View File

@ -0,0 +1,45 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Copyright by The HDF Group. *
* All rights reserved. *
* *
* This file is part of HDF5. The full HDF5 copyright notice, including *
* terms governing use, modification, and redistribution, is contained in *
* the COPYING file, which can be found at the root of the source code *
* distribution tree, or in https://www.hdfgroup.org/licenses. *
* If you do not have access to either file, you may request a copy from *
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*
* Purpose: The private header file for the stdio VFD
*/
#ifndef H5FDstdio_private_H
#define H5FDstdio_private_H
/* Include VFD's public header */
#include "H5FDstdio.h" /* stdio VFD */
/* Private headers needed by this file */
#include "H5FDprivate.h" /* File drivers */
/**************************/
/* Library Private Macros */
/**************************/
/****************************/
/* Library Private Typedefs */
/****************************/
/*****************************/
/* Library Private Variables */
/*****************************/
/* stdio VFD's class struct */
H5_DLLVAR const H5FD_class_t H5FD_stdio_g;
/******************************/
/* Library Private Prototypes */
/******************************/
#endif /* H5FDstdio_private_H */

242
src/H5FDsubfiling/H5FDioc.c
View File

@ -16,27 +16,29 @@
* another underlying VFD. Maintains two files simultaneously.
*/
/* This source code file is part of the H5FD driver module */
#include "H5FDdrvr_module.h"
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5FDpublic.h" /* Basic H5FD definitions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDioc.h" /* IOC file driver */
#include "H5FDioc_priv.h" /* IOC file driver */
#include "H5Fprivate.h" /* File access */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDioc_priv.h" /* I/O concetrator file driver */
#include "H5FDmpio.h" /* MPI I/O VFD */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Fprivate.h" /* File access */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
/* The driver identification number, initialized at runtime */
static hid_t H5FD_IOC_g = H5I_INVALID_HID;
hid_t H5FD_IOC_id_g = H5I_INVALID_HID;
/* Flag to indicate whether global driver resources & settings have been
* initialized.
*/
static bool H5FD_ioc_init_s = false;
/* Whether the driver initialized MPI on its own */
static bool H5FD_mpi_self_initialized = false;
static bool H5FD_mpi_self_initialized_s = false;
/* Pointer to value for MPI_TAG_UB */
int *H5FD_IOC_tag_ub_val_ptr = NULL;
@ -113,7 +115,7 @@ static herr_t H5FD__ioc_read_vector(H5FD_t *file, hid_t dxpl_id, uint32_t count
static herr_t H5FD__ioc_write_vector(H5FD_t *file, hid_t dxpl_id, uint32_t count, H5FD_mem_t types[],
haddr_t addrs[], size_t sizes[], const void *bufs[] /* in */);
static herr_t H5FD__ioc_truncate(H5FD_t *_file, hid_t dxpl_id, bool closing);
static herr_t H5FD__ioc_del(const char *name, hid_t fapl);
static herr_t H5FD__ioc_delete(const char *name, hid_t fapl);
/*
static herr_t H5FD__ioc_ctl(H5FD_t *file, uint64_t op_code, uint64_t flags,
const void *input, void **result);
@ -167,7 +169,7 @@ static const H5FD_class_t H5FD_ioc_g = {
H5FD__ioc_truncate, /* truncate */
NULL, /* lock */
NULL, /* unlock */
H5FD__ioc_del, /* del */
H5FD__ioc_delete, /* del */
NULL, /* ctl */
H5FD_FLMAP_DICHOTOMY /* fl_map */
};
@ -179,77 +181,112 @@ H5FL_DEFINE_STATIC(H5FD_ioc_t);
H5FL_DEFINE_STATIC(H5FD_ioc_config_t);
/*-------------------------------------------------------------------------
* Function: H5FD_ioc_init
* Function: H5FD__ioc_register
*
* Purpose: Initialize the IOC driver by registering it with the
* library.
* Purpose: Register the driver with the library.
*
* Return: SUCCEED/FAIL
*
* Return: Success: The driver ID for the ioc driver.
* Failure: Negative
*-------------------------------------------------------------------------
*/
hid_t
H5FD_ioc_init(void)
herr_t
H5FD__ioc_register(void)
{
hid_t ret_value = H5I_INVALID_HID;
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_PACKAGE
/* Register the IOC VFD, if it isn't already registered */
if (H5I_VFL != H5I_get_type(H5FD_IOC_g)) {
char *env_var;
int key_val_retrieved = 0;
int mpi_code;
if ((H5FD_IOC_g = H5FD_register(&H5FD_ioc_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, H5I_INVALID_HID, "can't register IOC VFD");
/* Check if IOC VFD has been loaded dynamically */
env_var = getenv(HDF5_DRIVER);
if (env_var && strlen(env_var) > 0 && !strcmp(env_var, H5FD_IOC_NAME)) {
int mpi_initialized = 0;
int provided = 0;
/* Initialize MPI if not already initialized */
if (MPI_SUCCESS != (mpi_code = MPI_Initialized(&mpi_initialized)))
HMPI_GOTO_ERROR(H5I_INVALID_HID, "MPI_Initialized failed", mpi_code);
if (mpi_initialized) {
/* If MPI is initialized, validate that it was initialized with MPI_THREAD_MULTIPLE */
if (MPI_SUCCESS != (mpi_code = MPI_Query_thread(&provided)))
HMPI_GOTO_ERROR(H5I_INVALID_HID, "MPI_Query_thread failed", mpi_code);
if (provided != MPI_THREAD_MULTIPLE)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
"IOC VFD requires the use of MPI_Init_thread with MPI_THREAD_MULTIPLE");
}
else {
int required = MPI_THREAD_MULTIPLE;
/* Otherwise, initialize MPI */
if (MPI_SUCCESS != (mpi_code = MPI_Init_thread(NULL, NULL, required, &provided)))
HMPI_GOTO_ERROR(H5I_INVALID_HID, "MPI_Init_thread failed", mpi_code);
H5FD_mpi_self_initialized = true;
if (provided != required)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
"MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE");
}
}
/* Retrieve upper bound for MPI message tag value */
if (MPI_SUCCESS != (mpi_code = MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, &H5FD_IOC_tag_ub_val_ptr,
&key_val_retrieved)))
HMPI_GOTO_ERROR(H5I_INVALID_HID, "MPI_Comm_get_attr failed", mpi_code);
if (!key_val_retrieved)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID, "couldn't retrieve value for MPI_TAG_UB");
}
ret_value = H5FD_IOC_g;
if (H5I_VFL != H5I_get_type(H5FD_IOC_id_g))
if ((H5FD_IOC_id_g = H5FD_register(&H5FD_ioc_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "can't register IOC VFD");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_ioc_init() */
} /* end H5FD__ioc_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__ioc_unregister
*
* Purpose: Reset library driver info.
*
* Return: SUCCEED/FAIL
*
*---------------------------------------------------------------------------
*/
herr_t
H5FD__ioc_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_IOC_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__ioc_unregister() */
/*-------------------------------------------------------------------------
* Function: H5FD__ioc_init
*
* Purpose: Singleton to initialize global driver settings & resources.
*
* Return: Non-negative on success/Negative on failure
*
*-------------------------------------------------------------------------
*/
static herr_t
H5FD__ioc_init(void)
{
char *env_var;
int key_val_retrieved = 0;
int mpi_code;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE
/* Check if IOC VFD has been loaded dynamically */
env_var = getenv(HDF5_DRIVER);
if (env_var && strlen(env_var) > 0 && !strcmp(env_var, H5FD_IOC_NAME)) {
int mpi_initialized = 0;
int provided = 0;
/* Initialize MPI if not already initialized */
if (MPI_SUCCESS != (mpi_code = MPI_Initialized(&mpi_initialized)))
HMPI_GOTO_ERROR(FAIL, "MPI_Initialized failed", mpi_code);
if (mpi_initialized) {
/* If MPI is initialized, validate that it was initialized with MPI_THREAD_MULTIPLE */
if (MPI_SUCCESS != (mpi_code = MPI_Query_thread(&provided)))
HMPI_GOTO_ERROR(FAIL, "MPI_Query_thread failed", mpi_code);
if (provided != MPI_THREAD_MULTIPLE)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL,
"IOC VFD requires the use of MPI_Init_thread with MPI_THREAD_MULTIPLE");
}
else {
/* Otherwise, initialize MPI */
if (MPI_SUCCESS != (mpi_code = MPI_Init_thread(NULL, NULL, MPI_THREAD_MULTIPLE, &provided)))
HMPI_GOTO_ERROR(FAIL, "MPI_Init_thread failed", mpi_code);
H5FD_mpi_self_initialized_s = true;
if (provided != MPI_THREAD_MULTIPLE)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL,
"MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE");
}
}
/* Retrieve upper bound for MPI message tag value */
if (MPI_SUCCESS != (mpi_code = MPI_Comm_get_attr(MPI_COMM_WORLD, MPI_TAG_UB, &H5FD_IOC_tag_ub_val_ptr,
&key_val_retrieved)))
HMPI_GOTO_ERROR(FAIL, "MPI_Comm_get_attr failed", mpi_code);
if (!key_val_retrieved)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "couldn't retrieve value for MPI_TAG_UB");
/* Indicate that driver is set up */
H5FD_ioc_init_s = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__ioc_init() */
/*---------------------------------------------------------------------------
* Function: H5FD__ioc_term
@ -257,6 +294,7 @@ done:
* Purpose: Shut down the IOC VFD.
*
* Return: SUCCEED/FAIL
*
*---------------------------------------------------------------------------
*/
static herr_t
@ -266,26 +304,21 @@ H5FD__ioc_term(void)
FUNC_ENTER_PACKAGE
if (H5FD_IOC_g >= 0) {
/* Terminate MPI if the driver initialized it */
if (H5FD_mpi_self_initialized) {
int mpi_finalized = 0;
int mpi_code;
/* Terminate MPI if the driver initialized it */
if (H5FD_mpi_self_initialized_s) {
int mpi_finalized = 0;
int mpi_code;
if (MPI_SUCCESS != (mpi_code = MPI_Finalized(&mpi_finalized)))
HMPI_GOTO_ERROR(FAIL, "MPI_Finalized failed", mpi_code);
if (!mpi_finalized)
if (MPI_SUCCESS != (mpi_code = MPI_Finalize()))
HMPI_GOTO_ERROR(FAIL, "MPI_Finalize failed", mpi_code);
if (MPI_SUCCESS != (mpi_code = MPI_Finalized(&mpi_finalized)))
HMPI_GOTO_ERROR(FAIL, "MPI_Finalized failed", mpi_code);
if (!mpi_finalized)
if (MPI_SUCCESS != (mpi_code = MPI_Finalize()))
HMPI_GOTO_ERROR(FAIL, "MPI_Finalize failed", mpi_code);
H5FD_mpi_self_initialized = false;
}
H5FD_mpi_self_initialized_s = false;
}
done:
/* Reset VFL ID */
H5FD_IOC_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__ioc_term() */
@ -310,6 +343,11 @@ H5Pset_fapl_ioc(hid_t fapl_id, H5FD_ioc_config_t *vfd_config)
if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
/* Initialize driver, if it's not yet */
if (!H5FD_ioc_init_s)
if (H5FD__ioc_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
if (vfd_config == NULL) {
/* Get IOC VFD defaults */
if (H5FD__subfiling_get_default_ioc_config(&ioc_conf) < 0)
@ -355,6 +393,11 @@ H5Pget_fapl_ioc(hid_t fapl_id, H5FD_ioc_config_t *config_out)
if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
/* Initialize driver, if it's not yet */
if (!H5FD_ioc_init_s)
if (H5FD__ioc_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
if (H5FD_IOC != H5P_peek_driver(plist))
use_default_config = true;
else {
@ -679,6 +722,11 @@ H5FD__ioc_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
if (ADDR_OVERFLOW(maxaddr))
HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "bogus maxaddr");
/* Initialize driver, if it's not yet */
if (!H5FD_ioc_init_s)
if (H5FD__ioc_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "can't initialize driver");
if (NULL == (file = (H5FD_ioc_t *)H5FL_CALLOC(H5FD_ioc_t)))
HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, NULL, "unable to allocate file struct");
file->comm = MPI_COMM_NULL;
@ -695,7 +743,7 @@ H5FD__ioc_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list");
if (H5FD_mpi_self_initialized) {
if (H5FD_mpi_self_initialized_s) {
file->comm = MPI_COMM_WORLD;
file->info = MPI_INFO_NULL;
@ -1192,8 +1240,17 @@ H5FD__ioc_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, bool H5_ATTR_UNU
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__ioc_truncate */
/*-------------------------------------------------------------------------
* Function: H5FD__ioc_delete
*
* Purpose: Delete a file
*
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
static herr_t
H5FD__ioc_del(const char *name, hid_t fapl)
H5FD__ioc_delete(const char *name, hid_t fapl)
{
H5P_genplist_t *plist;
MPI_Comm comm = MPI_COMM_NULL;
@ -1208,11 +1265,16 @@ H5FD__ioc_del(const char *name, hid_t fapl)
FUNC_ENTER_PACKAGE
/* Initialize driver, if it's not yet */
if (!H5FD_ioc_init_s)
if (H5FD__ioc_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
if (NULL == (plist = H5P_object_verify(fapl, H5P_FILE_ACCESS)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
assert(H5FD_IOC == H5P_peek_driver(plist));
if (H5FD_mpi_self_initialized)
if (H5FD_mpi_self_initialized_s)
comm = MPI_COMM_WORLD;
else {
/* Get the MPI communicator and info from the fapl */
@ -1314,7 +1376,7 @@ done:
HMPI_DONE_ERROR(FAIL, "MPI_Barrier failed", mpi_code);
}
if (!H5FD_mpi_self_initialized) {
if (!H5FD_mpi_self_initialized_s) {
/* Free duplicated MPI Communicator and Info objects */
if (H5_mpi_comm_free(&comm) < 0)
HDONE_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "unable to free MPI communicator");

15
src/H5FDsubfiling/H5FDioc.h
View File

@ -20,14 +20,16 @@
#ifndef H5FDioc_H
#define H5FDioc_H
#include "H5FDsubfiling.h"
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
#ifdef H5_HAVE_IOC_VFD
/**
* \def H5FD_IOC
* Macro that returns the identifier for the #H5FD_IOC driver. \hid_t{file driver}
*/
#define H5FD_IOC (H5FDperform_init(H5FD_ioc_init))
#define H5FD_IOC (H5OPEN H5FD_IOC_id_g)
#else
#define H5FD_IOC (H5I_INVALID_HID)
#endif
@ -114,11 +116,12 @@ typedef struct H5FD_ioc_config_t {
extern "C" {
#endif
/**
* \brief Internal routine to initialize #H5FD_IOC driver. Not meant to be
* called directly by an HDF5 application
/** @private
*
* \brief ID for the IOC VFD
*/
H5_DLL hid_t H5FD_ioc_init(void);
H5_DLLVAR hid_t H5FD_IOC_id_g;
/**
* \ingroup FAPL
*

33
src/H5FDsubfiling/H5FDioc_int.c
View File

@ -14,7 +14,12 @@
* Purpose: This is part of an I/O concentrator driver.
*/
#include "H5FDioc_priv.h"
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDioc_priv.h" /* I/O concetrator file driver */
/*
* Given a file offset, the stripe size, the number of IOCs and the number of
@ -80,12 +85,12 @@ herr_t
H5FD__ioc_write_independent_async(int64_t context_id, int64_t offset, int64_t elements, const void *data,
io_req_t **io_req)
{
subfiling_context_t *sf_context = NULL;
MPI_Request ack_request = MPI_REQUEST_NULL;
io_req_t *sf_io_request = NULL;
int64_t ioc_start;
int64_t ioc_offset;
int64_t ioc_subfile_idx;
subfiling_context_t *sf_context = NULL;
MPI_Request ack_request = MPI_REQUEST_NULL;
io_req_t *sf_io_request = NULL;
int64_t ioc_start = -1;
int64_t ioc_offset = -1;
int64_t ioc_subfile_idx = -1;
int64_t msg[3] = {0};
int *io_concentrators = NULL;
int num_io_concentrators;
@ -236,13 +241,13 @@ herr_t
H5FD__ioc_read_independent_async(int64_t context_id, int64_t offset, int64_t elements, void *data,
io_req_t **io_req)
{
subfiling_context_t *sf_context = NULL;
MPI_Request ack_request = MPI_REQUEST_NULL;
io_req_t *sf_io_request = NULL;
bool need_data_tag = false;
int64_t ioc_start;
int64_t ioc_offset;
int64_t ioc_subfile_idx;
subfiling_context_t *sf_context = NULL;
MPI_Request ack_request = MPI_REQUEST_NULL;
io_req_t *sf_io_request = NULL;
bool need_data_tag = false;
int64_t ioc_start = -1;
int64_t ioc_offset = -1;
int64_t ioc_subfile_idx = -1;
int64_t msg[3] = {0};
int *io_concentrators = NULL;
int num_io_concentrators;

14
src/H5FDsubfiling/H5FDioc_priv.h
View File

@ -21,16 +21,12 @@
/* H5 Headers */
/**************/
#include "H5private.h" /* Generic Functions */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDioc.h" /* IOC VFD */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
#include "H5TSprivate.h" /* Threadsafety */
/* Public header */
#include "H5FDioc.h" /* IOC VFD */
/* Private headers */
#include "H5private.h" /* Generic Functions */
#include "H5TSprivate.h" /* Threadsafety */
#include "H5subfiling_common.h"
/*

7
src/H5FDsubfiling/H5FDioc_threads.c
View File

@ -10,9 +10,12 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "H5FDioc_priv.h"
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5FDsubfiling.h"
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDioc_priv.h" /* I/O concetrator file driver */
#define MIN_READ_RETRIES 10

7
src/H5FDsubfiling/H5FDsubfile_int.c
View File

@ -19,7 +19,12 @@
/* Headers */
/***********/
#include "H5FDsubfiling_priv.h"
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDsubfiling_priv.h" /* Subfiling file driver */
/*-------------------------------------------------------------------------
* Function: H5FD__subfiling__truncate_sub_files

294
src/H5FDsubfiling/H5FDsubfiling.c
View File

@ -16,27 +16,30 @@
* mirror, and family VFDs.
*/
#include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#include "H5CXprivate.h" /* API contexts, etc. */
#include "H5Dprivate.h" /* Dataset stuff */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDsubfiling.h" /* Subfiling file driver */
#include "H5FDsubfiling_priv.h" /* Subfiling file driver */
#include "H5FDsec2.h" /* Sec2 VFD */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Fprivate.h" /* File access */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDsec2.h" /* Sec2 VFD */
#include "H5FDsubfiling_priv.h" /* Subfiling file driver */
#include "H5FLprivate.h" /* Free Lists */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
/* The driver identification number, initialized at runtime */
static hid_t H5FD_SUBFILING_g = H5I_INVALID_HID;
hid_t H5FD_SUBFILING_id_g = H5I_INVALID_HID;
/* Flag to indicate whether global driver resources & settings have been
* initialized.
*/
static bool H5FD_subfiling_init_s = false;
/* Whether the driver initialized MPI on its own */
static bool H5FD_mpi_self_initialized = false;
static bool H5FD_mpi_self_initialized_s = false;
/* The description of a file belonging to this driver. The 'eoa' and 'eof'
* determine the amount of hdf5 address space in use and the high-water mark
@ -178,7 +181,7 @@ static herr_t H5FD__subfiling_read_vector(H5FD_t *file, hid_t dxpl_id, uint32_t
static herr_t H5FD__subfiling_write_vector(H5FD_t *file, hid_t dxpl_id, uint32_t count, H5FD_mem_t types[],
haddr_t addrs[], size_t sizes[], const void *bufs[] /* in */);
static herr_t H5FD__subfiling_truncate(H5FD_t *_file, hid_t dxpl_id, bool closing);
static herr_t H5FD__subfiling_del(const char *name, hid_t fapl);
static herr_t H5FD__subfiling_delete(const char *name, hid_t fapl);
static herr_t H5FD__subfiling_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, const void *input,
void **output);
@ -238,8 +241,6 @@ static void H5_subfiling_dump_iovecs(subfiling_context_t *sf_context, size_t ior
haddr_t *io_addrs, size_t *io_sizes, H5_flexible_const_ptr_t *io_bufs);
#endif
void H5FD__subfiling_mpi_finalize(void);
static const H5FD_class_t H5FD_subfiling_g = {
H5FD_CLASS_VERSION, /* VFD interface version */
H5_VFD_SUBFILING, /* value */
@ -278,7 +279,7 @@ static const H5FD_class_t H5FD_subfiling_g = {
H5FD__subfiling_truncate, /* truncate */
NULL, /* lock */
NULL, /* unlock */
H5FD__subfiling_del, /* del */
H5FD__subfiling_delete, /* del */
H5FD__subfiling_ctl, /* ctl */
H5FD_FLMAP_DICHOTOMY /* fl_map */
};
@ -286,101 +287,110 @@ static const H5FD_class_t H5FD_subfiling_g = {
/* Declare a free list to manage the H5FD_subfiling_t struct */
H5FL_DEFINE_STATIC(H5FD_subfiling_t);
/*
* If this VFD initialized MPI, this routine will be registered
* as an atexit handler in order to finalize MPI before the
* application exits.
*/
void
H5FD__subfiling_mpi_finalize(void)
{
/*
* Don't call normal FUNC_ENTER() since we don't want to initialize the
* whole library just to release it all right away. It is safe to call
* this function for an uninitialized library.
*/
FUNC_ENTER_NOAPI_NOINIT_NOERR
H5_term_library();
MPI_Finalize();
FUNC_LEAVE_NOAPI_VOID
}
/*-------------------------------------------------------------------------
* Function: H5FD_subfiling_init
* Function: H5FD__subfiling_register
*
* Purpose: Initialize this driver by registering the driver with the
* library.
* Purpose: Register the driver with the library.
*
* Return: Success: The driver ID for the subfiling driver
* Failure: H5I_INVALID_HID
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
hid_t
H5FD_subfiling_init(void)
herr_t
H5FD__subfiling_register(void)
{
hid_t ret_value = H5I_INVALID_HID; /* Return value */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_PACKAGE
/* Register the Subfiling VFD, if it isn't already registered */
if (H5I_VFL != H5I_get_type(H5FD_SUBFILING_g)) {
int mpi_initialized = 0;
int provided = 0;
int mpi_code;
if ((H5FD_SUBFILING_g = H5FD_register(&H5FD_subfiling_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, H5I_INVALID_HID, "can't register subfiling VFD");
/* Initialize MPI if not already initialized */
if (MPI_SUCCESS != (mpi_code = MPI_Initialized(&mpi_initialized)))
HMPI_GOTO_ERROR(H5I_INVALID_HID, "MPI_Initialized failed", mpi_code);
if (mpi_initialized) {
/* If MPI is initialized, validate that it was initialized with MPI_THREAD_MULTIPLE */
if (MPI_SUCCESS != (mpi_code = MPI_Query_thread(&provided)))
HMPI_GOTO_ERROR(H5I_INVALID_HID, "MPI_Query_thread failed", mpi_code);
if (provided != MPI_THREAD_MULTIPLE)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
"Subfiling VFD requires the use of MPI_Init_thread with MPI_THREAD_MULTIPLE");
}
else {
int required = MPI_THREAD_MULTIPLE;
if (MPI_SUCCESS != (mpi_code = MPI_Init_thread(NULL, NULL, required, &provided)))
HMPI_GOTO_ERROR(H5I_INVALID_HID, "MPI_Init_thread failed", mpi_code);
H5FD_mpi_self_initialized = true;
if (provided != required)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
"MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE");
if (atexit(H5FD__subfiling_mpi_finalize) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, H5I_INVALID_HID,
"can't register atexit handler for MPI_Finalize");
}
/*
* Create the MPI Datatype that will be used
* for sending/receiving RPC messages
*/
HDcompile_assert(sizeof(((sf_work_request_t *)NULL)->header) == 3 * sizeof(int64_t));
if (H5_subfiling_rpc_msg_type == MPI_DATATYPE_NULL) {
if (MPI_SUCCESS != (mpi_code = MPI_Type_contiguous(3, MPI_INT64_T, &H5_subfiling_rpc_msg_type)))
HMPI_GOTO_ERROR(H5I_INVALID_HID, "MPI_Type_contiguous failed", mpi_code);
if (MPI_SUCCESS != (mpi_code = MPI_Type_commit(&H5_subfiling_rpc_msg_type)))
HMPI_GOTO_ERROR(H5I_INVALID_HID, "MPI_Type_commit failed", mpi_code);
}
}
/* Set return value */
ret_value = H5FD_SUBFILING_g;
if (H5I_VFL != H5I_get_type(H5FD_SUBFILING_id_g))
if ((H5FD_SUBFILING_id_g = H5FD_register(&H5FD_subfiling_g, sizeof(H5FD_class_t), false)) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTREGISTER, FAIL, "can't register subfiling VFD");
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_subfiling_init() */
} /* end H5FD__subfiling_register() */
/*---------------------------------------------------------------------------
* Function: H5FD__subfiling_unregister
*
* Purpose: Reset library driver info.
*
* Returns: SUCCEED (Can't fail)
*
*---------------------------------------------------------------------------
*/
herr_t
H5FD__subfiling_unregister(void)
{
FUNC_ENTER_PACKAGE_NOERR
/* Reset VFL ID */
H5FD_SUBFILING_id_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD__subfiling_unregister() */
/*-------------------------------------------------------------------------
* Function: H5FD__subfiling_init
*
* Purpose: Singleton to initialize global driver settings & resources.
*
* Return: Non-negative on success/Negative on failure
*
*-------------------------------------------------------------------------
*/
static herr_t
H5FD__subfiling_init(void)
{
int mpi_initialized = 0;
int provided = 0;
int mpi_code;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE
/* Initialize MPI if not already initialized */
if (MPI_SUCCESS != (mpi_code = MPI_Initialized(&mpi_initialized)))
HMPI_GOTO_ERROR(FAIL, "MPI_Initialized failed", mpi_code);
if (mpi_initialized) {
/* If MPI is initialized, validate that it was initialized with MPI_THREAD_MULTIPLE */
if (MPI_SUCCESS != (mpi_code = MPI_Query_thread(&provided)))
HMPI_GOTO_ERROR(FAIL, "MPI_Query_thread failed", mpi_code);
if (provided != MPI_THREAD_MULTIPLE)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL,
"Subfiling VFD requires the use of MPI_Init_thread with MPI_THREAD_MULTIPLE");
}
else {
if (MPI_SUCCESS != (mpi_code = MPI_Init_thread(NULL, NULL, MPI_THREAD_MULTIPLE, &provided)))
HMPI_GOTO_ERROR(FAIL, "MPI_Init_thread failed", mpi_code);
H5FD_mpi_self_initialized_s = true;
if (provided != MPI_THREAD_MULTIPLE)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL,
"MPI doesn't support MPI_Init_thread with MPI_THREAD_MULTIPLE");
}
/*
* Create the MPI Datatype that will be used
* for sending/receiving RPC messages
*/
HDcompile_assert(sizeof(((sf_work_request_t *)NULL)->header) == 3 * sizeof(int64_t));
if (H5_subfiling_rpc_msg_type == MPI_DATATYPE_NULL) {
if (MPI_SUCCESS != (mpi_code = MPI_Type_contiguous(3, MPI_INT64_T, &H5_subfiling_rpc_msg_type)))
HMPI_GOTO_ERROR(FAIL, "MPI_Type_contiguous failed", mpi_code);
if (MPI_SUCCESS != (mpi_code = MPI_Type_commit(&H5_subfiling_rpc_msg_type)))
HMPI_GOTO_ERROR(FAIL, "MPI_Type_commit failed", mpi_code);
}
/* Indicate that driver is set up */
H5FD_subfiling_init_s = true;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__subfiling_init() */
/*---------------------------------------------------------------------------
* Function: H5FD__subfiling_term
@ -394,44 +404,45 @@ done:
static herr_t
H5FD__subfiling_term(void)
{
int mpi_finalized;
int mpi_code;
herr_t ret_value = SUCCEED;
FUNC_ENTER_PACKAGE
if (H5FD_SUBFILING_g >= 0) {
int mpi_finalized;
int mpi_code;
/*
* Retrieve status of whether MPI has already been terminated.
* This can happen if an HDF5 ID is left unclosed and HDF5
* shuts down after MPI_Finalize() is called in an application.
*/
if (MPI_SUCCESS != (mpi_code = MPI_Finalized(&mpi_finalized)))
HMPI_GOTO_ERROR(FAIL, "MPI_Finalized failed", mpi_code);
/*
* Retrieve status of whether MPI has already been terminated.
* This can happen if an HDF5 ID is left unclosed and HDF5
* shuts down after MPI_Finalize() is called in an application.
*/
if (MPI_SUCCESS != (mpi_code = MPI_Finalized(&mpi_finalized)))
HMPI_GOTO_ERROR(FAIL, "MPI_Finalized failed", mpi_code);
if (!mpi_finalized) {
/* Free RPC message MPI Datatype */
if (H5_subfiling_rpc_msg_type != MPI_DATATYPE_NULL) {
if (!mpi_finalized) {
if (MPI_SUCCESS != (mpi_code = MPI_Type_free(&H5_subfiling_rpc_msg_type)))
HMPI_GOTO_ERROR(FAIL, "MPI_Type_free failed", mpi_code);
}
#ifdef H5_SUBFILING_DEBUG
else
printf("** WARNING **: HDF5 is terminating the Subfiling VFD after MPI_Finalize() was called "
"- an HDF5 ID was probably left unclosed\n");
#endif
}
if (H5_subfiling_rpc_msg_type != MPI_DATATYPE_NULL)
if (MPI_SUCCESS != (mpi_code = MPI_Type_free(&H5_subfiling_rpc_msg_type)))
HMPI_GOTO_ERROR(FAIL, "MPI_Type_free failed", mpi_code);
/* Clean up resources */
if (H5FD__subfiling_terminate() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "can't cleanup internal subfiling resources");
/* Terminate MPI if the driver initialized it */
if (H5FD_mpi_self_initialized_s) {
if (MPI_SUCCESS != (mpi_code = MPI_Finalize()))
HMPI_GOTO_ERROR(FAIL, "MPI_Finalize failed", mpi_code);
H5FD_mpi_self_initialized_s = false;
}
}
#ifdef H5_SUBFILING_DEBUG
else
printf("** WARNING **: HDF5 is terminating the Subfiling VFD after MPI_Finalize() was called "
"- an HDF5 ID was probably left unclosed\n");
#endif
/* Clean up resources */
if (H5FD__subfiling_terminate() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTRELEASE, FAIL, "can't cleanup internal subfiling resources");
done:
/* Reset VFL ID */
H5FD_SUBFILING_g = H5I_INVALID_HID;
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__subfiling_term() */
@ -461,13 +472,14 @@ H5Pset_fapl_subfiling(hid_t fapl_id, const H5FD_subfiling_config_t *vfd_config)
FUNC_ENTER_API(FAIL)
/* Ensure Subfiling (and therefore MPI) is initialized before doing anything */
if (H5FD_subfiling_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize subfiling VFD");
if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
/* Initialize driver, if it's not yet */
if (!H5FD_subfiling_init_s)
if (H5FD__subfiling_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
if (vfd_config == NULL) {
if (NULL == (subfiling_conf = H5MM_calloc(sizeof(*subfiling_conf))))
HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, FAIL, "can't allocate subfiling VFD configuration");
@ -544,6 +556,11 @@ H5Pget_fapl_subfiling(hid_t fapl_id, H5FD_subfiling_config_t *config_out)
if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");
/* Initialize driver, if it's not yet */
if (!H5FD_subfiling_init_s)
if (H5FD__subfiling_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
if (H5FD_SUBFILING != H5P_peek_driver(plist))
use_default_config = true;
else {
@ -1113,6 +1130,11 @@ H5FD__subfiling_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t ma
if (ADDR_OVERFLOW(maxaddr))
HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "bogus maxaddr");
/* Initialize driver, if it's not yet */
if (!H5FD_subfiling_init_s)
if (H5FD__subfiling_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "can't initialize driver");
if (NULL == (file = (H5FD_subfiling_t *)H5FL_CALLOC(H5FD_subfiling_t)))
HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, NULL, "unable to allocate file struct");
file->comm = MPI_COMM_NULL;
@ -1127,7 +1149,7 @@ H5FD__subfiling_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t ma
if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list");
if (H5FD_mpi_self_initialized) {
if (H5FD_mpi_self_initialized_s) {
file->comm = MPI_COMM_WORLD;
file->info = MPI_INFO_NULL;
}
@ -1759,8 +1781,17 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD__subfiling_truncate() */
/*-------------------------------------------------------------------------
* Function: H5FD__subfiling_delete
*
* Purpose: Delete a file
*
* Return: SUCCEED/FAIL
*
*-------------------------------------------------------------------------
*/
static herr_t
H5FD__subfiling_del(const char *name, hid_t fapl)
H5FD__subfiling_delete(const char *name, hid_t fapl)
{
const H5FD_subfiling_config_t *subfiling_config = NULL;
H5FD_subfiling_config_t default_config;
@ -1769,6 +1800,11 @@ H5FD__subfiling_del(const char *name, hid_t fapl)
FUNC_ENTER_PACKAGE
/* Initialize driver, if it's not yet */
if (!H5FD_subfiling_init_s)
if (H5FD__subfiling_init() < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "can't initialize driver");
if (NULL == (plist = H5P_object_verify(fapl, H5P_FILE_ACCESS)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list");

15
src/H5FDsubfiling/H5FDsubfiling.h
View File

@ -14,12 +14,16 @@
#ifndef H5FDsubfiling_H
#define H5FDsubfiling_H
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
#ifdef H5_HAVE_SUBFILING_VFD
/**
* \def H5FD_SUBFILING
* Macro that returns the identifier for the #H5FD_SUBFILING driver. \hid_t{file driver}
*/
#define H5FD_SUBFILING (H5FDperform_init(H5FD_subfiling_init))
#define H5FD_SUBFILING (H5OPEN H5FD_SUBFILING_id_g)
#else
#define H5FD_SUBFILING (H5I_INVALID_HID)
#endif
@ -319,11 +323,12 @@ typedef struct H5FD_subfiling_config_t {
extern "C" {
#endif
/**
* \brief Internal routine to initialize #H5FD_SUBFILING driver. Not meant to be
* called directly by an HDF5 application
/** @private
*
* \brief ID for the SUBFILING VFD
*/
H5_DLL hid_t H5FD_subfiling_init(void);
H5_DLLVAR hid_t H5FD_SUBFILING_id_g;
/**
* \ingroup FAPL
*

11
src/H5FDsubfiling/H5FDsubfiling_priv.h
View File

@ -21,16 +21,11 @@
/* H5 Headers */
/**************/
#include "H5private.h" /* Generic Functions */
#include "H5CXprivate.h" /* API Contexts */
#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
/* Public header */
#include "H5FDsubfiling.h" /* Subfiling VFD */
#include "H5FDioc.h" /* IOC VFD */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
/* Private headers */
#include "H5private.h" /* Generic Functions */
#include "H5subfiling_common.h"
#define DRIVER_INFO_MESSAGE_MAX_INFO 65536

14
src/H5FDsubfiling/H5subfiling_common.c
View File

@ -14,11 +14,15 @@
* Generic code for integrating an HDF5 VFD with the subfiling feature
*/
#include "H5subfiling_common.h"
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5Eprivate.h"
#include "H5MMprivate.h"
#include "H5TSprivate.h" /* Threadsafety */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDpkg.h" /* File drivers */
#include "H5Iprivate.h" /* IDs */
#include "H5MMprivate.h" /* Memory management */
#include "H5TSprivate.h" /* Threadsafety */
#include "H5subfiling_common.h"
typedef struct { /* Format of a context map entry */
uint64_t file_id; /* key value (linear search of the cache) */
@ -94,7 +98,7 @@ static int64_t
H5FD__subfiling_new_object_id(sf_obj_type_t obj_type)
{
int64_t index_val = 0;
int64_t ret_value;
int64_t ret_value = 0;
FUNC_ENTER_PACKAGE

13
src/H5FDsubfiling/H5subfiling_common.h
View File

@ -17,14 +17,11 @@
#ifndef H5_SUBFILING_COMMON_H
#define H5_SUBFILING_COMMON_H
#include "H5private.h" /* Generic Functions */
#include "H5FDprivate.h" /* File Drivers */
#include "H5Iprivate.h" /* IDs */
#include "H5Pprivate.h" /* Property lists */
#include "H5TSprivate.h" /* Threads */
#include "H5FDsubfiling.h"
#include "H5FDioc.h"
#include "H5private.h" /* Generic Functions */
#include "H5FDsubfiling.h" /* Subfiling file driver */
#include "H5FDioc.h" /* I/O concentrator file driver */
#include "H5Pprivate.h" /* Property lists */
#include "H5TSprivate.h" /* Threads */
#ifndef PATH_MAX
#define PATH_MAX 4096

15
src/H5FDwindows.c
View File

@ -10,15 +10,18 @@
* help@hdfgroup.org. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FDprivate.h" /* File drivers */
#include "H5FDwindows.h" /* Windows file driver */
#include "H5FDsec2.h" /* Windows file driver */
#include "H5Pprivate.h" /* Property lists */
#include "H5FDmodule.h" /* This source code file is part of the H5FD module */
#include "H5private.h" /* Generic Functions */
#ifdef H5_HAVE_WINDOWS
#include "H5Eprivate.h" /* Error handling */
#include "H5FDsec2.h" /* Windows file driver */
#include "H5FDpkg.h" /* File drivers */
#include "H5FDwindows.h" /* Windows file driver */
#include "H5Pprivate.h" /* Property lists */
/*-------------------------------------------------------------------------
* Function: H5Pset_fapl_windows
*

13
src/H5FDwindows.h
View File

@ -20,13 +20,22 @@
#ifndef H5FDwindows_H
#define H5FDwindows_H
/** Initializer for the Windows VFD */
#define H5FD_WINDOWS (H5FD_sec2_init())
/* Public header files */
#include "H5FDpublic.h" /* File drivers */
/** ID for the windows VFD */
#define H5FD_WINDOWS (H5OPEN H5FD_SEC2_id_g)
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/** @private
*
* \brief ID for the windows (sec2) VFD
*/
H5_DLLVAR hid_t H5FD_SEC2_id_g;
/**
* \ingroup FAPL
*

22
src/H5FL.c
View File

@ -110,6 +110,9 @@ struct H5FL_fac_node_t {
struct H5FL_fac_node_t *next; /* Pointer to next block in free list */
};
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/* The head of the list of factory things to garbage collect */
static H5FL_fac_gc_list_t H5FL_fac_gc_head = {0, NULL};
@ -168,15 +171,20 @@ H5FL_term_package(void)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if (H5_PKG_INIT_VAR) {
/* Garbage collect any nodes on the free lists */
(void)
H5FL_garbage_coll();
(void)H5FL_garbage_coll();
/* Shut down the various kinds of free lists */
n += H5FL__reg_term();
n += H5FL__fac_term_all();
n += H5FL__arr_term();
n += H5FL__blk_term();
/* Shut down the various kinds of free lists */
n += H5FL__reg_term();
n += H5FL__fac_term_all();
n += H5FL__arr_term();
n += H5FL__blk_term();
/* Mark interface closed */
if (0 == n)
H5_PKG_INIT_VAR = false;
} /* end if */
FUNC_LEAVE_NOAPI(n)
} /* end H5FL_term_package() */

5
src/H5FLmodule.h
View File

@ -22,7 +22,8 @@
* reporting macros.
*/
#define H5FL_MODULE
#define H5_MY_PKG H5FL
#define H5_MY_PKG_ERR H5E_RESOURCE
#define H5_MY_PKG H5FL
#define H5_MY_PKG_ERR H5E_RESOURCE
#define H5_MY_PKG_INIT NO
#endif /* H5FLmodule_H */

3
src/H5FS.c
View File

@ -58,6 +58,9 @@ static herr_t H5FS__sinfo_free_node_cb(void *item, void *key, void *op_data);
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/* Declare a free list to manage the H5FS_section_class_t sequence information */
H5FL_SEQ_DEFINE(H5FS_section_class_t);

22
src/H5FSint.c
View File

@ -64,6 +64,28 @@
/* Local Variables */
/*******************/
/*-------------------------------------------------------------------------
* Function: H5FS_init
*
* Purpose: Initialize the interface in case it is unable to initialize
* itself soon enough.
*
* Return: Success: non-negative
* Failure: negative
*
*-------------------------------------------------------------------------
*/
herr_t
H5FS_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
/* FUNC_ENTER() does all the work */
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FS_init() */
/*-------------------------------------------------------------------------
* Function: H5FS__create_flush_depend
*

5
src/H5FSmodule.h
View File

@ -22,7 +22,8 @@
* reporting macros.
*/
#define H5FS_MODULE
#define H5_MY_PKG H5FS
#define H5_MY_PKG_ERR H5E_FSPACE
#define H5_MY_PKG H5FS
#define H5_MY_PKG_ERR H5E_FSPACE
#define H5_MY_PKG_INIT NO
#endif /* H5FSmodule_H */

3
src/H5FSprivate.h
View File

@ -183,6 +183,9 @@ H5FL_SEQ_EXTERN(H5FS_section_class_t);
/* Library-private Function Prototypes */
/***************************************/
/* Package initialization routine */
H5_DLL herr_t H5FS_init(void);
/* Free space manager routines */
H5_DLL H5FS_t *H5FS_create(H5F_t *f, haddr_t *fs_addr, const H5FS_create_t *fs_create, uint16_t nclasses,
const H5FS_section_class_t *classes[], void *cls_init_udata, hsize_t alignment,

6
src/H5Fcwfs.c
View File

@ -240,7 +240,7 @@ H5F_cwfs_advance_heap(H5F_t *f, H5HG_heap_t *heap, bool add_heap)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(f);
@ -260,6 +260,7 @@ H5F_cwfs_advance_heap(H5F_t *f, H5HG_heap_t *heap, bool add_heap)
f->shared->cwfs[f->shared->ncwfs - 1] = heap;
} /* end if */
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5F_cwfs_advance_heap() */
@ -279,7 +280,7 @@ H5F_cwfs_remove_heap(H5F_shared_t *shared, H5HG_heap_t *heap)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(shared);
@ -294,5 +295,6 @@ H5F_cwfs_remove_heap(H5F_shared_t *shared, H5HG_heap_t *heap)
} /* end if */
} /* end for */
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5F_cwfs_remove_heap() */

54
src/H5Fint.c
View File

@ -91,6 +91,9 @@ static herr_t H5F__flush_phase2(H5F_t *f, bool closing);
/* Package Variables */
/*********************/
/* Package initialization variable */
bool H5_PKG_INIT_VAR = false;
/* Based on the value of the HDF5_USE_FILE_LOCKING environment variable.
* true/false have obvious meanings. FAIL means the environment variable was
* not set, so the code should ignore it and use the fapl value instead.
@ -136,6 +139,29 @@ H5F_init(void)
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_init() */
/*--------------------------------------------------------------------------
NAME
H5F__init_package -- Initialize interface-specific information
USAGE
herr_t H5F__init_package()
RETURNS
Non-negative on success/Negative on failure
DESCRIPTION
Initializes any interface-specific data or routines.
--------------------------------------------------------------------------*/
herr_t
H5F__init_package(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_PACKAGE
/* Initialize the ID group for the file IDs */
if (H5I_register_type(H5I_FILE_CLS) < 0)
@ -147,7 +173,7 @@ H5F_init(void)
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_init() */
} /* H5F__init_package() */
/*-------------------------------------------------------------------------
* Function: H5F_term_package
@ -171,17 +197,23 @@ H5F_term_package(void)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if (H5I_nmembers(H5I_FILE) > 0) {
(void)H5I_clear_type(H5I_FILE, false, false);
n++; /*H5I*/
} /* end if */
else {
/* Make certain we've cleaned up all the shared file objects */
H5F_sfile_assert_num(0);
if (H5_PKG_INIT_VAR) {
if (H5I_nmembers(H5I_FILE) > 0) {
(void)H5I_clear_type(H5I_FILE, false, false);
n++; /*H5I*/
} /* end if */
else {
/* Make certain we've cleaned up all the shared file objects */
H5F_sfile_assert_num(0);
/* Destroy the file object id group */
n += (H5I_dec_type_ref(H5I_FILE) > 0);
} /* end else */
/* Destroy the file object id group */
n += (H5I_dec_type_ref(H5I_FILE) > 0);
/* Mark closed */
if (0 == n)
H5_PKG_INIT_VAR = false;
} /* end else */
} /* end if */
FUNC_LEAVE_NOAPI(n)
} /* end H5F_term_package() */

5
src/H5Fmodule.h
View File

@ -22,8 +22,9 @@
* reporting macros.
*/
#define H5F_MODULE
#define H5_MY_PKG H5F
#define H5_MY_PKG_ERR H5E_FILE
#define H5_MY_PKG H5F
#define H5_MY_PKG_ERR H5E_FILE
#define H5_MY_PKG_INIT YES
/** \page H5F_UG HDF5 File
*

6
src/H5Fmpi.c
View File

@ -432,7 +432,7 @@ done:
bool
H5F_get_coll_metadata_reads(const H5F_t *file)
{
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file && file->shared);
@ -458,7 +458,7 @@ H5F_shared_get_coll_metadata_reads(const H5F_shared_t *f_sh)
H5P_coll_md_read_flag_t file_flag = H5P_USER_FALSE;
bool ret_value = false;
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(f_sh);
@ -536,7 +536,7 @@ H5F_set_coll_metadata_reads(H5F_t *file, H5P_coll_md_read_flag_t *file_flag, boo
H5P_coll_md_read_flag_t prev_file_flag = H5P_USER_FALSE;
bool prev_context_flag = false;
FUNC_ENTER_NOAPI_NOERR
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file && file->shared);
assert(file_flag);

Some files were not shown because too many files have changed in this diff Show More